cleanup

Signed-off-by: sezen.leblay <sezen.leblay@datadoghq.com>

Author: sezen-datadog

dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java

@@ -863,6 +863,7 @@ private NoopFlow onRequestEnded(RequestContext ctx_, IGSpanInfo spanInfo) {
       // If detected any events - mark span at appsec.event
       if (!collectedEvents.isEmpty()) {
         if (ctx.isManuallyKept()) {
+          // Set asm keep in case that root span was not available when events are detected
           traceSeg.setTagTop(Tags.ASM_KEEP, true);
           traceSeg.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
         }

dd-trace-api/src/main/java/datadog/trace/api/DDTags.java

@@ -59,9 +59,6 @@ public class DDTags {
   /** Manually force tracer to drop the trace */
   public static final String MANUAL_DROP = "manual.drop";
 
-  /** ASM force tracer to keep the trace with sampler priority (SAMPLER_KEEP) */
-  public static final String ASM_SAMPLER_KEEP = "asm.sampler.keep";
-
   public static final String TRACE_START_TIME = "t0";
 
   /* Tags below are for internal use only. */

dd-trace-core/src/main/java/datadog/trace/core/taginterceptor/TagInterceptor.java

@@ -4,7 +4,6 @@
 import static datadog.trace.api.DDTags.MEASURED;
 import static datadog.trace.api.DDTags.ORIGIN_KEY;
 import static datadog.trace.api.DDTags.SPAN_TYPE;
-import static datadog.trace.api.sampling.PrioritySampling.SAMPLER_KEEP;
 import static datadog.trace.api.sampling.PrioritySampling.USER_DROP;
 import static datadog.trace.api.sampling.PrioritySampling.USER_KEEP;
 import static datadog.trace.bootstrap.instrumentation.api.Tags.HTTP_METHOD;
@@ -109,7 +108,6 @@ public boolean needsIntercept(String tag) {
       case DDTags.MANUAL_KEEP:
       case DDTags.MANUAL_DROP:
       case Tags.ASM_KEEP:
-      case DDTags.ASM_SAMPLER_KEEP:
       case Tags.SAMPLING_PRIORITY:
       case Tags.PROPAGATED_TRACE_SOURCE:
       case Tags.PROPAGATED_DEBUG:
@@ -157,12 +155,6 @@ public boolean interceptTag(DDSpanContext span, String tag, Object value) {
           return true;
         }
         return false;
-      case DDTags.ASM_SAMPLER_KEEP:
-        if (asBoolean(value)) {
-          span.setSamplingPriority(SAMPLER_KEEP, SamplingMechanism.APPSEC);
-          return true;
-        }
-        return false;
       case Tags.SAMPLING_PRIORITY:
         return interceptSamplingPriority(span, value);
       case Tags.PROPAGATED_TRACE_SOURCE: