chore: Git spans changed from enum to string #32454

sondermanish · 2024-04-05T09:55:10Z

Description

GitSpan is now following same standards as the other spans.
Added meter for application fetch by id and branch
added test case to enforce the name standards

Fixes Issue URL

Automation

/ok-to-test tags="@tag.Git"

🔍 Cypress test results

Summary by CodeRabbit

New Features
- Enhanced Git operations like commit, push, clone, and more with improved method calls for better performance and reliability.
- Introduced new constants for Git operations and application spans to facilitate easier tracking and management of Git-related activities.
Refactor
- Updated various classes to use new constants for Git operations, streamlining the process of event name generation and span tracking.
- Improved method chaining in Git services for clearer and more efficient code.
Tests
- Added tests to ensure the correct usage of names in Git operations, validating the new approach to event name generation and span tracking.

Important

Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/8613398600
Commit: 60d265ab55b3373a73f48cc1fb6e3124027dd000
Cypress dashboard url: Click here!
All cypress tests have passed 🎉🎉🎉

coderabbitai · 2024-04-05T09:55:28Z

Walkthrough

The changes aim to streamline Git operations and boost observability in the Appsmith application, enhancing code maintainability and monitoring for improved performance tracking.

Changes

File Path	Change Summary
`.../git/service/ce/GitExecutorCEImpl.java`	Updated method calls to use `GitSpans` constants directly for various Git operations.
`.../constants/spans/BaseSpan.java`	Added `APPLICATION_SPAN_PREFIX` constant.
`.../git/constants/GitSpans.java`	Refactored to focus on event name generation, removing enum declaration.
`.../git/constants/ce/GitSpansCE.java`	Defined constants for Git operations tracing spans.
`.../git/GitSpansTest.java`	Introduced tests validating `GitSpansCE` usage and event name correctness.
`.../applications/base/ApplicationServiceCEImpl.java` `.../server/applications/base/ApplicationServiceImpl.java` `.../server/services/ce_compatible/ApplicationServiceCECompatibleImpl.java`	Added `ObservationRegistry` dependency and updated metrics tracking using `ApplicationSpans`.
`.../applications/spans/ApplicationSpans.java` `.../applications/spans/ApplicationSpansCE.java`	Introduced classes for application span constants related to different application span types.
`.../server/services/ce/GitServiceCEImpl.java`	Updated Git method chaining and added application span tracking using `ApplicationSpans`.

Possibly related issues

[Feat]:There is no option to push committed changes after git push fails #15349: The enhancements to Git operations and error handling could potentially address the issue of pushing committed changes after a failed push, improving the robustness of Git integrations.
[Bug]: Git setup failed for an app and now is in a dirty state #20272: The improvements in Git setup and operation handling might resolve the described problems with Git setup and commit error messages, making this PR potentially relevant to the issue.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>.
- Generate unit testing code for this file.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai generate interesting stats about this repository and render them as a table.
- @coderabbitai show all the console.log statements in this repository.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/constants/GitSpans.java

github-actions · 2024-04-08T11:27:11Z

Failed server tests

com.appsmith.server.refactors.ce.RefactoringServiceCETest#tableWidgetKeyEscapeRefactorName

github-actions · 2024-04-09T06:46:39Z

Failed server tests

com.appsmith.server.services.PageServiceTest#createValidPageWithLayout

nidhi-nair · 2024-04-09T07:05:32Z

...ver/appsmith-interfaces/src/main/java/com/appsmith/external/git/constants/ce/GitSpansCE.java

