use single method for status code

Author: zeitlinger

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

@@ -66,11 +66,9 @@ public final void onEnd(
       @Nullable Throwable error) {
     if (error != null) {
       internalSet(attributes, ERROR_TYPE, error.getClass().getName());
-      internalSet(
-          attributes, DB_RESPONSE_STATUS_CODE, getter.getResponseStatusFromException(error));
     }
-    if (response != null) {
-      internalSet(attributes, DB_RESPONSE_STATUS_CODE, getter.getResponseStatus(response));
+    if (error != null || response != null) {
+      internalSet(attributes, DB_RESPONSE_STATUS_CODE, getter.getResponseStatus(response, error));
     }
   }
 

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

@@ -46,12 +46,7 @@ default String getDbNamespace(REQUEST request) {
   String getConnectionString(REQUEST request);
 
   @Nullable
-  default String getResponseStatusFromException(Throwable throwable) {
-    return null;
-  }
-
-  @Nullable
-  default String getResponseStatus(RESPONSE response) {
+  default String getResponseStatus(@Nullable RESPONSE response, @Nullable Throwable error) {
     return null;
   }
 }

instrumentation/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseAttributesGetter.java

@@ -63,9 +63,9 @@ public String getConnectionString(ClickHouseDbRequest request) {
 
   @Nullable
   @Override
-  public String getResponseStatusFromException(Throwable throwable) {
-    if (throwable instanceof ClickHouseException) {
-      return Integer.toString(((ClickHouseException) throwable).getErrorCode());
+  public String getResponseStatus(@Nullable Void response, @Nullable Throwable error) {
+    if (error instanceof ClickHouseException) {
+      return Integer.toString(((ClickHouseException) error).getErrorCode());
     }
     return null;
   }

instrumentation/elasticsearch/elasticsearch-rest-common-5.0/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/common/v5_0/internal/ElasticsearchDbAttributesGetter.java

@@ -94,9 +94,12 @@ public String getDbOperationName(ElasticsearchRestRequest request) {
     return endpointDefinition != null ? endpointDefinition.getEndpointName() : null;
   }
 
+  @Nullable
   @Override
-  public String getResponseStatus(Response response) {
-    return DbResponseStatusUtil.httpStatusToResponseStatus(
-        response.getStatusLine().getStatusCode());
+  public String getResponseStatus(@Nullable Response response, @Nullable Throwable error) {
+    if (response != null) {
+      return DbResponseStatusUtil.httpStatusToResponseStatus(
+          response.getStatusLine().getStatusCode());
+    }
   }
 }

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

@@ -54,10 +54,11 @@ public Long getBatchSize(DbRequest request) {
     return request.getBatchSize();
   }
 
+  @Nullable
   @Override
-  public String getResponseStatusFromException(Throwable throwable) {
-    if (throwable instanceof SQLException) {
-      return Integer.toString(((SQLException) throwable).getErrorCode());
+  public String getResponseStatus(@Nullable Void response, @Nullable Throwable error) {
+    if (error instanceof SQLException) {
+      return Integer.toString(((SQLException) error).getErrorCode());
     }
     return null;
   }

instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetter.java

@@ -100,9 +100,9 @@ public String getDbOperationName(CommandStartedEvent event) {
 
   @Nullable
   @Override
-  public String getResponseStatusFromException(Throwable throwable) {
-    if (throwable instanceof MongoException) {
-      return Integer.toString(((MongoException) throwable).getCode());
+  public String getResponseStatus(@Nullable Void response, @Nullable Throwable error) {
+    if (error instanceof MongoException) {
+      return Integer.toString(((MongoException) error).getCode());
     }
     return null;
   }

instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestAttributesGetter.java

@@ -52,9 +52,12 @@ public String getDbOperationName(OpenSearchRestRequest request) {
     return request.getMethod();
   }
 
+  @Nullable
   @Override
-  public String getResponseStatus(Response response) {
-    return DbResponseStatusUtil.httpStatusToResponseStatus(
-        response.getStatusLine().getStatusCode());
+  public String getResponseStatus(@Nullable Response response, @Nullable Throwable error) {
+    if (response != null) {
+      return DbResponseStatusUtil.httpStatusToResponseStatus(
+          response.getStatusLine().getStatusCode());
+    }
   }
 }

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

@@ -51,9 +51,9 @@ public Collection<String> getRawQueryTexts(DbExecution request) {
 
   @Nullable
   @Override
-  public String getResponseStatusFromException(Throwable throwable) {
-    if (throwable instanceof R2dbcException) {
-      return ((R2dbcException) throwable).getSqlState();
+  public String getResponseStatus(@Nullable Void response, @Nullable Throwable error) {
+    if (error instanceof R2dbcException) {
+      return ((R2dbcException) error).getSqlState();
     }
     return null;
   }

instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientAttributesGetter.java

@@ -48,11 +48,11 @@ public Collection<String> getRawQueryTexts(VertxSqlClientRequest request) {
 
   @Nullable
   @Override
-  public String getResponseStatusFromException(Throwable throwable) {
+  public String getResponseStatus(@Nullable Void response, @Nullable Throwable error) {
     try {
       Class<?> ex = Class.forName("io.vertx.pgclient.PgException");
-      if (ex.isInstance(throwable)) {
-        return (String) ex.getMethod("getCode").invoke(throwable);
+      if (ex.isInstance(error)) {
+        return (String) ex.getMethod("getCode").invoke(error);
       }
     } catch (ClassNotFoundException
         | NoSuchMethodException