feat: add unit tests to otel-integration

Signed-off-by: chenhuan <[email protected]>

Author: chenhuansome

opengemini-client-api/src/main/java/io/opengemini/client/api/Query.java

@@ -16,7 +16,6 @@
 
 package io.opengemini.client.api;
 
-import io.opentelemetry.api.trace.Span;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -74,4 +73,4 @@ public void setAttribute(String key, Object value) {
     public Object getAttribute(String key) {
         return attributes.get(key);
     }
-}
+}

opengemini-client-api/src/main/java/io/opengemini/client/api/Write.java

@@ -49,4 +49,4 @@ public void setAttribute(String key, Object value) {
     public Object getAttribute(String key) {
         return attributes.get(key);
     }
-}
+}

opengemini-client-common/src/main/java/io/opengemini/client/common/BaseClient.java

@@ -58,10 +58,6 @@ public BaseClient(Configuration conf) {
         }
         String httpPrefix;
         HttpClientConfig httpConfig = conf.getHttpConfig();
-        if (httpConfig != null) {
-            httpConfig = new HttpClientConfig.Builder().build();
-            conf.setHttpConfig(httpConfig);
-        }
         if (httpConfig != null && httpConfig.tlsConfig() != null) {
             httpPrefix = "https://";
         }else {

opengemini-client/src/main/java/io/opengemini/client/impl/OpenGeminiClient.java

@@ -38,18 +38,7 @@
 
 public class OpenGeminiClient extends BaseClient implements OpenGeminiAsyncClient {
     private final List<Interceptor> interceptors = new ArrayList<>();
-
-    /**
-     * Add interceptors to the client.
-     */
-    public void addInterceptors(Interceptor... interceptors) {
-        Collections.addAll(this.interceptors, interceptors);
-    }
-
-
-
     protected final Configuration conf;
-
     private final HttpClient client;
 
     public OpenGeminiClient(@NotNull Configuration conf) {
@@ -68,6 +57,10 @@ public OpenGeminiClient(@NotNull Configuration conf) {
         this.client = HttpClientFactory.createHttpClient(httpConfig);
     }
 
+    public void addInterceptors(Interceptor... interceptors) {
+        Collections.addAll(this.interceptors, interceptors);
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -163,7 +156,7 @@ public CompletableFuture<Void> write(String database, String retentionPolicy, Po
         if (StringUtils.isEmpty(body)) {
             return CompletableFuture.completedFuture(null);
         }
-        return executeWrite(database, retentionPolicy, body );
+        return executeWrite(database, retentionPolicy, body);
     }
 
     @Override
@@ -201,25 +194,20 @@ public CompletableFuture<Pong> ping() {
      */
     public CompletableFuture<QueryResult> executeQuery(Query query) {
         String queryUrl = getQueryUrl(query);
-
-        // 执行所有queryBefore拦截器
         CompletableFuture<Void> beforeFutures = CompletableFuture.allOf(
                 interceptors.stream()
                         .map(interceptor -> interceptor.queryBefore(query))
                         .toArray(CompletableFuture[]::new)
         );
 
-        return beforeFutures.thenCompose(voidResult -> {
-            return executeHttpQuery(query).thenCompose(response -> {
-                // 执行所有queryAfter拦截器
-                CompletableFuture<Void> afterFutures = CompletableFuture.allOf(
-                        interceptors.stream()
-                                .map(interceptor -> interceptor.queryAfter(query, response))
-                                .toArray(CompletableFuture[]::new)
-                );
-                return afterFutures.thenCompose(voidResult2 -> convertResponse(response, QueryResult.class));
-            });
-        });
+        return beforeFutures.thenCompose(voidResult -> executeHttpQuery(query).thenCompose(response -> {
+            CompletableFuture<Void> afterFutures = CompletableFuture.allOf(
+                    interceptors.stream()
+                            .map(interceptor -> interceptor.queryAfter(query, response))
+                            .toArray(CompletableFuture[]::new)
+            );
+            return afterFutures.thenCompose(voidResult2 -> convertResponse(response, QueryResult.class));
+        }));
     }
 
     /**
@@ -244,28 +232,28 @@ public CompletableFuture<Void> executeWrite(String database, String retentionPol
         Write write = new Write(
                 database,
                 retentionPolicy,
-                "default_measurement", // Default measurement name
+                "default_measurement",
                 lineProtocol,
-                "ns" // Default precision
+                "ns"
         );
 
-        // Execute all writeBefore interceptors
         CompletableFuture<Void> beforeFutures = CompletableFuture.allOf(
                 interceptors.stream()
                         .map(interceptor -> interceptor.writeBefore(write))
                         .toArray(CompletableFuture[]::new)
         );
 
-        return beforeFutures.thenCompose(voidResult -> {
-            return executeHttpWrite(write).thenCompose(response -> { // response 是 io.github.openfacade.http.HttpResponse
-                CompletableFuture<Void> afterFutures = CompletableFuture.allOf(
-                        interceptors.stream()
-                                .map(interceptor -> interceptor.writeAfter(write, response)) // 传递正确的类型
-                                .toArray(CompletableFuture[]::new)
-                );
-                return afterFutures.thenCompose(voidResult2 -> convertResponse(response, Void.class));
-            });
-        });
+        return beforeFutures.thenCompose(voidResult ->
+                executeHttpWrite(write).thenCompose(response -> {
+                    CompletableFuture<Void> afterFutures = CompletableFuture.allOf(
+                            interceptors.stream()
+                                    .map(interceptor -> interceptor.writeAfter(write, response))
+                                    .toArray(CompletableFuture[]::new)
+                    );
+                    return afterFutures.thenCompose(voidResult2 ->
+                            convertResponse(response, Void.class));
+                })
+        );
     }
 
     /**
@@ -317,19 +305,13 @@ public String toString() {
         return "OpenGeminiClient{" + "httpEngine=" + conf.getHttpConfig().engine() + '}';
     }
 
-    /**
-     * 执行 HTTP 查询请求
-     */
     private CompletableFuture<HttpResponse> executeHttpQuery(Query query) {
         String queryUrl = getQueryUrl(query);
         return get(queryUrl);
     }
 
-    /**
-     * 执行 HTTP 写入请求
-     */
     private CompletableFuture<HttpResponse> executeHttpWrite(Write write) {
         String writeUrl = getWriteUrl(write.getDatabase(), write.getRetentionPolicy());
         return post(writeUrl, write.getLineProtocol());
     }
-}
+}

opengemini-client/src/main/java/io/opengemini/client/impl/OpenGeminiClientFactory.java

@@ -25,7 +25,6 @@
 import io.opengemini.client.interceptor.OtelInterceptor;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
 import java.util.List;
 
 public class OpenGeminiClientFactory {
@@ -61,16 +60,11 @@ public static OpenGeminiClient create(@NotNull Configuration configuration) thro
     }
 
     public static OpenGeminiClient createClientWithInterceptors(Configuration config) throws OpenGeminiException {
-
         OpenGeminiClient client = create(config);
-
-        // Add all interceptors at once
-        List<Interceptor> interceptors = Arrays.asList(
+        List<Interceptor> interceptors = List.of(
                 new OtelInterceptor()
-                // Other interceptors can be added here
         );
-
         client.addInterceptors(interceptors.toArray(new Interceptor[0]));
         return client;
     }
-}
+}

opengemini-client/src/main/java/io/opengemini/client/impl/OpenTelemetryConfig.java

@@ -30,7 +30,6 @@
  * Configuration for OpenTelemetry tracing.
  */
 public class OpenTelemetryConfig {
-
     private static volatile OpenTelemetry openTelemetry;
     private static volatile Tracer tracer;
 
@@ -73,4 +72,4 @@ public static Tracer getTracer() {
         }
         return tracer;
     }
-}
+}

