reverting env/service filtering in tracingconfigpoller

Author: mhlidd

dd-trace-core/src/main/java/datadog/trace/core/TracingConfigPoller.java

@@ -106,24 +106,6 @@ public void accept(ConfigKey configKey, byte[] content, PollingRateHinter hinter
               Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
 
       if (null != overrides && null != overrides.libConfig) {
-        ServiceTarget serviceTarget = overrides.serviceTarget;
-        if (serviceTarget != null) {
-          String targetService = serviceTarget.service;
-          String thisService = Config.get().getServiceName();
-          if (targetService != null && !targetService.equalsIgnoreCase(thisService)) {
-            log.debug(
-                "Skipping config for service {}. Current service is {}",
-                targetService,
-                thisService);
-            throw new IllegalArgumentException("service mismatch");
-          }
-          String targetEnv = serviceTarget.env;
-          String thisEnv = Config.get().getEnv();
-          if (targetEnv != null && !targetEnv.equalsIgnoreCase(thisEnv)) {
-            log.debug("Skipping config for env {}. Current env is {}", targetEnv, thisEnv);
-            throw new IllegalArgumentException("env mismatch");
-          }
-        }
         receivedOverrides = true;
         applyConfigOverrides(checkConfig(overrides.libConfig));
         if (log.isDebugEnabled()) {
@@ -266,21 +248,10 @@ private Map<String, String> parseTagListToMap(List<String> input) {
   }
 
   static final class ConfigOverrides {
-    @Json(name = "service_target")
-    public ServiceTarget serviceTarget;
-
     @Json(name = "lib_config")
     public LibConfig libConfig;
   }
 
-  static final class ServiceTarget {
-    @Json(name = "service")
-    public String service;
-
-    @Json(name = "env")
-    public String env;
-  }
-
   static final class LibConfig {
     @Json(name = "tracing_enabled")
     public Boolean tracingEnabled;

dd-trace-core/src/test/groovy/datadog/trace/core/CoreTracerTest.groovy

@@ -570,135 +570,6 @@ class CoreTracerTest extends DDCoreSpecification {
     tracer?.close()
   }
 
-
-  def "reject configuration when target service+env mismatch"() {
-    setup:
-    injectSysConfig(SERVICE_NAME, service)
-    injectSysConfig(ENV, env)
-
-    def key = ParsedConfigKey.parse("datadog/2/APM_TRACING/config_overrides/config")
-    def poller = Mock(ConfigurationPoller)
-    def sco = new SharedCommunicationObjects(
-      okHttpClient: Mock(OkHttpClient),
-      monitoring: Mock(Monitoring),
-      agentUrl: HttpUrl.get('https://example.com'),
-      featuresDiscovery: Mock(DDAgentFeaturesDiscovery),
-      configurationPoller: poller
-      )
-
-    def updater
-
-    when:
-    def tracer = CoreTracer.builder()
-      .sharedCommunicationObjects(sco)
-      .pollForTracingConfiguration()
-      .build()
-
-    then:
-    1 * poller.addListener(Product.APM_TRACING, _ as ProductListener) >> {
-      updater = it[1] // capture config updater for further testing
-    }
-    and:
-    tracer.captureTraceConfig().serviceMapping == [:]
-
-    when:
-    updater.accept(key, """
-      {
-        "service_target": {
-          "service": "${targetService}",
-          "env": "${targetEnv}"
-        },
-        "lib_config":
-        {
-          "tracing_service_mapping":
-          [{
-             "from_key": "foobar",
-             "to_name": "bar"
-          }]
-        }
-      }
-      """.getBytes(StandardCharsets.UTF_8), null)
-    updater.commit()
-
-    then: "configuration should not be applied"
-    tracer.captureTraceConfig().serviceMapping == [:]
-    and:
-    thrown(IllegalArgumentException)
-
-    cleanup:
-    tracer?.close()
-
-    where:
-    service   | env    | targetService | targetEnv
-    "service" | "env"  | "service_1"   | "env"
-    "service" | "env"  | "service"     | "env_1"
-    "service" | "env"  | "service_2"   | "env_2"
-  }
-
-  def "accept configuration when target service+env match case-insensitive"() {
-    setup:
-    injectSysConfig(SERVICE_NAME, service)
-    injectSysConfig(ENV, env)
-
-    def key = ParsedConfigKey.parse("datadog/2/APM_TRACING/config_overrides/config")
-    def poller = Mock(ConfigurationPoller)
-    def sco = new SharedCommunicationObjects(
-      okHttpClient: Mock(OkHttpClient),
-      monitoring: Mock(Monitoring),
-      agentUrl: HttpUrl.get('https://example.com'),
-      featuresDiscovery: Mock(DDAgentFeaturesDiscovery),
-      configurationPoller: poller
-      )
-
-    def updater
-
-    when:
-    def tracer = CoreTracer.builder()
-      .sharedCommunicationObjects(sco)
-      .pollForTracingConfiguration()
-      .build()
-
-    then:
-    1 * poller.addListener(Product.APM_TRACING, _ as ProductListener) >> {
-      updater = it[1] // capture config updater for further testing
-    }
-    and:
-    tracer.captureTraceConfig().serviceMapping == [:]
-
-    when:
-    updater.accept(key, """
-      {
-        "service_target": {
-          "service": "${targetService}",
-          "env": "${targetEnv}"
-        },
-        "lib_config":
-        {
-          "tracing_service_mapping":
-          [{
-             "from_key": "foobar",
-             "to_name": "bar"
-          }]
-        }
-      }
-      """.getBytes(StandardCharsets.UTF_8), null)
-    updater.commit()
-
-    then: "configuration should be applied"
-    tracer.captureTraceConfig().serviceMapping == ["foobar":"bar"]
-
-    cleanup:
-    tracer?.close()
-
-    where:
-    service   | env   | targetService | targetEnv
-    "service" | "env" | "service"     | "env"
-    "service" | "env" | "SERVICE"     | "env"
-    "service" | "env" | "service"     | "ENV"
-    "service" | "env" | "SERVICE"     | "ENV"
-    "SERVICE" | "ENV" | "service"     | "env"
-  }
-
   def "flushes on tracer close if configured to do so"() {
     given:
     def writer = new WriterWithExplicitFlush()