Update to SDK 0.17.0 #2338
Merged
Update to SDK 0.17.0 #2338
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
added 3 commits
February 18, 2021 15:19
…nstrumentation into 0.17.0
anuraaga
requested review from
iNikem,
jkwatson,
mateuszrzeszutek,
pavolloffay,
trask and
tylerbenson
as code owners
trask
approved these changes
Feb 19, 2021
| return extract(GlobalOpenTelemetry.getPropagators(), carrier, getter); | ||
| } | ||
|
|
||
| public <C> Context extract(C carrier, TextMapPropagator.Getter<C> getter) { | ||
| public <C> Context extract(C carrier, TextMapGetter<C> getter) { |
| @@ -35,7 +35,7 @@ void resetOpenTelemetry() { | |||
| public void shouldCreateNoopRequestIfNoPropagatorsSet() throws IOException { | |||
| // given | |||
| InputStream mock = mock(InputStream.class); | |||
| GlobalOpenTelemetry.set(OpenTelemetry.getDefault()); | |||
| GlobalOpenTelemetry.set(OpenTelemetry.noop()); | |||
| @@ -12,7 +12,7 @@ | |||
| public final class BaggageBridging { | |||
|
|
|||
| public static Baggage toApplication(io.opentelemetry.api.baggage.Baggage agentBaggage) { | |||
| BaggageBuilder applicationBaggageBuilder = Baggage.builder().setNoParent(); | |||
| BaggageBuilder applicationBaggageBuilder = Baggage.builder(); | |||
There was a problem hiding this comment.
Yeah I was quite happy with how baggage turned out here and in the SDK's unit tests too, much simpler API.
Comment on lines
-66
to
-90
|
|
||
| // Reread after our calls to setProperty to determine whether we need to enforce agent defaults. | ||
| Properties environmentPropertiesWithCopies = | ||
| new ConfigBuilder() | ||
| .readEnvironmentVariables() | ||
| .readSystemProperties() | ||
| .build() | ||
| .asJavaProperties(); | ||
|
|
||
| // Agent has different defaults than SDK | ||
| if (!environmentPropertiesWithCopies.containsKey("otel.propagators")) { | ||
| System.setProperty("otel.propagators", "tracecontext,baggage"); | ||
| } | ||
| String traceExporter = environmentPropertiesWithCopies.getProperty("otel.traces.exporter"); | ||
| if (traceExporter == null) { | ||
| System.setProperty("otel.traces.exporter", "otlp"); | ||
| } else if (traceExporter.equals("none")) { | ||
| System.clearProperty("otel.traces.exporter"); | ||
| } | ||
| String metricExporter = environmentPropertiesWithCopies.getProperty("otel.metrics.exporter"); | ||
| if (metricExporter == null) { | ||
| System.setProperty("otel.metrics.exporter", "otlp"); | ||
| } else if (metricExporter.equals("none")) { | ||
| System.clearProperty("otel.metrics.exporter"); | ||
| } |
There was a problem hiding this comment.
I don't understand this :) Why is this not needed anymore?
There was a problem hiding this comment.
The SDK autoconfigure now follows the same defaults as the spec, which are the same defaults our agent expected.
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.
No description provided.