-
Notifications
You must be signed in to change notification settings - Fork 1k
Add common TextMapGetter test #15618
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
Open
jaydeluca
wants to merge
2
commits into
open-telemetry:main
Choose a base branch
from
jaydeluca:common-propagator-test
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
90 changes: 0 additions & 90 deletions
90
...t/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/WebfluxTextMapGetterTest.java
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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
48 changes: 48 additions & 0 deletions
48
.../src/main/java/io/opentelemetry/instrumentation/testing/util/KeysVerifyingPropagator.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.instrumentation.testing.util; | ||
|
|
||
| import io.opentelemetry.context.Context; | ||
| import io.opentelemetry.context.propagation.TextMapGetter; | ||
| import io.opentelemetry.context.propagation.TextMapPropagator; | ||
| import io.opentelemetry.context.propagation.TextMapSetter; | ||
| import java.util.Collection; | ||
| import javax.annotation.Nullable; | ||
|
|
||
| /** | ||
| * A TextMapPropagator wrapper that verifies TextMapGetter methods can be called without errors. | ||
| * | ||
| * <p>This propagator wraps another propagator and calls methods during extraction. This catches | ||
| * compatibility issues where underlying library APIs change (e.g., NoSuchMethodError). | ||
| */ | ||
| public final class KeysVerifyingPropagator implements TextMapPropagator { | ||
| private final TextMapPropagator delegate; | ||
|
|
||
| public KeysVerifyingPropagator(TextMapPropagator delegate) { | ||
| this.delegate = delegate; | ||
| } | ||
|
|
||
| @Override | ||
| public Collection<String> fields() { | ||
| return delegate.fields(); | ||
| } | ||
|
|
||
| @Override | ||
| public <C> void inject(Context context, C carrier, TextMapSetter<C> setter) { | ||
| delegate.inject(context, carrier, setter); | ||
| } | ||
|
|
||
| @Override | ||
| public <C> Context extract(Context context, @Nullable C carrier, TextMapGetter<C> getter) { | ||
| // exercise methods to verify no errors | ||
| Iterable<String> keys = getter.keys(carrier); | ||
| if (keys != null) { | ||
| keys.iterator().forEachRemaining(key -> getter.get(carrier, key)); | ||
| } | ||
|
|
||
| return delegate.extract(context, carrier, getter); | ||
| } | ||
| } |
This file contains hidden or 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
32 changes: 32 additions & 0 deletions
32
...n/java/io/opentelemetry/javaagent/testing/propagator/KeysVerifyingPropagatorProvider.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.javaagent.testing.propagator; | ||
|
|
||
| import com.google.auto.service.AutoService; | ||
| import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator; | ||
| import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator; | ||
| import io.opentelemetry.context.propagation.TextMapPropagator; | ||
| import io.opentelemetry.javaagent.testing.util.KeysVerifyingPropagator; | ||
| import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; | ||
| import io.opentelemetry.sdk.autoconfigure.spi.ConfigurablePropagatorProvider; | ||
|
|
||
| /** Provides a propagator that wraps the default W3C propagators with additional verification. */ | ||
| @AutoService(ConfigurablePropagatorProvider.class) | ||
| public final class KeysVerifyingPropagatorProvider implements ConfigurablePropagatorProvider { | ||
| @Override | ||
| public TextMapPropagator getPropagator(ConfigProperties configProperties) { | ||
| TextMapPropagator composite = | ||
| TextMapPropagator.composite( | ||
| W3CTraceContextPropagator.getInstance(), W3CBaggagePropagator.getInstance()); | ||
|
|
||
| return new KeysVerifyingPropagator(composite); | ||
| } | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return "testing-verifying-propagator"; | ||
| } | ||
| } |
50 changes: 50 additions & 0 deletions
50
...porter/src/main/java/io/opentelemetry/javaagent/testing/util/KeysVerifyingPropagator.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.javaagent.testing.util; | ||
|
|
||
| import io.opentelemetry.context.Context; | ||
| import io.opentelemetry.context.propagation.TextMapGetter; | ||
| import io.opentelemetry.context.propagation.TextMapPropagator; | ||
| import io.opentelemetry.context.propagation.TextMapSetter; | ||
| import java.util.Collection; | ||
| import javax.annotation.Nullable; | ||
|
|
||
| /** | ||
| * A TextMapPropagator wrapper that verifies TextMapGetter methods can be called without errors. | ||
| * | ||
| * <p>This propagator wraps another propagator and calls methods during extraction. This catches | ||
| * compatibility issues where underlying library APIs change (e.g., NoSuchMethodError). | ||
| * | ||
| * <p>Note: This is a copy of the class in testing-common to avoid dependency conflicts | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. when I tried adding test-common as a dependency, I hit a bunch of ASM errors. I was able to get it to work by adding some dependency exclusions, but this seemed simpler. I can go back to the other approach if that is preferable |
||
| */ | ||
| public final class KeysVerifyingPropagator implements TextMapPropagator { | ||
| private final TextMapPropagator delegate; | ||
|
|
||
| public KeysVerifyingPropagator(TextMapPropagator delegate) { | ||
| this.delegate = delegate; | ||
| } | ||
|
|
||
| @Override | ||
| public Collection<String> fields() { | ||
| return delegate.fields(); | ||
| } | ||
|
|
||
| @Override | ||
| public <C> void inject(Context context, C carrier, TextMapSetter<C> setter) { | ||
| delegate.inject(context, carrier, setter); | ||
| } | ||
|
|
||
| @Override | ||
| public <C> Context extract(Context context, @Nullable C carrier, TextMapGetter<C> getter) { | ||
| // exercise methods to verify no errors | ||
| Iterable<String> keys = getter.keys(carrier); | ||
| if (keys != null) { | ||
| keys.iterator().forEachRemaining(key -> getter.get(carrier, key)); | ||
| } | ||
|
|
||
| return delegate.extract(context, carrier, getter); | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
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.
fixes: