update clickhouse-client to 0.8

Author: mznet

instrumentation/clickhouse/clickhouse-client-0.6/javaagent/build.gradle.kts renamed to instrumentation/clickhouse/clickhouse-client-0.8/javaagent/build.gradle.kts

@@ -6,18 +6,18 @@ muzzle {
   pass {
     group.set("com.clickhouse")
     module.set("client-v2")
-    versions.set("[0.6.4,)")
+    versions.set("[0.8.0,)")
     assertInverse.set(true)
   }
 }
 
 dependencies {
   implementation(project(":instrumentation:clickhouse:clickhouse-client-common:javaagent"))
-  compileOnly("com.clickhouse:client-v2:0.6.4")
+  compileOnly("com.clickhouse:client-v2:0.8.0")
 
   testImplementation("com.google.guava:guava")
   testImplementation(project(":instrumentation:clickhouse:testing"))
-  testLibrary("com.clickhouse:client-v2:0.6.4")
+  testLibrary("com.clickhouse:client-v2:0.8.0")
 }
 
 val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"

instrumentation/clickhouse/clickhouse-client-0.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/v0_6/ClickHouseClientV2Instrumentation.java renamed to instrumentation/clickhouse/clickhouse-client-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/v0_8/ClickHouseClientV2Instrumentation.java

@@ -3,9 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_6;
+package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_8;
 
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.isSubTypeOf;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -26,10 +27,11 @@ public ElementMatcher<TypeDescription> typeMatcher() {
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
         isMethod()
+            .and(isPublic())
             .and(named("query"))
             .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_6.ClickHouseClientV2QueryAdvice");
+        "io.opentelemetry.javaagent.instrumentation.clickhouse.v0_8.ClickHouseClientV2QueryAdvice");
   }
 }

instrumentation/clickhouse/clickhouse-client-0.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/v0_6/ClickHouseClientV2InstrumentationModule.java renamed to instrumentation/clickhouse/clickhouse-client-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/v0_8/ClickHouseClientV2InstrumentationModule.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_6;
+package io.opentelemetry.javaagent.instrumentation.clickhouse.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.6", "clickhouse");
+    super("clickhouse-client", "clickhouse-client-0.8", "clickhouse");
   }
 
   @Override

instrumentation/clickhouse/clickhouse-client-0.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/v0_6/ClickHouseClientV2QueryAdvice.java renamed to instrumentation/clickhouse/clickhouse-client-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/v0_8/ClickHouseClientV2QueryAdvice.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_6;
+package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_8;
 
 import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
 

instrumentation/clickhouse/clickhouse-client-0.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/v0_6/ClickHouseClientV2Singletons.java renamed to instrumentation/clickhouse/clickhouse-client-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/v0_8/ClickHouseClientV2Singletons.java

@@ -3,15 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_6;
+package io.opentelemetry.javaagent.instrumentation.clickhouse.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.6";
+  private static final String INSTRUMENTER_NAME = "io.opentelemetry.clickhouse-client-0.8";
   private static final Instrumenter<ClickHouseDbRequest, Void> INSTRUMENTER;
 
   static {

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

@@ -0,0 +1,23 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_8;
+
+@SuppressWarnings("unused")
+public class ClickHouseClientV2ExampleData {
+  private String value;
+
+  public String getValue() {
+    return value;
+  }
+
+  public void setValue(String value) {
+    this.value = value;
+  }
+
+  public ClickHouseClientV2ExampleData(String value) {
+    this.value = value;
+  }
+}

instrumentation/clickhouse/clickhouse-client-0.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/clickhouse/v0_6/ClickHouseClientV2Test.java renamed to instrumentation/clickhouse/clickhouse-client-0.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/clickhouse/v0_8/ClickHouseClientV2Test.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_6;
+package io.opentelemetry.javaagent.instrumentation.clickhouse.v0_8;
 
 import static io.opentelemetry.instrumentation.testing.junit.db.DbClientMetricsTestUtil.assertDurationMetric;
 import static io.opentelemetry.javaagent.instrumentation.clickhouse.testing.ClickHouseAttributeAssertions.attributeAssertions;
@@ -19,7 +19,7 @@
 import static org.assertj.core.api.Assertions.catchThrowable;
 
 import com.clickhouse.client.api.Client;
-import com.clickhouse.client.api.ClientException;
+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.QueryResponse;
@@ -31,8 +31,11 @@
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
 import io.opentelemetry.sdk.trace.data.StatusData;
+import java.time.Instant;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -71,11 +74,13 @@ void setup() throws Exception {
             .setDefaultDatabase(dbName)
             .setUsername(username)
             .setPassword(password)
-            .setOption("compress", "0")
+            .setOption("compress", "false")
             .build();
 
     QueryResponse response =
-        client.query("create table if not exists " + tableName + "(s String) engine=Memory").get();
+        client
+            .query("create table if not exists " + tableName + "(value String) engine=Memory")
+            .get();
     response.close();
 
     // wait for CREATE operation and clear
@@ -96,7 +101,9 @@ void testConnectionStringWithoutDatabaseSpecifiedStillGeneratesSpans() throws Ex
     Client client =
         new Client.Builder()
             .addEndpoint(Protocol.HTTP, host, port, false)
-            .setOption("compress", "0")
+            .setOption("compress", "false")
+            .setUsername(username)
+            .setPassword(password)
             .build();
 
     QueryResponse response = client.query("select * from " + tableName).get();
@@ -115,7 +122,7 @@ void testConnectionStringWithoutDatabaseSpecifiedStillGeneratesSpans() throws Ex
 
     assertDurationMetric(
         testing,
-        "io.opentelemetry.clickhouse-client-0.6",
+        "io.opentelemetry.clickhouse-client-0.8",
         DB_SYSTEM_NAME,
         DB_OPERATION_NAME,
         DB_NAMESPACE,
@@ -194,7 +201,7 @@ void testQueryThrowsException() {
               response.close();
             });
 
-    assertThat(thrown).isInstanceOf(ClientException.class);
+    assertThat(thrown).isInstanceOf(ServerException.class);
 
     List<AttributeAssertion> assertions =
         new ArrayList<>(
@@ -222,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(0);
+          assertThat(results.getReadRows()).isEqualTo(2);
         });
 
     testing.waitAndAssertTraces(
@@ -241,4 +248,39 @@ void testSendQuery() throws Exception {
                                 "select * from " + tableName + " limit ?",
                                 "SELECT"))));
   }
+
+  @Test
+  void testPlaceholderQuery() throws Exception {
+    Map<String, Object> queryParams = new HashMap<>();
+    queryParams.put("param_s", Instant.now().getEpochSecond());
+
+    testing.runWithSpan(
+        "parent",
+        () -> {
+          QueryResponse response =
+              client
+                  .query(
+                      "select * from " + tableName + " where value={param_s: String}",
+                      queryParams,
+                      null)
+                  .get();
+          response.close();
+        });
+
+    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 + " where value={param_s: String}",
+                                "SELECT"))));
+  }
 }

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.6:javaagent")
+include(":instrumentation:clickhouse:clickhouse-client-0.8:javaagent")
 include(":instrumentation:clickhouse:clickhouse-client-0.5:javaagent")
 include(":instrumentation:clickhouse:testing")
 include(":instrumentation:couchbase:couchbase-2.0:javaagent")