Skip to content

Commit

Permalink
revert: use server name for backward compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
franklinkim committed Apr 17, 2024
1 parent c6734a4 commit 3fd13ec
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions net/http/middleware/telemetry.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/propagation"
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
"go.opentelemetry.io/otel/trace"
"go.uber.org/zap"
)
Expand Down Expand Up @@ -77,10 +78,7 @@ func TelemetryWithOptions(opts TelemetryOptions) Middleware {
}

if labeler, ok := otelhttp.LabelerFromContext(r.Context()); ok {
labeler.Add(
log.KeelServiceTypeKey.String("http"),
log.KeelServiceNameKey.String(name),
)
labeler.Add(semconv.HTTPServerNameKey.String(name))
}

if labeler, ok := httplog.LabelerFromRequest(r); ok {
Expand Down

0 comments on commit 3fd13ec

Please sign in to comment.