chore: clean up according to review

ory · May 31, 2022 · 554dab1 · 554dab1
1 parent dc46d71
commit 554dab1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 21 deletions.
diff --git a/go.mod b/go.mod
@@ -115,7 +115,6 @@ require (
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/css v1.0.0 // indirect
-	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect

diff --git a/internal/driver/daemon.go b/internal/driver/daemon.go
@@ -35,6 +35,7 @@ import (
 	"github.com/ory/analytics-go/v4"
 	"github.com/ory/x/healthx"
 	"github.com/ory/x/metricsx"
+	"github.com/ory/x/otelx"
 	"github.com/spf13/cobra"
 
 	"github.com/ory/keto/internal/driver/config"
@@ -128,7 +129,7 @@ func (r *RegistryDefault) serveRead(ctx context.Context, done chan<- struct{}) f
 	rt, s := r.ReadRouter(ctx), r.ReadGRPCServer(ctx)
 
 	if tracer := r.Tracer(ctx); tracer.IsLoaded() {
-		rt = x.TraceHandler(rt)
+		rt = otelx.TraceHandler(rt)
 	}
 
 	return func() error {
@@ -140,7 +141,7 @@ func (r *RegistryDefault) serveWrite(ctx context.Context, done chan<- struct{})
 	rt, s := r.WriteRouter(ctx), r.WriteGRPCServer(ctx)
 
 	if tracer := r.Tracer(ctx); tracer.IsLoaded() {
-		rt = x.TraceHandler(rt)
+		rt = otelx.TraceHandler(rt)
 	}
 
 	return func() error {

diff --git a/internal/driver/registry_default.go b/internal/driver/registry_default.go
@@ -114,10 +114,6 @@ func (r *RegistryDefault) Tracer(ctx context.Context) *otelx.Tracer {
 		r.tracer = t
 	}
 
-	if r.tracer.Tracer() == nil {
-		r.tracer = otelx.NewNoop(r.l, r.Config(ctx).TracingConfig())
-	}
-
 	return r.tracer
 }
 

diff --git a/internal/x/tracing.go b/internal/x/tracing.go