Skip to content

Commit 35f3952

Browse files
authored
fix(httpserver): Fixed semconv compatibility (ankorstore#182)
1 parent 06b0643 commit 35f3952

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

httpserver/factory_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/prometheus/client_golang/prometheus/testutil"
1919
"github.com/stretchr/testify/assert"
2020
"go.opentelemetry.io/otel/attribute"
21-
semconv "go.opentelemetry.io/otel/semconv/v1.24.0"
21+
semconv "go.opentelemetry.io/otel/semconv/v1.20.0"
2222
)
2323

2424
var (
@@ -134,7 +134,7 @@ func TestCreateWithRequestLoggerAndTracerAndErrorHandlerOn2xx(t *testing.T) {
134134
exporter,
135135
"GET /test",
136136
attribute.String(httpserver.TraceSpanAttributeHttpRequestId, testRequestId),
137-
semconv.HTTPResponseStatusCode(http.StatusOK),
137+
semconv.HTTPStatusCode(http.StatusOK),
138138
)
139139
}
140140

@@ -200,7 +200,7 @@ func TestCreateWithRequestLoggerAndTracerAndErrorHandlerOn4xx(t *testing.T) {
200200
exporter,
201201
"GET /test",
202202
attribute.String(httpserver.TraceSpanAttributeHttpRequestId, testRequestId),
203-
semconv.HTTPResponseStatusCode(http.StatusBadRequest),
203+
semconv.HTTPStatusCode(http.StatusBadRequest),
204204
)
205205
}
206206

@@ -266,7 +266,7 @@ func TestCreateWithRequestLoggerAndTracerAndErrorHandlerOn5xx(t *testing.T) {
266266
exporter,
267267
"GET /test",
268268
attribute.String(httpserver.TraceSpanAttributeHttpRequestId, testRequestId),
269-
semconv.HTTPResponseStatusCode(http.StatusInternalServerError),
269+
semconv.HTTPStatusCode(http.StatusInternalServerError),
270270
)
271271
}
272272

@@ -336,7 +336,7 @@ func TestCreateWithLeveledRequestLoggerAndTracerAndErrorHandlerOn2xx(t *testing.
336336
exporter,
337337
"GET /test",
338338
attribute.String(httpserver.TraceSpanAttributeHttpRequestId, testRequestId),
339-
semconv.HTTPResponseStatusCode(http.StatusOK),
339+
semconv.HTTPStatusCode(http.StatusOK),
340340
)
341341
}
342342

@@ -406,7 +406,7 @@ func TestCreateWithLeveledRequestLoggerAndTracerAndErrorHandlerOn4xx(t *testing.
406406
exporter,
407407
"GET /test",
408408
attribute.String(httpserver.TraceSpanAttributeHttpRequestId, testRequestId),
409-
semconv.HTTPResponseStatusCode(http.StatusBadRequest),
409+
semconv.HTTPStatusCode(http.StatusBadRequest),
410410
)
411411
}
412412

httpserver/middleware/request_tracer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"go.opentelemetry.io/otel"
1111
"go.opentelemetry.io/otel/attribute"
1212
"go.opentelemetry.io/otel/propagation"
13+
semconv "go.opentelemetry.io/otel/semconv/v1.20.0"
1314
"go.opentelemetry.io/otel/semconv/v1.20.0/httpconv"
14-
semconv "go.opentelemetry.io/otel/semconv/v1.24.0"
1515
oteltrace "go.opentelemetry.io/otel/trace"
1616
)
1717

@@ -99,7 +99,7 @@ func RequestTracerMiddlewareWithConfig(serviceName string, config RequestTracerM
9999
span.SetStatus(httpconv.ServerStatus(status))
100100

101101
if status > 0 {
102-
span.SetAttributes(semconv.HTTPResponseStatusCode(status))
102+
span.SetAttributes(semconv.HTTPStatusCode(status))
103103
}
104104

105105
return err

0 commit comments

Comments
 (0)