rename clickhouse-client-0.8 to clickhouse-clientv2-0.8

mznet · mznet · commit 1b1d79478c3b · 2025-08-24T17:15:02.000+09:00
diff --git a/.fossa.yml b/.fossa.yml
@@ -93,7 +93,7 @@ targets:
       target: ':instrumentation:clickhouse:clickhouse-client-0.5:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:clickhouse:clickhouse-client-0.8:javaagent'
+      target: ':instrumentation:clickhouse:clickhouse-clientv2-0.8:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:executors:bootstrap'
diff --git a/instrumentation/clickhouse/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/v0_5/ClickHouseClientV1AttributesGetter.java b/instrumentation/clickhouse/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/v0_5/ClickHouseClientV1AttributesGetter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_5;
+package io.opentelemetry.javaagent.instrumentation.clickhouse.client.v0_5;
 
 import com.clickhouse.client.ClickHouseException;
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;
diff --git a/instrumentation/clickhouse/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/v0_5/ClickHouseClientV1ExecuteAndWaitAdvice.java b/instrumentation/clickhouse/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/v0_5/ClickHouseClientV1ExecuteAndWaitAdvice.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_5;
+package io.opentelemetry.javaagent.instrumentation.clickhouse.client.v0_5;
 
 import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
 
diff --git a/instrumentation/clickhouse/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/v0_5/ClickHouseClientV1Instrumentation.java b/instrumentation/clickhouse/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/v0_5/ClickHouseClientV1Instrumentation.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_5;
+package io.opentelemetry.javaagent.instrumentation.clickhouse.client.v0_5;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@@ -28,6 +28,6 @@ public void transform(TypeTransformer transformer) {
         isMethod()
             .and(namedOneOf("executeAndWait", "execute"))
             .and(takesArgument(0, named("com.clickhouse.client.ClickHouseRequest"))),
-        "io.opentelemetry.javaagent.instrumentation.clickhouse.v0_5.ClickHouseClientV1ExecuteAndWaitAdvice");
+        "io.opentelemetry.javaagent.instrumentation.clickhouse.client.v0_5.ClickHouseClientV1ExecuteAndWaitAdvice");
   }
 }
diff --git a/instrumentation/clickhouse/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/v0_5/ClickHouseClientV1InstrumentationModule.java b/instrumentation/clickhouse/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/v0_5/ClickHouseClientV1InstrumentationModule.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_5;
+package io.opentelemetry.javaagent.instrumentation.clickhouse.client.v0_5;
 
 import static java.util.Collections.singletonList;
 
diff --git a/instrumentation/clickhouse/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/v0_5/ClickHouseClientV1Singletons.java b/instrumentation/clickhouse/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/v0_5/ClickHouseClientV1Singletons.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_5;
+package io.opentelemetry.javaagent.instrumentation.clickhouse.client.v0_5;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseDbRequest;
diff --git a/instrumentation/clickhouse/clickhouse-client-0.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/v0_5/ClickHouseClientV1Test.java b/instrumentation/clickhouse/clickhouse-client-0.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/clickhouse/client/v0_5/ClickHouseClientV1Test.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_5;
+package io.opentelemetry.javaagent.instrumentation.clickhouse.client.v0_5;
 
 import static io.opentelemetry.instrumentation.testing.junit.db.DbClientMetricsTestUtil.assertDurationMetric;
 import static io.opentelemetry.javaagent.instrumentation.clickhouse.testing.ClickHouseAttributeAssertions.attributeAssertions;
diff --git a/instrumentation/clickhouse/clickhouse-client-common/javaagent/build.gradle.kts b/instrumentation/clickhouse/clickhouse-client-common/javaagent/build.gradle.kts
@@ -3,10 +3,6 @@ plugins {
   id("otel.javaagent-instrumentation")
 }
 
