more

Author: trask

instrumentation/armeria/armeria-1.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttp2Test.java

@@ -16,6 +16,7 @@
 import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PROTOCOL_VERSION;
 import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
 import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
+import static io.opentelemetry.semconv.incubating.PeerIncubatingAttributes.PEER_SERVICE;
 import static io.opentelemetry.semconv.UrlAttributes.URL_FULL;
 import static io.opentelemetry.semconv.UrlAttributes.URL_PATH;
 import static io.opentelemetry.semconv.UrlAttributes.URL_SCHEME;
@@ -79,7 +80,8 @@ void testHello() throws Exception {
                             equalTo(SERVER_ADDRESS, "127.0.0.1"),
                             equalTo(SERVER_PORT, server2.httpPort()),
                             equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
-                            satisfies(NETWORK_PEER_PORT, val -> val.isInstanceOf(Long.class))),
+                            satisfies(NETWORK_PEER_PORT, val -> val.isInstanceOf(Long.class)),
+                            equalTo(PEER_SERVICE, "test-peer-service")),
                 span ->
                     span.hasName("GET /")
                         .hasKind(SpanKind.SERVER)
@@ -109,7 +111,8 @@ void testHello() throws Exception {
                             equalTo(SERVER_ADDRESS, "127.0.0.1"),
                             equalTo(SERVER_PORT, server1.httpPort()),
                             equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
-                            satisfies(NETWORK_PEER_PORT, val -> val.isInstanceOf(Long.class))),
+                            satisfies(NETWORK_PEER_PORT, val -> val.isInstanceOf(Long.class)),
+                            equalTo(PEER_SERVICE, "test-peer-service")),
                 span ->
                     span.hasName("GET /")
                         .hasKind(SpanKind.SERVER)

instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java

@@ -15,6 +15,7 @@
 import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
 import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
 import static io.opentelemetry.semconv.UrlAttributes.URL_FULL;
+import static io.opentelemetry.semconv.incubating.PeerIncubatingAttributes.PEER_SERVICE;
 
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.http.HttpRequest;
@@ -111,7 +112,8 @@ void errorTracesWhenExceptionIsNotThrown() throws Exception {
                 equalTo(URL_FULL, uri.toString()),
                 equalTo(HTTP_REQUEST_METHOD, "GET"),
                 equalTo(HTTP_RESPONSE_STATUS_CODE, 500),
-                equalTo(ERROR_TYPE, "500")));
+                equalTo(ERROR_TYPE, "500"),
+                equalTo(PEER_SERVICE, "test-peer-service")));
 
     testing.waitAndAssertTraces(
         trace ->

instrumentation/spring/spring-web/spring-web-3.1/testing/build.gradle.kts

@@ -7,3 +7,7 @@ dependencies {
 
   testInstrumentation(project(":instrumentation:http-url-connection:javaagent"))
 }
+
+tasks.withType<Test>().configureEach {
+  systemProperty("otel.instrumentation.common.peer-service-mapping", "localhost=test-peer-service,127.0.0.1=test-peer-service,192.0.2.1=test-peer-service")
+}

instrumentation/vertx/vertx-rx-java-3.5/javaagent/build.gradle.kts

@@ -97,6 +97,10 @@ tasks {
     }
   }
 
+  withType<Test>().configureEach {
+    systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")
+  }
+
   check {
     dependsOn(testing.suites)
   }