r2dbc

Author: trask

instrumentation/r2dbc-1.0/library/src/test/java/io/opentelemetry/instrumentation/r2dbc/v1_0/R2dbcStatementTest.java

@@ -5,6 +5,9 @@
 
 package io.opentelemetry.instrumentation.r2dbc.v1_0;
 
+import io.opentelemetry.instrumentation.api.incubator.semconv.net.PeerServiceAttributesExtractor;
+import io.opentelemetry.instrumentation.api.incubator.semconv.net.PeerServiceResolver;
+import io.opentelemetry.instrumentation.r2dbc.v1_0.internal.R2dbcNetAttributesGetter;
 import io.opentelemetry.instrumentation.reactor.v3_1.ContextPropagationOperator;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
@@ -39,7 +42,18 @@ void stop() {
   @Override
   protected ConnectionFactory createProxyConnectionFactory(
       ConnectionFactoryOptions connectionFactoryOptions) {
-    return R2dbcTelemetry.create(testing.getOpenTelemetry())
+    // Create peer service mapping for testing
+    java.util.Map<String, String> peerServiceMapping = new java.util.HashMap<>();
+    peerServiceMapping.put("127.0.0.1", "test-peer-service");
+    peerServiceMapping.put("localhost", "test-peer-service");
+    peerServiceMapping.put("192.0.2.1", "test-peer-service");
+    
+    return R2dbcTelemetry.builder(testing.getOpenTelemetry())
+        .addAttributesExtractor(
+            PeerServiceAttributesExtractor.create(
+                R2dbcNetAttributesGetter.INSTANCE,
+                PeerServiceResolver.create(peerServiceMapping)))
+        .build()
         .wrapConnectionFactory(
             super.createProxyConnectionFactory(connectionFactoryOptions), connectionFactoryOptions);
   }

instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java

@@ -17,6 +17,7 @@
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER;
+import static io.opentelemetry.semconv.incubating.PeerIncubatingAttributes.PEER_SERVICE;
 import static io.r2dbc.spi.ConnectionFactoryOptions.CONNECT_TIMEOUT;
 import static io.r2dbc.spi.ConnectionFactoryOptions.DATABASE;
 import static io.r2dbc.spi.ConnectionFactoryOptions.DRIVER;
@@ -181,6 +182,7 @@ void testQueries(Parameter parameter) {
                                 equalTo(maybeStable(DB_STATEMENT), parameter.expectedStatement),
                                 equalTo(maybeStable(DB_OPERATION), parameter.operation),
                                 equalTo(maybeStable(DB_SQL_TABLE), parameter.table),
+                                equalTo(PEER_SERVICE, "test-peer-service"),
                                 equalTo(SERVER_ADDRESS, container.getHost()),
                                 equalTo(SERVER_PORT, port)),
                     span ->