[#10643] Change behavior of disable option

pinpoint-apm · Feb 13, 2024 · 0fb33e0 · 0fb33e0
1 parent 751ecc7
commit 0fb33e0
Show file tree

Hide file tree

Showing 43 changed files with 28 additions and 95 deletions.
diff --git a/agent/src/main/resources/pinpoint-root.config b/agent/src/main/resources/pinpoint-root.config
@@ -12,6 +12,10 @@
 #  - -Dpinpoint.config=$MY_CONFIG_PATH/pinpoint.config
 pinpoint.profiler.profiles.active=release
 
+# Pinpoint Disable (default : false)
+# Using VM option or environmental variable will disable Pinpoint agent more strictly
+pinpoint.disable=false
+
 # GRPC or THRIFT
 profiler.transport.module=GRPC
 ###########################################################
@@ -131,8 +135,6 @@ profiler.system.property.io.netty.noPreferDirect=false
 ###########################################################
 # Profiler Global Configuration                           #
 ###########################################################
-profiler.enable=true
-
 # Application namespace
 # Differentiate from external pinpoint agents. (e.g., com.pinpoint)
 profiler.application.namespace=

diff --git a/agent/src/main/resources/profiles/local/pinpoint.config b/agent/src/main/resources/profiles/local/pinpoint.config
@@ -11,6 +11,9 @@
 # Support external property
 #  - -Dpinpoint.config=$MY_CONFIG_PATH/pinpoint.config
 
+# pinpoint disable (default : false)
+# Using VM option or environmental variable will disable Pinpoint agent more strictly
+pinpoint.disable=false
 
 # GRPC or THRIFT
 profiler.transport.module=GRPC
@@ -23,8 +26,6 @@ profiler.transport.grpc.collector.ip=127.0.0.1
 ###########################################################
 # Profiler Global Configuration                           # 
 ###########################################################
-profiler.enable=true
-
 # Application namespace
 # Differentiate from external pinpoint agents. (e.g., com.pinpoint)
 profiler.application.namespace=

diff --git a/agent/src/main/resources/profiles/release/pinpoint.config b/agent/src/main/resources/profiles/release/pinpoint.config
@@ -11,6 +11,9 @@
 # Support external property
 #  - -Dpinpoint.config=$MY_CONFIG_PATH/pinpoint.config
 
+# Pinpoint Disable (default : false)
+# Using VM option or environmental variable will disable Pinpoint agent more strictly
+pinpoint.disable=false
 
 # GRPC or THRIFT
 profiler.transport.module=GRPC
@@ -22,8 +25,6 @@ profiler.transport.grpc.collector.ip=127.0.0.1
 ###########################################################
 # Profiler Global Configuration                           # 
 ###########################################################
-profiler.enable=true
-
 # Application namespace
 # Differentiate from external pinpoint agents. (e.g., com.pinpoint)
 profiler.application.namespace=

diff --git a/...rap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/DefaultProfilerConfig.java b/...rap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/DefaultProfilerConfig.java
@@ -51,8 +51,8 @@ public class DefaultProfilerConfig implements ProfilerConfig {
 
     private static final TransportModule DEFAULT_TRANSPORT_MODULE = TransportModule.GRPC;
 
-    @Value("${profiler.enable:true}")
-    private boolean profileEnable = false;
+    @Value("${pinpoint.disable:false}")
+    private String pinpointDisable = "false";
 
     @Value("${profiler.logdir.maxbackupsize}")
     private int logDirMaxBackupSize = 5;
@@ -114,11 +114,9 @@ public void setTransportModule(String transportModule) {
         this.transportModule = TransportModule.parse(transportModule, DEFAULT_TRANSPORT_MODULE);
     }
 
-
-
     @Override
-    public boolean isProfileEnable() {
-        return profileEnable;
+    public String getPinpointDisable() {
+        return pinpointDisable;
     }
 
     @Override
@@ -275,7 +273,7 @@ public Map<String, String> readPattern(String propertyNamePatternRegex) {
 
     @Override
     public String toString() {
-        return "DefaultProfilerConfig{" + "profileEnable='" + profileEnable + '\'' +
+        return "DefaultProfilerConfig{" + "pinpointDisable='" + pinpointDisable + '\'' +
                 ", activeProfile=" + activeProfile +
                 ", logDirMaxBackupSize=" + logDirMaxBackupSize +
                 ", staticResourceCleanup=" + staticResourceCleanup +

diff --git a/.../bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/ProfilerConfig.java b/.../bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/ProfilerConfig.java
@@ -36,8 +36,7 @@ public interface ProfilerConfig {
 
     TransportModule getTransportModule();
 
-
-    boolean isProfileEnable();
+    String getPinpointDisable();
 
     int getJdbcSqlCacheSize();
 

diff --git a/...straps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/Profiles.java b/...straps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/Profiles.java
@@ -26,6 +26,7 @@ private Profiles() {
     public static final String LOG_CONFIG_LOCATION_KEY = "pinpoint.profiler.log.config.location";
 
     public static final String CONFIG_LOAD_MODE_KEY = "pinpoint.config.load.mode";
+
     public enum CONFIG_LOAD_MODE {
         PROFILE,
         // for IT TEST
@@ -38,7 +39,6 @@ public enum CONFIG_LOAD_MODE {
     public static final String CONFIG_FILE_NAME = "pinpoint-root.config";
     // 2. profile config
     public static final String PROFILE_CONFIG_FILE_NAME = "pinpoint.config";
-
     // 3. external config
     public static final String EXTERNAL_CONFIG_KEY = "pinpoint.config";
 }
diff --git a/bootstraps/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/PinpointBootStrap.java b/bootstraps/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/PinpointBootStrap.java
@@ -61,9 +61,10 @@ public static void premain(String agentArgs, Instrumentation instrumentation) {
     }
 
     private static boolean disabled() {
-        final String env = System.getenv("PINPOINT_DISABLE");
         final String prop = System.getProperty("pinpoint.disable");
-        return env != null || prop != null;
+        final String disable = prop != null ? prop : System.getenv("PINPOINT_DISABLE");
+
+        return (disable != null) && !disable.equalsIgnoreCase("false");
     }
 
     private final String agentArgs;
@@ -115,7 +116,6 @@ private void start() {
     }
 
 
-
     private ModuleBootLoader loadModuleBootLoader(Instrumentation instrumentation, ClassLoader parentClassLoader) {
         if (!ModuleUtils.isModuleSupported()) {
             return null;
@@ -131,7 +131,7 @@ private AgentDirectory resolveAgentDir(ClassPathResolver classPathResolver) {
         try {
             AgentDirectory agentDir = classPathResolver.resolve();
             return agentDir;
-        } catch(Exception e) {
+        } catch (Exception e) {
             logger.warn("AgentDir resolve fail Caused by:" + e.getMessage(), e);
             return null;
         }
@@ -141,7 +141,7 @@ private AgentDirectory resolveAgentDir(ClassPathResolver classPathResolver) {
     private ClassLoader getParentClassLoader() {
         final ClassLoader classLoader = getPinpointBootStrapClassLoader();
         if (classLoader == Object.class.getClassLoader()) {
-            logger.info("parentClassLoader:BootStrapClassLoader:" + classLoader );
+            logger.info("parentClassLoader:BootStrapClassLoader:" + classLoader);
         } else {
             logger.info("parentClassLoader:" + classLoader);
         }
@@ -171,7 +171,6 @@ private void appendToBootstrapClassLoader(Instrumentation instrumentation, BootD
     }
 
 
-
     private static void logPinpointAgentLoadFail() {
         final String errorLog =
                 "*****************************************************************************\n" +

diff --git a/bootstraps/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/PinpointStarter.java b/bootstraps/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/PinpointStarter.java
@@ -48,7 +48,6 @@
 
 /**
  * @author Jongho Moon
- *
  */
 class PinpointStarter {
 
@@ -118,6 +117,10 @@ boolean start() {
             final Properties properties = loadProperties();
 
             ProfilerConfig profilerConfig = ProfilerConfigLoader.load(properties);
+            if (!profilerConfig.getPinpointDisable().equalsIgnoreCase("false")) {
+                this.logger.warn("value of disable property is not false, pinpoint.disable=" + profilerConfig.getPinpointDisable());
+                return false;
+            }
 
             // set the path of log file as a system property
             saveAgentIdForLog(agentIds);
@@ -328,15 +331,15 @@ private List<Path> order(List<Path> releaseLib) {
         // pinpoint module first
         for (Path path : releaseLib) {
             Path fileName = path.getFileName();
-            if(fileName != null) {
+            if (fileName != null) {
                 if (fileName.startsWith(PINPOINT_PREFIX)) {
                     orderList.add(path);
                 }
             }
         }
         for (Path path : releaseLib) {
             Path fileName = path.getFileName();
-            if(fileName != null) {
+            if (fileName != null) {
                 if (!fileName.startsWith(PINPOINT_PREFIX)) {
                     orderList.add(path);
                 }

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
@@ -9,8 +9,6 @@
 ###########################################################
 # Profiler Global Configuration                           #
 ###########################################################
-profiler.enable=true
-
 profiler.interceptorregistry.size=8192
 profiler.jvm.collect.interval=1000
 

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
@@ -9,8 +9,6 @@
 ###########################################################
 # Profiler Global Configuration                           #
 ###########################################################
-profiler.enable=true
-
 profiler.interceptorregistry.size=8192
 profiler.jvm.collect.interval=1000
 

diff --git a/plugins-it/clickhouse-jdbc-it/src/test/resources/pinpoint-clickhouse.config b/plugins-it/clickhouse-jdbc-it/src/test/resources/pinpoint-clickhouse.config
@@ -11,8 +11,6 @@ profiler.profiles.active=local
 ###########################################################
 # Profiler Global Configuration                           #
 ###########################################################
-profiler.enable=true
-
 # Application namespace
 # Differentiate from external pinpoint agents. (e.g., com.pinpoint)
 profiler.application.namespace=

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
@@ -9,8 +9,6 @@
 ###########################################################
 # Profiler Global Configuration                           # 
 ###########################################################
-profiler.enable=true
-
 # Application namespace
 # Differentiate from external pinpoint agents. (e.g., com.pinpoint)
 profiler.application.namespace=

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
@@ -9,8 +9,6 @@
 ###########################################################
 # Profiler Global Configuration                           # 
 ###########################################################
-profiler.enable=true
-
 # Application namespace
 # Differentiate from external pinpoint agents. (e.g., com.pinpoint)
 profiler.application.namespace=

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
@@ -9,8 +9,6 @@
 ###########################################################
 # Profiler Global Configuration                           # 
 ###########################################################
-profiler.enable=true
-
 # Application namespace
 # Differentiate from external pinpoint agents. (e.g., com.pinpoint)
 profiler.application.namespace=

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
@@ -9,8 +9,6 @@
 ###########################################################
 # Profiler Global Configuration                           # 
 ###########################################################
-profiler.enable=true
-
 # Application namespace
 # Differentiate from external pinpoint agents. (e.g., com.pinpoint)
 profiler.application.namespace=

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
@@ -9,8 +9,6 @@
 ###########################################################
 # Profiler Global Configuration                           #
 ###########################################################
-profiler.enable=true
-
 profiler.jvm.collect.interval=1000
 
 profiler.sampling.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
@@ -9,8 +9,6 @@
 ###########################################################
 # Profiler Global Configuration                           #
 ###########################################################
-profiler.enable=true
-
 profiler.jvm.collect.interval=1000
 
 profiler.sampling.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
@@ -9,8 +9,6 @@
 ###########################################################
 # Profiler Global Configuration                           # 
 ###########################################################
-profiler.enable=true
-
 # Application namespace
 # Differentiate from external pinpoint agents. (e.g., com.pinpoint)
 profiler.application.namespace=

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
@@ -9,8 +9,6 @@
 ###########################################################
 # Profiler Global Configuration                           # 
 ###########################################################
-profiler.enable=true
-
 profiler.interceptorregistry.size=8192
 
 # Manually override jvm vendor name (Oracle, IBM, OpenJDK, etc)

diff --git a/plugins-it/informix-jdbc-it/src/test/resources/pinpoint-informix.config b/plugins-it/informix-jdbc-it/src/test/resources/pinpoint-informix.config
@@ -10,8 +10,6 @@
 ###########################################################
 # Profiler Global Configuration                           # 
 ###########################################################
-profiler.enable=true
-
 # Application namespace
 # Differentiate from external pinpoint agents. (e.g., com.pinpoint)
 profiler.application.namespace=

diff --git a/plugins-it/jtds-it/src/test/resources/pinpoint.config b/plugins-it/jtds-it/src/test/resources/pinpoint.config
@@ -10,8 +10,6 @@
 ###########################################################
 # Profiler Global Configuration                           # 
 ###########################################################
-profiler.enable=true
-
 # Application namespace
 # Differentiate from external pinpoint agents. (e.g., com.pinpoint)
 profiler.application.namespace=

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
@@ -9,8 +9,6 @@
 ###########################################################
 # Profiler Global Configuration                           # 
 ###########################################################
-profiler.enable=true
-
 profiler.jvm.collect.interval=1000
 
 profiler.sampling.enable=true

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
@@ -10,8 +10,6 @@
 ###########################################################
 # Profiler Global Configuration                           #
 ###########################################################
-profiler.enable=true
-
 profiler.jvm.collect.interval=1000
 
 profiler.sampling.enable=true

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
@@ -9,8 +9,6 @@
 ###########################################################
 # Profiler Global Configuration                           #
 ###########################################################
-profiler.enable=true
-
 profiler.jvm.collect.interval=1000
 
 profiler.sampling.enable=true

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
@@ -9,8 +9,6 @@
 ###########################################################
 # Profiler Global Configuration                           #
 ###########################################################
-profiler.enable=true
-
 profiler.jvm.collect.interval=1000
 
 profiler.sampling.enable=true

diff --git a/plugins-it/mssql-jdbc-it/src/test/resources/pinpoint-mssql.config b/plugins-it/mssql-jdbc-it/src/test/resources/pinpoint-mssql.config
@@ -10,8 +10,6 @@
 ###########################################################
 # Profiler Global Configuration                           # 
 ###########################################################
-profiler.enable=true
-
 # Application namespace
 # Differentiate from external pinpoint agents. (e.g., com.pinpoint)
 profiler.application.namespace=

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
@@ -9,8 +9,6 @@
 ###########################################################
 # Profiler Global Configuration                           # 
 ###########################################################
-profiler.enable=true
-
 profiler.jvm.collect.interval=1000
 
 profiler.sampling.enable=true

diff --git a/plugins-it/postgresql-jdbc-it/src/test/resources/pinpoint-postgresql.config b/plugins-it/postgresql-jdbc-it/src/test/resources/pinpoint-postgresql.config
@@ -10,8 +10,6 @@
 ###########################################################
 # Profiler Global Configuration                           # 
 ###########################################################
-profiler.enable=true
-
 # Application namespace
 # Differentiate from external pinpoint agents. (e.g., com.pinpoint)
 profiler.application.namespace=

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
@@ -9,8 +9,6 @@
 ###########################################################
 # Profiler Global Configuration                           #
 ###########################################################
-profiler.enable=true
-
 profiler.jvm.collect.interval=1000
 
 profiler.sampling.enable=true

diff --git a/plugins-it/rabbitmq-it/src/test/resources/rabbitmq/client/pinpoint-rabbitmq.config b/plugins-it/rabbitmq-it/src/test/resources/rabbitmq/client/pinpoint-rabbitmq.config
@@ -9,8 +9,6 @@
 ###########################################################
 # Profiler Global Configuration                           # 
 ###########################################################
-profiler.enable=true
-
 profiler.interceptorregistry.size=8192
 
 # Manually override jvm vendor name (Oracle, IBM, OpenJDK, etc)