-repositories {
-  mavenCentral()
-}
-
 dependencies {
   api(project(":instrumentation-api"))
   api(project(":instrumentation-api-incubator"))
diff --git a/instrumentation/clickhouse/clickhouse-clientv2-0.8/javaagent/build.gradle.kts b/instrumentation/clickhouse/clickhouse-clientv2-0.8/javaagent/build.gradle.kts
@@ -15,7 +15,6 @@ dependencies {
   implementation(project(":instrumentation:clickhouse:clickhouse-client-common:javaagent"))
   compileOnly("com.clickhouse:client-v2:0.8.0")
 
-  testImplementation("com.google.guava:guava")
   testImplementation(project(":instrumentation:clickhouse:testing"))
   testLibrary("com.clickhouse:client-v2:0.8.0")
 }
diff --git a/instrumentation/clickhouse/clickhouse-clientv2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2AttributesGetter.java b/instrumentation/clickhouse/clickhouse-clientv2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2AttributesGetter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_8;
+package io.opentelemetry.javaagent.instrumentation.clickhouse.clientv2.v0_8;
 
 import com.clickhouse.client.api.ServerException;
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;
diff --git a/instrumentation/clickhouse/clickhouse-clientv2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2Instrumentation.java b/instrumentation/clickhouse/clickhouse-clientv2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2Instrumentation.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_8;
+package io.opentelemetry.javaagent.instrumentation.clickhouse.clientv2.v0_8;
 
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
@@ -32,6 +32,6 @@ public void transform(TypeTransformer transformer) {
             .and(takesArgument(0, String.class))
             .and(takesArgument(1, isSubTypeOf(Map.class)))
             .and(takesArgument(2, named("com.clickhouse.client.api.query.QuerySettings"))),
-        "io.opentelemetry.javaagent.instrumentation.clickhouse.v0_8.ClickHouseClientV2QueryAdvice");
+        "io.opentelemetry.javaagent.instrumentation.clickhouse.clientv2.v0_8.ClickHouseClientV2QueryAdvice");
   }
 }
