get error response from ServerException

Author: mznet

instrumentation/clickhouse/clickhouse-client-common/javaagent/src/main/java/com/clickhouse/client/ClickHouseRequestAccess.java renamed to instrumentation/clickhouse/clickhouse-client-0.5/javaagent/src/main/java/com/clickhouse/client/ClickHouseRequestAccess.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_5;
+
+import com.clickhouse.client.ClickHouseException;
+import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;
+import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseAttributesGetter;
+import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseDbRequest;
+import javax.annotation.Nullable;
+
+public final class ClickHouseClientV1AttributesGetter extends ClickHouseAttributesGetter
+    implements DbClientAttributesGetter<ClickHouseDbRequest, Void> {
+
+  public static ClickHouseClientV1AttributesGetter create() {
+    return new ClickHouseClientV1AttributesGetter();
+  }
+
+  @Nullable
+  @Override
+  public String getResponseStatus(@Nullable Void response, @Nullable Throwable error) {
+    if (error instanceof ClickHouseException) {
+      return Integer.toString(((ClickHouseException) error).getErrorCode());
+    }
+    return null;
+  }
+}

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

@@ -15,7 +15,9 @@ public final class ClickHouseClientV1Singletons {
   private static final Instrumenter<ClickHouseDbRequest, Void> INSTRUMENTER;
 
   static {
-    INSTRUMENTER = ClickHouseInstrumenterFactory.createInstrumenter(INSTRUMENTER_NAME);
+    INSTRUMENTER =
+        ClickHouseInstrumenterFactory.createInstrumenter(
+            INSTRUMENTER_NAME, ClickHouseClientV1AttributesGetter.create());
   }
 
   public static Instrumenter<ClickHouseDbRequest, Void> instrumenter() {

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

@@ -0,0 +1,29 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_8;
+
+import com.clickhouse.client.api.ServerException;
+import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;
+import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseAttributesGetter;
+import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseDbRequest;
+import javax.annotation.Nullable;
+
+public final class ClickHouseClientV2AttributesGetter extends ClickHouseAttributesGetter
+    implements DbClientAttributesGetter<ClickHouseDbRequest, Void> {
+
+  public static ClickHouseClientV2AttributesGetter create() {
+    return new ClickHouseClientV2AttributesGetter();
+  }
+
+  @Nullable
+  @Override
+  public String getResponseStatus(@Nullable Void response, @Nullable Throwable error) {
+    if (error instanceof ServerException) {
+      return Integer.toString(((ServerException) error).getCode());
+    }
+    return null;
+  }
+}

instrumentation/clickhouse-client-0.5/metadata.yaml renamed to instrumentation/clickhouse/clickhouse-client-0.5/metadata.yaml

@@ -15,7 +15,9 @@ public final class ClickHouseClientV2Singletons {
   private static final Instrumenter<ClickHouseDbRequest, Void> INSTRUMENTER;
 
   static {
-    INSTRUMENTER = ClickHouseInstrumenterFactory.createInstrumenter(INSTRUMENTER_NAME);
+    INSTRUMENTER =
+        ClickHouseInstrumenterFactory.createInstrumenter(
+            INSTRUMENTER_NAME, ClickHouseClientV2AttributesGetter.create());
   }
 
   public static Instrumenter<ClickHouseDbRequest, Void> instrumenter() {

instrumentation/clickhouse/clickhouse-client-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/v0_8/ClickHouseClientV2AttributesGetter.java

@@ -193,7 +193,7 @@ void testQueryWithStringQueryAndId() throws Exception {
   }
 
   @Test
-  void testQueryThrowsException() {
+  void testQueryThrowsServerException() {
     Throwable thrown =
         catchThrowable(
             () -> {
@@ -208,7 +208,7 @@ void testQueryThrowsException() {
             attributeAssertions(dbName, host, port, "select * from non_existent_table", "SELECT"));
     if (SemconvStability.emitStableDatabaseSemconv()) {
       assertions.add(equalTo(DB_RESPONSE_STATUS_CODE, "60"));
-      assertions.add(equalTo(ERROR_TYPE, "com.clickhouse.client.ClickHouseException"));
+      assertions.add(equalTo(ERROR_TYPE, "com.clickhouse.client.api.ServerException"));
     }
     testing.waitAndAssertTraces(
         trace ->
@@ -229,7 +229,7 @@ void testSendQuery() throws Exception {
           CompletableFuture<CommandResponse> future =
               client.execute("select * from " + tableName + " limit 1");
           CommandResponse results = future.get();
-          assertThat(results.getReadRows()).isEqualTo(2);
+          assertThat(results.getReadRows()).isEqualTo(0);
         });
 
     testing.waitAndAssertTraces(

instrumentation/clickhouse/clickhouse-client-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/v0_8/ClickHouseClientV2Singletons.java

@@ -12,9 +12,4 @@ dependencies {
   api(project(":instrumentation-api-incubator"))
   compileOnly("com.google.auto.value:auto-value-annotations")
   annotationProcessor("com.google.auto.value:auto-value")
-  compileOnly("com.clickhouse:clickhouse-client:0.5.0")
-}
-
-tasks.test {
-  useJUnitPlatform()
 }

instrumentation/clickhouse/clickhouse-client-0.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/clickhouse/v0_8/ClickHouseClientV2Test.java

@@ -5,12 +5,11 @@
 
 package io.opentelemetry.javaagent.instrumentation.clickhouse.common;
 
-import com.clickhouse.client.ClickHouseException;
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
 import javax.annotation.Nullable;
 
-public final class ClickHouseAttributesGetter
+public class ClickHouseAttributesGetter
     implements DbClientAttributesGetter<ClickHouseDbRequest, Void> {
 
   @Nullable
@@ -64,9 +63,6 @@ public String getConnectionString(ClickHouseDbRequest request) {
   @Nullable
   @Override
   public String getResponseStatus(@Nullable Void response, @Nullable Throwable error) {
-    if (error instanceof ClickHouseException) {
-      return Integer.toString(((ClickHouseException) error).getErrorCode());
-    }
     return null;
   }
 }

instrumentation/clickhouse/clickhouse-client-common/javaagent/build.gradle.kts

@@ -16,9 +16,7 @@
 public final class ClickHouseInstrumenterFactory {
 
   public static Instrumenter<ClickHouseDbRequest, Void> createInstrumenter(
-      String instrumenterName) {
-    ClickHouseAttributesGetter dbAttributesGetter = new ClickHouseAttributesGetter();
-
+      String instrumenterName, ClickHouseAttributesGetter dbAttributesGetter) {
     return Instrumenter.<ClickHouseDbRequest, Void>builder(
             GlobalOpenTelemetry.get(),
             instrumenterName,