Correlation between metrics & traces removed

dadrus · Jan 18, 2023 · b9ae7ee · b9ae7ee
1 parent 4213d27
commit b9ae7ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 52 deletions.
diff --git a/internal/fiber/middleware/prometheus/handler.go b/internal/fiber/middleware/prometheus/handler.go
@@ -24,8 +24,6 @@ import (
 	"github.com/gofiber/fiber/v2"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	trace2 "go.opentelemetry.io/otel/sdk/trace"
-	"go.opentelemetry.io/otel/trace"
 )
 
 type metricsHandler struct {
@@ -64,7 +62,7 @@ func New(opts ...Option) fiber.Handler {
 			1.0, 2.0, 5.0, 10.0, 15.0, // 1, 2, 5, 10, 20s
 		},
 	},
-		[]string{"status_code", "method", "path", "parent_id", "trace_id", "span_id"},
+		[]string{"status_code", "method", "path"},
 	)
 
 	gauge := promauto.With(options.registerer).NewGaugeVec(prometheus.GaugeOpts{
@@ -84,10 +82,7 @@ func New(opts ...Option) fiber.Handler {
 }
 
 func (h *metricsHandler) observeRequest(ctx *fiber.Ctx) error {
-	const (
-		MagicNumber = 1e9
-		NoValue     = "none"
-	)
+	const MagicNumber = 1e9
 
 	start := time.Now()
 
@@ -121,24 +116,8 @@ func (h *metricsHandler) observeRequest(ctx *fiber.Ctx) error {
 	statusCode := strconv.Itoa(status)
 	h.reqCounter.WithLabelValues(statusCode, method, path).Inc()
 
-	span := trace.SpanFromContext(ctx.UserContext())
-	spanCtx := span.SpanContext()
-
-	traceID := NoValue
-	spanID := NoValue
-	parentID := NoValue
-
-	if spanCtx.IsValid() {
-		if roSpan, ok := span.(trace2.ReadOnlySpan); ok && roSpan.Parent().IsValid() {
-			parentID = roSpan.Parent().SpanID().String()
-		}
-
-		traceID = spanCtx.TraceID().String()
-		spanID = spanCtx.SpanID().String()
-	}
-
 	elapsed := float64(time.Since(start).Nanoseconds()) / MagicNumber
-	h.reqHistogram.WithLabelValues(statusCode, method, path, parentID, traceID, spanID).Observe(elapsed)
+	h.reqHistogram.WithLabelValues(statusCode, method, path).Observe(elapsed)
 
 	return err
 }
diff --git a/internal/fiber/middleware/prometheus/handler_test.go b/internal/fiber/middleware/prometheus/handler_test.go
@@ -17,7 +17,6 @@
 package prometheus
 
 import (
-	"context"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -27,12 +26,6 @@ import (
 	dto "github.com/prometheus/client_model/go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/otel"
-	"go.opentelemetry.io/otel/propagation"
-	sdktrace "go.opentelemetry.io/otel/sdk/trace"
-	"go.opentelemetry.io/otel/trace"
-
-	"github.com/dadrus/heimdall/internal/fiber/middleware/opentelemetry"
 )
 
 func metricForType(metrics []*dto.MetricFamily, metricType *dto.MetricType) *dto.MetricFamily {
@@ -58,13 +51,6 @@ func getLabel(labels []*dto.LabelPair, name string) string {
 func TestHandlerObserveRequests(t *testing.T) { //nolint:maintidx
 	t.Parallel()
 
-	otel.SetTracerProvider(sdktrace.NewTracerProvider())
-	otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}))
-
-	parentCtx := trace.NewSpanContext(trace.SpanContextConfig{
-		TraceID: trace.TraceID{1}, SpanID: trace.SpanID{2}, TraceFlags: trace.FlagsSampled,
-	})
-
 	for _, tc := range []struct {
 		uc     string
 		req    *http.Request
@@ -97,9 +83,6 @@ func TestHandlerObserveRequests(t *testing.T) { //nolint:maintidx
 				assert.Equal(t, "/test", getLabel(histMetric.Metric[0].Label, "path"))
 				assert.Equal(t, "foobar", getLabel(histMetric.Metric[0].Label, "service"))
 				assert.Equal(t, "200", getLabel(histMetric.Metric[0].Label, "status_code"))
-				assert.Equal(t, "0200000000000000", getLabel(histMetric.Metric[0].Label, "parent_id"))
-				assert.NotEqual(t, "none", getLabel(histMetric.Metric[0].Label, "span_id"))
-				assert.NotEqual(t, "none", getLabel(histMetric.Metric[0].Label, "trace_id"))
 				require.Len(t, histMetric.Metric[0].Histogram.Bucket, 22)
 
 				gaugeMetric := metricForType(metrics, dto.MetricType_GAUGE.Enum())
@@ -142,9 +125,6 @@ func TestHandlerObserveRequests(t *testing.T) { //nolint:maintidx
 				assert.Equal(t, "/test", getLabel(histMetric.Metric[0].Label, "path"))
 				assert.Equal(t, "foobar", getLabel(histMetric.Metric[0].Label, "service"))
 				assert.Equal(t, "500", getLabel(histMetric.Metric[0].Label, "status_code"))
-				assert.Equal(t, "0200000000000000", getLabel(histMetric.Metric[0].Label, "parent_id"))
-				assert.NotEqual(t, "none", getLabel(histMetric.Metric[0].Label, "span_id"))
-				assert.NotEqual(t, "none", getLabel(histMetric.Metric[0].Label, "trace_id"))
 				require.Len(t, histMetric.Metric[0].Histogram.Bucket, 22)
 
 				gaugeMetric := metricForType(metrics, dto.MetricType_GAUGE.Enum())
@@ -187,9 +167,6 @@ func TestHandlerObserveRequests(t *testing.T) { //nolint:maintidx
 				assert.Equal(t, "/error", getLabel(histMetric.Metric[0].Label, "path"))
 				assert.Equal(t, "foobar", getLabel(histMetric.Metric[0].Label, "service"))
 				assert.Equal(t, "410", getLabel(histMetric.Metric[0].Label, "status_code"))
-				assert.Equal(t, "0200000000000000", getLabel(histMetric.Metric[0].Label, "parent_id"))
-				assert.NotEqual(t, "none", getLabel(histMetric.Metric[0].Label, "span_id"))
-				assert.NotEqual(t, "none", getLabel(histMetric.Metric[0].Label, "trace_id"))
 				require.Len(t, histMetric.Metric[0].Histogram.Bucket, 22)
 
 				gaugeMetric := metricForType(metrics, dto.MetricType_GAUGE.Enum())
@@ -220,7 +197,6 @@ func TestHandlerObserveRequests(t *testing.T) { //nolint:maintidx
 			registry := prometheus.NewRegistry()
 
 			app := fiber.New()
-			app.Use(opentelemetry.New())
 			app.Use(New(
 				WithRegisterer(registry),
 				WithNamespace("foo"),
@@ -237,10 +213,6 @@ func TestHandlerObserveRequests(t *testing.T) { //nolint:maintidx
 
 			defer app.Shutdown() // nolint: errcheck
 
-			otel.GetTextMapPropagator().Inject(
-				trace.ContextWithRemoteSpanContext(context.Background(), parentCtx),
-				propagation.HeaderCarrier(tc.req.Header))
-
 			// WHEN
 			resp, err := app.Test(tc.req, -1)
 			require.NoError(t, err)