Skip to content

Emit schema url from HTTP instrumentations #15144

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Nov 5, 2025
Merged

Emit schema url from HTTP instrumentations #15144

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
264210e
Emit schema url from HTTP instrumentations
trask Oct 25, 2025
d8a5ef8
Fix TelemetryConverter to preserve schema URL from spans
trask Oct 25, 2025
f8cbed7
fix
trask Oct 25, 2025
d945a1d
Remove unused InstrumentationScope import
trask Oct 25, 2025
a416dcb
Fix schema URL for connection-level HTTP instrumentation
trask Oct 26, 2025
a9c2003
Update MeterTest expectations to include schema URL
trask Oct 26, 2025
f3efe97
Add schema URL to netty-3.8 connection instrumenter
trask Oct 26, 2025
1e42dfe
spotless
trask Oct 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .../instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor;
import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder;
import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanStatusExtractor;
import io.opentelemetry.semconv.SchemaUrls;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
Expand Down Expand Up @@ -245,7 +246,8 @@ public Instrumenter<REQUEST, RESPONSE> build() {
statusExtractorTransformer.apply(HttpSpanStatusExtractor.create(attributesGetter)))
.addAttributesExtractor(httpAttributesExtractorBuilder.build())
.addAttributesExtractors(additionalExtractors)
.addOperationMetrics(HttpClientMetrics.get());
.addOperationMetrics(HttpClientMetrics.get())
.setSchemaUrl(SchemaUrls.V1_37_0);
Copy link
Contributor

@laurit laurit Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does setting schema url pose any additional restrictions to what we can do with these instrumentations?

if (emitExperimentalHttpClientTelemetry) {
builder
.addAttributesExtractor(HttpExperimentalAttributesExtractor.create(attributesGetter))
Expand Down
4 changes: 3 additions & 1 deletion .../instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor;
import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder;
import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanStatusExtractor;
import io.opentelemetry.semconv.SchemaUrls;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
Expand Down Expand Up @@ -207,7 +208,8 @@ public InstrumenterBuilder<REQUEST, RESPONSE> instrumenterBuilder() {
.addAttributesExtractor(httpAttributesExtractorBuilder.build())
.addAttributesExtractors(additionalExtractors)
.addContextCustomizer(httpServerRouteBuilder.build())
.addOperationMetrics(HttpServerMetrics.get());
.addOperationMetrics(HttpServerMetrics.get())
.setSchemaUrl(SchemaUrls.V1_37_0);
if (emitExperimentalHttpServerTelemetry) {
builder
.addAttributesExtractor(HttpExperimentalAttributesExtractor.create(attributesGetter))
Expand Down
7 changes: 6 additions & 1 deletion ...main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import io.opentelemetry.semconv.ErrorAttributes;
import io.opentelemetry.semconv.HttpAttributes;
import io.opentelemetry.semconv.NetworkAttributes;
import io.opentelemetry.semconv.SchemaUrls;
import io.opentelemetry.semconv.ServerAttributes;
import io.opentelemetry.semconv.UrlAttributes;
import io.opentelemetry.semconv.UserAgentAttributes;
Expand Down Expand Up @@ -1151,7 +1152,11 @@ protected SpanDataAssert assertClientSpan(
} else {
assertThat(attrs).doesNotContainKey(HttpAttributes.HTTP_REQUEST_RESEND_COUNT);
}
});
})
.satisfies(
spanData ->
assertThat(spanData.getInstrumentationScopeInfo().getSchemaUrl())
.isEqualTo(SchemaUrls.V1_37_0));
}

protected static SpanDataAssert assertServerSpan(SpanDataAssert span) {
Expand Down
8 changes: 7 additions & 1 deletion ...main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import io.opentelemetry.semconv.ErrorAttributes;
import io.opentelemetry.semconv.HttpAttributes;
import io.opentelemetry.semconv.NetworkAttributes;
import io.opentelemetry.semconv.SchemaUrls;
import io.opentelemetry.semconv.ServerAttributes;
import io.opentelemetry.semconv.UrlAttributes;
import io.opentelemetry.semconv.UserAgentAttributes;
Expand Down Expand Up @@ -828,7 +829,12 @@ protected SpanDataAssert assertServerSpan(
String expectedRoute = options.expectedHttpRoute.apply(endpoint, method);
String name = options.expectedServerSpanNameMapper.apply(endpoint, method, expectedRoute);

span.hasName(name).hasKind(SpanKind.SERVER);
span.hasName(name)
.hasKind(SpanKind.SERVER)
.satisfies(
spanData ->
assertThat(spanData.getInstrumentationScopeInfo().getSchemaUrl())
.isEqualTo(SchemaUrls.V1_37_0));
if (statusCode >= 500) {
span.hasStatus(StatusData.error());
}
Expand Down
Loading