From a1de76b400d51fb353784fe5168ef32533f1969e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dario=20Casta=C3=B1=C3=A9?= <dario.castane@datadoghq.com>
Date: Tue, 19 Mar 2024 10:23:35 +0100
Subject: [PATCH] contrib/net/http: harmonize benchmarks for v2 (#2619)

---
 contrib/net/http/http_test.go  |  5 +++--
 contrib/net/http/trace_test.go | 15 ++++++++-------
 ddtrace/tracer/tracer_test.go  |  1 +
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/contrib/net/http/http_test.go b/contrib/net/http/http_test.go
index 5024884755..07bcf221fa 100644
--- a/contrib/net/http/http_test.go
+++ b/contrib/net/http/http_test.go
@@ -17,6 +17,7 @@ import (
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/mocktracer"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
+	"gopkg.in/DataDog/dd-trace-go.v1/internal/log"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/normalizer"
 
 	"github.com/stretchr/testify/assert"
@@ -496,8 +497,8 @@ func handler500(w http.ResponseWriter, _ *http.Request) {
 }
 
 func BenchmarkHttpServeTrace(b *testing.B) {
-	mt := mocktracer.Start()
-	defer mt.Stop()
+	tracer.Start(tracer.WithLogger(log.DiscardLogger{}))
+	defer tracer.Stop()
 	header, tag := normalizer.HeaderTag("3header")
 	globalconfig.SetHeaderTag(header, tag)
 
diff --git a/contrib/net/http/trace_test.go b/contrib/net/http/trace_test.go
index f44789ae9a..f7018976a8 100644
--- a/contrib/net/http/trace_test.go
+++ b/contrib/net/http/trace_test.go
@@ -373,14 +373,15 @@ func BenchmarkTraceAndServe(b *testing.B) {
 	if err != nil {
 		b.Fatal(err)
 	}
+	cfg := ServeConfig{
+		Service:     "service-name",
+		Resource:    "resource-name",
+		FinishOpts:  []ddtrace.FinishOption{},
+		SpanOpts:    []ddtrace.StartSpanOption{},
+		QueryParams: false,
+	}
+	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		cfg := ServeConfig{
-			Service:     "service-name",
-			Resource:    "resource-name",
-			FinishOpts:  []ddtrace.FinishOption{},
-			SpanOpts:    []ddtrace.StartSpanOption{},
-			QueryParams: false,
-		}
 		TraceAndServe(handler, noopWriter{}, req, &cfg)
 	}
 }
diff --git a/ddtrace/tracer/tracer_test.go b/ddtrace/tracer/tracer_test.go
index 1218b42fa5..c0321e90a6 100644
--- a/ddtrace/tracer/tracer_test.go
+++ b/ddtrace/tracer/tracer_test.go
@@ -2046,6 +2046,7 @@ func BenchmarkTracerAddSpans(b *testing.B) {
 	tracer, _, _, stop := startTestTracer(b, WithLogger(log.DiscardLogger{}), WithSampler(NewRateSampler(0)))
 	defer stop()
 
+	b.ResetTimer()
 	for n := 0; n < b.N; n++ {
 		span := tracer.StartSpan("pylons.request", ServiceName("pylons"), ResourceName("/"))
 		span.Finish()