From a5f242f683589e8d726b31bc3ce4fff8f1747cba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sw=C3=A4rd?= <excds@kth.se>
Date: Wed, 2 Aug 2023 13:08:41 +0200
Subject: [PATCH] Convert webfinger to use service trace provider

---
 services/webfinger/pkg/command/server.go     |  6 ++---
 services/webfinger/pkg/config/tracing.go     | 12 ++++++++++
 services/webfinger/pkg/service/v0/tracing.go |  7 +++---
 services/webfinger/pkg/tracing/tracing.go    | 23 --------------------
 4 files changed, 19 insertions(+), 29 deletions(-)
 delete mode 100644 services/webfinger/pkg/tracing/tracing.go

diff --git a/services/webfinger/pkg/command/server.go b/services/webfinger/pkg/command/server.go
index 12cfa8466..7560b5436 100644
--- a/services/webfinger/pkg/command/server.go
+++ b/services/webfinger/pkg/command/server.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
+	"github.com/owncloud/ocis/v2/ocis-pkg/tracing"
 	"github.com/owncloud/ocis/v2/ocis-pkg/version"
 	"github.com/owncloud/ocis/v2/services/webfinger/pkg/config"
 	"github.com/owncloud/ocis/v2/services/webfinger/pkg/config/parser"
@@ -15,7 +16,6 @@ import (
 	"github.com/owncloud/ocis/v2/services/webfinger/pkg/server/debug"
 	"github.com/owncloud/ocis/v2/services/webfinger/pkg/server/http"
 	"github.com/owncloud/ocis/v2/services/webfinger/pkg/service/v0"
-	"github.com/owncloud/ocis/v2/services/webfinger/pkg/tracing"
 	"github.com/urfave/cli/v2"
 )
 
@@ -30,7 +30,7 @@ func Server(cfg *config.Config) *cli.Command {
 		},
 		Action: func(c *cli.Context) error {
 			logger := logging.Configure(cfg.Service.Name, cfg.Log)
-			err := tracing.Configure(cfg)
+			traceProvider, err := tracing.GetServiceTraceProvider(cfg.Tracing, cfg.Service.Name)
 			if err != nil {
 				return err
 			}
@@ -68,7 +68,7 @@ func Server(cfg *config.Config) *cli.Command {
 				}
 				svc = service.NewInstrument(svc, metrics)
 				svc = service.NewLogging(svc, logger) // this logs service specific data
-				svc = service.NewTracing(svc)
+				svc = service.NewTracing(svc, traceProvider)
 
 				server, err := http.Server(
 					http.Logger(logger),
diff --git a/services/webfinger/pkg/config/tracing.go b/services/webfinger/pkg/config/tracing.go
index a24a73ec4..e9568fa28 100644
--- a/services/webfinger/pkg/config/tracing.go
+++ b/services/webfinger/pkg/config/tracing.go
@@ -1,5 +1,7 @@
 package config
 
+import "github.com/owncloud/ocis/v2/ocis-pkg/tracing"
+
 // Tracing defines the available tracing configuration.
 type Tracing struct {
 	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;WEBFINGER_TRACING_ENABLED" desc:"Activates tracing."`
@@ -7,3 +9,13 @@ type Tracing struct {
 	Endpoint  string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;WEBFINGER_TRACING_ENDPOINT" desc:"The endpoint of the tracing agent."`
 	Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;WEBFINGER_TRACING_COLLECTOR" desc:"The HTTP endpoint for sending spans directly to a collector, i.e. http://jaeger-collector:14268/api/traces. Only used if the tracing endpoint is unset."`
 }
+
+// Convert Tracing to the tracing package's Config struct.
+func (t Tracing) Convert() tracing.Config {
+	return tracing.Config{
+		Enabled:   t.Enabled,
+		Type:      t.Type,
+		Endpoint:  t.Endpoint,
+		Collector: t.Collector,
+	}
+}
diff --git a/services/webfinger/pkg/service/v0/tracing.go b/services/webfinger/pkg/service/v0/tracing.go
index 23edef36e..1586388c4 100644
--- a/services/webfinger/pkg/service/v0/tracing.go
+++ b/services/webfinger/pkg/service/v0/tracing.go
@@ -4,21 +4,22 @@ import (
 	"context"
 	"net/url"
 
-	webfingertracing "github.com/owncloud/ocis/v2/services/webfinger/pkg/tracing"
 	"github.com/owncloud/ocis/v2/services/webfinger/pkg/webfinger"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 )
 
 // NewTracing returns a service that instruments traces.
-func NewTracing(next Service) Service {
+func NewTracing(next Service, tp trace.TracerProvider) Service {
 	return tracing{
 		next: next,
+		tp:   tp,
 	}
 }
 
 type tracing struct {
 	next Service
+	tp   trace.TracerProvider
 }
 
 // Webfinger implements the Service interface.
@@ -30,7 +31,7 @@ func (t tracing) Webfinger(ctx context.Context, queryTarget *url.URL, rels []str
 			attribute.KeyValue{Key: "rels", Value: attribute.StringSliceValue(rels)},
 		),
 	}
-	ctx, span := webfingertracing.TraceProvider.Tracer("webfinger").Start(ctx, "Webfinger", spanOpts...)
+	ctx, span := t.tp.Tracer("webfinger").Start(ctx, "Webfinger", spanOpts...)
 	defer span.End()
 
 	return t.next.Webfinger(ctx, queryTarget, rels)
diff --git a/services/webfinger/pkg/tracing/tracing.go b/services/webfinger/pkg/tracing/tracing.go
deleted file mode 100644
index 95c332c53..000000000
--- a/services/webfinger/pkg/tracing/tracing.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package tracing
-
-import (
-	pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing"
-	"github.com/owncloud/ocis/v2/services/webfinger/pkg/config"
-	"go.opentelemetry.io/otel/trace"
-)
-
-var (
-	// TraceProvider is the global trace provider for the proxy service.
-	TraceProvider = trace.NewNoopTracerProvider()
-)
-
-func Configure(cfg *config.Config) error {
-	var err error
-	if cfg.Tracing.Enabled {
-		if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, cfg.Service.Name, cfg.Tracing.Type); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}