Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions extrator.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ import (
"time"

"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
"go.opentelemetry.io/otel/metric"
)

import (
semconv "go.opentelemetry.io/otel/semconv/v1.39.0"
"go.opentelemetry.io/otel/semconv/v1.39.0/httpconv"
)
Expand Down Expand Up @@ -560,3 +559,13 @@ func SpanNameFormatter(v Values) string {
}
return method
}

func spanStatus(code int) (codes.Code, string) {
if code < 100 || code >= 600 {
return codes.Error, fmt.Sprintf("Invalid HTTP status code %d", code)
}
if code >= 500 {
return codes.Error, ""
}
return codes.Unset, ""
}
1 change: 1 addition & 0 deletions otel.go
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ func (config Config) ToMiddleware() (echo.MiddlewareFunc, error) {
if resp != nil {
ev.HTTPResponseBodySize = resp.Size
}
span.SetStatus(spanStatus(status))

endAttributes := ev.SpanEndAttributes()
if config.SpanEndAttributes != nil {
Expand Down
47 changes: 47 additions & 0 deletions otel_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/codes"
"go.opentelemetry.io/otel/propagation"
"go.opentelemetry.io/otel/semconv/v1.39.0/httpconv"
"go.opentelemetry.io/otel/trace"
Expand All @@ -24,6 +25,8 @@ import (
sdkmetric "go.opentelemetry.io/otel/sdk/metric"
"go.opentelemetry.io/otel/sdk/metric/metricdata"
"go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
"go.opentelemetry.io/otel/sdk/trace/tracetest"
)

func TestGetSpanNotInstrumented(t *testing.T) {
Expand Down Expand Up @@ -446,6 +449,50 @@ func TestNewMiddlewareWithConfig_Metric(t *testing.T) {
}, sm.Metrics[0], metricdatatest.IgnoreTimestamp(), metricdatatest.IgnoreValue(), metricdatatest.IgnoreExemplars())
}

func TestSpanStatusOnHTTP500(t *testing.T) {
tests := []struct {
name string
handler echo.HandlerFunc
}{
{
name: "handler writes 500 status code directly",
handler: func(c *echo.Context) error {
return c.String(http.StatusInternalServerError, "internal server error")
},
},
{
name: "handler returns echo HTTP error with 500",
handler: func(c *echo.Context) error {
return echo.NewHTTPError(http.StatusInternalServerError, "internal server error")
},
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
exporter := tracetest.NewInMemoryExporter()
tp := sdktrace.NewTracerProvider(sdktrace.WithSyncer(exporter))

e := echo.New()
e.Use(NewMiddlewareWithConfig(Config{
ServerName: "foobar",
TracerProvider: tp,
}))
e.GET("/error", tt.handler)

r := httptest.NewRequest(http.MethodGet, "/error", http.NoBody)
w := httptest.NewRecorder()
e.ServeHTTP(w, r)

assert.Equal(t, http.StatusInternalServerError, w.Result().StatusCode)

spans := exporter.GetSpans()
assert.Len(t, spans, 1)
assert.Equal(t, codes.Error, spans[0].Status.Code)
})
}
}

func TestConfig_OnNextError(t *testing.T) {
tests := []struct {
name string
Expand Down
Loading