From f0e2b50675c9a6ce9cd34c6f0aa5b64131bfd123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sw=C3=A4rd?= <excds@kth.se>
Date: Mon, 21 Aug 2023 10:37:12 +0200
Subject: [PATCH] Partially revert removal of believed unused reva tracing
 initialization.

---
 ocis-pkg/tracing/tracing.go | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ocis-pkg/tracing/tracing.go b/ocis-pkg/tracing/tracing.go
index 7eeb24c284..f94c0a93f5 100644
--- a/ocis-pkg/tracing/tracing.go
+++ b/ocis-pkg/tracing/tracing.go
@@ -8,6 +8,7 @@ import (
 	"strings"
 	"time"
 
+	rtrace "github.com/cs3org/reva/v2/pkg/trace"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/exporters/jaeger"
@@ -85,13 +86,15 @@ func GetTraceProvider(endpoint, collector, serviceName, traceType string) (*sdkt
 			return nil, err
 		}
 
-		return sdktrace.NewTracerProvider(
+		tp := sdktrace.NewTracerProvider(
 			sdktrace.WithBatcher(exp),
 			sdktrace.WithResource(resource.NewWithAttributes(
 				semconv.SchemaURL,
 				semconv.ServiceNameKey.String(serviceName)),
 			),
-		), nil
+		)
+		rtrace.SetDefaultTracerProvider(tp)
+		return tp, nil
 	case "otlp":
 		ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 		defer cancel()
@@ -121,11 +124,13 @@ func GetTraceProvider(endpoint, collector, serviceName, traceType string) (*sdkt
 			return nil, err
 		}
 
-		return sdktrace.NewTracerProvider(
+		tp := sdktrace.NewTracerProvider(
 			sdktrace.WithSampler(sdktrace.AlwaysSample()),
 			sdktrace.WithBatcher(exporter),
 			sdktrace.WithResource(resources),
-		), nil
+		)
+		rtrace.SetDefaultTracerProvider(tp)
+		return tp, nil
 	case "agent":
 		fallthrough
 	case "zipkin":