Enable span suppression by SpanKey by default #5779
Merged
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
mateuszrzeszutek
force-pushed
the
suppression
branch
5 times, most recently
from
ad3cf14
to
4e0df4d
Compare
...src/main/java/io/opentelemetry/instrumentation/api/instrumenter/SpanSuppressionStrategy.java
Show resolved
Hide resolved
...ation/aws-sdk/aws-sdk-1.11/javaagent-unit-tests/src/test/java/TracingRequestHandlerTest.java
Show resolved
Hide resolved
Comment on lines
-113
to
-120
| if (hasHttpClientSpan()) { | ||
| offset = 1 | ||
| span(1) { | ||
| name "HTTP POST" | ||
| kind CLIENT | ||
| childOf span(0) | ||
| } | ||
| } |
There was a problem hiding this comment.
The AWS SQS.SendMessage span implements both RPC and HTTP conventions, thus it suppresses this HTTP span -- they both had the exact same net/HTTP attributes anyway.
There was a problem hiding this comment.
@anuraaga this sounds like a good thing, just wanted to get your 👀 on it
...common/src/main/java/io/opentelemetry/instrumentation/testing/InstrumentationTestRunner.java
Show resolved
Hide resolved
mateuszrzeszutek
force-pushed
the
suppression
branch
from
66bee8a
to
e8abe95
Compare
trask
approved these changes
Apr 17, 2022
...tion-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/SpanSuppressor.java
Outdated
Show resolved
Hide resolved
...tion-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/SpanSuppressor.java
Show resolved
Hide resolved
...tation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/server/ServerSpan.java
Show resolved
Hide resolved
...on-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterTest.java
Outdated
Show resolved
Hide resolved
Comment on lines
-113
to
-120
| if (hasHttpClientSpan()) { | ||
| offset = 1 | ||
| span(1) { | ||
| name "HTTP POST" | ||
| kind CLIENT | ||
| childOf span(0) | ||
| } | ||
| } |
There was a problem hiding this comment.
@anuraaga this sounds like a good thing, just wanted to get your 👀 on it
...ntelemetry-api/opentelemetry-api-1.0/testing/src/main/java/AgentSpanTestingInstrumenter.java
Outdated
Show resolved
Hide resolved
...agent/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioAsyncMarker.java
Show resolved
Hide resolved
| "$SemanticAttributes.HTTP_URL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" | ||
| "$SemanticAttributes.HTTP_STATUS_CODE.key" 200 | ||
| } | ||
| } |
There was a problem hiding this comment.
and we get the underlying http span 🎉
testing-common/src/main/java/io/opentelemetry/instrumentation/testing/TestInstrumenters.java
Show resolved
Hide resolved
...src/main/java/io/opentelemetry/instrumentation/api/instrumenter/SpanSuppressionStrategy.java
Show resolved
Hide resolved
added 14 commits
April 19, 2022 12:06
mateuszrzeszutek
force-pushed
the
suppression
branch
from
e25c629
to
6c82d64
Compare
RashmiRam
pushed a commit
to RashmiRam/opentelemetry-auto-instr-java
that referenced
this pull request
May 23, 2022
* Enable span suppression by SpanKey by default * fix HTTP tests (probably) * add exception for camel * remove suppression tests from @WithSpan instrumentations * remove suppression tests from @WithSpan instrumentation; spring boot autoconfigure * fix twilio tests * fix netty-based HTTP clients, remove AWS SDK 1.11 unit test * fix elasticsearch tests * codenarc * spotless * fix AWS SDK 1.11 tests * remove a TODO * code review comments * fix merge conflict Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
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.
Resolves #5735 -- now suppression by
SpanKeyis the default suppression strategy; there is a configuration option that allows to choose the strategy.Resolves #3965 -- adds a new "none" mode that does not suppress spans at all.
This PR includes a significant refactoring of the span suppression code, and includes a couple of new
SpanKeys.CC @lmolkova
(I'll mark it ready for review once I fix all the tests 🤞 )