opengemini-client/src/main/java/io/opengemini/client/interceptor/Interceptor.java

@@ -61,4 +61,4 @@ public interface Interceptor {
      * @return a CompletableFuture that completes when the interceptor logic is done
      */
     CompletableFuture<Void> writeAfter(Write write, HttpResponse response);
-}
+}

opengemini-client/src/main/java/io/opengemini/client/interceptor/OtelInterceptor.java

@@ -16,10 +16,10 @@
 
 package io.opengemini.client.interceptor;
 
+import io.github.openfacade.http.HttpResponse;
 import io.opengemini.client.api.Query;
 import io.opengemini.client.api.Write;
 import io.opengemini.client.impl.OpenTelemetryConfig;
-import io.github.openfacade.http.HttpResponse;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.StatusCode;
@@ -120,6 +120,7 @@ public CompletableFuture<Void> writeAfter(Write write, HttpResponse response) {
                 try (Scope scope = writeAfterSpan.makeCurrent()) {
                     int statusCode = response.statusCode();
                     writeAfterSpan.setAttribute("status_code", statusCode);
+
                     if (statusCode >= 400) {
                         String errorBody = response.bodyAsString();
                         writeAfterSpan.setStatus(StatusCode.ERROR, "HTTP error: " + statusCode);
@@ -136,4 +137,4 @@ public CompletableFuture<Void> writeAfter(Write write, HttpResponse response) {
             }
         });
     }
-}
+}