diff --git a/instrumentation/clickhouse/clickhouse-clientv2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2InstrumentationModule.java b/instrumentation/clickhouse/clickhouse-clientv2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2InstrumentationModule.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_8;
+package io.opentelemetry.javaagent.instrumentation.clickhouse.clientv2.v0_8;
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
@@ -17,7 +17,7 @@ public class ClickHouseClientV2InstrumentationModule extends InstrumentationModu
     implements ExperimentalInstrumentationModule {
 
   public ClickHouseClientV2InstrumentationModule() {
-    super("clickhouse-client", "clickhouse-client-0.8", "clickhouse");
+    super("clickhouse-clientv2", "clickhouse-clientv2-0.8", "clickhouse");
   }
 
   @Override
diff --git a/instrumentation/clickhouse/clickhouse-clientv2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2QueryAdvice.java b/instrumentation/clickhouse/clickhouse-clientv2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2QueryAdvice.java
@@ -3,14 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_8;
+package io.opentelemetry.javaagent.instrumentation.clickhouse.clientv2.v0_8;
 
 import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
 
 import com.clickhouse.client.api.Client;
 import com.clickhouse.client.api.query.QuerySettings;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.javaagent.bootstrap.CallDepth;
 import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseDbRequest;
 import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseScope;
@@ -26,9 +25,6 @@ public static ClickHouseScope onEnter(
       @Advice.Argument(0) String sqlQuery,
       @Advice.Argument(1) Map<String, Object> queryParams,
       @Advice.Argument(2) QuerySettings querySettings) {
-    Instrumenter<ClickHouseDbRequest, Void> instrumenter =
-        ClickHouseClientV2Singletons.instrumenter();
-
     CallDepth callDepth = CallDepth.forClass(Client.class);
     if (callDepth.getAndIncrement() > 0 || sqlQuery == null) {
       return null;
@@ -45,25 +41,21 @@ public static ClickHouseScope onEnter(
     }
 
     String database = client.getConfiguration().get("database");
-
     Context parentContext = currentContext();
-
     ClickHouseDbRequest request = ClickHouseDbRequest.create(host, port, database, sqlQuery);
 
-    return ClickHouseScope.start(instrumenter, parentContext, request);
+    return ClickHouseScope.start(
+        ClickHouseClientV2Singletons.instrumenter(), parentContext, request);
   }
 
   @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
   public static void onExit(
       @Advice.Thrown Throwable throwable, @Advice.Enter ClickHouseScope scope) {
-    Instrumenter<ClickHouseDbRequest, Void> instrumenter =
-        ClickHouseClientV2Singletons.instrumenter();
-
     CallDepth callDepth = CallDepth.forClass(Client.class);
     if (callDepth.decrementAndGet() > 0 || scope == null) {
       return;
     }
 
-    scope.end(instrumenter, throwable);
+    scope.end(ClickHouseClientV2Singletons.instrumenter(), throwable);
   }
 }
diff --git a/instrumentation/clickhouse/clickhouse-clientv2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2Singletons.java b/instrumentation/clickhouse/clickhouse-clientv2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2Singletons.java
@@ -3,15 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_8;
+package io.opentelemetry.javaagent.instrumentation.clickhouse.clientv2.v0_8;
 
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseDbRequest;
 import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseInstrumenterFactory;
 
 public final class ClickHouseClientV2Singletons {
 
-  private static final String INSTRUMENTER_NAME = "io.opentelemetry.clickhouse-client-0.8";
+  private static final String INSTRUMENTER_NAME = "io.opentelemetry.clickhouse-clientv2-0.8";
   private static final Instrumenter<ClickHouseDbRequest, Void> INSTRUMENTER;
 
   static {
diff --git a/instrumentation/clickhouse/clickhouse-clientv2-0.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2Test.java b/instrumentation/clickhouse/clickhouse-clientv2-0.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2Test.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_8;
+package io.opentelemetry.javaagent.instrumentation.clickhouse.clientv2.v0_8;
 
 import static io.opentelemetry.instrumentation.testing.junit.db.DbClientMetricsTestUtil.assertDurationMetric;
 import static io.opentelemetry.javaagent.instrumentation.clickhouse.testing.ClickHouseAttributeAssertions.attributeAssertions;
@@ -22,8 +22,10 @@
 import com.clickhouse.client.api.ServerException;
 import com.clickhouse.client.api.command.CommandResponse;
 import com.clickhouse.client.api.enums.Protocol;
+import com.clickhouse.client.api.query.GenericRecord;
 import com.clickhouse.client.api.query.QueryResponse;
 import com.clickhouse.client.api.query.QuerySettings;
+import com.clickhouse.client.api.query.Records;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.api.internal.SemconvStability;
@@ -122,7 +124,7 @@ void testConnectionStringWithoutDatabaseSpecifiedStillGeneratesSpans() throws Ex
 
     assertDurationMetric(
         testing,
-        "io.opentelemetry.clickhouse-client-0.8",
+        "io.opentelemetry.clickhouse-clientv2-0.8",
         DB_SYSTEM_NAME,
         DB_OPERATION_NAME,
         DB_NAMESPACE,
@@ -249,6 +251,74 @@ void testSendQuery() throws Exception {
                                 "SELECT"))));
   }
 
