-
Notifications
You must be signed in to change notification settings - Fork 118
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
Fix OTEL HTTP exclusion detection #1688
Conversation
Hello @mariomac!
Please, if the current pull request addresses a bug fix, label it with the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! Nice catch!
This PR must be merged before a backport PR will be created. |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1688 +/- ##
==========================================
- Coverage 69.76% 69.71% -0.06%
==========================================
Files 209 209
Lines 21006 21006
==========================================
- Hits 14655 14644 -11
- Misses 5649 5657 +8
- Partials 702 705 +3
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we do traces as well?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
* Fix OTEL HTTP exclusion detection * Fix grpc and add traces too * add unit test (cherry picked from commit dabf256)
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-1688-to-release-2.0 origin/release-2.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x dabf256a3e526a286bdcea66eb1150d9d8e44814 When the conflicts are resolved, stage and commit the changes:
If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-1688-to-release-2.0
# Create the PR body template
PR_BODY=$(gh pr view 1688 --json body --template 'Backport dabf256a3e526a286bdcea66eb1150d9d8e44814 from #1688{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-2.0] Fix OTEL HTTP exclusion detection' --body-file - --label 'bug' --label 'type/bug' --label 'backport' --base release-2.0 --milestone release-2.0 --web Or, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-1688-to-release-2.0
# Create a pull request where the `base` branch is `release-2.0` and the `compare`/`head` branch is `backport-1688-to-release-2.0`.
# Remove the local backport branch
git switch main
git branch -D backport-1688-to-release-2.0 |
* Fix OTEL HTTP exclusion detection * Fix grpc and add traces too * add unit test (cherry picked from commit dabf256) Co-authored-by: Mario Macias <[email protected]>
If the OTEL endpoint has a path prefix (e.g.
/otlp
as in Grafana Cloud), the OTEL Exclusion detection mechanism won't work.