Commit 115cc9c2 authored by liuyixun's avatar liuyixun

feat(ops): 弃用skywalking的tid,响应头去除tid!添加OTEL日志,增加spanid输出。响应头增加spanid,traceid。

parent 92aed895
......@@ -161,11 +161,6 @@
</dependency>
<!-- 运维类依赖-->
<dependency>
<groupId>com.afanticar</groupId>
<artifactId>ops-java-common</artifactId>
<version>0.0.1-Release</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
......@@ -194,6 +189,16 @@
<artifactId>spring-vault-core</artifactId>
<version>2.3.2</version>
</dependency>
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-logback-mdc-1.0</artifactId>
<version>1.29.0-alpha</version>
</dependency>
<dependency>
<groupId>com.afanticar</groupId>
<artifactId>ops-java-common</artifactId>
<version>1.0.1-snapshots</version>
</dependency>
<!-- 运维类依赖-->
<dependency>
......
......@@ -2,42 +2,56 @@
<configuration debug="false">
<contextName>Logback</contextName>
<springProfile name="local">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc.TraceIdMDCPatternLogbackLayout">
<Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%X{tid}] [%thread] %-5level %logger{36} -%msg%n</Pattern>
</layout>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [TID: %X{trace_id}] [SPANID: %X{span_id}] [%thread] %-5level %logger{36} -%msg%n</Pattern>
</encoder>
<!-- <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">-->
<!-- <providers>-->
<!-- <pattern>-->
<!-- <omitEmptyFields>true</omitEmptyFields>-->
<!-- <pattern>-->
<!-- {-->
<!-- "timestamp": "%d{yyyy-MM-dd HH:mm:ss.SSS}",-->
<!-- "trace_id": "%X{trace_id}",-->
<!-- "span_id": "%X{span_id}",-->
<!-- "thread": "%thread",-->
<!-- "level": "%-5level",-->
<!-- "class": "%logger{36}",-->
<!-- "message": "%message"-->
<!-- }-->
<!-- </pattern>-->
<!-- </pattern>-->
<!-- </providers>-->
<!-- </encoder>-->
</appender>
<appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
<discardingThreshold>0</discardingThreshold>
<queueSize>1024</queueSize>
<neverBlock>true</neverBlock>
<appender-ref ref="STDOUT"/>
<!-- Just wrap your logging appender, for example ConsoleAppender, with OpenTelemetryAppender -->
<appender name="OTEL" class="io.opentelemetry.instrumentation.logback.mdc.v1_0.OpenTelemetryAppender">
<appender-ref ref="CONSOLE"/>
</appender>
<!-- Use the wrapped "OTEL" appender instead of the original "CONSOLE" one -->
<root level="INFO">
<appender-ref ref="ASYNC"/>
<appender-ref ref="OTEL"/>
</root>
</springProfile>
<!-- 配置spring使用的参数名 -->
<springProfile name="dev,uat,pro,test,production">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<!-- 引入skywalking日志,添加tid -->
<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc.TraceIdMDCPatternLogbackLayout">
<Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%X{tid}] [%thread] %-5level %logger{36} -%msg%n</Pattern>
</layout>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [TID:%X{trace_id}] [SpanID:%X{span_id}] [%thread] %-5level %logger{36} -%msg%n</Pattern>
</encoder>
</appender>
<!-- 配置异步输出 -->
<appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
<discardingThreshold>0</discardingThreshold>
<queueSize>1024</queueSize>
<neverBlock>true</neverBlock>
<appender-ref ref="STDOUT"/>
<!-- Just wrap your logging appender, for example ConsoleAppender, with OpenTelemetryAppender -->
<appender name="OTEL" class="io.opentelemetry.instrumentation.logback.mdc.v1_0.OpenTelemetryAppender">
<appender-ref ref="CONSOLE"/>
</appender>
<!-- Use the wrapped "OTEL" appender instead of the original "CONSOLE" one -->
<root level="INFO">
<appender-ref ref="ASYNC"/>
<appender-ref ref="OTEL"/>
</root>
</springProfile>
</configuration>
\ No newline at end of file
</configuration>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment