[#noissue] Remove TransportModule

Author: emeroad

agent-module/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/DefaultProfilerConfig.java

@@ -49,8 +49,6 @@ public class DefaultProfilerConfig implements ProfilerConfig {
 
     private final Properties properties;
 
-    private static final TransportModule DEFAULT_TRANSPORT_MODULE = TransportModule.GRPC;
-
     @Value("${pinpoint.disable:false}")
     private String pinpointDisable = "false";
 
@@ -63,8 +61,6 @@ public class DefaultProfilerConfig implements ProfilerConfig {
     @VisibleForTesting
     private boolean staticResourceCleanup = false;
 
-    private TransportModule transportModule = DEFAULT_TRANSPORT_MODULE;
-
     @Value("${profiler.jdbc.sqlcachesize}")
     private int jdbcSqlCacheSize = 1024;
     @Value("${profiler.jdbc.tracesqlbindvalue}")
@@ -108,16 +104,6 @@ public String getActiveProfile() {
         return activeProfile;
     }
 
-    @Override
-    public TransportModule getTransportModule() {
-        return transportModule;
-    }
-
-    @Value("${profiler.transport.module}")
-    public void setTransportModule(String transportModule) {
-        this.transportModule = TransportModule.parse(transportModule, DEFAULT_TRANSPORT_MODULE);
-    }
-
     @Override
     public String getPinpointDisable() {
         return pinpointDisable;
@@ -293,7 +279,6 @@ public String toString() {
                 ", logDirMaxBackupSize=" + logDirMaxBackupSize +
                 ", activeProfile='" + activeProfile + '\'' +
                 ", staticResourceCleanup=" + staticResourceCleanup +
-                ", transportModule=" + transportModule +
                 ", jdbcSqlCacheSize=" + jdbcSqlCacheSize +
                 ", traceSqlBindValue=" + traceSqlBindValue +
                 ", maxSqlBindValueSize=" + maxSqlBindValueSize +

agent-module/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/ProfilerConfig.java

@@ -34,8 +34,6 @@ public interface ProfilerConfig {
 
     Properties getProperties();
 
-    TransportModule getTransportModule();
-
     String getPinpointDisable();
 
     int getJdbcSqlCacheSize();

agent-module/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/TransportModule.java

@@ -19,8 +19,6 @@
 import com.google.inject.Module;
 import com.google.inject.util.Modules;
 import com.navercorp.pinpoint.bootstrap.AgentOption;
-import com.navercorp.pinpoint.bootstrap.config.DefaultProfilerConfig;
-import com.navercorp.pinpoint.bootstrap.config.TransportModule;
 import com.navercorp.pinpoint.profiler.context.module.ApplicationContextModuleFactory;
 import com.navercorp.pinpoint.profiler.context.module.ModuleFactory;
 import com.navercorp.pinpoint.profiler.test.rpc.MockRpcModule;
@@ -44,9 +42,6 @@ public OverrideModuleFactory(Module... overrideModule) {
     @Override
     public Module newModule(AgentOption agentOption) {
 
-        DefaultProfilerConfig profilerConfig = (DefaultProfilerConfig) agentOption.getProfilerConfig();
-        profilerConfig.setTransportModule(TransportModule.GRPC.name());
-
         ModuleFactory moduleFactory = new ApplicationContextModuleFactory() {
             @Override
             protected Module newRpcModule(AgentOption agentOption) {

agent-module/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/TransportModuleTest.java

@@ -20,7 +20,6 @@
 import com.google.inject.util.Modules;
 import com.navercorp.pinpoint.bootstrap.AgentOption;
 import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig;
-import com.navercorp.pinpoint.bootstrap.config.TransportModule;
 import com.navercorp.pinpoint.profiler.context.module.config.ConfigModule;
 import com.navercorp.pinpoint.profiler.context.module.config.ConfigurationLoader;
 import com.navercorp.pinpoint.profiler.context.monitor.config.DefaultExceptionTraceConfig;
@@ -71,11 +70,6 @@ protected Module newExceptionTraceModule(Properties properties) {
 
     protected Module newRpcModule(AgentOption agentOption) {
         ProfilerConfig profilerConfig = agentOption.getProfilerConfig();
-        final TransportModule transportModule = profilerConfig.getTransportModule();
-        if (TransportModule.GRPC == transportModule) {
-            logger.info("load GrpcModule");
-            return new GrpcModule(profilerConfig);
-        }
         logger.info("load GrpcModule");
         return new GrpcModule(profilerConfig);
     }

agent-module/profiler-test/src/main/java/com/navercorp/pinpoint/profiler/test/OverrideModuleFactory.java

@@ -21,7 +21,6 @@
 import com.google.inject.TypeLiteral;
 import com.navercorp.pinpoint.bootstrap.AgentOption;
 import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig;
-import com.navercorp.pinpoint.bootstrap.config.TransportModule;
 import com.navercorp.pinpoint.common.trace.ServiceType;
 import com.navercorp.pinpoint.profiler.context.TraceDataFormatVersion;
 import com.navercorp.pinpoint.profiler.context.config.ContextConfig;
@@ -122,8 +121,6 @@ protected void configure() {
         logger.info("{}", micrometerConfig);
         bind(MicrometerConfig.class).toInstance(micrometerConfig);
 
-        bind(TransportModule.class).toInstance(profilerConfig.getTransportModule());
-
         bind(Instrumentation.class).toInstance(agentOption.getInstrumentation());
 
         bind(InterceptorRegistryBinder.class).toProvider(InterceptorRegistryBinderProvider.class).in(Scopes.SINGLETON);

agent-module/profiler/src/main/java/com/navercorp/pinpoint/profiler/context/module/ApplicationContextModuleFactory.java

@@ -19,7 +19,6 @@
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig;
-import com.navercorp.pinpoint.bootstrap.config.TransportModule;
 import com.navercorp.pinpoint.profiler.context.TraceDataFormatVersion;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -38,17 +37,11 @@ public TraceDataFormatVersionProvider(ProfilerConfig profilerConfig) {
     }
 
     private TraceDataFormatVersion getVersion(ProfilerConfig profilerConfig) {
-        final TransportModule transportModule = profilerConfig.getTransportModule();
-        logger.info("TransportModule:{}", transportModule);
-        if (TransportModule.GRPC == transportModule) {
-            final String version = profilerConfig.readString(TraceDataFormatVersion.GRPC_TRACE_VERSION_KEY, "v2");
-            if ("v2".equalsIgnoreCase(version)) {
-                return TraceDataFormatVersion.V2;
-            }
-            throw new UnsupportedOperationException("unknown " + TraceDataFormatVersion.GRPC_TRACE_VERSION_KEY + ":" + version);
+        final String version = profilerConfig.readString(TraceDataFormatVersion.GRPC_TRACE_VERSION_KEY, "v2");
+        if ("v2".equalsIgnoreCase(version)) {
+            return TraceDataFormatVersion.V2;
         }
-
-        throw new UnsupportedOperationException("unknown transportModule:" + transportModule);
+        throw new UnsupportedOperationException("unknown " + TraceDataFormatVersion.GRPC_TRACE_VERSION_KEY + ":" + version);
     }
 
     @Override

agent-module/profiler/src/main/java/com/navercorp/pinpoint/profiler/context/module/config/ConfigModule.java

@@ -19,7 +19,6 @@
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig;
-import com.navercorp.pinpoint.bootstrap.config.TransportModule;
 
 import java.util.Objects;
 
@@ -30,12 +29,7 @@ public class SimpleCacheFactoryProvider implements Provider<SimpleCacheFactory>
     private final ProfilerConfig profilerConfig;
 
     @Inject
-    public SimpleCacheFactoryProvider(TransportModule transportModule, ProfilerConfig profilerConfig) {
-        if (TransportModule.GRPC == transportModule) {
-            // do nothing
-        } else {
-            throw new IllegalStateException("Unsupported transportModule:" + transportModule);
-        }
+    public SimpleCacheFactoryProvider(ProfilerConfig profilerConfig) {
         this.profilerConfig = Objects.requireNonNull(profilerConfig, "profilerConfig");
     }