[#10615] Add spring boot 3.2.X default launcher classes

pinpoint-apm · Jan 17, 2024 · fcd8113 · fcd8113
1 parent 447e328
commit fcd8113
Show file tree

Hide file tree

Showing 33 changed files with 50 additions and 47 deletions.
diff --git a/agent/src/main/resources/profiles/local/pinpoint.config b/agent/src/main/resources/profiles/local/pinpoint.config
@@ -569,7 +569,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=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
 
 ###########################################################
 # Reactor Netty

diff --git a/agent/src/main/resources/profiles/release/pinpoint.config b/agent/src/main/resources/profiles/release/pinpoint.config
@@ -567,7 +567,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=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
 
 ###########################################################
 # Reactor Netty

diff --git a/...mq-it/activemq-5-15-it/src/test/resources/activemq/client/pinpoint-activemq-client.config b/...mq-it/activemq-5-15-it/src/test/resources/activemq/client/pinpoint-activemq-client.config
@@ -158,7 +158,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=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
 
 
 ###########################################################
@@ -520,4 +520,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/...mq-it/activemq-5-17-it/src/test/resources/activemq/client/pinpoint-activemq-client.config b/...mq-it/activemq-5-17-it/src/test/resources/activemq/client/pinpoint-activemq-client.config
@@ -158,7 +158,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=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
 
 
 ###########################################################
@@ -520,4 +520,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/cxf-3-0-it/src/test/resources/cxf/pinpoint-cxf-test.config b/plugins-it/cxf-it/cxf-3-0-it/src/test/resources/cxf/pinpoint-cxf-test.config
@@ -368,7 +368,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=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
 
 ###########################################################
 # JSP                                                     #
@@ -862,4 +862,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/cxf-it/cxf-3-6-it/src/test/resources/cxf/pinpoint-cxf-test.config b/plugins-it/cxf-it/cxf-3-6-it/src/test/resources/cxf/pinpoint-cxf-test.config
@@ -368,7 +368,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=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
 
 ###########################################################
 # JSP                                                     #
@@ -862,4 +862,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
@@ -368,7 +368,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=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
 
 ###########################################################
 # JSP                                                     #
@@ -860,4 +860,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
@@ -368,7 +368,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=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
 
 ###########################################################
 # JSP                                                     #
@@ -859,4 +859,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/...it/google-grpc-it/google-grpc-1-42-it/src/test/resources/pinpoint-grpc-plugin-test.config b/...it/google-grpc-it/google-grpc-1-42-it/src/test/resources/pinpoint-grpc-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=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
 
 ###########################################################
 # JDBC                                                    #
@@ -381,4 +381,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/...-it/google-grpc-it/google-grpc-1-8-it/src/test/resources/pinpoint-grpc-plugin-test.config b/...-it/google-grpc-it/google-grpc-1-8-it/src/test/resources/pinpoint-grpc-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=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
 
 ###########################################################
 # JDBC                                                    #
@@ -381,4 +381,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
@@ -368,7 +368,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=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
 
 ###########################################################
 # JSP                                                     #
@@ -882,4 +882,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
@@ -241,7 +241,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=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
 
 ###########################################################
 # JSP                                                     #

diff --git a/plugins-it/jtds-it/src/test/resources/pinpoint.config b/plugins-it/jtds-it/src/test/resources/pinpoint.config
@@ -146,7 +146,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=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
 
 ###########################################################
 # 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
@@ -124,7 +124,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=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
 
 
 ###########################################################
@@ -314,4 +314,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
@@ -128,7 +128,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=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
 
 ###########################################################
 # JDBC                                                    #
@@ -366,4 +366,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
@@ -127,7 +127,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=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
 
 ###########################################################
 # JDBC                                                    #
@@ -365,4 +365,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
@@ -127,7 +127,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=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
 
 ###########################################################
 # JDBC                                                    #
@@ -365,4 +365,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
@@ -128,7 +128,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=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
 
 ###########################################################
 # JDBC                                                    # 
@@ -349,4 +349,4 @@ profiler.json.jsonlib=true
 ###########################################################
 # recommend netty plugin disable, when using VERTX.
 profiler.netty=true
-profiler.netty.http=true
+profiler.netty.http=true