+  @Test
+  void testSendQueryAll() throws Exception {
+    testing.runWithSpan(
+        "parent",
+        () -> {
+          List<GenericRecord> records = client.queryAll("select * from " + tableName + " limit 1");
+          assertThat(records.size()).isEqualTo(0);
+        });
+
+    testing.waitAndAssertTraces(
+        trace ->
+            trace.hasSpansSatisfyingExactly(
+                span -> span.hasName("parent").hasNoParent().hasAttributes(Attributes.empty()),
+                span ->
+                    span.hasName("SELECT " + dbName)
+                        .hasKind(SpanKind.CLIENT)
+                        .hasParent(trace.getSpan(0))
+                        .hasAttributesSatisfyingExactly(
+                            attributeAssertions(
+                                dbName,
+                                host,
+                                port,
+                                "select * from " + tableName + " limit ?",
+                                "SELECT"))));
+  }
+
+  @Test
+  void testSendQueryRecords() throws Exception {
+    testing.runWithSpan(
+        "parent",
+        () -> {
+          Records records =
+              client.queryRecords("insert into " + tableName + " values('test_value')").get();
+          records.close();
+
+          records = client.queryRecords("select * from " + tableName + " limit 1").get();
+          records.close();
+          assertThat(records.getReadRows()).isEqualTo(1);
+        });
+
+    testing.waitAndAssertTraces(
+        trace ->
+            trace.hasSpansSatisfyingExactly(
+                span -> span.hasName("parent").hasNoParent().hasAttributes(Attributes.empty()),
+                span ->
+                    span.hasName("INSERT " + dbName)
+                        .hasKind(SpanKind.CLIENT)
+                        .hasParent(trace.getSpan(0))
+                        .hasAttributesSatisfyingExactly(
+                            attributeAssertions(
+                                dbName,
+                                host,
+                                port,
+                                "insert into " + tableName + " values(?)",
+                                "INSERT")),
+                span ->
+                    span.hasName("SELECT " + dbName)
+                        .hasKind(SpanKind.CLIENT)
+                        .hasParent(trace.getSpan(0))
+                        .hasAttributesSatisfyingExactly(
+                            attributeAssertions(
+                                dbName,
+                                host,
+                                port,
+                                "select * from " + tableName + " limit ?",
+                                "SELECT"))));
+  }
+
   @Test
   void testPlaceholderQuery() throws Exception {
     Map<String, Object> queryParams = new HashMap<>();
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -191,7 +191,7 @@ include(":instrumentation:cassandra:cassandra-4.4:testing")
 include(":instrumentation:cassandra:cassandra-4-common:testing")
 include(":instrumentation:cdi-testing")
 include(":instrumentation:clickhouse:clickhouse-client-common:javaagent")
-include(":instrumentation:clickhouse:clickhouse-client-0.8:javaagent")
+include(":instrumentation:clickhouse:clickhouse-clientv2-0.8:javaagent")
 include(":instrumentation:clickhouse:clickhouse-client-0.5:javaagent")
 include(":instrumentation:clickhouse:testing")
 include(":instrumentation:couchbase:couchbase-2.0:javaagent")

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* SPDX-License-Identifier: Apache-2.0`
`4`	`4`	`*/`
`5`	`5`
`6`		`-package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_5;`
	`6`	`+package io.opentelemetry.javaagent.instrumentation.clickhouse.client.v0_5;`
`7`	`7`
`8`	`8`	`import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;`
`9`	`9`	`import static net.bytebuddy.matcher.ElementMatchers.isMethod;`
`@@ -28,6 +28,6 @@ public void transform(TypeTransformer transformer) {`
`28`	`28`	`isMethod()`
`29`	`29`	`.and(namedOneOf("executeAndWait", "execute"))`
`30`	`30`	`.and(takesArgument(0, named("com.clickhouse.client.ClickHouseRequest"))),`
`31`		`- "io.opentelemetry.javaagent.instrumentation.clickhouse.v0_5.ClickHouseClientV1ExecuteAndWaitAdvice");`
	`31`	`+ "io.opentelemetry.javaagent.instrumentation.clickhouse.client.v0_5.ClickHouseClientV1ExecuteAndWaitAdvice");`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ dependencies {`
`15`	`15`	`implementation(project(":instrumentation:clickhouse:clickhouse-client-common:javaagent"))`
`16`	`16`	`compileOnly("com.clickhouse:client-v2:0.8.0")`
`17`	`17`
`18`		`- testImplementation("com.google.guava:guava")`
`19`	`18`	`testImplementation(project(":instrumentation:clickhouse:testing"))`
`20`	`19`	`testLibrary("com.clickhouse:client-v2:0.8.0")`
`21`	`20`	`}`