Migrate to uptrace

Author: AchoArnold

api/pkg/di/container.go

@@ -1111,10 +1111,11 @@ func (container *Container) UserRepository() repositories.UserRepository {
 
 // InitializeTraceProvider initializes the open telemetry trace provider
 func (container *Container) InitializeTraceProvider() func() {
-	if isLocal() {
-		return container.initializeUptraceProvider(container.version, container.projectID)
-	}
-	return container.initializeGoogleTraceProvider(container.version, container.projectID)
+	return container.initializeUptraceProvider(container.version, container.projectID)
+	//if isLocal() {
+	//	return container.initializeUptraceProvider(container.version, container.projectID)
+	//}
+	//return container.initializeGoogleTraceProvider(container.version, container.projectID)
 }
 
 func (container *Container) initializeGoogleTraceProvider(version string, namespace string) func() {

api/pkg/middlewares/otel_context_middleware.go

@@ -3,8 +3,6 @@ package middlewares
 import (
 	"context"
 	"fmt"
-	"strconv"
-	"strings"
 
 	"github.com/NdoleStudio/httpsms/pkg/telemetry"
 	"github.com/gofiber/fiber/v2"
@@ -21,21 +19,10 @@ const (
 // OtelTraceContext adds a trace for an HTTP request
 func OtelTraceContext(tracer telemetry.Tracer, logger telemetry.Logger, header string, namespace string) fiber.Handler {
 	return func(c *fiber.Ctx) error {
-		// Get the Context from the request
-		spanContext, errors := spanContextFromHeader(c.Get(header))
-		if len(errors) != 0 {
-			logger.Error(stacktrace.NewError(strings.Join(errors, "\n")))
-		}
-
-		if !spanContext.IsValid() {
-			if c.Get(header) != "" {
-				logger.Error(stacktrace.NewError("invalid trace context %s creating new context", c.Get(header)))
-			}
-			otelTracer := otel.Tracer(namespace)
-			_, span := otelTracer.Start(context.Background(), fmt.Sprintf("%s %s", c.Method(), c.OriginalURL()))
-			defer span.End()
-			spanContext = span.SpanContext()
-		}
+		otelTracer := otel.Tracer(namespace)
+		_, span := otelTracer.Start(context.Background(), fmt.Sprintf("%s %s", c.Method(), c.OriginalURL()))
+		defer span.End()
+		spanContext := span.SpanContext()
 
 		logger.WithSpan(spanContext).
 			WithString("http.method", c.Method()).
@@ -46,8 +33,7 @@ func OtelTraceContext(tracer telemetry.Tracer, logger telemetry.Logger, header s
 		defer span.End()
 
 		ctxLogger := tracer.CtxLogger(logger, span)
-		traceID := spanContext.TraceID().String()
-		span.SetAttributes(attribute.Key("traceID").String(traceID))
+		span.SetAttributes(attribute.Key("traceID").String(span.SpanContext().TraceID().String()))
 		span.SetAttributes(attribute.Key("SpanID").String(span.SpanContext().SpanID().String()))
 		span.SetAttributes(attribute.Key("traceFlags").String(spanContext.TraceFlags().String()))
 		span.SetAttributes(attribute.Key("clientVersion").String(c.Get(clientVersionHeader)))
@@ -58,7 +44,7 @@ func OtelTraceContext(tracer telemetry.Tracer, logger telemetry.Logger, header s
 		response := c.Next()
 
 		statusCode := c.Response().StatusCode()
-		span.AddEvent(fmt.Sprintf("finished handling request with traceID: [%s], statusCode: [%d]", traceID, statusCode))
+		span.AddEvent(fmt.Sprintf("finished handling request with traceID: [%s], statusCode: [%d]", span.SpanContext().TraceID().String(), statusCode))
 
 		if statusCode >= 300 && len(c.Request().Body()) > 0 {
 			ctxLogger.Warn(stacktrace.NewError(fmt.Sprintf("http.status [%d], body [%s]", statusCode, string(c.Request().Body()))))
@@ -67,49 +53,3 @@ func OtelTraceContext(tracer telemetry.Tracer, logger telemetry.Logger, header s
 		return response
 	}
 }
-
-func spanContextFromHeader(parentContext string) (trace.SpanContext, []string) {
-	result := trace.NewSpanContext(trace.SpanContextConfig{
-		TraceID:    trace.TraceID{},
-		SpanID:     trace.SpanID{},
-		TraceState: trace.TraceState{},
-		Remote:     true,
-	})
-
-	parts := strings.Split(parentContext, "/")
-	var errors []string
-	if len(parts) == 2 {
-		traceID, err := trace.TraceIDFromHex(parts[0])
-		if err != nil {
-			errors = append(errors, fmt.Sprintf("could not get trace id %v", err))
-			return result, errors
-		}
-		result = result.WithTraceID(traceID)
-
-		spanParts := strings.Split(parts[1], ";")
-		if len(spanParts) == 1 {
-			spanParts = append(spanParts, "")
-		}
-
-		if len(spanParts) == 2 {
-			val, err := strconv.ParseUint(spanParts[0], 10, 64)
-			if err != nil {
-				errors = append(errors, fmt.Sprintf("could not get trace id %v", err))
-				return result, errors
-			}
-
-			spanID, err := trace.SpanIDFromHex(fmt.Sprintf("%016x", val))
-			if err != nil {
-				errors = append(errors, fmt.Sprintf("could not get span trace id %v", err))
-				return result, errors
-			}
-			result = result.WithSpanID(spanID)
-
-			if spanParts[1] == "o=1" {
-				result = result.WithTraceFlags(trace.FlagsSampled)
-			}
-		}
-	}
-
-	return result, errors
-}