完善 skywalking 组件的集成
parent
81b1f3751a
commit
e351cdf785
@ -1,32 +0,0 @@
|
|||||||
package cn.iocoder.dashboard.framework.tracer.core.annotation;
|
|
||||||
|
|
||||||
import cn.hutool.core.util.StrUtil;
|
|
||||||
import cn.iocoder.dashboard.util.sping.SpElUtil;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.apache.skywalking.apm.toolkit.trace.ActiveSpan;
|
|
||||||
import org.aspectj.lang.ProceedingJoinPoint;
|
|
||||||
import org.aspectj.lang.annotation.Around;
|
|
||||||
import org.aspectj.lang.annotation.Aspect;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 业务链路AOP切面
|
|
||||||
*
|
|
||||||
* @author mashu
|
|
||||||
*/
|
|
||||||
@Aspect
|
|
||||||
@Slf4j
|
|
||||||
public class BizTracingAop {
|
|
||||||
|
|
||||||
@Around(value = "@annotation(bizTracing)")
|
|
||||||
public void tagBizInfo(ProceedingJoinPoint joinPoint, BizTracing bizTracing) {
|
|
||||||
String bizId = (String) SpElUtil.analysisSpEl(bizTracing.id(), joinPoint);
|
|
||||||
String bizType = (String) SpElUtil.analysisSpEl(bizTracing.type(), joinPoint);
|
|
||||||
if (StrUtil.isBlankIfStr(bizId)) {
|
|
||||||
log.error("empty biz: bizId[{}], bizType[{}].", bizId, bizType);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
log.info("accept biz: bizId[{}], bizType[{}].", bizId, bizType);
|
|
||||||
ActiveSpan.tag(BizTracing.ID_TAG, bizId);
|
|
||||||
ActiveSpan.tag(BizTracing.TYPE_TAG, bizType);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
/*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed with
|
|
||||||
* this work for additional information regarding copyright ownership.
|
|
||||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
|
||||||
* (the "License"); you may not use this file except in compliance with
|
|
||||||
* the License. You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
package cn.iocoder.dashboard.framework.tracer.skywalking;
|
|
||||||
|
|
||||||
import ch.qos.logback.classic.pattern.ClassicConverter;
|
|
||||||
import ch.qos.logback.classic.spi.ILoggingEvent;
|
|
||||||
import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by mashu on 2021/3/6.
|
|
||||||
*/
|
|
||||||
public class LocalLogbackPatternConverter extends ClassicConverter {
|
|
||||||
/**
|
|
||||||
* 作为默认的方式, 从{@link TracerUtils}中获取traceId,
|
|
||||||
* 需要用这个去替代logback的Layout,
|
|
||||||
* 同时避免了sky-walking agent生效的情况下仍然输出定值的问题.
|
|
||||||
*
|
|
||||||
* @param iLoggingEvent the event
|
|
||||||
* @return the traceId: UUID, or the real traceId.
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public String convert(ILoggingEvent iLoggingEvent) {
|
|
||||||
return TracerUtils.getTraceId();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
/*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed with
|
|
||||||
* this work for additional information regarding copyright ownership.
|
|
||||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
|
||||||
* (the "License"); you may not use this file except in compliance with
|
|
||||||
* the License. You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
package cn.iocoder.dashboard.framework.tracer.skywalking;
|
|
||||||
|
|
||||||
import ch.qos.logback.classic.PatternLayout;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Based on the logback-component convert register mechanism,
|
|
||||||
* register {@link LocalLogbackPatternConverter} as a new convert, match to "tid".
|
|
||||||
* You can use "%tid" in logback config file, "Pattern" section.
|
|
||||||
* If sky-walking agent is not active mode, it will use UUID as tid.
|
|
||||||
* <p>
|
|
||||||
* logback 的转换组件,为tid 添加占位符的转换器
|
|
||||||
* Created by mashu on 2021/3/6.
|
|
||||||
*/
|
|
||||||
public class TraceIdPatternLogbackLayout extends PatternLayout {
|
|
||||||
static {
|
|
||||||
defaultConverterMap.put("tid", LocalLogbackPatternConverter.class.getName());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue