feat: add TraceFilter and TraceIdGenerator for enhanced tracing support

Author: hb0730

README.MD

@@ -12,10 +12,12 @@
 8. `zoom-operator-log` 提供操作日志支持，基于`spring-aop`的操作日志记录支持
 9. `zoom-oss` 提供对象存储支持，支持`S3`等
 10. `zoom-poi` 提供`POI`支持，支持`Excel`等
-11. `zoom-security` 提供安全支持，包含`XSS`、`CSRF`、`SQL注入`等支持
-12. `zoom-social` 提供社交支持，包含`QQ`、`微信`等支持
-13. `zoom-sofa-rpc` 提供[sofa-rpc](https://github.com/sofastack/sofa-rpc)支持
-14. `zoom-springdoc` 提供`springdoc`支持，支持`swagger`等
-15. `zoom-web` 处理`全局异常`、`跨域` 等配置
+11. `zoom-rabbitmq` 提供`RabbitMQ`支持，包含`消息发送`、`接收`、`重试`等支持
+12. `zoom-robots` 提供`企业微信`、`钉钉`等自定义机器人消息发送的支持
+13. `zoom-security` 提供安全支持，包含`XSS`、`CSRF`、`SQL注入`等支持
+14. `zoom-social` 提供社交支持，包含`QQ`、`微信`等支持
+15. `zoom-sofa-rpc` 提供[sofa-rpc](https://github.com/sofastack/sofa-rpc)支持
 16. `zoom-spring-retry` 提供`spring-retry`支持
-17. `zoom-robots` 提供`企业微信`、`钉钉`等自定义机器人消息发送的支持
+17. `zoom-springdoc` 提供`springdoc`支持，支持`swagger`等
+18. `zoom-web` 处理`全局异常`、`跨域` 等配置
+

zoom-base/src/main/java/com/hb0730/zoom/base/R.java

@@ -61,7 +61,7 @@ public class R<T> implements Serializable {
      * 链路追踪id
      */
     @Schema(description = "链路追踪id")
-    private String traceId = TraceHolder.getTraceIdOrOtelTraceId();
+    private String traceId = TraceHolder.getTraceId();
 
 
     /**

zoom-opentelemetry/zoom-opentelemetry-configuration/src/main/java/com/hb0730/zoom/opentelemetry/configuration/OpenTelemetryAutoConfiguration.java

@@ -1,8 +1,12 @@
 package com.hb0730.zoom.opentelemetry.configuration;
 
+import com.hb0730.zoom.opentelemetry.configuration.config.TraceIdGenerator;
 import com.hb0730.zoom.opentelemetry.sofa.rpc.SofaRpcTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.context.Context;
+import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -28,6 +32,17 @@ public class OpenTelemetryAutoConfiguration {
     private static final String ACTUATOR_TASK_SCHEDULER_BEAN_NAME = "actuatorTaskScheduler";
 
 
+    @Bean
+    public AutoConfigurationCustomizerProvider otelCustom() {
+        return p -> p.addTracerProviderCustomizer(this::configTracerProviderCustomizer);
+    }
+
+
+    private SdkTracerProviderBuilder configTracerProviderCustomizer(SdkTracerProviderBuilder sdkTracerProviderBuilder, ConfigProperties configProperties) {
+        sdkTracerProviderBuilder.setIdGenerator(TraceIdGenerator.INSTANCE);
+        return sdkTracerProviderBuilder;
+    }
+
     @Bean
     @ConditionalOnMissingBean
     @ConditionalOnProperty(value = "zoom.opentelemetry.sofa.rpc.enabled", havingValue = "true", matchIfMissing = true)

zoom-opentelemetry/zoom-opentelemetry-configuration/src/main/java/com/hb0730/zoom/opentelemetry/configuration/config/TraceIdGenerator.java

@@ -0,0 +1,28 @@
+package com.hb0730.zoom.opentelemetry.configuration.config;
+
+import com.hb0730.zoom.base.meta.TraceHolder;
+import io.opentelemetry.sdk.trace.IdGenerator;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author <a href="mailto:huangbing0730@gmail">hb0730</a>
+ * @date 2025/5/22
+ */
+@Slf4j
+public class TraceIdGenerator implements IdGenerator {
+    public static final TraceIdGenerator INSTANCE = new TraceIdGenerator();
+
+    @Override
+    public String generateSpanId() {
+//        log.info("[otel] generate spanId");
+        return IdGenerator.random().generateSpanId();
+    }
+
+    @Override
+    public String generateTraceId() {
+//        log.info("[otel] generate traceId");
+        String traceId = IdGenerator.random().generateTraceId();
+        TraceHolder.setTraceId(traceId);
+        return traceId;
+    }
+}

zoom-operator-log/src/main/java/com/hb0730/zoom/operator/log/core/model/OperatorLogModelBuilder.java

@@ -109,7 +109,7 @@ public OperatorLogModelBuilder fillTraceId(String traceId) {
      */
     public OperatorLogModelBuilder fillRequest() {
         // traceId
-        String traceId = TraceHolder.getTraceIdOrOtelTraceId();
+        String traceId = TraceHolder.getTraceId();
         model.setTraceId(traceId);
         // 填充请求信息
         Optional

zoom-sofa-rpc/src/main/java/com/hb0730/zoom/sofa/rpc/core/filter/TraceFilter.java

@@ -0,0 +1,42 @@
+package com.hb0730.zoom.sofa.rpc.core.filter;
+
+import com.alipay.sofa.rpc.context.RpcInternalContext;
+import com.alipay.sofa.rpc.core.exception.SofaRpcException;
+import com.alipay.sofa.rpc.core.request.SofaRequest;
+import com.alipay.sofa.rpc.core.response.SofaResponse;
+import com.alipay.sofa.rpc.filter.Filter;
+import com.alipay.sofa.rpc.filter.FilterInvoker;
+import com.hb0730.zoom.base.meta.TraceHolder;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * TraceFilter
+ *
+ * @author <a href="mailto:huangbing0730@gmail">hb0730</a>
+ * @date 2025/5/22
+ */
+@com.alipay.sofa.rpc.ext.Extension("traceFilter")
+@com.alipay.sofa.rpc.filter.AutoActive(providerSide = true, consumerSide = true)
+@Slf4j
+public class TraceFilter extends Filter {
+    @Override
+    public SofaResponse invoke(FilterInvoker invoker, SofaRequest request) throws SofaRpcException {
+        // 1. 获取当前上下文
+        // 2. 获取当前请求的 traceId
+        // 3. 如果 traceId 不为空，则设置到当前上下文中
+        // 4. 调用下一个过滤器
+        // 5. 返回响应
+        RpcInternalContext context = RpcInternalContext.getContext();
+        if (context.isProviderSide()) {
+            Object requestProp = request.getRequestProp("traceId");
+            if (requestProp != null) {
+                TraceHolder.setTraceId((String) requestProp);
+            }
+        } else {
+            String traceId = TraceHolder.getTraceId();
+            request.addRequestProp("traceId", traceId);
+
+        }
+        return invoker.invoke(request);
+    }
+}

zoom-sofa-rpc/src/main/resources/META-INF/services/sofa-rpc/com.alipay.sofa.rpc.filter.Filter

@@ -1,2 +1,3 @@
 serverExceptionLogPrintFilter=com.hb0730.zoom.sofa.rpc.core.filter.ServerExceptionLogPrintFilter
 usernameFilter=com.hb0730.zoom.sofa.rpc.core.filter.UsernameFilter
+traceFilter=com.hb0730.zoom.sofa.rpc.core.filter.TraceFilter