fix merge

Author: trask

instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/JdbcInstrumentationTest.java

@@ -39,4 +39,9 @@ protected Connection wrap(Connection connection) throws SQLException {
   protected DataSource wrap(DataSource dataSource) {
     return telemetry.wrap(dataSource);
   }
+
+  @Override
+  protected boolean hasPeerService() {
+    return false;
+  }
 }

instrumentation/jdbc/testing/src/main/java/io/opentelemetry/instrumentation/jdbc/testing/AbstractJdbcInstrumentationTest.java

@@ -25,6 +25,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 java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
@@ -90,6 +91,10 @@ protected DataSource wrap(DataSource dataSource) {
     return dataSource;
   }
 
+  protected boolean hasPeerService() {
+    return true;
+  }
+
   private static final String dbName = "jdbcUnitTest";
   private static final String dbNameLower = dbName.toLowerCase(Locale.ROOT);
   private static final Map<String, String> jdbcUrls =
@@ -1166,6 +1171,7 @@ void testGetClientInfoException(String query) throws SQLException {
                                 equalTo(
                                     DB_CONNECTION_STRING,
                                     emitStableDatabaseSemconv() ? null : "testdb://localhost"),
+                                equalTo(PEER_SERVICE, hasPeerService() ? "test-peer-service" : null),
                                 equalTo(SERVER_ADDRESS, "localhost"))));
   }
 
@@ -1254,6 +1260,7 @@ void testProduceProperSpanName(
                                 equalTo(maybeStable(DB_STATEMENT), sanitizedQuery),
                                 equalTo(maybeStable(DB_OPERATION), operation),
                                 equalTo(maybeStable(DB_SQL_TABLE), table),
+                                equalTo(PEER_SERVICE, hasPeerService() ? "test-peer-service" : null),
                                 equalTo(SERVER_ADDRESS, "localhost"))));
   }
 
@@ -1379,6 +1386,7 @@ void testHandleRecursiveStatements(
                                 equalTo(maybeStable(DB_STATEMENT), "SELECT * FROM table"),
                                 equalTo(maybeStable(DB_OPERATION), "SELECT"),
                                 equalTo(maybeStable(DB_SQL_TABLE), "table"),
+                                equalTo(PEER_SERVICE, hasPeerService() ? "test-peer-service" : null),
                                 equalTo(SERVER_ADDRESS, "localhost"))));
   }