From 0fb33e04210d856b7d41a284cb2ec4ff401e37a9 Mon Sep 17 00:00:00 2001 From: donghun-cho Date: Thu, 8 Feb 2024 18:17:59 +0900 Subject: [PATCH] [#10643] Change behavior of disable option --- agent/src/main/resources/pinpoint-root.config | 6 ++++-- .../main/resources/profiles/local/pinpoint.config | 5 +++-- .../main/resources/profiles/release/pinpoint.config | 5 +++-- .../bootstrap/config/DefaultProfilerConfig.java | 12 +++++------- .../pinpoint/bootstrap/config/ProfilerConfig.java | 3 +-- .../pinpoint/bootstrap/config/Profiles.java | 2 +- .../pinpoint/bootstrap/PinpointBootStrap.java | 11 +++++------ .../pinpoint/bootstrap/PinpointStarter.java | 9 ++++++--- .../activemq/client/pinpoint-activemq-client.config | 2 -- .../activemq/client/pinpoint-activemq-client.config | 2 -- .../src/test/resources/pinpoint-clickhouse.config | 2 -- .../src/test/resources/cxf/pinpoint-cxf-test.config | 2 -- .../src/test/resources/cxf/pinpoint-cxf-test.config | 2 -- .../test/resources/druid/pinpoint-druid-test.config | 2 -- .../resources/fastjson/pinpoint-fastjson-test.config | 2 -- .../test/resources/pinpoint-grpc-plugin-test.config | 2 -- .../test/resources/pinpoint-grpc-plugin-test.config | 2 -- .../test/resources/hbase/pinpoint-hbase-test.config | 2 -- .../test/resources/hystrix/pinpoint-hystrix.config | 2 -- .../src/test/resources/pinpoint-informix.config | 2 -- .../jtds-it/src/test/resources/pinpoint.config | 2 -- .../src/test/resources/pinpoint-lambda-test.config | 2 -- .../test/resources/pinpoint-spring-bean-test.config | 2 -- .../test/resources/pinpoint-spring-bean-test.config | 2 -- .../test/resources/pinpoint-spring-bean-test.config | 2 -- .../src/test/resources/pinpoint-mssql.config | 2 -- .../test/resources/pinpoint-netty-plugin-test.config | 2 -- .../src/test/resources/pinpoint-postgresql.config | 2 -- .../src/test/resources/pinpoint-process-test.config | 2 -- .../rabbitmq/client/pinpoint-rabbitmq.config | 2 -- .../src/test/resources/rxjava/pinpoint-rxjava.config | 2 -- .../src/test/resources/pinpoint-postgresql.config | 2 -- plugins/akka-http/src/test/resources/pinpoint.config | 2 -- .../src/test/resources/pinpoint.config | 2 -- .../httpclient3/src/test/resources/pinpoint.config | 2 -- .../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/tomcat/src/test/resources/pinpoint.config | 2 -- plugins/user/src/test/resources/pinpoint.config | 2 -- plugins/weblogic/src/test/resources/pinpoint.config | 2 -- profiler/src/test/resources/pinpoint.config | 2 -- 43 files changed, 28 insertions(+), 95 deletions(-) diff --git a/agent/src/main/resources/pinpoint-root.config b/agent/src/main/resources/pinpoint-root.config index 5fdd10610dd5..8ac3040d0592 100644 --- 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 index 5d1304fdab47..3d030bef3be6 100644 --- 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 index eb36635e1613..2cbccf117606 100644 --- 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/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/DefaultProfilerConfig.java b/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/DefaultProfilerConfig.java index 0b25cf0b1327..c78bd1ab934d 100644 --- a/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/DefaultProfilerConfig.java +++ b/bootstraps/bootstrap-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 readPattern(String propertyNamePatternRegex) { @Override public String toString() { - return "DefaultProfilerConfig{" + "profileEnable='" + profileEnable + '\'' + + return "DefaultProfilerConfig{" + "pinpointDisable='" + pinpointDisable + '\'' + ", activeProfile=" + activeProfile + ", logDirMaxBackupSize=" + logDirMaxBackupSize + ", staticResourceCleanup=" + staticResourceCleanup + diff --git a/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/ProfilerConfig.java b/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/ProfilerConfig.java index 87806a6451ff..01774e5456ac 100644 --- a/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/ProfilerConfig.java +++ b/bootstraps/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/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/Profiles.java b/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/Profiles.java index 22509e7d1d50..0a38901a0f2b 100644 --- a/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/Profiles.java +++ b/bootstraps/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 index 93dbdc66227f..dbcb057be730 100644 --- 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 index 46f4f1b01c75..a35a7072ffa4 100644 --- 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,7 +331,7 @@ private List order(List 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); } @@ -336,7 +339,7 @@ private List order(List releaseLib) { } 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/plugins-it/activemq-it/activemq-5-15-it/src/test/resources/activemq/client/pinpoint-activemq-client.config b/plugins-it/activemq-it/activemq-5-15-it/src/test/resources/activemq/client/pinpoint-activemq-client.config index 6ff93da03399..05fdf41204c0 100644 --- a/plugins-it/activemq-it/activemq-5-15-it/src/test/resources/activemq/client/pinpoint-activemq-client.config +++ b/plugins-it/activemq-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/plugins-it/activemq-it/activemq-5-17-it/src/test/resources/activemq/client/pinpoint-activemq-client.config b/plugins-it/activemq-it/activemq-5-17-it/src/test/resources/activemq/client/pinpoint-activemq-client.config index 6ff93da03399..05fdf41204c0 100644 --- a/plugins-it/activemq-it/activemq-5-17-it/src/test/resources/activemq/client/pinpoint-activemq-client.config +++ b/plugins-it/activemq-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 index cad365743ab5..5b1229af0863 100644 --- 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 index 25e313046aab..4794d24a86c4 100644 --- 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 index 25e313046aab..4794d24a86c4 100644 --- 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 index 12fccf1482c2..a8bb0e107822 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 @@ -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 index 3dbef61e8931..145b8e6af193 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 @@ -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/google-grpc-it/google-grpc-1-42-it/src/test/resources/pinpoint-grpc-plugin-test.config b/plugins-it/google-grpc-it/google-grpc-1-42-it/src/test/resources/pinpoint-grpc-plugin-test.config index 671cbdb25da2..2493ff92ce3d 100644 --- a/plugins-it/google-grpc-it/google-grpc-1-42-it/src/test/resources/pinpoint-grpc-plugin-test.config +++ b/plugins-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/plugins-it/google-grpc-it/google-grpc-1-8-it/src/test/resources/pinpoint-grpc-plugin-test.config b/plugins-it/google-grpc-it/google-grpc-1-8-it/src/test/resources/pinpoint-grpc-plugin-test.config index 671cbdb25da2..2493ff92ce3d 100644 --- a/plugins-it/google-grpc-it/google-grpc-1-8-it/src/test/resources/pinpoint-grpc-plugin-test.config +++ b/plugins-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 index 8b6fe29f5ac4..cb46694feab5 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 @@ -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 index 9089d1e4a606..e8f66ae75e2c 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 @@ -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 index e6dad6485fed..30498b218229 100644 --- 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 index c39e76a0b016..fddd5426e953 100644 --- 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 index 858c506ca408..23ed3ca8ee4b 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 @@ -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 index 50f13961ba0f..fe7b2ef687a9 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 @@ -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 index 67fb6315c888..dbed984f02bf 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 @@ -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 index 1daec10fc62d..8ea56800c8c4 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 @@ -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 index 221b1919c0db..3902a94776be 100644 --- 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 index 382843255c6a..fe823d167603 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 @@ -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 index e03a6018d633..5b0bd3ac4496 100644 --- 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 index 62be3c52d06c..75730654d027 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 @@ -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 index 0fb0367c8d45..58a5379d4589 100644 --- 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) 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 1501d02b80c5..a3fb0bdf2d37 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 @@ -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/spring-data-r2dbc-it/src/test/resources/pinpoint-postgresql.config b/plugins-it/spring-data-r2dbc-it/src/test/resources/pinpoint-postgresql.config index c5fdc492ab31..98e30ce43160 100644 --- a/plugins-it/spring-data-r2dbc-it/src/test/resources/pinpoint-postgresql.config +++ b/plugins-it/spring-data-r2dbc-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/akka-http/src/test/resources/pinpoint.config b/plugins/akka-http/src/test/resources/pinpoint.config index 1200364d968b..41cfe7c610b0 100644 --- a/plugins/akka-http/src/test/resources/pinpoint.config +++ b/plugins/akka-http/src/test/resources/pinpoint.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/google-httpclient/src/test/resources/pinpoint.config b/plugins/google-httpclient/src/test/resources/pinpoint.config index c2c502893a3f..56c14fa13072 100644 --- a/plugins/google-httpclient/src/test/resources/pinpoint.config +++ b/plugins/google-httpclient/src/test/resources/pinpoint.config @@ -5,8 +5,6 @@ ########################################################### # Profiler Global Configuration # ########################################################### -profiler.enable=true - profiler.jvm.collect.interval=1000 profiler.sampling.enable=true diff --git a/plugins/httpclient3/src/test/resources/pinpoint.config b/plugins/httpclient3/src/test/resources/pinpoint.config index 8c6715c7b3df..8ca6f37637f4 100644 --- a/plugins/httpclient3/src/test/resources/pinpoint.config +++ b/plugins/httpclient3/src/test/resources/pinpoint.config @@ -9,8 +9,6 @@ ########################################################### # Profiler Global Configuration # ########################################################### -profiler.enable=true - profiler.jvm.collect.interval=1000 profiler.sampling.enable=true diff --git a/plugins/httpclient4/src/test/resources/pinpoint.config b/plugins/httpclient4/src/test/resources/pinpoint.config index 627808f40ef8..6055e86bc76b 100644 --- a/plugins/httpclient4/src/test/resources/pinpoint.config +++ b/plugins/httpclient4/src/test/resources/pinpoint.config @@ -9,8 +9,6 @@ ########################################################### # Profiler Global Configuration # ########################################################### -profiler.enable=true - profiler.jvm.collect.interval=1000 profiler.sampling.enable=true diff --git a/plugins/jboss/src/test/resources/pinpoint.config b/plugins/jboss/src/test/resources/pinpoint.config index ed63baeb21b4..49f523dcce6f 100644 --- a/plugins/jboss/src/test/resources/pinpoint.config +++ b/plugins/jboss/src/test/resources/pinpoint.config @@ -9,8 +9,6 @@ ########################################################### # Profiler Global Configuration # ########################################################### -profiler.enable=true - profiler.jvm.collect.interval=1000 profiler.sampling.enable=true diff --git a/plugins/jsp/src/test/resources/pinpoint.config b/plugins/jsp/src/test/resources/pinpoint.config index f5685d783de6..64e24249f9f6 100644 --- a/plugins/jsp/src/test/resources/pinpoint.config +++ b/plugins/jsp/src/test/resources/pinpoint.config @@ -9,8 +9,6 @@ ########################################################### # Profiler Global Configuration # ########################################################### -profiler.enable=true - profiler.jvm.collect.interval=1000 profiler.sampling.enable=true diff --git a/plugins/redis/src/test/resources/pinpoint.config b/plugins/redis/src/test/resources/pinpoint.config index 335c4c7e054f..6ca6aa2ffac0 100644 --- a/plugins/redis/src/test/resources/pinpoint.config +++ b/plugins/redis/src/test/resources/pinpoint.config @@ -9,8 +9,6 @@ ########################################################### # Profiler Global Configuration # ########################################################### -profiler.enable=true - profiler.jvm.collect.interval=1000 profiler.sampling.enable=true diff --git a/plugins/tomcat/src/test/resources/pinpoint.config b/plugins/tomcat/src/test/resources/pinpoint.config index f14823bd41ce..477d02d43cad 100644 --- a/plugins/tomcat/src/test/resources/pinpoint.config +++ b/plugins/tomcat/src/test/resources/pinpoint.config @@ -9,8 +9,6 @@ ########################################################### # Profiler Global Configuration # ########################################################### -profiler.enable=true - profiler.jvm.collect.interval=1000 profiler.sampling.enable=true diff --git a/plugins/user/src/test/resources/pinpoint.config b/plugins/user/src/test/resources/pinpoint.config index 8dd99e137b20..96f15850efcb 100644 --- a/plugins/user/src/test/resources/pinpoint.config +++ b/plugins/user/src/test/resources/pinpoint.config @@ -9,8 +9,6 @@ ########################################################### # Profiler Global Configuration # ########################################################### -profiler.enable=true - profiler.jvm.collect.interval=1000 profiler.sampling.enable=true diff --git a/plugins/weblogic/src/test/resources/pinpoint.config b/plugins/weblogic/src/test/resources/pinpoint.config index 7adecbe7bd6e..141f3ac2b824 100644 --- a/plugins/weblogic/src/test/resources/pinpoint.config +++ b/plugins/weblogic/src/test/resources/pinpoint.config @@ -9,8 +9,6 @@ ########################################################### # Profiler Global Configuration # ########################################################### -profiler.enable=true - profiler.interceptorregistry.size=8192 profiler.jvm.collect.interval=1000 diff --git a/profiler/src/test/resources/pinpoint.config b/profiler/src/test/resources/pinpoint.config index e8101ec1da67..2c0c1cf954dc 100644 --- a/profiler/src/test/resources/pinpoint.config +++ b/profiler/src/test/resources/pinpoint.config @@ -60,8 +60,6 @@ profiler.transport.grpc.span.sender.write.buffer.lowwatermark=3M ########################################################### # Profiler Global Configuration # ########################################################### -profiler.enable=true - profiler.jvm.collect.interval=1000 profiler.sampling.enable=true