opentracing升级为opentelemetry

yudao-dependencies/pom.xml

@@ -47,9 +47,8 @@
         <!-- 服务保障相关 -->
         <lock4j.version>2.2.7</lock4j.version>
         <!-- 监控相关 -->
-        <skywalking.version>8.12.0</skywalking.version>
         <spring-boot-admin.version>2.7.15</spring-boot-admin.version>
-        <opentracing.version>0.33.0</opentracing.version>
+        <opentelemetry.version>1.39.0</opentelemetry.version>
         <!-- Test 测试相关 -->
         <podam.version>7.2.11.RELEASE</podam.version> <!-- Spring Boot 2.X 最多使用 7.2.11 版本 -->
         <jedis-mock.version>1.1.11</jedis-mock.version>
@@ -402,44 +401,19 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.skywalking</groupId>
+                <groupId>io.opentelemetry</groupId>
-                <artifactId>apm-toolkit-trace</artifactId>
+                <artifactId>opentelemetry-api</artifactId>
-                <version>${skywalking.version}</version>
+                <version>${opentelemetry.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.skywalking</groupId>
+                <groupId>io.opentelemetry</groupId>
-                <artifactId>apm-toolkit-logback-1.x</artifactId>
+                <artifactId>opentelemetry-sdk</artifactId>
-                <version>${skywalking.version}</version>
+                <version>${opentelemetry.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.skywalking</groupId>
+                <groupId>io.opentelemetry</groupId>
-                <artifactId>apm-toolkit-opentracing</artifactId>
+                <artifactId>opentelemetry-exporter-otlp</artifactId>
-                <version>${skywalking.version}</version>
+                <version>${opentelemetry.version}</version>
-                <!--                <exclusions>-->
-                <!--                    <exclusion>-->
-                <!--                        <artifactId>opentracing-api</artifactId>-->
-                <!--                        <groupId>io.opentracing</groupId>-->
-                <!--                    </exclusion>-->
-                <!--                    <exclusion>-->
-                <!--                        <artifactId>opentracing-util</artifactId>-->
-                <!--                        <groupId>io.opentracing</groupId>-->
-                <!--                    </exclusion>-->
-                <!--                </exclusions>-->
-            </dependency>
-            <dependency>
-                <groupId>io.opentracing</groupId>
-                <artifactId>opentracing-api</artifactId>
-                <version>${opentracing.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.opentracing</groupId>
-                <artifactId>opentracing-util</artifactId>
-                <version>${opentracing.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.opentracing</groupId>
-                <artifactId>opentracing-noop</artifactId>
-                <version>${opentracing.version}</version>
             </dependency>
 
             <dependency>

yudao-framework/yudao-common/pom.xml

@@ -73,8 +73,8 @@
 
         <!-- 监控相关 -->
         <dependency>
-            <groupId>org.apache.skywalking</groupId>
+            <groupId>io.opentelemetry</groupId>
-            <artifactId>apm-toolkit-trace</artifactId>
+            <artifactId>opentelemetry-api</artifactId>
         </dependency>
 
         <!-- 工具类相关 -->

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/monitor/TracerUtils.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.framework.common.util.monitor;
 
-import org.apache.skywalking.apm.toolkit.trace.TraceContext;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanContext;
 
 /**
  * 链路追踪工具类
@@ -24,7 +25,9 @@ public class TracerUtils {
      * @return 链路追踪编号
      */
     public static String getTraceId() {
-        return TraceContext.traceId();
+        Span currentSpan = Span.current();
+        SpanContext context = currentSpan.getSpanContext();
+        return context.isValid() ? context.getTraceId() : "";
     }
 
 }

yudao-framework/yudao-spring-boot-starter-monitor/pom.xml

@@ -42,23 +42,18 @@
 
         <!-- 监控相关 -->
         <dependency>
-            <groupId>io.opentracing</groupId>
+            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentracing-util</artifactId>
+            <artifactId>opentelemetry-api</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.apache.skywalking</groupId>
+            <groupId>io.opentelemetry</groupId>
-            <artifactId>apm-toolkit-trace</artifactId>
+            <artifactId>opentelemetry-sdk</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.apache.skywalking</groupId>
+            <groupId>io.opentelemetry</groupId>
-            <artifactId>apm-toolkit-logback-1.x</artifactId>
+            <artifactId>opentelemetry-exporter-otlp</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-toolkit-opentracing</artifactId>
             <optional>true</optional>
         </dependency>
 

yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoTracerAutoConfiguration.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.framework.tracer.config;
 
 import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum;
+import cn.iocoder.yudao.framework.tracer.core.aop.BizTraceAspect;
 import cn.iocoder.yudao.framework.tracer.core.filter.TraceFilter;
+import io.opentelemetry.api.trace.Tracer;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -16,28 +19,28 @@ import org.springframework.context.annotation.Bean;
  */
 @AutoConfiguration
 @ConditionalOnClass(name = {
-        "org.apache.skywalking.apm.toolkit.opentracing.SkywalkingTracer", // 来自 apm-toolkit-opentracing.jar
+        "io.opentelemetry.api.trace.Tracer", // 来自 opentelemetry-api.jar
-//        "io.opentracing.Tracer", // 来自 opentracing-api.jar
-        "javax.servlet.Filter"
 })
 @EnableConfigurationProperties(TracerProperties.class)
 @ConditionalOnProperty(prefix = "yudao.tracer", value = "enable", matchIfMissing = true)
 public class YudaoTracerAutoConfiguration {
 
-    // TODO @芋艿：skywalking 不兼容最新的 opentracing 版本。同时，opentracing 也停止了维护，尬住了！后续换 opentelemetry 即可！
+    @Value("${spring.application.name}")
-//    @Bean
+    private String applicationName;
-//    public BizTraceAspect bizTracingAop() {
+
-//        return new BizTraceAspect(tracer());
+
-//    }
+    @Bean
-//
+    public BizTraceAspect bizTracingAop() {
-//    @Bean
+        return new BizTraceAspect(tracer());
-//    public Tracer tracer() {
+    }
-//        // 创建 SkywalkingTracer 对象
+
-//        SkywalkingTracer tracer = new SkywalkingTracer();
+    /**
-//        // 设置为 GlobalTracer 的追踪器
+     * 创建 OpenTelemetry Tracer
-//        GlobalTracer.registerIfAbsent(tracer);
+     */
-//        return tracer;
+    @Bean
-//    }
+    public Tracer tracer() {
+        return io.opentelemetry.api.GlobalOpenTelemetry.getTracer(applicationName);
+    }
 
     /**
      * 创建 TraceFilter 过滤器，响应 header 设置 traceId

yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/aop/BizTraceAspect.java

@@ -5,9 +5,8 @@ import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.tracer.core.annotation.BizTrace;
 import cn.iocoder.yudao.framework.common.util.spring.SpringExpressionUtils;
 import cn.iocoder.yudao.framework.tracer.core.util.TracerFrameworkUtils;
-import io.opentracing.Span;
+import io.opentelemetry.api.trace.Span;
-import io.opentracing.Tracer;
+import io.opentelemetry.api.trace.Tracer;
-import io.opentracing.tag.Tags;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -36,9 +35,9 @@ public class BizTraceAspect {
     public Object around(ProceedingJoinPoint joinPoint, BizTrace trace) throws Throwable {
         // 创建 span
         String operationName = getOperationName(joinPoint, trace);
-        Span span = tracer.buildSpan(operationName)
+        Span span = tracer.spanBuilder(operationName)
-                .withTag(Tags.COMPONENT.getKey(), "biz")
+                .setAttribute("component", "biz")
-                .start();
+                .startSpan();
         try {
             // 执行原有方法
             return joinPoint.proceed();
@@ -49,7 +48,7 @@ public class BizTraceAspect {
             // 设置 Span 的 biz 属性
             setBizTag(span, joinPoint, trace);
             // 完成 Span
-            span.finish();
+            span.end();
         }
     }
 
@@ -67,8 +66,8 @@ public class BizTraceAspect {
     private void setBizTag(Span span, ProceedingJoinPoint joinPoint, BizTrace trace) {
         try {
             Map<String, Object> result = SpringExpressionUtils.parseExpressions(joinPoint, asList(trace.type(), trace.id()));
-            span.setTag(BizTrace.TYPE_TAG, MapUtil.getStr(result, trace.type()));
+            span.setAttribute(BizTrace.TYPE_TAG, MapUtil.getStr(result, trace.type()));
-            span.setTag(BizTrace.ID_TAG, MapUtil.getStr(result, trace.id()));
+            span.setAttribute(BizTrace.ID_TAG, MapUtil.getStr(result, trace.id()));
         } catch (Exception ex) {
             log.error("[setBizTag][解析 bizType 与 bizId 发生异常]", ex);
         }

yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/util/TracerFrameworkUtils.java

@@ -1,12 +1,11 @@
 package cn.iocoder.yudao.framework.tracer.core.util;
 
-import io.opentracing.Span;
+import io.opentelemetry.api.trace.Span;
-import io.opentracing.tag.Tags;
+import io.opentelemetry.api.trace.StatusCode;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.HashMap;
+
-import java.util.Map;
 
 /**
  * 链路追踪 Util
@@ -22,25 +21,21 @@ public class TracerFrameworkUtils {
      * @param span Span
      */
     public static void onError(Throwable throwable, Span span) {
-        Tags.ERROR.set(span, Boolean.TRUE);
+        if (span == null || !span.getSpanContext().isValid()) {
+            return;
+        }
         if (throwable != null) {
-            span.log(errorLogs(throwable));
+            // 记录异常信息
-        }
+            span.recordException(throwable);
-    }
+            span.setStatus(StatusCode.ERROR, throwable.getMessage());
 
-    private static Map<String, Object> errorLogs(Throwable throwable) {
+            // 如果需要，可以把完整堆栈放到属性里
-        Map<String, Object> errorLogs = new HashMap<String, Object>(10);
+            StringWriter sw = new StringWriter();
-        errorLogs.put("event", Tags.ERROR.getKey());
+            throwable.printStackTrace(new PrintWriter(sw));
-        errorLogs.put("error.object", throwable);
+            span.setAttribute("error.stacktrace", sw.toString());
-        errorLogs.put("error.kind", throwable.getClass().getName());
+        } else {
-        String message = throwable.getCause() != null ? throwable.getCause().getMessage() : throwable.getMessage();
+            span.setStatus(StatusCode.ERROR);
-        if (message != null) {
-            errorLogs.put("message", message);
         }
-        StringWriter sw = new StringWriter();
-        throwable.printStackTrace(new PrintWriter(sw));
-        errorLogs.put("stack", sw.toString());
-        return errorLogs;
     }
 
 }