move the advices into instrumentation

Author: mznet

.fossa.yml

@@ -88,12 +88,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:camel-2.20:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:clickhouse:clickhouse-client-0.5:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:clickhouse:clickhouse-clientv2-0.8:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:executors:bootstrap'
@@ -394,6 +388,15 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:cassandra:cassandra-4.4:library'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:clickhouse:clickhouse-client-0.5:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:clickhouse:clickhouse-client-common:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:clickhouse:clickhouse-clientv2-0.8:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:couchbase:couchbase-2-common:javaagent'

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

@@ -5,14 +5,25 @@
 
 package io.opentelemetry.javaagent.instrumentation.clickhouse.client.v0_5;
 
+import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
+import com.clickhouse.client.ClickHouseClient;
+import com.clickhouse.client.ClickHouseRequest;
+import com.clickhouse.client.ClickHouseRequestAccess;
+import com.clickhouse.client.config.ClickHouseDefaults;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+import io.opentelemetry.javaagent.bootstrap.CallDepth;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseDbRequest;
+import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseScope;
+import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -28,6 +39,50 @@ public void transform(TypeTransformer transformer) {
         isMethod()
             .and(namedOneOf("executeAndWait", "execute"))
             .and(takesArgument(0, named("com.clickhouse.client.ClickHouseRequest"))),
-        "io.opentelemetry.javaagent.instrumentation.clickhouse.client.v0_5.ClickHouseClientV1ExecuteAndWaitAdvice");
+        this.getClass().getName() + "$ClickHouseClientV1ExecuteAndWaitAdvice");
+  }
+
+  @SuppressWarnings("unused")
+  public static class ClickHouseClientV1ExecuteAndWaitAdvice {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ClickHouseScope onEnter(
+        @Advice.Argument(0) ClickHouseRequest<?> clickHouseRequest) {
+      Instrumenter<ClickHouseDbRequest, Void> instrumenter =
+          ClickHouseClientV1Singletons.instrumenter();
+
+      CallDepth callDepth = CallDepth.forClass(ClickHouseClient.class);
+      if (callDepth.getAndIncrement() > 0 || clickHouseRequest == null) {
+        return null;
+      }
+
+      Context parentContext = currentContext();
+
+      ClickHouseDbRequest request =
+          ClickHouseDbRequest.create(
+              clickHouseRequest.getServer().getHost(),
+              clickHouseRequest.getServer().getPort(),
+              clickHouseRequest
+                  .getServer()
+                  .getDatabase()
+                  .orElse(ClickHouseDefaults.DATABASE.getDefaultValue().toString()),
+              ClickHouseRequestAccess.getQuery(clickHouseRequest));
+
+      return ClickHouseScope.start(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 =
+          ClickHouseClientV1Singletons.instrumenter();
+
+      CallDepth callDepth = CallDepth.forClass(ClickHouseClient.class);
+      if (callDepth.decrementAndGet() > 0 || scope == null) {
+        return;
+      }
+
+      scope.end(instrumenter, throwable);
+    }
   }
 }

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

@@ -7,7 +7,7 @@
 
 import io.opentelemetry.instrumentation.api.semconv.network.ServerAttributesGetter;
 
-public final class ClickHouseNetworkAttributesGetter
+final class ClickHouseNetworkAttributesGetter
     implements ServerAttributesGetter<ClickHouseDbRequest> {
 
   @Override

instrumentation/clickhouse/clickhouse-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/common/ClickHouseNetworkAttributesGetter.java

@@ -5,15 +5,25 @@
 
 package io.opentelemetry.javaagent.instrumentation.clickhouse.clientv2.v0_8;
 
+import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
 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;
 
+import com.clickhouse.client.api.Client;
+import com.clickhouse.client.api.query.QuerySettings;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.instrumentation.api.incubator.semconv.net.internal.UrlParser;
+import io.opentelemetry.javaagent.bootstrap.CallDepth;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseDbRequest;
+import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseScope;
 import java.util.Map;
+import java.util.Optional;
+import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -32,6 +42,48 @@ 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.clientv2.v0_8.ClickHouseClientV2QueryAdvice");
+        this.getClass().getName() + "$ClickHouseClientV2QueryAdvice");
+  }
+
+  @SuppressWarnings("unused")
+  public static class ClickHouseClientV2QueryAdvice {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static ClickHouseScope onEnter(
+        @Advice.This Client client,
+        @Advice.Argument(0) String sqlQuery,
+        @Advice.Argument(1) Map<String, Object> queryParams,
+        @Advice.Argument(2) QuerySettings querySettings) {
+      CallDepth callDepth = CallDepth.forClass(Client.class);
+      if (callDepth.getAndIncrement() > 0 || sqlQuery == null) {
+        return null;
+      }
+
+      String endPoint = client.getEndpoints().stream().findFirst().orElse(null);
+      String host = null;
+      Integer port = 0;
+
+      if (endPoint != null) {
+        host = UrlParser.getHost(endPoint);
+        port = Optional.ofNullable(UrlParser.getPort(endPoint)).orElse(0);
+      }
+
+      String database = client.getConfiguration().get("database");
+      Context parentContext = currentContext();
+      ClickHouseDbRequest request = ClickHouseDbRequest.create(host, port, database, sqlQuery);
+
+      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) {
+      CallDepth callDepth = CallDepth.forClass(Client.class);
+      if (callDepth.decrementAndGet() > 0 || scope == null) {
+        return;
+      }
+
+      scope.end(ClickHouseClientV2Singletons.instrumenter(), throwable);
+    }
   }
 }