Skip to content

fix(httpserver): Fixed semconv compatibility #182

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 1 commit into from
Mar 22, 2024
Merged

fix(httpserver): Fixed semconv compatibility #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions httpserver/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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),
)
}

Expand Down Expand Up @@ -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),
)
}

Expand Down Expand Up @@ -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),
)
}

Expand Down Expand Up @@ -336,7 +336,7 @@ func TestCreateWithLeveledRequestLoggerAndTracerAndErrorHandlerOn2xx(t *testing.
exporter,
"GET /test",
attribute.String(httpserver.TraceSpanAttributeHttpRequestId, testRequestId),
semconv.HTTPResponseStatusCode(http.StatusOK),
semconv.HTTPStatusCode(http.StatusOK),
)
}

Expand Down Expand Up @@ -406,7 +406,7 @@ func TestCreateWithLeveledRequestLoggerAndTracerAndErrorHandlerOn4xx(t *testing.
exporter,
"GET /test",
attribute.String(httpserver.TraceSpanAttributeHttpRequestId, testRequestId),
semconv.HTTPResponseStatusCode(http.StatusBadRequest),
semconv.HTTPStatusCode(http.StatusBadRequest),
)
}

Expand Down
4 changes: 2 additions & 2 deletions httpserver/middleware/request_tracer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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
Expand Down