safer code

This commit is contained in:
A.Unger
2021-08-10 00:09:39 +02:00
parent 1ed38e1f3b
commit 8a80b990a8
17 changed files with 77 additions and 90 deletions
+4 -3
View File
@@ -222,10 +222,11 @@ func (p *MultiHostReverseProxy) ServeHTTP(w http.ResponseWriter, r *http.Request
span trace.Span
)
tracer := proxytracing.TraceProvider.Tracer("proxy")
ctx, span = tracer.Start(ctx, fmt.Sprintf("%s %v", r.Method, r.URL.Path))
defer span.End()
if p.config.Tracing.Enabled {
tracer := proxytracing.TraceProvider.Tracer("proxy")
ctx, span = tracer.Start(ctx, fmt.Sprintf("%s %v", r.Method, r.URL.Path))
defer span.End()
pkgtrace.Propagator.Inject(ctx, propagation.HeaderCarrier(r.Header))
}
+2 -2
View File
@@ -3,12 +3,12 @@ package tracing
import (
pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing"
"github.com/owncloud/ocis/proxy/pkg/config"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
"go.opentelemetry.io/otel/trace"
)
var (
// TraceProvider is the global trace provider for the proxy service.
TraceProvider *sdktrace.TracerProvider
TraceProvider = trace.NewNoopTracerProvider()
)
func Configure(cfg *config.Config) error {