Merge branch 'main' of github.com:openGemini/opengemini-client-java into otel-integration-tests

chenhuansome · chenhuansome · commit 7cf7a5f75e35 · 2025-10-19T18:52:53.000+08:00
diff --git a/.github/workflows/java_unit_tests.yml b/.github/workflows/java_unit_tests.yml
@@ -35,3 +35,5 @@ jobs:
         uses: hezhangjian/setup-opengemini-action@main
       - name: unit tests
         run: mvn -B clean test
+      - name: setup ts-trace
+        run: go install github.com/openGemini/observability/trace/cmd/ts-trace@latest && ts-trace &
diff --git a/README.md b/README.md
@@ -1,6 +1,9 @@
 # opengemini-client-java
 
-![License](https://img.shields.io/badge/license-Apache2.0-green) ![Language](https://img.shields.io/badge/language-Java-blue.svg) [![version](https://img.shields.io/github/v/tag/opengemini/opengemini-client-java?label=release&color=blue)](https://github.com/opengemini/opengemini-client-java/releases)
+![License](https://img.shields.io/badge/license-Apache2.0-green)
+[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/11009/badge)](https://www.bestpractices.dev/projects/11009)
+![Language](https://img.shields.io/badge/language-C-blue.svg)
+[![version](https://img.shields.io/github/v/tag/opengemini/opengemini-client-java?label=release&color=blue)](https://github.com/opengemini/opengemini-client-java/releases)
 
 English | [简体中文](README_CN.md)
 
diff --git a/README_CN.md b/README_CN.md
@@ -1,6 +1,9 @@
 # opengemini-client-java
 
-![License](https://img.shields.io/badge/开源许可证-Apache2.0-green) ![language](https://img.shields.io/badge/语言-Java-blue.svg) [![version](https://img.shields.io/github/v/tag/opengemini/opengemini-client-java?label=%e5%8f%91%e8%a1%8c%e7%89%88%e6%9c%ac&color=blue)](https://github.com/opengemini/opengemini-client-java/releases)
+![License](https://img.shields.io/badge/开源许可证-Apache2.0-green)
+[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/11009/badge)](https://www.bestpractices.dev/projects/11009)
+![language](https://img.shields.io/badge/语言-Java-blue.svg)
+[![version](https://img.shields.io/github/v/tag/opengemini/opengemini-client-java?label=%e5%8f%91%e8%a1%8c%e7%89%88%e6%9c%ac&color=blue)](https://github.com/opengemini/opengemini-client-java/releases)
 
 [English](README.md) | 简体中文
 
diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,9 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+If you have apprehensions regarding OpenGemini's security or you discover vulnerability or potential threat, don’t hesitate to get in touch with us by dropping a mail at opengemini-private@googlegroups.com.
+
+In the mail, specify the description of the issue or potential threat. You are also urged to recommend the way to reproduce and replicate the issue. The OpenGemini community will get back to you after assessing and analysing the findings.
+
+PLEASE PAY ATTENTION to report the security issue on the security email before disclosing it on public domain.
diff --git a/opengemini-client-api/pom.xml b/opengemini-client-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.opengemini</groupId>
         <artifactId>opengemini-client-parent</artifactId>
-        <version>0.3.3</version>
+        <version>0.3.4</version>
     </parent>
 
     <artifactId>opengemini-client-api</artifactId>
diff --git a/opengemini-client-api/src/main/java/io/opengemini/client/api/Write.java b/opengemini-client-api/src/main/java/io/opengemini/client/api/Write.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 openGemini Authors
+ * Copyright 2025 openGemini Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,17 +27,14 @@
 public class Write {
     private String database;
     private String retentionPolicy;
-    private String measurement;
     private String lineProtocol;
     private String precision;
 
     private Map<String, Object> attributes = new HashMap<>();
 
-    public Write(String database, String retentionPolicy, String measurement,
-                 String lineProtocol, String precision) {
+    public Write(String database, String retentionPolicy, String lineProtocol, String precision) {
         this.database = database;
         this.retentionPolicy = retentionPolicy;
-        this.measurement = measurement;
         this.lineProtocol = lineProtocol;
         this.precision = precision;
     }
diff --git a/opengemini-client-common/pom.xml b/opengemini-client-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.opengemini</groupId>
         <artifactId>opengemini-client-parent</artifactId>
-        <version>0.3.3</version>
+        <version>0.3.4</version>
     </parent>
 
     <artifactId>opengemini-client-common</artifactId>
diff --git a/opengemini-client-reactor/pom.xml b/opengemini-client-reactor/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.opengemini</groupId>
         <artifactId>opengemini-client-parent</artifactId>
-        <version>0.3.3</version>
+        <version>0.3.4</version>
     </parent>
 
     <artifactId>opengemini-client-reactor</artifactId>
diff --git a/opengemini-client/pom.xml b/opengemini-client/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.opengemini</groupId>
         <artifactId>opengemini-client-parent</artifactId>
-        <version>0.3.3</version>
+        <version>0.3.4</version>
     </parent>
 
     <artifactId>opengemini-client</artifactId>
diff --git a/opengemini-client/src/main/java/io/opengemini/client/impl/OpenGeminiClient.java b/opengemini-client/src/main/java/io/opengemini/client/impl/OpenGeminiClient.java
@@ -245,7 +245,6 @@ public CompletableFuture<Void> executeWrite(String database, String retentionPol
         Write write = new Write(
                 database,
                 retentionPolicy,
-                "default_measurement",
                 lineProtocol,
                 "ns"
         );
diff --git a/opengemini-client/src/main/java/io/opengemini/client/impl/OpenTelemetryConfig.java b/opengemini-client/src/main/java/io/opengemini/client/impl/OpenTelemetryConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 openGemini Authors
+ * Copyright 2025 openGemini Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,60 +16,15 @@
 
 package io.opengemini.client.impl;
 
-import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.Tracer;
-import io.opentelemetry.exporter.jaeger.JaegerGrpcSpanExporter;
-import io.opentelemetry.sdk.OpenTelemetrySdk;
-import io.opentelemetry.sdk.resources.Resource;
-import io.opentelemetry.sdk.trace.SdkTracerProvider;
-import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * Configuration for OpenTelemetry tracing.
  */
+@Getter
+@Setter
 public class OpenTelemetryConfig {
-    private static volatile OpenTelemetry openTelemetry;
-    private static volatile Tracer tracer;
-
-    public static synchronized void initialize() {
-        if (openTelemetry != null) {
-            return;
-        }
-
-        try {
-            JaegerGrpcSpanExporter jaegerExporter = JaegerGrpcSpanExporter.builder()
-                    .setEndpoint("http://localhost:14250")
-                    .build();
-
-            BatchSpanProcessor spanProcessor = BatchSpanProcessor.builder(jaegerExporter)
-                    .setScheduleDelay(100, java.util.concurrent.TimeUnit.MILLISECONDS)
-                    .build();
-
-            SdkTracerProvider tracerProvider = SdkTracerProvider.builder()
-                    .addSpanProcessor(spanProcessor)
-                    .setResource(Resource.create(
-                            Attributes.of(ResourceAttributes.SERVICE_NAME, "opengemini-client-java")
-                    ))
-                    .build();
-
-            openTelemetry = OpenTelemetrySdk.builder()
-                    .setTracerProvider(tracerProvider)
-                    .build();
-
-            tracer = openTelemetry.getTracer("opengemini-client-java");
-        } catch (Exception e) {
-            // Fallback to no-op implementation
-            openTelemetry = OpenTelemetry.noop();
-            tracer = openTelemetry.getTracer("opengemini-client-java");
-        }
-    }
-
-    public static Tracer getTracer() {
-        if (tracer == null) {
-            initialize();
-        }
-        return tracer;
-    }
+    private volatile Tracer tracer;
 }
diff --git a/opengemini-client/src/main/java/io/opengemini/client/interceptor/Interceptor.java b/opengemini-client/src/main/java/io/opengemini/client/interceptor/Interceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 openGemini Authors
+ * Copyright 2025 openGemini Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/opengemini-client/src/main/java/io/opengemini/client/interceptor/OtelInterceptor.java b/opengemini-client/src/main/java/io/opengemini/client/interceptor/OtelInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 openGemini Authors
+ * Copyright 2025 openGemini Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,16 +19,18 @@
 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.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.StatusCode;
-import io.opentelemetry.context.Scope;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.concurrent.CompletableFuture;
 
+@Getter
+@Setter
 public class OtelInterceptor implements Interceptor {
-    private static final io.opentelemetry.api.trace.Tracer tracer = OpenTelemetryConfig.getTracer();
+    private io.opentelemetry.api.trace.Tracer tracer;
 
     @Override
     public CompletableFuture<Void> queryBefore(Query query) {
@@ -39,47 +41,28 @@ public CompletableFuture<Void> queryBefore(Query query) {
                     .setAttribute("command", query.getCommand())
                     .startSpan();
 
-            Span queryBeforeSpan = tracer.spanBuilder("queryBefore")
-                    .setParent(io.opentelemetry.context.Context.current().with(querySpan))
-                    .setSpanKind(SpanKind.INTERNAL)
-                    .startSpan();
-
-            try (Scope scope = queryBeforeSpan.makeCurrent()) {
-                query.setAttribute("querySpan", querySpan);
-                query.setAttribute("queryBeforeSpan", queryBeforeSpan);
-            } finally {
-                queryBeforeSpan.end();
-            }
+            query.setAttribute("querySpan", querySpan);
         });
     }
 
     @Override
     public CompletableFuture<Void> queryAfter(Query query, HttpResponse response) {
         return CompletableFuture.runAsync(() -> {
             Span querySpan = (Span) query.getAttribute("querySpan");
-            if (querySpan != null) {
-                Span queryAfterSpan = tracer.spanBuilder("queryAfter")
-                        .setParent(io.opentelemetry.context.Context.current().with(querySpan))
-                        .setSpanKind(SpanKind.INTERNAL)
-                        .startSpan();
+            if (querySpan == null) {
+                return;
+            }
 
-                try (Scope scope = queryAfterSpan.makeCurrent()) {
-                    int statusCode = response.statusCode();
-                    queryAfterSpan.setAttribute("status_code", statusCode);
-                    if (statusCode >= 400) {
-                        String errorBody = response.bodyAsString();
-                        queryAfterSpan.setStatus(StatusCode.ERROR, "HTTP error: " + statusCode);
-                        queryAfterSpan.setAttribute("error.message", errorBody);
-                        querySpan.setStatus(StatusCode.ERROR, "Query failed: " + errorBody);
-                    } else {
-                        queryAfterSpan.setStatus(StatusCode.OK);
-                        querySpan.setStatus(StatusCode.OK);
-                    }
-                } finally {
-                    queryAfterSpan.end();
-                    querySpan.end();
-                }
+            int statusCode = response.statusCode();
+            querySpan.setAttribute("status_code", statusCode);
+            if (statusCode >= 400) {
+                String errorBody = response.bodyAsString();
+                querySpan.setStatus(StatusCode.ERROR, "HTTP error: " + statusCode);
+                querySpan.setAttribute("error.message", errorBody);
+            } else {
+                querySpan.setStatus(StatusCode.OK);
             }
+            querySpan.end();
         });
     }
 
@@ -90,51 +73,30 @@ public CompletableFuture<Void> writeBefore(Write write) {
                     .setSpanKind(SpanKind.CLIENT)
                     .setAttribute("database", write.getDatabase())
                     .setAttribute("retention_policy", write.getRetentionPolicy())
-                    .setAttribute("measurement", write.getMeasurement())
-                    .startSpan();
-
-            Span writeBeforeSpan = tracer.spanBuilder("writeBefore")
-                    .setParent(io.opentelemetry.context.Context.current().with(writeSpan))
-                    .setSpanKind(SpanKind.INTERNAL)
+                    .setAttribute("command", write.getLineProtocol())
                     .startSpan();
-
-            try (Scope scope = writeBeforeSpan.makeCurrent()) {
-                write.setAttribute("writeSpan", writeSpan);
-                write.setAttribute("writeBeforeSpan", writeBeforeSpan);
-            } finally {
-                writeBeforeSpan.end();
-            }
+            write.setAttribute("writeSpan", writeSpan);
         });
     }
 
     @Override
     public CompletableFuture<Void> writeAfter(Write write, HttpResponse response) {
         return CompletableFuture.runAsync(() -> {
             Span writeSpan = (Span) write.getAttribute("writeSpan");
-            if (writeSpan != null) {
-                Span writeAfterSpan = tracer.spanBuilder("writeAfter")
-                        .setParent(io.opentelemetry.context.Context.current().with(writeSpan))
-                        .setSpanKind(SpanKind.INTERNAL)
-                        .startSpan();
-
-                try (Scope scope = writeAfterSpan.makeCurrent()) {
-                    int statusCode = response.statusCode();
-                    writeAfterSpan.setAttribute("status_code", statusCode);
+            if (writeSpan == null) {
+                return;
+            }
+            int statusCode = response.statusCode();
+            writeSpan.setAttribute("status_code", statusCode);
 
-                    if (statusCode >= 400) {
-                        String errorBody = response.bodyAsString();
-                        writeAfterSpan.setStatus(StatusCode.ERROR, "HTTP error: " + statusCode);
-                        writeAfterSpan.setAttribute("error.message", errorBody);
-                        writeSpan.setStatus(StatusCode.ERROR, "Write failed: " + errorBody);
-                    } else {
-                        writeAfterSpan.setStatus(StatusCode.OK);
-                        writeSpan.setStatus(StatusCode.OK);
-                    }
-                } finally {
-                    writeAfterSpan.end();
-                    writeSpan.end();
-                }
+            if (statusCode >= 400) {
+                String errorBody = response.bodyAsString();
+                writeSpan.setStatus(StatusCode.ERROR, "HTTP error: " + statusCode);
+                writeSpan.setAttribute("error.message", errorBody);
+            } else {
+                writeSpan.setStatus(StatusCode.OK);
             }
+            writeSpan.end();
         });
     }
 }
diff --git a/opengemini-client/src/main/java/io/opengemini/client/interceptor/package-info.java b/opengemini-client/src/main/java/io/opengemini/client/interceptor/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 openGemini Authors
+ * Copyright 2025 openGemini Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/opengemini-client/src/test/java/io/opengemini/client/interceptor/TracingIntegrationTest.java b/opengemini-client/src/test/java/io/opengemini/client/interceptor/TracingIntegrationTest.java
diff --git a/pom.xml b/pom.xml
diff --git a/spring/opengemini-spring-boot-starter-reactive/pom.xml b/spring/opengemini-spring-boot-starter-reactive/pom.xml
diff --git a/spring/opengemini-spring-boot-starter/pom.xml b/spring/opengemini-spring-boot-starter/pom.xml
diff --git a/spring/opengemini-spring/pom.xml b/spring/opengemini-spring/pom.xml
diff --git a/spring/pom.xml b/spring/pom.xml
