Not necessary to keep experimental env var

Author: jandro996

dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java

@@ -40,7 +40,5 @@ public final class AppSecConfig {
   public static final String APPSEC_MAX_STACKTRACE_DEPTH_DEPRECATED =
       "appsec.max.stacktrace.depth"; // old non-standard as a fallback alias
 
-  public static final String APPSEC_STANDALONE_ENABLED = "experimental.appsec.standalone.enabled";
-
   private AppSecConfig() {}
 }

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

@@ -286,7 +286,6 @@ public static String getHostName() {
   private final boolean appSecStackTraceEnabled;
   private final int appSecMaxStackTraces;
   private final int appSecMaxStackTraceDepth;
-  private final boolean appSecStandaloneEnabled;
   private final boolean apiSecurityEnabled;
   private final float apiSecurityRequestSampleRate;
 
@@ -1292,7 +1291,6 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
             configProvider.getStringNotEmpty(APPSEC_AUTO_USER_INSTRUMENTATION_MODE, null),
             configProvider.getStringNotEmpty(APPSEC_AUTOMATED_USER_EVENTS_TRACKING, null));
     appSecScaEnabled = configProvider.getBoolean(APPSEC_SCA_ENABLED);
-    appSecStandaloneEnabled = configProvider.getBoolean(APPSEC_STANDALONE_ENABLED, false);
     appSecRaspEnabled = configProvider.getBoolean(APPSEC_RASP_ENABLED, DEFAULT_APPSEC_RASP_ENABLED);
     appSecStackTraceEnabled =
         configProvider.getBoolean(
@@ -3408,7 +3406,7 @@ public String getDataJobsCommandPattern() {
   }
 
   public boolean isApmTracingEnabled() {
-    return !appSecStandaloneEnabled && apmTracingEnabled;
+    return apmTracingEnabled;
   }
 
   /** @return A map of tags to be applied only to the local application root span. */
@@ -3601,97 +3599,6 @@ private Map<String, Long> getProcessIdTag() {
     return Collections.singletonMap(PID_TAG, getProcessId());
   }
 
-  private Map<String, String> getAzureAppServicesTags() {
-    // These variable names and derivations are copied from the dotnet tracer
-    // See
-    // https://github.com/DataDog/dd-trace-dotnet/blob/master/tracer/src/Datadog.Trace/PlatformHelpers/AzureAppServices.cs
-    // and
-    // https://github.com/DataDog/dd-trace-dotnet/blob/master/tracer/src/Datadog.Trace/TraceContext.cs#L207
-    Map<String, String> aasTags = new HashMap<>();
-
-    /// The site name of the site instance in Azure where the traced application is running.
-    String siteName = getEnv("WEBSITE_SITE_NAME");
-    if (siteName != null) {
-      aasTags.put("aas.site.name", siteName);
-    }
-
-    // The kind of application instance running in Azure.
-    // Possible values: app, api, mobileapp, app_linux, app_linux_container, functionapp,
-    // functionapp_linux, functionapp_linux_container
-
-    // The type of application instance running in Azure.
-    // Possible values: app, function
-    if (getEnv("FUNCTIONS_WORKER_RUNTIME") != null
-        || getEnv("FUNCTIONS_EXTENSIONS_VERSION") != null) {
-      aasTags.put("aas.site.kind", "functionapp");
-      aasTags.put("aas.site.type", "function");
-    } else {
-      aasTags.put("aas.site.kind", "app");
-      aasTags.put("aas.site.type", "app");
-    }
-
-    //  The resource group of the site instance in Azure App Services
-    String resourceGroup = getEnv("WEBSITE_RESOURCE_GROUP");
-    if (resourceGroup != null) {
-      aasTags.put("aas.resource.group", resourceGroup);
-    }
-
-    // Example: 8c500027-5f00-400e-8f00-60000000000f+apm-dotnet-EastUSwebspace
-    // Format: {subscriptionId}+{planResourceGroup}-{hostedInRegion}
-    String websiteOwner = getEnv("WEBSITE_OWNER_NAME");
-    int plusIndex = websiteOwner == null ? -1 : websiteOwner.indexOf("+");
-
-    // The subscription ID of the site instance in Azure App Services
-    String subscriptionId = null;
-    if (plusIndex > 0) {
-      subscriptionId = websiteOwner.substring(0, plusIndex);
-      aasTags.put("aas.subscription.id", subscriptionId);
-    }
-
-    if (subscriptionId != null && siteName != null && resourceGroup != null) {
-      // The resource ID of the site instance in Azure App Services
-      String resourceId =
-          "/subscriptions/"
-              + subscriptionId
-              + "/resourcegroups/"
-              + resourceGroup
-              + "/providers/microsoft.web/sites/"
-              + siteName;
-      resourceId = resourceId.toLowerCase(Locale.ROOT);
-      aasTags.put("aas.resource.id", resourceId);
-    } else {
-      log.warn(
-          "Unable to generate resource id subscription id: {}, site name: {}, resource group {}",
-          subscriptionId,
-          siteName,
-          resourceGroup);
-    }
-
-    // The instance ID in Azure
-    String instanceId = getEnv("WEBSITE_INSTANCE_ID");
-    instanceId = instanceId == null ? "unknown" : instanceId;
-    aasTags.put("aas.environment.instance_id", instanceId);
-
-    // The instance name in Azure
-    String instanceName = getEnv("COMPUTERNAME");
-    instanceName = instanceName == null ? "unknown" : instanceName;
-    aasTags.put("aas.environment.instance_name", instanceName);
-
-    // The operating system in Azure
-    String operatingSystem = getEnv("WEBSITE_OS");
-    operatingSystem = operatingSystem == null ? "unknown" : operatingSystem;
-    aasTags.put("aas.environment.os", operatingSystem);
-
-    // The version of the extension installed
-    String siteExtensionVersion = getEnv("DD_AAS_JAVA_EXTENSION_VERSION");
-    siteExtensionVersion = siteExtensionVersion == null ? "unknown" : siteExtensionVersion;
-    aasTags.put("aas.environment.extension_version", siteExtensionVersion);
-
-    aasTags.put("aas.environment.runtime", getProp("java.vm.name", "unknown"));
-
-    return aasTags;
-  }
-
   private int schemaVersionFromConfig() {
     String versionStr =
         configProvider.getString(TRACE_SPAN_ATTRIBUTE_SCHEMA, "v" + SpanNaming.SCHEMA_MIN_VERSION);
@@ -3913,6 +3820,97 @@ public boolean isTelemetryDebugRequestsEnabled() {
     return telemetryDebugRequestsEnabled;
   }
 
+  private Map<String, String> getAzureAppServicesTags() {
+    // These variable names and derivations are copied from the dotnet tracer
+    // See
+    // https://github.com/DataDog/dd-trace-dotnet/blob/master/tracer/src/Datadog.Trace/PlatformHelpers/AzureAppServices.cs
+    // and
+    // https://github.com/DataDog/dd-trace-dotnet/blob/master/tracer/src/Datadog.Trace/TraceContext.cs#L207
+    Map<String, String> aasTags = new HashMap<>();
+
+    /// The site name of the site instance in Azure where the traced application is running.
+    String siteName = getEnv("WEBSITE_SITE_NAME");
+    if (siteName != null) {
+      aasTags.put("aas.site.name", siteName);
+    }
+
+    // The kind of application instance running in Azure.
+    // Possible values: app, api, mobileapp, app_linux, app_linux_container, functionapp,
+    // functionapp_linux, functionapp_linux_container
+
+    // The type of application instance running in Azure.
+    // Possible values: app, function
+    if (getEnv("FUNCTIONS_WORKER_RUNTIME") != null
+        || getEnv("FUNCTIONS_EXTENSIONS_VERSION") != null) {
+      aasTags.put("aas.site.kind", "functionapp");
+      aasTags.put("aas.site.type", "function");
+    } else {
+      aasTags.put("aas.site.kind", "app");
+      aasTags.put("aas.site.type", "app");
+    }
+
+    //  The resource group of the site instance in Azure App Services
+    String resourceGroup = getEnv("WEBSITE_RESOURCE_GROUP");
+    if (resourceGroup != null) {
+      aasTags.put("aas.resource.group", resourceGroup);
+    }
+
+    // Example: 8c500027-5f00-400e-8f00-60000000000f+apm-dotnet-EastUSwebspace
+    // Format: {subscriptionId}+{planResourceGroup}-{hostedInRegion}
+    String websiteOwner = getEnv("WEBSITE_OWNER_NAME");
+    int plusIndex = websiteOwner == null ? -1 : websiteOwner.indexOf("+");
+
+    // The subscription ID of the site instance in Azure App Services
+    String subscriptionId = null;
+    if (plusIndex > 0) {
+      subscriptionId = websiteOwner.substring(0, plusIndex);
+      aasTags.put("aas.subscription.id", subscriptionId);
+    }
+
+    if (subscriptionId != null && siteName != null && resourceGroup != null) {
+      // The resource ID of the site instance in Azure App Services
+      String resourceId =
+          "/subscriptions/"
+              + subscriptionId
+              + "/resourcegroups/"
+              + resourceGroup
+              + "/providers/microsoft.web/sites/"
+              + siteName;
+      resourceId = resourceId.toLowerCase(Locale.ROOT);
+      aasTags.put("aas.resource.id", resourceId);
+    } else {
+      log.warn(
+          "Unable to generate resource id subscription id: {}, site name: {}, resource group {}",
+          subscriptionId,
+          siteName,
+          resourceGroup);
+    }
+
+    // The instance ID in Azure
+    String instanceId = getEnv("WEBSITE_INSTANCE_ID");
+    instanceId = instanceId == null ? "unknown" : instanceId;
+    aasTags.put("aas.environment.instance_id", instanceId);
+
+    // The instance name in Azure
+    String instanceName = getEnv("COMPUTERNAME");
+    instanceName = instanceName == null ? "unknown" : instanceName;
+    aasTags.put("aas.environment.instance_name", instanceName);
+
+    // The operating system in Azure
+    String operatingSystem = getEnv("WEBSITE_OS");
+    operatingSystem = operatingSystem == null ? "unknown" : operatingSystem;
+    aasTags.put("aas.environment.os", operatingSystem);
+
+    // The version of the extension installed
+    String siteExtensionVersion = getEnv("DD_AAS_JAVA_EXTENSION_VERSION");
+    siteExtensionVersion = siteExtensionVersion == null ? "unknown" : siteExtensionVersion;
+    aasTags.put("aas.environment.extension_version", siteExtensionVersion);
+
+    aasTags.put("aas.environment.runtime", getProp("java.vm.name", "unknown"));
+
+    return aasTags;
+  }
+
   public boolean isAgentlessLogSubmissionEnabled() {
     return agentlessLogSubmissionEnabled;
   }
@@ -4643,8 +4641,8 @@ public String toString() {
         + dataJobsEnabled
         + ", dataJobsCommandPattern="
         + dataJobsCommandPattern
-        + ", appSecStandaloneEnabled="
-        + appSecStandaloneEnabled
+        + ", apmTracingEnabled="
+        + apmTracingEnabled
         + ", cloudRequestPayloadTagging="
         + cloudRequestPayloadTagging
         + ", cloudResponsePayloadTagging="