Implement span started and live health metrics #7430
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,5 @@ | ||
| Comparing source compatibility of opentelemetry-sdk-trace-1.52.0-SNAPSHOT.jar against opentelemetry-sdk-trace-1.51.0.jar | ||
| *** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.trace.SdkTracerProviderBuilder (not serializable) | ||
| === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 | ||
| +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.trace.SdkTracerProviderBuilder setInternalTelemetry(io.opentelemetry.sdk.common.InternalTelemetryVersion) | ||
| +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.trace.SdkTracerProviderBuilder setMeterProvider(java.util.function.Supplier<io.opentelemetry.api.metrics.MeterProvider>) |
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
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
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
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
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
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
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
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,133 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.sdk.trace; | ||
|
|
||
| import io.opentelemetry.api.common.AttributeKey; | ||
| import io.opentelemetry.api.common.Attributes; | ||
| import io.opentelemetry.api.trace.Span; | ||
| import io.opentelemetry.api.trace.SpanContext; | ||
| import io.opentelemetry.api.trace.StatusCode; | ||
| import io.opentelemetry.sdk.trace.internal.metrics.SpanMetrics; | ||
| import java.util.concurrent.TimeUnit; | ||
| import javax.annotation.Nullable; | ||
| import javax.annotation.concurrent.Immutable; | ||
|
|
||
| /** | ||
| * Span implementation used from {@link io.opentelemetry.sdk.trace.SdkTracer} when starting a span | ||
| * which is not recording. All operations are noop, except for {@link #end()}, which ensures health | ||
JonasKunz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| * metrics are still collected. | ||
| */ | ||
| @Immutable | ||
| final class NonRecordingSpan implements Span { | ||
|
|
||
| private final SpanContext spanContext; | ||
| private final SpanMetrics.Recording metricRecording; | ||
|
|
||
| NonRecordingSpan(SpanContext spanContext, SpanMetrics.Recording metricRecording) { | ||
| this.spanContext = spanContext; | ||
| this.metricRecording = metricRecording; | ||
| } | ||
|
|
||
| @Override | ||
| public Span setAttribute(String key, @Nullable String value) { | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public Span setAttribute(String key, long value) { | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public Span setAttribute(String key, double value) { | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public Span setAttribute(String key, boolean value) { | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public <T> Span setAttribute(AttributeKey<T> key, @Nullable T value) { | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public Span setAllAttributes(Attributes attributes) { | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public Span addEvent(String name) { | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public Span addEvent(String name, long timestamp, TimeUnit unit) { | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public Span addEvent(String name, Attributes attributes) { | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public Span addEvent(String name, Attributes attributes, long timestamp, TimeUnit unit) { | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public Span setStatus(StatusCode statusCode) { | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public Span setStatus(StatusCode statusCode, String description) { | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public Span recordException(Throwable exception) { | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public Span recordException(Throwable exception, Attributes additionalAttributes) { | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public Span updateName(String name) { | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public void end() { | ||
| metricRecording.recordSpanEnd(); | ||
| } | ||
|
|
||
| @Override | ||
| public void end(long timestamp, TimeUnit unit) { | ||
| end(); | ||
| } | ||
|
|
||
| @Override | ||
| public SpanContext getSpanContext() { | ||
| return spanContext; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isRecording() { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "NonRecordingSpan{" + spanContext + '}'; | ||
| } | ||
| } | ||
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
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
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 |
|---|---|---|
|
|
@@ -5,18 +5,22 @@ | |
|
|
||
| package io.opentelemetry.sdk.trace; | ||
|
|
||
| import io.opentelemetry.api.metrics.MeterProvider; | ||
| import io.opentelemetry.api.trace.Tracer; | ||
| import io.opentelemetry.api.trace.TracerBuilder; | ||
| import io.opentelemetry.api.trace.TracerProvider; | ||
| import io.opentelemetry.sdk.common.Clock; | ||
| import io.opentelemetry.sdk.common.CompletableResultCode; | ||
| import io.opentelemetry.sdk.common.InstrumentationScopeInfo; | ||
| import io.opentelemetry.sdk.common.InternalTelemetryVersion; | ||
| import io.opentelemetry.sdk.internal.ComponentRegistry; | ||
| import io.opentelemetry.sdk.internal.ExceptionAttributeResolver; | ||
| import io.opentelemetry.sdk.internal.ScopeConfigurator; | ||
| import io.opentelemetry.sdk.resources.Resource; | ||
| import io.opentelemetry.sdk.trace.internal.SdkTracerProviderUtil; | ||
| import io.opentelemetry.sdk.trace.internal.TracerConfig; | ||
| import io.opentelemetry.sdk.trace.internal.metrics.SemConvSpanMetrics; | ||
| import io.opentelemetry.sdk.trace.internal.metrics.SpanMetrics; | ||
| import io.opentelemetry.sdk.trace.samplers.Sampler; | ||
| import java.io.Closeable; | ||
| import java.util.List; | ||
|
|
@@ -54,7 +58,9 @@ | |
| Sampler sampler, | ||
| List<SpanProcessor> spanProcessors, | ||
| ScopeConfigurator<TracerConfig> tracerConfigurator, | ||
| ExceptionAttributeResolver exceptionAttributeResolver, | ||
| InternalTelemetryVersion internalTelemetryVersion, | ||
| Supplier<MeterProvider> meterProviderSupplier) { | ||
| this.sharedState = | ||
| new TracerSharedState( | ||
| clock, | ||
|
|
@@ -63,7 +69,8 @@ | |
| spanLimitsSupplier, | ||
| sampler, | ||
| spanProcessors, | ||
| exceptionAttributeResolver, | ||
| createSpanMetrics(internalTelemetryVersion, meterProviderSupplier)); | ||
| this.tracerSdkComponentRegistry = | ||
| new ComponentRegistry<>( | ||
| instrumentationScopeInfo -> | ||
|
|
@@ -74,6 +81,19 @@ | |
| this.tracerConfigurator = tracerConfigurator; | ||
| } | ||
|
|
||
| private static SpanMetrics createSpanMetrics( | ||
|
There was a problem hiding this comment. Let's follow the pattern of
There was a problem hiding this comment. Changed in 6f4b0af. However, I kept |
||
| InternalTelemetryVersion internalTelemetryVersion, | ||
| Supplier<MeterProvider> meterProviderSupplier) { | ||
| switch (internalTelemetryVersion) { | ||
| case LEGACY: | ||
| return SpanMetrics.noop(); | ||
| case LATEST: | ||
| return new SemConvSpanMetrics(meterProviderSupplier); | ||
| } | ||
| throw new IllegalStateException( | ||
| "Unhandled telemetry schema version: " + internalTelemetryVersion); | ||
| } | ||
|
|
||
| private TracerConfig getTracerConfig(InstrumentationScopeInfo instrumentationScopeInfo) { | ||
| TracerConfig tracerConfig = tracerConfigurator.apply(instrumentationScopeInfo); | ||
| return tracerConfig == null ? TracerConfig.defaultConfig() : tracerConfig; | ||
|
|
||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.