up

Author: trask

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java

@@ -65,6 +65,7 @@ public static <REQUEST, RESPONSE> AttributesExtractor<REQUEST, RESPONSE> create(
   @Override
   public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
     onStartCommon(attributes, getter, request);
+    serverAttributesExtractor.onStart(attributes, parentContext, request);
   }
 
   @SuppressWarnings("deprecation") // until old db semconv are dropped
@@ -90,7 +91,6 @@ static <REQUEST, RESPONSE> void onStartCommon(
       internalSet(attributes, DB_STATEMENT, getter.getDbQueryText(request));
       internalSet(attributes, DB_OPERATION, getter.getDbOperationName(request));
     }
-    serverAttributesExtractor.onStart(attributes, parentContext, request);
   }
 
   @Override
@@ -100,6 +100,7 @@ public void onEnd(
       REQUEST request,
       @Nullable RESPONSE response,
       @Nullable Throwable error) {
+    internalNetworkExtractor.onEnd(attributes, request, response);
     onEndCommon(attributes, getter, response, error);
   }
 
@@ -108,7 +109,6 @@ static <REQUEST, RESPONSE> void onEndCommon(
       DbClientAttributesGetter<REQUEST, RESPONSE> getter,
       @Nullable RESPONSE response,
       @Nullable Throwable error) {
-    internalNetworkExtractor.onEnd(attributes, request, response);
     if (SemconvStability.emitStableDatabaseSemconv()) {
       if (error != null) {
         internalSet(attributes, ERROR_TYPE, error.getClass().getName());

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesGetter.java

@@ -20,47 +20,11 @@
  * from the attribute methods, but implement as many as possible for best compliance with the
  * OpenTelemetry specification.
  */
+@SuppressWarnings("deprecation") // until DbClientCommonAttributesGetter is removed
 public interface DbClientAttributesGetter<REQUEST, RESPONSE>
-    extends NetworkAttributesGetter<REQUEST, RESPONSE>, ServerAttributesGetter<REQUEST> {
-
-  @Deprecated
-  @Nullable
-  default String getSystem(REQUEST request) {
-    return null;
-  }
-
-  // TODO: make this required to implement
-  @Nullable
-  default String getDbSystem(REQUEST request) {
-    return getSystem(request);
-  }
-
-  @Deprecated
-  @Nullable
-  default String getUser(REQUEST request) {
-    return null;
-  }
-
-  /**
-   * @deprecated Use {@link #getDbNamespace(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String getName(REQUEST request) {
-    return null;
-  }
-
-  // TODO: make this required to implement
-  @Nullable
-  default String getDbNamespace(REQUEST request) {
-    return getName(request);
-  }
-
-  @Deprecated
-  @Nullable
-  default String getConnectionString(REQUEST request) {
-    return null;
-  }
+    extends DbClientCommonAttributesGetter<REQUEST, RESPONSE>,
+        NetworkAttributesGetter<REQUEST, RESPONSE>,
+        ServerAttributesGetter<REQUEST> {
 
   /**
    * @deprecated Use {@link #getDbQueryText(REQUEST)} instead.
@@ -96,9 +60,4 @@ default String getDbOperationName(REQUEST request) {
   default String getDbQuerySummary(REQUEST request) {
     return null;
   }
-
-  @Nullable
-  default String getResponseStatus(@Nullable RESPONSE response, @Nullable Throwable error) {
-    return null;
-  }
 }

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java

@@ -7,9 +7,11 @@
 
 import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
 import static io.opentelemetry.semconv.DbAttributes.DB_COLLECTION_NAME;
+import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
 import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_BATCH_SIZE;
 import static io.opentelemetry.semconv.DbAttributes.DB_OPERATION_NAME;
 import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_TEXT;
+import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.AttributesBuilder;
@@ -41,6 +43,11 @@ public final class SqlClientAttributesExtractor<REQUEST, RESPONSE>
   // copied from DbIncubatingAttributes
   private static final AttributeKey<String> DB_OPERATION = AttributeKey.stringKey("db.operation");
   private static final AttributeKey<String> DB_STATEMENT = AttributeKey.stringKey("db.statement");
+  private static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system");
+  private static final AttributeKey<String> DB_USER = AttributeKey.stringKey("db.user");
+  private static final AttributeKey<String> DB_NAME = AttributeKey.stringKey("db.name");
+  private static final AttributeKey<String> DB_CONNECTION_STRING =
+      AttributeKey.stringKey("db.connection_string");
   private static final AttributeKeyTemplate<String> DB_QUERY_PARAMETER =
       AttributeKeyTemplate.stringKeyTemplate("db.query.parameter");
 
@@ -194,19 +201,8 @@ public void onEnd(
       REQUEST request,
       @Nullable RESPONSE response,
       @Nullable Throwable error) {
-<<<<<<< HEAD
-    DbClientAttributesExtractor.onEndCommon(attributes, getter, response, error);
-=======
     internalNetworkExtractor.onEnd(attributes, request, response);
-    if (SemconvStability.emitStableDatabaseSemconv()) {
-      if (error != null) {
-        internalSet(attributes, ERROR_TYPE, error.getClass().getName());
-      }
-      if (error != null || response != null) {
-        internalSet(attributes, DB_RESPONSE_STATUS_CODE, getter.getResponseStatus(response, error));
-      }
-    }
->>>>>>> 491840ef70 (Consolidate network attribute extraction into DbClientAttributesGetter)
+    DbClientAttributesExtractor.onEndCommon(attributes, getter, response, error);
   }
 
   /**