From 546a0497bb55801c83d53340bd576ac17ebc9d84 Mon Sep 17 00:00:00 2001 From: donghun-cho Date: Mon, 8 Apr 2024 17:30:11 +0900 Subject: [PATCH] [#10844] Backport: Add new Main classes to SpringBootDetector --- agent/src/main/resources/profiles/local/pinpoint.config | 2 +- agent/src/main/resources/profiles/release/pinpoint.config | 2 +- .../resources/activemq/client/pinpoint-activemq-client.config | 4 ++-- .../cxf-it/src/test/resources/cxf/pinpoint-cxf-test.config | 4 ++-- .../src/test/resources/druid/pinpoint-druid-test.config | 4 ++-- .../src/test/resources/fastjson/pinpoint-fastjson-test.config | 4 ++-- .../src/test/resources/pinpoint-grpc-plugin-test.config | 4 ++-- .../src/test/resources/pinpoint-grpc-plugin-test.config | 4 ++-- .../src/test/resources/hbase/pinpoint-hbase-test.config | 4 ++-- .../src/test/resources/hystrix/pinpoint-hystrix.config | 2 +- plugins-it/jtds-it/src/test/resources/pinpoint.config | 2 +- .../lambda-it/src/test/resources/pinpoint-lambda-test.config | 4 ++-- .../src/test/resources/pinpoint-spring-bean-test.config | 4 ++-- .../src/test/resources/pinpoint-spring-bean-test.config | 4 ++-- .../src/test/resources/pinpoint-spring-bean-test.config | 4 ++-- .../src/test/resources/pinpoint-netty-plugin-test.config | 4 ++-- .../src/test/resources/pinpoint-process-test.config | 4 ++-- .../src/test/resources/rxjava/pinpoint-rxjava.config | 2 +- .../src/test/resources/pinpoint-disabled-plugin-test.config | 2 +- .../src/test/resources/pinpoint-spring-bean-test.config | 4 ++-- .../test/resources/pinpoint-thread-test-multiple-pkg.config | 2 +- .../thread-it/src/test/resources/pinpoint-thread-test.config | 2 +- plugins/akka-http/src/test/resources/pinpoint.config | 2 +- plugins/google-httpclient/src/test/resources/pinpoint.config | 2 +- plugins/httpclient3/src/test/resources/pinpoint.config | 2 +- plugins/httpclient4/src/test/resources/pinpoint.config | 2 +- plugins/jboss/src/test/resources/pinpoint.config | 2 +- plugins/jsp/src/test/resources/pinpoint.config | 2 +- plugins/redis/src/test/resources/pinpoint.config | 2 +- plugins/spring-boot/README.md | 2 +- .../pinpoint/plugin/spring/boot/SpringBootDetector.java | 3 +++ plugins/tomcat/src/test/resources/pinpoint.config | 2 +- plugins/user/src/test/resources/pinpoint.config | 2 +- plugins/vertx/src/test/resources/pinpoint.config | 2 +- plugins/weblogic/src/test/resources/pinpoint.config | 2 +- profiler/src/test/resources/pinpoint.config | 2 +- 36 files changed, 52 insertions(+), 49 deletions(-) diff --git a/agent/src/main/resources/profiles/local/pinpoint.config b/agent/src/main/resources/profiles/local/pinpoint.config index 028a995b2e48..a7d5a07684e3 100644 --- a/agent/src/main/resources/profiles/local/pinpoint.config +++ b/agent/src/main/resources/profiles/local/pinpoint.config @@ -563,7 +563,7 @@ profiler.undertow.excludeurl= ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # Reactor Netty diff --git a/agent/src/main/resources/profiles/release/pinpoint.config b/agent/src/main/resources/profiles/release/pinpoint.config index 85e340244432..8ecb089412d7 100644 --- a/agent/src/main/resources/profiles/release/pinpoint.config +++ b/agent/src/main/resources/profiles/release/pinpoint.config @@ -562,7 +562,7 @@ profiler.undertow.excludeurl= ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # Reactor Netty diff --git a/plugins-it/activemq-it/src/test/resources/activemq/client/pinpoint-activemq-client.config b/plugins-it/activemq-it/src/test/resources/activemq/client/pinpoint-activemq-client.config index cd704d5e0d55..0c2b1890fa8a 100644 --- a/plugins-it/activemq-it/src/test/resources/activemq/client/pinpoint-activemq-client.config +++ b/plugins-it/activemq-it/src/test/resources/activemq/client/pinpoint-activemq-client.config @@ -171,7 +171,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### @@ -533,4 +533,4 @@ profiler.resttemplate=false ########################################################### # recommend netty plugin disable, when using VERTX. profiler.netty=false -profiler.netty.http=false \ No newline at end of file +profiler.netty.http=false diff --git a/plugins-it/cxf-it/src/test/resources/cxf/pinpoint-cxf-test.config b/plugins-it/cxf-it/src/test/resources/cxf/pinpoint-cxf-test.config index 13df252a3303..1a13b9c73c4a 100644 --- a/plugins-it/cxf-it/src/test/resources/cxf/pinpoint-cxf-test.config +++ b/plugins-it/cxf-it/src/test/resources/cxf/pinpoint-cxf-test.config @@ -381,7 +381,7 @@ profiler.undertow.excludeurl= ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JSP # @@ -875,4 +875,4 @@ profiler.kafka.producer.enable=false profiler.kafka.consumer.enable=false // you must set target that handles ConsumerRecord as a argument for remote trace // ex) profiler.kafka.entryPoint=clazzName.methodName -profiler.kafka.consumer.entryPoint= \ No newline at end of file +profiler.kafka.consumer.entryPoint= diff --git a/plugins-it/druid-it/src/test/resources/druid/pinpoint-druid-test.config b/plugins-it/druid-it/src/test/resources/druid/pinpoint-druid-test.config index c24b1de4308d..1643e0e773b1 100644 --- a/plugins-it/druid-it/src/test/resources/druid/pinpoint-druid-test.config +++ b/plugins-it/druid-it/src/test/resources/druid/pinpoint-druid-test.config @@ -381,7 +381,7 @@ profiler.undertow.excludeurl= ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JSP # @@ -873,4 +873,4 @@ profiler.kafka.producer.enable=false profiler.kafka.consumer.enable=false // you must set target that handles ConsumerRecord as a argument for remote trace // ex) profiler.kafka.entryPoint=clazzName.methodName -profiler.kafka.consumer.entryPoint= \ No newline at end of file +profiler.kafka.consumer.entryPoint= diff --git a/plugins-it/fastjson-it/src/test/resources/fastjson/pinpoint-fastjson-test.config b/plugins-it/fastjson-it/src/test/resources/fastjson/pinpoint-fastjson-test.config index 8302abb72805..9c88ee3cfb06 100644 --- a/plugins-it/fastjson-it/src/test/resources/fastjson/pinpoint-fastjson-test.config +++ b/plugins-it/fastjson-it/src/test/resources/fastjson/pinpoint-fastjson-test.config @@ -381,7 +381,7 @@ profiler.undertow.excludeurl= ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JSP # @@ -872,4 +872,4 @@ profiler.kafka.producer.enable=false profiler.kafka.consumer.enable=false // you must set target that handles ConsumerRecord as a argument for remote trace // ex) profiler.kafka.entryPoint=clazzName.methodName -profiler.kafka.consumer.entryPoint= \ No newline at end of file +profiler.kafka.consumer.entryPoint= diff --git a/plugins-it/google-grpc-it/src/test/resources/pinpoint-grpc-plugin-test.config b/plugins-it/google-grpc-it/src/test/resources/pinpoint-grpc-plugin-test.config index e6389ad4d909..201cf12bcf2f 100644 --- a/plugins-it/google-grpc-it/src/test/resources/pinpoint-grpc-plugin-test.config +++ b/plugins-it/google-grpc-it/src/test/resources/pinpoint-grpc-plugin-test.config @@ -156,7 +156,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JDBC # @@ -395,4 +395,4 @@ profiler.grpc.server.enable=true # Therefore, tracking stream request that you want can be difficult. # please be sure that this description. profiler.grpc.server.streaming.enable=true -profiler.grpc.server.streaming.onmessage.enable=true \ No newline at end of file +profiler.grpc.server.streaming.onmessage.enable=true diff --git a/plugins-it/google-grpc-it2/src/test/resources/pinpoint-grpc-plugin-test.config b/plugins-it/google-grpc-it2/src/test/resources/pinpoint-grpc-plugin-test.config index e6389ad4d909..201cf12bcf2f 100644 --- a/plugins-it/google-grpc-it2/src/test/resources/pinpoint-grpc-plugin-test.config +++ b/plugins-it/google-grpc-it2/src/test/resources/pinpoint-grpc-plugin-test.config @@ -156,7 +156,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JDBC # @@ -395,4 +395,4 @@ profiler.grpc.server.enable=true # Therefore, tracking stream request that you want can be difficult. # please be sure that this description. profiler.grpc.server.streaming.enable=true -profiler.grpc.server.streaming.onmessage.enable=true \ No newline at end of file +profiler.grpc.server.streaming.onmessage.enable=true diff --git a/plugins-it/hbase-it/src/test/resources/hbase/pinpoint-hbase-test.config b/plugins-it/hbase-it/src/test/resources/hbase/pinpoint-hbase-test.config index 42490c31b1ab..7d1d3f4d82b1 100644 --- a/plugins-it/hbase-it/src/test/resources/hbase/pinpoint-hbase-test.config +++ b/plugins-it/hbase-it/src/test/resources/hbase/pinpoint-hbase-test.config @@ -381,7 +381,7 @@ profiler.undertow.excludeurl= ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JSP # @@ -895,4 +895,4 @@ profiler.kafka.consumer.entryPoint= profiler.hbase.client.enable=true profiler.hbase.client.admin.enable=true profiler.hbase.client.table.enable=true -profiler.hbase.client.params.enable=true \ No newline at end of file +profiler.hbase.client.params.enable=true diff --git a/plugins-it/hystrix-it/src/test/resources/hystrix/pinpoint-hystrix.config b/plugins-it/hystrix-it/src/test/resources/hystrix/pinpoint-hystrix.config index 5086f320a5fa..c69dec3db856 100644 --- a/plugins-it/hystrix-it/src/test/resources/hystrix/pinpoint-hystrix.config +++ b/plugins-it/hystrix-it/src/test/resources/hystrix/pinpoint-hystrix.config @@ -254,7 +254,7 @@ profiler.vertx.http.client.entity.statuscode=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JSP # diff --git a/plugins-it/jtds-it/src/test/resources/pinpoint.config b/plugins-it/jtds-it/src/test/resources/pinpoint.config index 7f1084c8a381..9d293aee3b4b 100644 --- a/plugins-it/jtds-it/src/test/resources/pinpoint.config +++ b/plugins-it/jtds-it/src/test/resources/pinpoint.config @@ -165,7 +165,7 @@ profiler.bloc.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JDBC # diff --git a/plugins-it/lambda-it/src/test/resources/pinpoint-lambda-test.config b/plugins-it/lambda-it/src/test/resources/pinpoint-lambda-test.config index f30201cedcb7..0ef7493620df 100644 --- a/plugins-it/lambda-it/src/test/resources/pinpoint-lambda-test.config +++ b/plugins-it/lambda-it/src/test/resources/pinpoint-lambda-test.config @@ -138,7 +138,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### @@ -328,4 +328,4 @@ profiler.resttemplate=false ########################################################### # recommend netty plugin disable, when using VERTX. profiler.netty=false -profiler.netty.http=false \ No newline at end of file +profiler.netty.http=false diff --git a/plugins-it/log4j-it/src/test/resources/pinpoint-spring-bean-test.config b/plugins-it/log4j-it/src/test/resources/pinpoint-spring-bean-test.config index 084b12291c6f..0b30367eddc0 100644 --- a/plugins-it/log4j-it/src/test/resources/pinpoint-spring-bean-test.config +++ b/plugins-it/log4j-it/src/test/resources/pinpoint-spring-bean-test.config @@ -141,7 +141,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JDBC # @@ -379,4 +379,4 @@ profiler.resttemplate=false ########################################################### # recommend netty plugin disable, when using VERTX. profiler.netty=false -profiler.netty.http=false \ No newline at end of file +profiler.netty.http=false diff --git a/plugins-it/log4j2-it/src/test/resources/pinpoint-spring-bean-test.config b/plugins-it/log4j2-it/src/test/resources/pinpoint-spring-bean-test.config index c5e71154682e..982c1119a941 100644 --- a/plugins-it/log4j2-it/src/test/resources/pinpoint-spring-bean-test.config +++ b/plugins-it/log4j2-it/src/test/resources/pinpoint-spring-bean-test.config @@ -141,7 +141,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JDBC # @@ -379,4 +379,4 @@ profiler.resttemplate=false ########################################################### # recommend netty plugin disable, when using VERTX. profiler.netty=false -profiler.netty.http=false \ No newline at end of file +profiler.netty.http=false diff --git a/plugins-it/logback-it/src/test/resources/pinpoint-spring-bean-test.config b/plugins-it/logback-it/src/test/resources/pinpoint-spring-bean-test.config index 1482fd31eaa9..6d018bb818b2 100644 --- a/plugins-it/logback-it/src/test/resources/pinpoint-spring-bean-test.config +++ b/plugins-it/logback-it/src/test/resources/pinpoint-spring-bean-test.config @@ -141,7 +141,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JDBC # @@ -379,4 +379,4 @@ profiler.resttemplate=false ########################################################### # recommend netty plugin disable, when using VERTX. profiler.netty=false -profiler.netty.http=false \ No newline at end of file +profiler.netty.http=false diff --git a/plugins-it/netty-it/src/test/resources/pinpoint-netty-plugin-test.config b/plugins-it/netty-it/src/test/resources/pinpoint-netty-plugin-test.config index 9acc5cc89226..4f9e8a35c58f 100644 --- a/plugins-it/netty-it/src/test/resources/pinpoint-netty-plugin-test.config +++ b/plugins-it/netty-it/src/test/resources/pinpoint-netty-plugin-test.config @@ -142,7 +142,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JDBC # @@ -363,4 +363,4 @@ profiler.json.jsonlib=true ########################################################### # recommend netty plugin disable, when using VERTX. profiler.netty=true -profiler.netty.http=true \ No newline at end of file +profiler.netty.http=true diff --git a/plugins-it/process-it/src/test/resources/pinpoint-process-test.config b/plugins-it/process-it/src/test/resources/pinpoint-process-test.config index 4ec1cfd96524..ebe18008bf67 100644 --- a/plugins-it/process-it/src/test/resources/pinpoint-process-test.config +++ b/plugins-it/process-it/src/test/resources/pinpoint-process-test.config @@ -143,7 +143,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JDBC # @@ -382,4 +382,4 @@ profiler.netty.http=false profiler.process.tracing.enabled=true -#which package of runnable instance can be thread plugin trace. \ No newline at end of file +#which package of runnable instance can be thread plugin trace. diff --git a/plugins-it/rxjava-it/src/test/resources/rxjava/pinpoint-rxjava.config b/plugins-it/rxjava-it/src/test/resources/rxjava/pinpoint-rxjava.config index 74f2b0d648f1..c4c2ab0a5fdf 100644 --- a/plugins-it/rxjava-it/src/test/resources/rxjava/pinpoint-rxjava.config +++ b/plugins-it/rxjava-it/src/test/resources/rxjava/pinpoint-rxjava.config @@ -254,7 +254,7 @@ profiler.vertx.http.client.entity.statuscode=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JSP # diff --git a/plugins-it/spring-it/src/test/resources/pinpoint-disabled-plugin-test.config b/plugins-it/spring-it/src/test/resources/pinpoint-disabled-plugin-test.config index 9461cafdfbe9..850c5e126531 100644 --- a/plugins-it/spring-it/src/test/resources/pinpoint-disabled-plugin-test.config +++ b/plugins-it/spring-it/src/test/resources/pinpoint-disabled-plugin-test.config @@ -142,7 +142,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JDBC # diff --git a/plugins-it/spring-it/src/test/resources/pinpoint-spring-bean-test.config b/plugins-it/spring-it/src/test/resources/pinpoint-spring-bean-test.config index 3b310dd4640b..523d7849da97 100644 --- a/plugins-it/spring-it/src/test/resources/pinpoint-spring-bean-test.config +++ b/plugins-it/spring-it/src/test/resources/pinpoint-spring-bean-test.config @@ -141,7 +141,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JDBC # @@ -376,4 +376,4 @@ profiler.resttemplate=false ########################################################### # recommend netty plugin disable, when using VERTX. profiler.netty=false -profiler.netty.http=false \ No newline at end of file +profiler.netty.http=false diff --git a/plugins-it/thread-it/src/test/resources/pinpoint-thread-test-multiple-pkg.config b/plugins-it/thread-it/src/test/resources/pinpoint-thread-test-multiple-pkg.config index d4cbeb7b67e3..8da2bccf08b0 100644 --- a/plugins-it/thread-it/src/test/resources/pinpoint-thread-test-multiple-pkg.config +++ b/plugins-it/thread-it/src/test/resources/pinpoint-thread-test-multiple-pkg.config @@ -141,7 +141,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JDBC # diff --git a/plugins-it/thread-it/src/test/resources/pinpoint-thread-test.config b/plugins-it/thread-it/src/test/resources/pinpoint-thread-test.config index 4bff52bbc116..94a194b2f696 100644 --- a/plugins-it/thread-it/src/test/resources/pinpoint-thread-test.config +++ b/plugins-it/thread-it/src/test/resources/pinpoint-thread-test.config @@ -141,7 +141,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JDBC # diff --git a/plugins/akka-http/src/test/resources/pinpoint.config b/plugins/akka-http/src/test/resources/pinpoint.config index c14114f9cb25..fce4238b086a 100644 --- a/plugins/akka-http/src/test/resources/pinpoint.config +++ b/plugins/akka-http/src/test/resources/pinpoint.config @@ -269,7 +269,7 @@ profiler.vertx.http.client.entity.statuscode=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JSP # diff --git a/plugins/google-httpclient/src/test/resources/pinpoint.config b/plugins/google-httpclient/src/test/resources/pinpoint.config index a09cbe4d6f1a..761587f4e903 100644 --- a/plugins/google-httpclient/src/test/resources/pinpoint.config +++ b/plugins/google-httpclient/src/test/resources/pinpoint.config @@ -136,7 +136,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### diff --git a/plugins/httpclient3/src/test/resources/pinpoint.config b/plugins/httpclient3/src/test/resources/pinpoint.config index c831be0fcdca..f89a165dcae6 100644 --- a/plugins/httpclient3/src/test/resources/pinpoint.config +++ b/plugins/httpclient3/src/test/resources/pinpoint.config @@ -136,7 +136,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### diff --git a/plugins/httpclient4/src/test/resources/pinpoint.config b/plugins/httpclient4/src/test/resources/pinpoint.config index 33fb80ce5a05..9275c2b2b01a 100644 --- a/plugins/httpclient4/src/test/resources/pinpoint.config +++ b/plugins/httpclient4/src/test/resources/pinpoint.config @@ -136,7 +136,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### diff --git a/plugins/jboss/src/test/resources/pinpoint.config b/plugins/jboss/src/test/resources/pinpoint.config index ae2b0d911856..f623b4c3f40a 100644 --- a/plugins/jboss/src/test/resources/pinpoint.config +++ b/plugins/jboss/src/test/resources/pinpoint.config @@ -135,7 +135,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### diff --git a/plugins/jsp/src/test/resources/pinpoint.config b/plugins/jsp/src/test/resources/pinpoint.config index a027152ad13a..a2e0f1cbb7cb 100644 --- a/plugins/jsp/src/test/resources/pinpoint.config +++ b/plugins/jsp/src/test/resources/pinpoint.config @@ -135,7 +135,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### diff --git a/plugins/redis/src/test/resources/pinpoint.config b/plugins/redis/src/test/resources/pinpoint.config index bb749aed0bb6..3d17b13b21c4 100644 --- a/plugins/redis/src/test/resources/pinpoint.config +++ b/plugins/redis/src/test/resources/pinpoint.config @@ -136,7 +136,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### diff --git a/plugins/spring-boot/README.md b/plugins/spring-boot/README.md index f974fd54ec16..67227ab941a1 100644 --- a/plugins/spring-boot/README.md +++ b/plugins/spring-boot/README.md @@ -10,7 +10,7 @@ pinpoint.config ~~~ profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ~~~ ### Include the Java agent with a Spring Boot diff --git a/plugins/spring-boot/src/main/java/com/navercorp/pinpoint/plugin/spring/boot/SpringBootDetector.java b/plugins/spring-boot/src/main/java/com/navercorp/pinpoint/plugin/spring/boot/SpringBootDetector.java index b6a769eeda12..840fcdf3707a 100644 --- a/plugins/spring-boot/src/main/java/com/navercorp/pinpoint/plugin/spring/boot/SpringBootDetector.java +++ b/plugins/spring-boot/src/main/java/com/navercorp/pinpoint/plugin/spring/boot/SpringBootDetector.java @@ -28,6 +28,9 @@ public class SpringBootDetector { private static final String[] DEFAULT_EXPECTED_MAIN_CLASSES = { + "org.springframework.boot.loader.launch.JarLauncher", + "org.springframework.boot.loader.launch.WarLauncher", + "org.springframework.boot.loader.launch.PropertiesLauncher", "org.springframework.boot.loader.JarLauncher", "org.springframework.boot.loader.WarLauncher", "org.springframework.boot.loader.PropertiesLauncher" diff --git a/plugins/tomcat/src/test/resources/pinpoint.config b/plugins/tomcat/src/test/resources/pinpoint.config index 96879c92d1c2..de23b2bf56f0 100644 --- a/plugins/tomcat/src/test/resources/pinpoint.config +++ b/plugins/tomcat/src/test/resources/pinpoint.config @@ -135,7 +135,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### diff --git a/plugins/user/src/test/resources/pinpoint.config b/plugins/user/src/test/resources/pinpoint.config index fbe0cf024a70..a752151637b2 100644 --- a/plugins/user/src/test/resources/pinpoint.config +++ b/plugins/user/src/test/resources/pinpoint.config @@ -136,7 +136,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### diff --git a/plugins/vertx/src/test/resources/pinpoint.config b/plugins/vertx/src/test/resources/pinpoint.config index 2d3f7aae2709..c488239f65dc 100644 --- a/plugins/vertx/src/test/resources/pinpoint.config +++ b/plugins/vertx/src/test/resources/pinpoint.config @@ -118,7 +118,7 @@ profiler.jboss.bootstrap.main=org.jboss.modules.Main ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### diff --git a/plugins/weblogic/src/test/resources/pinpoint.config b/plugins/weblogic/src/test/resources/pinpoint.config index 1a107dfc0b39..65e1c9534510 100644 --- a/plugins/weblogic/src/test/resources/pinpoint.config +++ b/plugins/weblogic/src/test/resources/pinpoint.config @@ -183,7 +183,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### diff --git a/profiler/src/test/resources/pinpoint.config b/profiler/src/test/resources/pinpoint.config index ff492afb8081..1481ed593a04 100644 --- a/profiler/src/test/resources/pinpoint.config +++ b/profiler/src/test/resources/pinpoint.config @@ -195,7 +195,7 @@ profiler.jboss.tracerequestparam=true ########################################################### profiler.springboot.enable=true # Classes for detecting application server type. Comma separated list of fully qualified class names. Wildcard not supported. -profiler.springboot.bootstrap.main=org.springframework.boot.loader.JarLauncher, org.springframework.boot.loader.WarLauncher, org.springframework.boot.loader.PropertiesLauncher +profiler.springboot.bootstrap.main= ########################################################### # JDBC #