[#10844] Backport: Add new Main classes to SpringBootDetector

pinpoint-apm · Apr 8, 2024 · 546a049 · 546a049
1 parent 80f78eb
commit 546a049
Show file tree

Hide file tree

Showing 36 changed files with 52 additions and 49 deletions.
diff --git 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
@@ -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
@@ -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
+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
@@ -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=
+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
@@ -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=
+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
@@ -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=
+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
@@ -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
+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
@@ -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
+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
@@ -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
+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
@@ -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
@@ -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
@@ -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
+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
@@ -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
+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
@@ -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
+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
@@ -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
+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
@@ -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
+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
@@ -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.
+#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
@@ -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
@@ -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
@@ -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
+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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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=
 
 
 ###########################################################