Move isRumEnabled to instrumenter config

Author: amarziali

dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/RumAsyncContextInstrumentation.java

@@ -41,8 +41,8 @@ public ElementMatcher<TypeDescription> hierarchyMatcher() {
   }
 
   @Override
-  protected boolean defaultEnabled() {
-    return super.defaultEnabled() && InstrumenterConfig.get().isRumEnabled();
+  public boolean isEnabled() {
+    return super.isEnabled() && InstrumenterConfig.get().isRumEnabled();
   }
 
   @Override

dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/RumAsyncContextInstrumentation.java

@@ -41,8 +41,8 @@ public ElementMatcher<TypeDescription> hierarchyMatcher() {
   }
 
   @Override
-  protected boolean defaultEnabled() {
-    return super.defaultEnabled() && InstrumenterConfig.get().isRumEnabled();
+  public boolean isEnabled() {
+    return super.isEnabled() && InstrumenterConfig.get().isRumEnabled();
   }
 
   @Override

internal-api/src/main/java/datadog/trace/api/Config.java

@@ -1224,7 +1224,6 @@ public static String getHostName() {
   private final boolean optimizedMapEnabled;
   private final int stackTraceLengthLimit;
 
-  private final boolean rumEnabled;
   private final RumInjectorConfig rumInjectorConfig;
 
   // Read order: System Properties -> Env Variables, [-> properties file], [-> default value]
@@ -2743,14 +2742,13 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
     this.stackTraceLengthLimit =
         configProvider.getInteger(STACK_TRACE_LENGTH_LIMIT, defaultStackTraceLengthLimit);
 
-    this.rumEnabled = InstrumenterConfig.get().isRumEnabled();
     this.rumInjectorConfig = parseRumConfig(configProvider);
 
     log.debug("New instance: {}", this);
   }
 
   private RumInjectorConfig parseRumConfig(ConfigProvider configProvider) {
-    if (!this.rumEnabled) {
+    if (!instrumenterConfig.isRumEnabled()) {
       return null;
     }
     try {
@@ -5034,10 +5032,6 @@ public int getCloudPayloadTaggingMaxTags() {
     return cloudPayloadTaggingMaxTags;
   }
 
-  public boolean isRumEnabled() {
-    return this.rumEnabled;
-  }
-
   public RumInjectorConfig getRumInjectorConfig() {
     return this.rumInjectorConfig;
   }
@@ -5722,8 +5716,6 @@ public String toString() {
         + cloudResponsePayloadTagging
         + ", experimentalPropagateProcessTagsEnabled="
         + experimentalPropagateProcessTagsEnabled
-        + ", rumEnabled="
-        + rumEnabled
         + ", rumInjectorConfig="
         + (rumInjectorConfig == null ? "null" : rumInjectorConfig.jsonPayload())
         + '}';

internal-api/src/main/java/datadog/trace/api/rum/RumInjector.java

@@ -1,13 +1,15 @@
 package datadog.trace.api.rum;
 
 import datadog.trace.api.Config;
+import datadog.trace.api.InstrumenterConfig;
 import datadog.trace.api.cache.DDCache;
 import datadog.trace.api.cache.DDCaches;
 import java.util.function.Function;
 import javax.annotation.Nullable;
 
 public final class RumInjector {
-  private static final RumInjector INSTANCE = new RumInjector(Config.get());
+  private static final RumInjector INSTANCE =
+      new RumInjector(Config.get(), InstrumenterConfig.get());
   private static final String MARKER = "</head>";
   private static final char[] MARKER_CHARS = MARKER.toCharArray();
   private static final Function<String, byte[]> MARKER_BYTES =
@@ -27,8 +29,8 @@ public final class RumInjector {
   private final DDCache<String, byte[]> markerCache;
   private final Function<String, byte[]> snippetBytes;
 
-  RumInjector(Config config) {
-    boolean rumEnabled = config.isRumEnabled();
+  RumInjector(Config config, InstrumenterConfig instrumenterConfig) {
+    boolean rumEnabled = instrumenterConfig.isRumEnabled();
     RumInjectorConfig injectorConfig = config.getRumInjectorConfig();
     // If both RUM is enabled and injector config is valid
     if (rumEnabled && injectorConfig != null) {

internal-api/src/test/groovy/datadog/trace/api/rum/RumInjectorTest.groovy

@@ -1,6 +1,7 @@
 package datadog.trace.api.rum
 
 import datadog.trace.api.Config
+import datadog.trace.api.InstrumenterConfig
 import datadog.trace.test.util.DDSpecification
 
 import static org.mockito.Mockito.mock
@@ -12,11 +13,12 @@ class RumInjectorTest extends DDSpecification {
   void 'disabled injector'(){
     setup:
     Config config = mock(Config)
+    InstrumenterConfig instrumenterConfig = mock(InstrumenterConfig)
     RumInjector injector
 
     when:
-    when(config.isRumEnabled()).thenReturn(false)
-    injector = new RumInjector(config)
+    when(instrumenterConfig.isRumEnabled()).thenReturn(false)
+    injector = new RumInjector(config, instrumenterConfig)
 
     then:
     !injector.isEnabled()
@@ -27,12 +29,13 @@ class RumInjectorTest extends DDSpecification {
   void 'invalid config injector'() {
     setup:
     Config config = mock(Config)
+    InstrumenterConfig instrumenterConfig = mock(InstrumenterConfig)
     RumInjector injector
 
     when:
-    when(config.isRumEnabled()).thenReturn(true)
+    when(instrumenterConfig.isRumEnabled()).thenReturn(true)
     when(config.rumInjectorConfig).thenReturn(null)
-    injector = new RumInjector(config)
+    injector = new RumInjector(config, instrumenterConfig)
 
     then:
     !injector.isEnabled()
@@ -45,14 +48,15 @@ class RumInjectorTest extends DDSpecification {
   void 'enabled injector'() {
     setup:
     Config config = mock(Config)
+    InstrumenterConfig instrumenterConfig = mock(InstrumenterConfig)
     def injectorConfig = mock(RumInjectorConfig)
     RumInjector injector
 
     when:
-    when(config.isRumEnabled()).thenReturn(true)
+    when(instrumenterConfig.isRumEnabled()).thenReturn(true)
     when(config.rumInjectorConfig).thenReturn(injectorConfig)
     when(injectorConfig.snippet).thenReturn("<script></script>")
-    injector = new RumInjector(config)
+    injector = new RumInjector(config, instrumenterConfig)
 
     then:
     injector.isEnabled()