Commit 8f5fcc7d authored by 吴晟's avatar 吴晟
Browse files

修复原有的方法入参为null时，spring方法拦截错误的问题。感觉 @汽车之家_泉 的异常反馈。

parent 56db909c

skywalking-sdk-plugin/spring-plugin/pom.xml

+96 −90
Original line number Diff line number Diff line
@@ -35,6 +35,12 @@ 
			<version>3.8.1</version>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>org.apache.logging.log4j</groupId>

			<artifactId>log4j-core</artifactId>

			<version>2.4.1</version>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>org.springframework</groupId>

			<artifactId>spring-context</artifactId>

skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingAspect.java

+1 −13
Original line number Diff line number Diff line
@@ -9,19 +9,7 @@ public class TracingAspect { 
    public Object doTracing(ProceedingJoinPoint proceedingJoinPoint) throws Throwable {

        LocalBuriedPointSender _sender = new LocalBuriedPointSender();

        try {

            StringBuilder viewPoint = new StringBuilder();

            viewPoint.append(proceedingJoinPoint.getTarget().getClass().getName() + "." + proceedingJoinPoint.getSignature().getName() + "(");

            boolean first = true;

            for (Object arg : proceedingJoinPoint.getArgs()) {

                if (!first) {

                    viewPoint.append(",");

                } else {

                    first = false;

                }

                viewPoint.append(arg.getClass().getName());

            }

            viewPoint.append(")");

            _sender.beforeSend(Identification.newBuilder().viewPoint(viewPoint.toString()).spanType(SpringBuriedPointType.instance()).build());

            _sender.beforeSend(Identification.newBuilder().viewPoint(proceedingJoinPoint.getSignature().toString()).spanType(SpringBuriedPointType.instance()).build());

            return proceedingJoinPoint.proceed();

        } catch (Throwable e) {

            _sender.handleException(e);

skywalking-sdk-plugin/spring-plugin/src/test/java/com/ai/cloud/skywalking/plugin/spring/test/TestBean.java

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ import org.springframework.stereotype.Service; 
import org.springframework.transaction.annotation.Transactional;



@Service

@Transactional

//@Transactional

public class TestBean/* implements TestInterface*/ {

    private String value;

skywalking-sdk-plugin/spring-plugin/src/test/resources/log4j2.xml

0 → 100644
+16 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<Configuration status="error">

	<Appenders>

		<Console name="Console" target="SYSTEM_OUT">

			<PatternLayout pattern="%d [%t](%F:%L) %-5level %logger{36} - %msg%n" />

		</Console>

	</Appenders>

	<Loggers>

		<Root level="error">

			<AppenderRef ref="Console" />

		</Root>

		<logger name="com.ai.cloud.skywalking" level="debug">

			<AppenderRef ref="Console" />

		</logger>

	</Loggers>

</Configuration>
 
 No newline at end of file

skywalking-sdk-plugin/spring-plugin/src/test/resources/sky-walking.auth

0 → 100644
+47 −0
Original line number Diff line number Diff line 
#skyWalking用户ID

skywalking.user_id=123

#skyWalking应用编码

skywalking.application_code=test

#skywalking auth的环境变量名字

skywalking.auth_system_env_name=SKYWALKING_RUN

#skywalking数据编码

skywalking.charset=UTF-8



#是否打印数据

buriedpoint.printf=true

#埋点异常的最大长度

buriedpoint.max_exception_stack_length=4000

#业务字段的最大长度

buriedpoint.businesskey_max_length=300

#过滤异常

buriedpoint.exclusive_exceptions=java.lang.RuntimeException



#最大发送者的连接数阀比例

sender.connect_percent=100

#发送服务端配置

sender.servers_addr=127.0.0.1:34000

#最大发送的副本数量

sender.max_copy_num=2

#发送的最大长度

sender.max_send_length=20000

#当没有Sender时,尝试获取sender的等待周期

sender.retry_get_sender_wait_interval=2000

#是否开启发送消息

sender.is_off=false





#最大消费线程数

consumer.max_consumer=2

#消费者最大等待时间

consumer.max_wait_time=5

#发送失败等待时间  

consumer.consumer_fail_retry_wait_interval=50



#每个Buffer的最大个数

buffer.buffer_max_size=18000

#Buffer池的最大长度

buffer.pool_size=5



#发送检查线程检查周期 

senderchecker.check_polling_time=200