safer code

ocs/pkg/service/v0/groups.go

@@ -33,14 +33,12 @@ func (o Ocs) ListUserGroups(w http.ResponseWriter, r *http.Request) {
 			// the OCS API is a REST API and it uses the username to look for groups. If the id from the user in the context
 			// differs from that of the url we can assume we are an admin because we are past the selfOrAdmin middleware.
 
-			if o.config.Tracing.Enabled {
-				_, span := ocstracing.TraceProvider.
-					Tracer("ocs").
-					Start(r.Context(), "ListUserGroups")
-				defer span.End()
+			_, span := ocstracing.TraceProvider.
+				Tracer("ocs").
+				Start(r.Context(), "ListUserGroups")
+			defer span.End()
 
-				span.SetAttributes(attribute.Any("groups", u.Groups))
-			}
+			span.SetAttributes(attribute.Any("groups", u.Groups))
 
 			if len(u.Groups) > 0 {
 				mustNotFail(render.Render(w, r, response.DataRender(&data.Groups{Groups: u.Groups})))
@@ -93,14 +91,12 @@ func (o Ocs) ListUserGroups(w http.ResponseWriter, r *http.Request) {
 
 	o.logger.Error().Err(err).Int("count", len(groups)).Str("userid", account.Id).Msg("listing groups for user")
 
-	if o.config.Tracing.Enabled {
-		_, span := ocstracing.TraceProvider.
-			Tracer("ocs").
-			Start(r.Context(), "ListUserGroups")
-		defer span.End()
+	_, span := ocstracing.TraceProvider.
+		Tracer("ocs").
+		Start(r.Context(), "ListUserGroups")
+	defer span.End()
 
-		span.SetAttributes(attribute.Any("groups", groups))
-	}
+	span.SetAttributes(attribute.Any("groups", groups))
 
 	mustNotFail(render.Render(w, r, response.DataRender(&data.Groups{Groups: groups})))
 }
@@ -265,14 +261,12 @@ func (o Ocs) ListGroups(w http.ResponseWriter, r *http.Request) {
 		groups = append(groups, res.Groups[i].OnPremisesSamAccountName)
 	}
 
-	if o.config.Tracing.Enabled {
-		_, span := ocstracing.TraceProvider.
-			Tracer("ocs").
-			Start(r.Context(), "ListGroups")
-		defer span.End()
+	_, span := ocstracing.TraceProvider.
+		Tracer("ocs").
+		Start(r.Context(), "ListGroups")
+	defer span.End()
 
-		span.SetAttributes(attribute.Any("groups", groups))
-	}
+	span.SetAttributes(attribute.Any("groups", groups))
 
 	mustNotFail(render.Render(w, r, response.DataRender(&data.Groups{Groups: groups})))
 }

ocs/pkg/service/v0/users.go

@@ -148,14 +148,12 @@ func (o Ocs) GetUser(w http.ResponseWriter, r *http.Request) {
 		},
 	}
 
-	if o.config.Tracing.Enabled {
-		_, span := ocstracing.TraceProvider.
-			Tracer("ocs").
-			Start(r.Context(), "GetUser")
-		defer span.End()
+	_, span := ocstracing.TraceProvider.
+		Tracer("ocs").
+		Start(r.Context(), "GetUser")
+	defer span.End()
 
-		span.SetAttributes(attribute.Any("user", d))
-	}
+	span.SetAttributes(attribute.Any("user", d))
 
 	mustNotFail(render.Render(w, r, response.DataRender(d)))
 }

ocs/pkg/tracing/tracing.go

@@ -3,12 +3,12 @@ package tracing
 import (
 	pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing"
 	"github.com/owncloud/ocis/ocs/pkg/config"
-	sdktrace "go.opentelemetry.io/otel/sdk/trace"
+	"go.opentelemetry.io/otel/trace"
 )
 
 var (
 	// TraceProvider is the global trace provider for the ocs service.
-	TraceProvider *sdktrace.TracerProvider
+	TraceProvider = trace.NewNoopTracerProvider()
 )
 
 func Configure(cfg *config.Config) error {