refactor: reuse gax ErrorTypeUtil and ObservabilityAttributes in bigquery

Author: blakeli0

java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/telemetry/BigQueryTelemetryTracer.java

@@ -19,6 +19,8 @@
 import com.google.api.client.googleapis.json.GoogleJsonError;
 import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 import com.google.api.core.InternalApi;
+import com.google.api.gax.tracing.ErrorTypeUtil;
+import com.google.api.gax.tracing.ObservabilityAttributes;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.StatusCode;
@@ -37,27 +39,30 @@ private BigQueryTelemetryTracer() {}
   // https://github.com/googleapis/google-cloud-java/issues/12099
   // Common GCP Attributes
   public static final AttributeKey<String> GCP_CLIENT_SERVICE =
-      AttributeKey.stringKey("gcp.client.service");
+      AttributeKey.stringKey(ObservabilityAttributes.GCP_CLIENT_SERVICE_ATTRIBUTE);
   public static final AttributeKey<String> GCP_CLIENT_VERSION =
       AttributeKey.stringKey("gcp.client.version");
   public static final AttributeKey<String> GCP_CLIENT_REPO =
-      AttributeKey.stringKey("gcp.client.repo");
+      AttributeKey.stringKey(ObservabilityAttributes.REPO_ATTRIBUTE);
   public static final AttributeKey<String> GCP_CLIENT_ARTIFACT =
       AttributeKey.stringKey("gcp.client.artifact");
   public static final AttributeKey<String> GCP_RESOURCE_DESTINATION_ID =
-      AttributeKey.stringKey("gcp.resource.destination.id");
+      AttributeKey.stringKey(ObservabilityAttributes.DESTINATION_RESOURCE_ID_ATTRIBUTE);
   public static final AttributeKey<String> RPC_SYSTEM_NAME =
-      AttributeKey.stringKey("rpc.system.name");
+      AttributeKey.stringKey(ObservabilityAttributes.RPC_SYSTEM_NAME_ATTRIBUTE);
 
   // Common Error Attributes
-  public static final AttributeKey<String> ERROR_TYPE = AttributeKey.stringKey("error.type");
+  public static final AttributeKey<String> ERROR_TYPE =
+      AttributeKey.stringKey(ObservabilityAttributes.ERROR_TYPE_ATTRIBUTE);
   public static final AttributeKey<String> EXCEPTION_TYPE =
-      AttributeKey.stringKey("exception.type");
+      AttributeKey.stringKey(ObservabilityAttributes.EXCEPTION_TYPE_ATTRIBUTE);
   public static final AttributeKey<String> STATUS_MESSAGE =
-      AttributeKey.stringKey("status.message");
+      AttributeKey.stringKey(ObservabilityAttributes.STATUS_MESSAGE_ATTRIBUTE);
 
-  public static final AttributeKey<String> URL_TEMPLATE = AttributeKey.stringKey("url.template");
-  public static final AttributeKey<String> URL_DOMAIN = AttributeKey.stringKey("url.domain");
+  public static final AttributeKey<String> URL_TEMPLATE =
+      AttributeKey.stringKey(ObservabilityAttributes.URL_TEMPLATE_ATTRIBUTE);
+  public static final AttributeKey<String> URL_DOMAIN =
+      AttributeKey.stringKey(ObservabilityAttributes.URL_DOMAIN_ATTRIBUTE);
 
   public static void addCommonAttributeToSpan(Span span) {
     span.setAttribute(GCP_CLIENT_SERVICE, BQ_GCP_CLIENT_SERVICE)
@@ -78,7 +83,7 @@ public static void addExceptionToSpan(Exception e, Span span) {
     String statusMessage = simpleName + (message != null ? ": " + message : "");
     span.setAttribute(BigQueryTelemetryTracer.EXCEPTION_TYPE, e.getClass().getName());
     span.setAttribute(
-        BigQueryTelemetryTracer.ERROR_TYPE, ErrorTypeUtil.getClientErrorType(e).toString());
+        BigQueryTelemetryTracer.ERROR_TYPE, ErrorTypeUtil.extractErrorType(e));
     span.setAttribute(BigQueryTelemetryTracer.STATUS_MESSAGE, statusMessage);
     span.setStatus(StatusCode.ERROR, statusMessage);
   }

java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/telemetry/ErrorTypeUtil.java

@@ -143,7 +143,7 @@ public void testAddExceptionToSpan_WithMessage() {
     assertEquals(
         "java.lang.Exception",
         spanData.getAttributes().get(BigQueryTelemetryTracer.EXCEPTION_TYPE));
-    assertErrorSpanAttributes("CLIENT_UNKNOWN_ERROR", "Exception: Test error message");
+    assertErrorSpanAttributes("Exception", "Exception: Test error message");
   }
 
   @Test
@@ -161,7 +161,7 @@ public void testAddExceptionToSpan_NoMessage() {
         spanData.getAttributes().get(BigQueryTelemetryTracer.EXCEPTION_TYPE));
     assertEquals("Exception", spanData.getAttributes().get(BigQueryTelemetryTracer.STATUS_MESSAGE));
     assertEquals(
-        "CLIENT_UNKNOWN_ERROR", spanData.getAttributes().get(BigQueryTelemetryTracer.ERROR_TYPE));
+        "Exception", spanData.getAttributes().get(BigQueryTelemetryTracer.ERROR_TYPE));
   }
 
   @Test