Fix relying on configId for remote config log level tracer flare change (#7788)

* initial commit

* Update dd-trace-core/src/main/java/datadog/trace/core/flare/TracerFlarePoller.java

simplification of code

Co-authored-by: Stuart McCulloch <stuart.mcculloch@datadoghq.com>

---------

Co-authored-by: Cecile Terpin <“cecile.terpin@datadoghq.com”>
Co-authored-by: Stuart McCulloch <stuart.mcculloch@datadoghq.com>

Author: 3 people

dd-trace-core/src/main/java/datadog/trace/core/flare/TracerFlarePoller.java

@@ -14,18 +14,21 @@
 import datadog.trace.core.CoreTracer;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 import okio.Okio;
 
 public final class TracerFlarePoller {
-  private static final String FLARE_LOG_LEVEL_PREFIX = "flare-log-level.";
-
+  private static final String FLARE_LOG_LEVEL = "flare-log-level";
   private final DynamicConfig<?> dynamicConfig;
 
   private Runnable stopPreparer;
   private Runnable stopSubmitter;
 
   private TracerFlareService tracerFlareService;
 
+  private final Map<String, String> configAction = new HashMap<>();
+
   public TracerFlarePoller(DynamicConfig<?> dynamicConfig) {
     this.dynamicConfig = dynamicConfig;
   }
@@ -68,23 +71,22 @@ public Runnable register(Config config, SharedCommunicationObjects sco) {
     @Override
     public void accept(ConfigKey configKey, byte[] content, PollingRateHinter hinter)
         throws IOException {
-      if (configKey.getConfigId().startsWith(FLARE_LOG_LEVEL_PREFIX)) {
-        AgentConfigLayer agentConfigLayer =
-            AGENT_CONFIG_LAYER_ADAPTER.fromJson(
-                Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
-        if (null != agentConfigLayer
-            && null != agentConfigLayer.config
-            && null != agentConfigLayer.config.logLevel) {
-          prepareForFlare(agentConfigLayer.config.logLevel);
-        } else {
-          cleanupAfterFlare();
-        }
+      AgentConfigLayer agentConfigLayer =
+          AGENT_CONFIG_LAYER_ADAPTER.fromJson(
+              Okio.buffer(Okio.source(new ByteArrayInputStream(content))));
+      if (null != agentConfigLayer
+          && null != agentConfigLayer.config
+          && null != agentConfigLayer.config.logLevel) {
+        configAction.put(configKey.getConfigId(), FLARE_LOG_LEVEL);
+        prepareForFlare(agentConfigLayer.config.logLevel);
+      } else {
+        cleanupAfterFlare();
       }
     }
 
     @Override
     public void remove(ConfigKey configKey, PollingRateHinter hinter) {
-      if (configKey.getConfigId().startsWith(FLARE_LOG_LEVEL_PREFIX)) {
+      if (configAction.remove(configKey.getConfigId(), FLARE_LOG_LEVEL)) {
         cleanupAfterFlare();
       }
     }