Skip to content

otelhttp: Add server-side test for OTEL_SEMCONV_STABILITY_OPT_IN=http/dup with new/old metrics #7356

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
dmathieu merged 4 commits into from
Jun 2, 2025
Merged

otelhttp: Add server-side test for OTEL_SEMCONV_STABILITY_OPT_IN=http/dup with new/old metrics #7356

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70fbdab
otelhttp: Add server-side test for OTEL_SEMCONV_STABILITY_OPT_IN=http…
May 23, 2025
1be82c4
fix errcheck
May 23, 2025
c02b278
replace expect with want
May 30, 2025
799a903
Merge branch 'main' into issue-6266
dmathieu Jun 2, 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
146 changes: 119 additions & 27 deletions instrumentation/net/http/otelhttp/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,63 +796,155 @@ func TestHandlerWithMetricAttributesFn(t *testing.T) {
}

func TestHandlerWithSemConvStabilityOptIn(t *testing.T) {
newSpanAttrs := []attribute.KeyValue{
attribute.String("http.request.method", "GET"),
attribute.String("url.scheme", "http"),
attribute.String("server.address", "localhost"),
attribute.String("network.protocol.version", "1.1"),
attribute.String("url.path", "/"),
attribute.Int("http.response.status_code", 200),
}
newMetricAttrs := attribute.NewSet(
attribute.String("http.request.method", "GET"),
attribute.Int("http.response.status_code", 200),
attribute.String("network.protocol.name", "http"),
attribute.String("network.protocol.version", "1.1"),
attribute.String("server.address", "localhost"),
attribute.String("url.scheme", "http"),
)
newMetrics := []metricdata.Metrics{
{
Name: "http.server.request.body.size",
Description: "Size of HTTP server request bodies.",
Unit: "By",
Data: metricdata.Histogram[int64]{
Temporality: metricdata.CumulativeTemporality,
DataPoints: []metricdata.HistogramDataPoint[int64]{{Attributes: newMetricAttrs}},
},
},
{
Name: "http.server.response.body.size",
Description: "Size of HTTP server response bodies.",
Unit: "By",
Data: metricdata.Histogram[int64]{
Temporality: metricdata.CumulativeTemporality,
DataPoints: []metricdata.HistogramDataPoint[int64]{{Attributes: newMetricAttrs}},
},
},
{
Name: "http.server.request.duration",
Description: "Duration of HTTP server requests.",
Unit: "s",
Data: metricdata.Histogram[float64]{
Temporality: metricdata.CumulativeTemporality,
DataPoints: []metricdata.HistogramDataPoint[float64]{{Attributes: newMetricAttrs}},
},
},
}
oldSpanAttrs := []attribute.KeyValue{
attribute.String("http.method", "GET"),
attribute.String("http.scheme", "http"),
attribute.String("net.host.name", "localhost"),
attribute.String("net.protocol.version", "1.1"),
attribute.String("http.target", "/"),
attribute.Int("http.status_code", 200),
}
oldMetricAttrs := attribute.NewSet(
attribute.String("http.method", "GET"),
attribute.String("http.scheme", "http"),
attribute.Int("http.status_code", 200),
attribute.String("net.host.name", "localhost"),
attribute.String("net.protocol.name", "http"),
attribute.String("net.protocol.version", "1.1"),
)
oldMetrics := []metricdata.Metrics{
{
Name: "http.server.request.size",
Description: "Measures the size of HTTP request messages.",
Unit: "By",
Data: metricdata.Sum[int64]{
Temporality: metricdata.CumulativeTemporality,
IsMonotonic: true,
DataPoints: []metricdata.DataPoint[int64]{{Attributes: oldMetricAttrs}},
},
},
{
Name: "http.server.response.size",
Description: "Measures the size of HTTP response messages.",
Unit: "By",
Data: metricdata.Sum[int64]{
Temporality: metricdata.CumulativeTemporality,
IsMonotonic: true,
DataPoints: []metricdata.DataPoint[int64]{{Attributes: oldMetricAttrs}},
},
},
{
Name: "http.server.duration",
Description: "Measures the duration of inbound HTTP requests.",
Unit: "ms",
Data: metricdata.Histogram[float64]{
Temporality: metricdata.CumulativeTemporality,
DataPoints: []metricdata.HistogramDataPoint[float64]{{Attributes: oldMetricAttrs}},
},
},
}
tests := []struct {
name string
semConvStabilityOptInValue string
expected []attribute.KeyValue
wantSpanAttributes []attribute.KeyValue
wantMetrics metricdata.ScopeMetrics
}{
{
name: "without opt-in",
semConvStabilityOptInValue: "",
expected: []attribute.KeyValue{
attribute.String("http.request.method", "GET"),
attribute.String("url.scheme", "http"),
attribute.String("server.address", "localhost"),
attribute.String("network.protocol.version", "1.1"),
attribute.String("url.path", "/"),
attribute.Int("http.response.status_code", 200),
wantSpanAttributes: newSpanAttrs,
wantMetrics: metricdata.ScopeMetrics{
Scope: instrumentation.Scope{
Name: ScopeName,
Version: Version(),
},
Metrics: newMetrics,
},
},
{
name: "with http/dup opt-in",
semConvStabilityOptInValue: "http/dup",
expected: []attribute.KeyValue{
// New semantic conventions
attribute.String("http.request.method", "GET"),
attribute.String("url.scheme", "http"),
attribute.String("server.address", "localhost"),
attribute.String("network.protocol.version", "1.1"),
attribute.String("url.path", "/"),
attribute.Int("http.response.status_code", 200),
// Old semantic conventions
attribute.String("http.method", "GET"),
attribute.String("http.scheme", "http"),
attribute.String("net.host.name", "localhost"),
attribute.String("net.protocol.version", "1.1"),
attribute.String("http.target", "/"),
attribute.Int("http.status_code", 200),
wantSpanAttributes: append(newSpanAttrs, oldSpanAttrs...),
wantMetrics: metricdata.ScopeMetrics{
Scope: instrumentation.Scope{
Name: ScopeName,
Version: Version(),
},
Metrics: append(newMetrics, oldMetrics...),
},
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
t.Setenv("OTEL_SEMCONV_STABILITY_OPT_IN", tt.semConvStabilityOptInValue)
metricRecorder := sdkmetric.NewManualReader()
spanRecorder := tracetest.NewSpanRecorder()
provider := sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(spanRecorder))
meterProvider := sdkmetric.NewMeterProvider(sdkmetric.WithReader(metricRecorder))
traceProvider := sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(spanRecorder))
h := NewHandler(
http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
w.WriteHeader(http.StatusOK)
}),
"test_handler",
WithTracerProvider(provider),
WithTracerProvider(traceProvider),
WithMeterProvider(meterProvider),
)
r, err := http.NewRequest(http.MethodGet, "http://localhost/", nil)
require.NoError(t, err)
h.ServeHTTP(httptest.NewRecorder(), r)
spans := spanRecorder.Ended()
require.Len(t, spans, 1)
assert.ElementsMatch(t, spans[0].Attributes(), tt.expected)
assert.ElementsMatch(t, spans[0].Attributes(), tt.wantSpanAttributes)
rm := metricdata.ResourceMetrics{}
err = metricRecorder.Collect(context.Background(), &rm)
require.NoError(t, err)
require.Len(t, rm.ScopeMetrics, 1)
metricdatatest.AssertEqual(t, tt.wantMetrics, rm.ScopeMetrics[0], metricdatatest.IgnoreTimestamp(), metricdatatest.IgnoreValue(), metricdatatest.IgnoreExemplars())
})
}
}
Expand Down