Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 13, 05:30 UTC
tracing: Support autoprop from OTEL_PROPAGATORS (#5147)
Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
Chris Reeves committed
Mar 9, 2023 at 16:02 UTC
b420561737e4589affbfe08c0acf7dcb593381d0
2 files changed
+4
-3
go.sum
+2
-1
@@ -740,8 +740,9 @@ go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ
740
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
741
go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
742
go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
743
-go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
743
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
744
+go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
745
+go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
746
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
747
go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
748
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
modules/caddyhttp/tracing/tracer.go
+2
-2
@@ -6,9 +6,9 @@ import (
6
"net/http"
7
8
"github.com/caddyserver/caddy/v2"
9
-
9
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
10
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
11
+ "go.opentelemetry.io/contrib/propagators/autoprop"
12
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
13
"go.opentelemetry.io/otel/propagation"
14
"go.opentelemetry.io/otel/sdk/resource"
@@ -62,7 +62,7 @@ func newOpenTelemetryWrapper(
62
return ot, fmt.Errorf("creating trace exporter error: %w", err)
63
}
64
65
- ot.propagators = propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}, propagation.Baggage{})
65
+ ot.propagators = autoprop.NewTextMapPropagator()
66
67
tracerProvider := globalTracerProvider.getTracerProvider(
68
sdktrace.WithBatcher(traceExporter),