-
Notifications
You must be signed in to change notification settings - Fork 913
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 azure-core nested HTTP suppression, update libs #12489
Merged
trask
merged 9 commits into
open-telemetry:main
from
lmolkova:azure-core-update-and-fix-suppression
Oct 26, 2024
Merged
Fix azure-core nested HTTP suppression, update libs #12489
trask
merged 9 commits into
open-telemetry:main
from
lmolkova:azure-core-update-and-fix-suppression
Oct 26, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lmolkova
commented
Oct 21, 2024
instrumentation/azure-core/azure-core-1.19/javaagent/build.gradle.kts
Outdated
Show resolved
Hide resolved
This was referenced Oct 23, 2024
Merged
trask
approved these changes
Oct 23, 2024
instrumentation/azure-core/azure-core-1.36/library-instrumentation-shaded/build.gradle.kts
Outdated
Show resolved
Hide resolved
instrumentation/azure-core/azure-core-1.53/library-instrumentation-shaded/build.gradle.kts
Outdated
Show resolved
Hide resolved
...o/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureSdkInstrumentationModule.java
Outdated
Show resolved
Hide resolved
d8a6655
to
e247e56
Compare
trask
reviewed
Oct 25, 2024
instrumentation/azure-core/azure-core-1.53/library-instrumentation-shaded/build.gradle.kts
Outdated
Show resolved
Hide resolved
trask
approved these changes
Oct 25, 2024
.../testAzure/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_53/AzureSdkTest.java
Outdated
Show resolved
Hide resolved
lmolkova
commented
Oct 25, 2024
instrumentation/azure-core/azure-core-1.36/library-instrumentation-shaded/build.gradle.kts
Show resolved
Hide resolved
jaydeluca
reviewed
Oct 26, 2024
.../testAzure/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureSdkTest.java
Outdated
Show resolved
Hide resolved
.../testAzure/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureSdkTest.java
Outdated
Show resolved
Hide resolved
@lmolkova whenever you have time, take a look at the simplification I pushed to make sure I didn't miss anything, thanks! |
jaydeluca
approved these changes
Oct 26, 2024
Thanks @trask ! This looks great. A side-note - I'll need to add new azure-core version in the future, but it's indeed not essential now and can wait for months. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Azure-core instrumentation is based on the native plugin and can be enabled/disabled using azure-core public APIs.
The instrumentation produces two types of spans: logical for API-level and HTTP (with some azure-specific context).
Azure-core HTTP spans suppress underlying HTTP spans generated by otel instrumentations (inside java-agent part)
opentelemetry-java-instrumentation/instrumentation/azure-core/azure-core-1.36/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureHttpClientInstrumentation.java
Line 39 in 5cc8917
Some users are not interested in the logical spans, but want to keep HTTP ones coming.
When azure-core instrumentation is disabled, it applies to all spans.
The problem is that suppression mechanism used in the agent part suppresses all HTTP spans done by azure-core regardless of whether the request was instrumented by azure-core or not.
This PR:
See also: Azure/azure-sdk-for-java#41100