updates

Author: trask

instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcSingletons.java

@@ -39,7 +39,7 @@ public final class JdbcSingletons {
   static {
     AttributesExtractor<DbRequest, Void> peerServiceExtractor =
         PeerServiceAttributesExtractor.create(
-            new JdbcAttributesGetter(), AgentCommonConfig.get().getPeerServiceResolver());
+            JdbcAttributesGetter.INSTANCE, AgentCommonConfig.get().getPeerServiceResolver());
 
     CAPTURE_QUERY_PARAMETERS =
         AgentInstrumentationConfig.get()

instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcAttributesGetter.java

@@ -18,6 +18,8 @@
  */
 public final class JdbcAttributesGetter implements SqlClientAttributesGetter<DbRequest, Void> {
 
+  public static final JdbcAttributesGetter INSTANCE = new JdbcAttributesGetter();
+
   @Nullable
   @Override
   public String getDbSystem(DbRequest request) {

instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcInstrumenterFactory.java

@@ -27,7 +27,6 @@
  */
 public final class JdbcInstrumenterFactory {
   public static final String INSTRUMENTATION_NAME = "io.opentelemetry.jdbc";
-  private static final JdbcAttributesGetter dbAttributesGetter = new JdbcAttributesGetter();
 
   public static boolean captureQueryParameters() {
     return ConfigPropertiesUtil.getBoolean(
@@ -68,9 +67,9 @@ public static Instrumenter<DbRequest, Void> createStatementInstrumenter(
     return Instrumenter.<DbRequest, Void>builder(
             openTelemetry,
             INSTRUMENTATION_NAME,
-            DbClientSpanNameExtractor.create(dbAttributesGetter))
+            DbClientSpanNameExtractor.create(JdbcAttributesGetter.INSTANCE))
         .addAttributesExtractor(
-            SqlClientAttributesExtractor.builder(dbAttributesGetter)
+            SqlClientAttributesExtractor.builder(JdbcAttributesGetter.INSTANCE)
                 .setStatementSanitizationEnabled(statementSanitizationEnabled)
                 .setCaptureQueryParameters(captureQueryParameters)
                 .build())
@@ -110,7 +109,7 @@ public static Instrumenter<DbRequest, Void> createTransactionInstrumenter(
       boolean enabled) {
     return Instrumenter.<DbRequest, Void>builder(
             openTelemetry, INSTRUMENTATION_NAME, DbRequest::getOperation)
-        .addAttributesExtractor(SqlClientAttributesExtractor.builder(dbAttributesGetter).build())
+        .addAttributesExtractor(SqlClientAttributesExtractor.builder(JdbcAttributesGetter.INSTANCE).build())
         .addAttributesExtractor(TransactionAttributeExtractor.INSTANCE)
         .addAttributesExtractors(extractors)
         .setEnabled(enabled)

instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcInstrumenterBuilder.java

@@ -45,7 +45,6 @@ public R2dbcInstrumenterBuilder addAttributesExtractor(
   public Instrumenter<DbExecution, Void> build(
       UnaryOperator<SpanNameExtractor<DbExecution>> spanNameExtractorTransformer,
       boolean statementSanitizationEnabled) {
-
     SpanNameExtractor<DbExecution> spanNameExtractor =
         spanNameExtractorTransformer.apply(
             DbClientSpanNameExtractor.create(R2dbcSqlAttributesGetter.INSTANCE));