resolve(conflict): resolve merge conflicts

flc1125 · Dec 12, 2024 · 16e399e · 16e399e
1 parent 3a75837
commit 16e399e
Showing 1 changed file with 0 additions and 8 deletions.
diff --git 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]{},
-	}
-}