diff --git a/httpserver/factory_test.go b/httpserver/factory_test.go index b903614f..21c5983e 100644 --- a/httpserver/factory_test.go +++ b/httpserver/factory_test.go @@ -18,7 +18,7 @@ import ( "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/assert" "go.opentelemetry.io/otel/attribute" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.20.0" ) var ( @@ -134,7 +134,7 @@ func TestCreateWithRequestLoggerAndTracerAndErrorHandlerOn2xx(t *testing.T) { exporter, "GET /test", attribute.String(httpserver.TraceSpanAttributeHttpRequestId, testRequestId), - semconv.HTTPResponseStatusCode(http.StatusOK), + semconv.HTTPStatusCode(http.StatusOK), ) } @@ -200,7 +200,7 @@ func TestCreateWithRequestLoggerAndTracerAndErrorHandlerOn4xx(t *testing.T) { exporter, "GET /test", attribute.String(httpserver.TraceSpanAttributeHttpRequestId, testRequestId), - semconv.HTTPResponseStatusCode(http.StatusBadRequest), + semconv.HTTPStatusCode(http.StatusBadRequest), ) } @@ -266,7 +266,7 @@ func TestCreateWithRequestLoggerAndTracerAndErrorHandlerOn5xx(t *testing.T) { exporter, "GET /test", attribute.String(httpserver.TraceSpanAttributeHttpRequestId, testRequestId), - semconv.HTTPResponseStatusCode(http.StatusInternalServerError), + semconv.HTTPStatusCode(http.StatusInternalServerError), ) } @@ -336,7 +336,7 @@ func TestCreateWithLeveledRequestLoggerAndTracerAndErrorHandlerOn2xx(t *testing. exporter, "GET /test", attribute.String(httpserver.TraceSpanAttributeHttpRequestId, testRequestId), - semconv.HTTPResponseStatusCode(http.StatusOK), + semconv.HTTPStatusCode(http.StatusOK), ) } @@ -406,7 +406,7 @@ func TestCreateWithLeveledRequestLoggerAndTracerAndErrorHandlerOn4xx(t *testing. exporter, "GET /test", attribute.String(httpserver.TraceSpanAttributeHttpRequestId, testRequestId), - semconv.HTTPResponseStatusCode(http.StatusBadRequest), + semconv.HTTPStatusCode(http.StatusBadRequest), ) } diff --git a/httpserver/middleware/request_tracer.go b/httpserver/middleware/request_tracer.go index 385eaf7a..bb97485d 100644 --- a/httpserver/middleware/request_tracer.go +++ b/httpserver/middleware/request_tracer.go @@ -10,8 +10,8 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" + semconv "go.opentelemetry.io/otel/semconv/v1.20.0" "go.opentelemetry.io/otel/semconv/v1.20.0/httpconv" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" oteltrace "go.opentelemetry.io/otel/trace" ) @@ -99,7 +99,7 @@ func RequestTracerMiddlewareWithConfig(serviceName string, config RequestTracerM span.SetStatus(httpconv.ServerStatus(status)) if status > 0 { - span.SetAttributes(semconv.HTTPResponseStatusCode(status)) + span.SetAttributes(semconv.HTTPStatusCode(status)) } return err