From 16e399e19294d7362175aa3afd74b4290ffaef6e Mon Sep 17 00:00:00 2001
From: Flc <four_leaf_clover@foxmail.com>
Date: Thu, 12 Dec 2024 22:44:42 +0800
Subject: [PATCH] resolve(conflict): resolve merge conflicts

---
 .../net/http/otelhttp/internal/semconv/env_test.go        | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/instrumentation/net/http/otelhttp/internal/semconv/env_test.go b/instrumentation/net/http/otelhttp/internal/semconv/env_test.go
index 01b17080100..9eddb65b720 100644
--- a/instrumentation/net/http/otelhttp/internal/semconv/env_test.go
+++ b/instrumentation/net/http/otelhttp/internal/semconv/env_test.go
@@ -134,11 +134,3 @@ func NewTestHTTPServer() HTTPServer {
 	httpServer.requestDurationHistogram = &testRecorder[float64]{}
 	return httpServer
 }
-
-func NewTestHTTPClient() HTTPClient {
-	return HTTPClient{
-		requestBytesCounter:  &testRecorder[int64]{},
-		responseBytesCounter: &testRecorder[int64]{},
-		latencyMeasure:       &testRecorder[float64]{},
-	}
-}