Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: develop deprecation and related changes #6668

Merged
merged 11 commits into from
Dec 19, 2024

Conversation

prashant-shahi
Copy link
Member

@prashant-shahi prashant-shahi commented Dec 18, 2024

Summary

  • develop deprecation and related changes

Important

Deprecate develop branch in favor of main across workflows, scripts, and documentation, with updates to Docker images and code refactoring for field handling.

  • Branch Deprecation:
    • Remove develop branch from build.yaml, push.yaml, sonar.yml, and jest-coverage-changes.yml.
    • Update docs.yml, e2e-k3s.yaml, staging-deployment.yaml, and testing-deployment.yaml to trigger on main.
    • Update URLs in hotrod-install.sh and hotrod-delete.sh to use main branch.
    • Remove develop branch check in frontend/.husky/commit-msg.
    • Update CONTRIBUTING.md and deploy/README.md to reference main branch.
  • Docker and Dependencies:
    • Update Docker images in docker-compose.yaml and docker-compose-core.yaml to new versions.
    • Update go.mod to use signoz-otel-collector v0.111.16.
  • Code Refactoring:
    • Refactor removeUnderscoreDuplicateFields() in reader.go to use model.Field instead of model.LogField.
    • Add GetTraceFields() and UpdateTraceField() in reader.go.
    • Add new API endpoints in http_handler.go for trace fields.
    • Modify buildTracesFilterQuery() in query_builder.go to handle new filter operations.
    • Update replaceFieldInToken() in parser.go to use model.Field.
  • Testing:
    • Update tests in parser_test.go and query_builder_test.go to reflect changes in field handling.

This description was created by Ellipsis for 42fefc6. It will automatically update as commits are pushed.

Copy link

Build Error! No Linked Issue found. Please link an issue or mention it in the body using #<issue_id>

@github-actions github-actions bot added the chore label Dec 18, 2024
Copy link

Build Error! No Linked Issue found. Please link an issue or mention it in the body using #<issue_id>

Copy link
Contributor

@ellipsis-dev ellipsis-dev bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Looks good to me! Reviewed everything up to 502f311 in 41 seconds

More details
  • Looked at 237 lines of code in 14 files
  • Skipped 0 files when reviewing.
  • Skipped posting 1 drafted comments based on config settings.
1. CONTRIBUTING.md:339
  • Draft comment:
    Update the contribution guidelines to reflect that contributions should be made to the 'main' branch instead of the 'develop' branch.
  • Reason this comment was not posted:
    Comment did not seem useful.

Workflow ID: wflow_VQvSWGomEkiMSyzu


You can customize Ellipsis with 👍 / 👎 feedback, review rules, user-specific overrides, quiet mode, and more.

shivanshuraj1333 and others added 3 commits December 18, 2024 19:06
* nit: update resource id and revert the flag
Co-authored-by: Nityananda Gohain <nityanandagohain@gmail.com>
grandwizard28
grandwizard28 previously approved these changes Dec 18, 2024
nityanandagohain and others added 2 commits December 19, 2024 11:52
* feat: api for trace materialization

* fix: minor changes and cleanup

* fix: minor fixes

* fix: update errors

* fix: address comments

* fix: address comments
Copy link

Build Error! No Linked Issue found. Please link an issue or mention it in the body using #<issue_id>

Copy link
Contributor

@ellipsis-dev ellipsis-dev bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Looks good to me! Incremental review on 42fefc6 in 1 minute and 23 seconds

More details
  • Looked at 237 lines of code in 14 files
  • Skipped 0 files when reviewing.
  • Skipped posting 2 drafted comments based on config settings.
1. deploy/README.md:61
  • Draft comment:
    The reference to the develop branch should be updated to main to reflect the deprecation of the develop branch.
  • Reason this comment was not posted:
    Comment looked like it was already resolved.
2. deploy/README.md:61
  • Draft comment:
    Update the branch reference from develop to main to reflect the changes made in the PR.
  • Reason this comment was not posted:
    Marked as duplicate.

Workflow ID: wflow_c9jLrO5DC8Z2QW0q


You can customize Ellipsis with 👍 / 👎 feedback, review rules, user-specific overrides, quiet mode, and more.

…1.15

Signed-off-by: Prashant Shahi <prashant@signoz.io>
…1.16

Signed-off-by: Prashant Shahi <prashant@signoz.io>
Signed-off-by: Prashant Shahi <prashant@signoz.io>
Signed-off-by: Prashant Shahi <prashant@signoz.io>
@prashant-shahi prashant-shahi enabled auto-merge (rebase) December 19, 2024 08:11
auto-merge was automatically disabled December 19, 2024 08:13

Rebase failed

@prashant-shahi prashant-shahi merged commit cecc57e into main Dec 19, 2024
15 of 17 checks passed
@prashant-shahi prashant-shahi deleted the chore/deprecate-develop branch December 19, 2024 08:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants