Remove peer service fallback to server.socket.* (#9369)

open-telemetry · Sep 5, 2023 · 9e12723 · 9e12723
1 parent db7eb14
commit 9e12723
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceAttributesExtractor.java b/...io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceAttributesExtractor.java
@@ -9,6 +9,7 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter;
+import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.util.Map;
 import javax.annotation.Nullable;
@@ -60,7 +61,7 @@ public void onEnd(
 
     String serverAddress = attributesGetter.getServerAddress(request);
     String peerService = mapToPeerService(serverAddress);
-    if (peerService == null) {
+    if (peerService == null && SemconvStability.emitOldHttpSemconv()) {
       String serverSocketDomain = attributesGetter.getServerSocketDomain(request, response);
       peerService = mapToPeerService(serverSocketDomain);
     }

diff --git a/...pentelemetry/instrumentation/api/instrumenter/net/PeerServiceAttributesExtractorTest.java b/...pentelemetry/instrumentation/api/instrumenter/net/PeerServiceAttributesExtractorTest.java
@@ -18,9 +18,11 @@
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesGetter;
+import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.util.HashMap;
 import java.util.Map;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -101,6 +103,9 @@ void shouldSetPeerNameIfItMatches() {
 
   @Test
   void shouldSetSockPeerNameIfItMatchesAndNoPeerNameProvided() {
+
+    Assumptions.assumeTrue(SemconvStability.emitOldHttpSemconv());
+
     // given
     Map<String, String> peerServiceMapping = new HashMap<>();
     peerServiceMapping.put("example.com", "myService");