monitoring/tracing: refactor initialization for re-use.

std/monitoring/tracing/wire.go

@@ -24,6 +24,7 @@ import (
 	semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
 	t "go.opentelemetry.io/otel/trace"
 	"namespacelabs.dev/foundation/schema"
+	"namespacelabs.dev/foundation/std/core/types"
 	"namespacelabs.dev/foundation/std/go/core"
 )
 
@@ -60,19 +61,18 @@ func ProvideExporter(_ context.Context, args *ExporterArgs, _ ExtensionDeps) (Ex
 	return Exporter{args.Name}, nil
 }
 
-func Prepare(ctx context.Context, deps ExtensionDeps) error {
-	var opts []trace.TracerProviderOption
-
-	exporters := consumeExporters()
+func CreateProvider(ctx context.Context, serverInfo *types.ServerInfo, exporters []trace.SpanExporter) (*trace.TracerProvider, error) {
 	if len(exporters) == 0 {
 		out, err := stdouttrace.New()
 		if err != nil {
-			return err
+			return nil, err
 		}
 
 		exporters = append(exporters, out)
 	}
 
+	var opts []trace.TracerProviderOption
+
 	for _, exp := range exporters {
 		if core.EnvIs(schema.Environment_PRODUCTION) {
 			opts = append(opts, trace.WithBatcher(exp, trace.WithBatchTimeout(10*time.Second)))
@@ -81,8 +81,6 @@ func Prepare(ctx context.Context, deps ExtensionDeps) error {
 		}
 	}
 
-	serverResources := core.ServerResourcesFrom(ctx)
-
 	// XXX use pod name
 	instanceID := uuid.NewString()
 
@@ -94,21 +92,33 @@ func Prepare(ctx context.Context, deps ExtensionDeps) error {
 			resource.WithProcessRuntimeVersion(),
 			resource.WithProcessRuntimeDescription(),
 			resource.WithAttributes(
-				semconv.ServiceNameKey.String(deps.ServerInfo.ServerName),
-				semconv.ServiceVersionKey.String(deps.ServerInfo.GetVcs().GetRevision()),
+				semconv.ServiceNameKey.String(serverInfo.ServerName),
+				semconv.ServiceVersionKey.String(serverInfo.GetVcs().GetRevision()),
 				semconv.ServiceInstanceIDKey.String(instanceID),
-				semconv.DeploymentEnvironmentKey.String(deps.ServerInfo.EnvName),
-				attribute.String("environment", deps.ServerInfo.EnvName),
+				semconv.DeploymentEnvironmentKey.String(serverInfo.EnvName),
+				attribute.String("environment", serverInfo.EnvName),
 			),
 		)
 	if err != nil {
-		return fmt.Errorf("failed to create resource: %w", err)
+		return nil, fmt.Errorf("failed to create resource: %w", err)
 	}
 
 	opts = append(opts, trace.WithResource(resource))
 
-	provider := trace.NewTracerProvider(opts...)
-	serverResources.Add(close{provider})
+	return trace.NewTracerProvider(opts...), nil
+}
+
+func Prepare(ctx context.Context, deps ExtensionDeps) error {
+	provider, err := CreateProvider(ctx, deps.ServerInfo, consumeExporters())
+	if err != nil {
+		return err
+	}
+
+	serverResources := core.ServerResourcesFrom(ctx)
+
+	if serverResources != nil {
+		serverResources.Add(close{provider})
+	}
 
 	deps.Interceptors.ForServer(
 		otelgrpc.UnaryServerInterceptor(otelgrpc.WithTracerProvider(provider), otelgrpc.WithPropagators(propagators)),

universe/monitoring/honeycomb/wire.go

@@ -13,23 +13,27 @@ import (
 	"google.golang.org/grpc/credentials"
 )
 
-func Prepare(ctx context.Context, deps ExtensionDeps) error {
-	xHoneycombTeam := os.Getenv("MONITORING_HONEYCOMB_X_HONEYCOMB_TEAM")
-	if xHoneycombTeam == "" {
-		// No secret specified.
-		return nil
-	}
-
+func Create(ctx context.Context, key string) (*otlptrace.Exporter, error) {
 	opts := []otlptracegrpc.Option{
 		otlptracegrpc.WithEndpoint("api.honeycomb.io:443"),
 		otlptracegrpc.WithHeaders(map[string]string{
-			"x-honeycomb-team": xHoneycombTeam,
+			"x-honeycomb-team": key,
 		}),
 		otlptracegrpc.WithTLSCredentials(credentials.NewClientTLSFromCert(nil, "")),
 	}
 
 	client := otlptracegrpc.NewClient(opts...)
-	exporter, err := otlptrace.New(ctx, client)
+	return otlptrace.New(ctx, client)
+}
+
+func Prepare(ctx context.Context, deps ExtensionDeps) error {
+	xHoneycombTeam := os.Getenv("MONITORING_HONEYCOMB_X_HONEYCOMB_TEAM")
+	if xHoneycombTeam == "" {
+		// No secret specified.
+		return nil
+	}
+
+	exporter, err := Create(ctx, xHoneycombTeam)
 	if err != nil {
 		return err
 	}