+import static com.appsmith.external.constants.spans.BaseSpan.APPSMITH_SPAN_PREFIX;
+import static com.appsmith.external.constants.spans.BaseSpan.GIT_SPAN_PREFIX;
+
+public class GitSpansCE {


Nit, existing classes are singular, please converge nomenclature

nidhi-nair · 2024-04-09T07:05:57Z

...ver/appsmith-interfaces/src/main/java/com/appsmith/external/git/constants/ce/GitSpansCE.java

+    public static final String FILE_SYSTEM_PUSH = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "file_system_push";
+    public static final String FILE_SYSTEM_FETCH_REMOTE =
+            APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "file_system_fetch_remote";
+    public static final String STATUS = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "status";


Are all of these compounds at API level?

yes, the one which doesn't have FILE_SYSTEM prefix

...r/appsmith-server/src/main/java/com/appsmith/server/applications/spans/ApplicationSpans.java

nidhi-nair

Minor nomenclature related comments.

github-actions · 2024-04-09T07:38:43Z

Failed server tests

com.appsmith.server.git.ServerSchemaMigrationEnforcerTest#importApplication_ThenExportApplication_MatchJson_equals_Success
com.appsmith.server.solutions.ApplicationForkingServiceTests#cloneApplicationMultipleTimes

added changes

4117393

sondermanish requested a review from AnaghHegde as a code owner April 5, 2024 09:55

sondermanish self-assigned this Apr 5, 2024

github-actions bot added the skip-changelog Adding this label to a PR prevents it from being listed in the changelog label Apr 5, 2024

sondermanish requested a review from nidhi-nair April 5, 2024 09:57

sondermanish changed the title ~~chore: added changes~~ chore: Git spans changed from enum to string Apr 5, 2024

coderabbitai bot reviewed Apr 5, 2024

View reviewed changes

sondermanish added 2 commits April 5, 2024 15:36

removed commented code

2f423f5

added more tappings

54080a4

remove application changes

5384103

sondermanish added ok-to-test Required label for CI Git performance Issues related to perceived performance on any git operation labels Apr 9, 2024

nidhi-nair reviewed Apr 9, 2024

View reviewed changes

...r/appsmith-server/src/main/java/com/appsmith/server/applications/spans/ApplicationSpans.java Outdated Show resolved Hide resolved

nidhi-nair requested changes Apr 9, 2024

View reviewed changes

name refactor

98c9607

sondermanish requested a review from nidhi-nair April 9, 2024 07:18

removed application span

60d265a

sondermanish added ok-to-test Required label for CI and removed ok-to-test Required label for CI labels Apr 9, 2024

made required changes

bd52deb

nidhi-nair approved these changes Apr 9, 2024

View reviewed changes

nidhi-nair merged commit 807f560 into release Apr 9, 2024
12 checks passed

nidhi-nair deleted the chore/meter-git branch April 9, 2024 14:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Git spans changed from enum to string #32454

chore: Git spans changed from enum to string #32454

sondermanish commented Apr 5, 2024 •

edited by github-actions bot

coderabbitai bot commented Apr 5, 2024 •

edited

Walkthrough

Changes

Possibly related issues

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configration File (`.coderabbit.yaml`)

Documentation and Community

github-actions bot commented Apr 8, 2024

github-actions bot commented Apr 9, 2024

nidhi-nair Apr 9, 2024

nidhi-nair Apr 9, 2024

sondermanish Apr 9, 2024

nidhi-nair left a comment

github-actions bot commented Apr 9, 2024

chore: Git spans changed from enum to string #32454

chore: Git spans changed from enum to string #32454

Conversation

sondermanish commented Apr 5, 2024 • edited by github-actions bot

Description

Automation

🔍 Cypress test results

Summary by CodeRabbit

coderabbitai bot commented Apr 5, 2024 • edited

Walkthrough

Changes

Possibly related issues

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configration File (.coderabbit.yaml)

Documentation and Community

github-actions bot commented Apr 8, 2024

Failed server tests

github-actions bot commented Apr 9, 2024

Failed server tests

nidhi-nair Apr 9, 2024

Choose a reason for hiding this comment

nidhi-nair Apr 9, 2024

Choose a reason for hiding this comment

sondermanish Apr 9, 2024

Choose a reason for hiding this comment

nidhi-nair left a comment

Choose a reason for hiding this comment

github-actions bot commented Apr 9, 2024

Failed server tests

sondermanish commented Apr 5, 2024 •

edited by github-actions bot

coderabbitai bot commented Apr 5, 2024 •

edited

CodeRabbit Configration File (`.coderabbit.yaml`)