enable aws resource detector for non app signals environments

Author: liustve

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsApplicationSignalsCustomizerProvider.java

@@ -194,12 +194,20 @@ private boolean isApplicationSignalsRuntimeEnabled(ConfigProperties configProps)
   }
 
   private Map<String, String> customizeProperties(ConfigProperties configProps) {
-    if (isApplicationSignalsEnabled(configProps)) {
-      Map<String, String> propsOverride = new HashMap<>();
-      // Enable AWS Resource Providers
-      propsOverride.put(OTEL_RESOURCE_PROVIDERS_AWS_ENABLED, "true");
+    boolean isLambdaEnvironment = isLambdaEnvironment();
+    Map<String, String> propsOverride = new HashMap<>();
+
+    // Enable AWS Resource Providers
+    propsOverride.put(OTEL_RESOURCE_PROVIDERS_AWS_ENABLED, "true");
+    if (!isLambdaEnvironment) {
+      this.disableAwsResourceProvider(
+          propsOverride,
+          configProps,
+          List.of("io.opentelemetry.contrib.aws.resource.LambdaResourceProvider"));
+    }
 
-      if (!isLambdaEnvironment()) {
+    if (isApplicationSignalsEnabled(configProps)) {
+      if (!isLambdaEnvironment) {
         // Check if properties exist in `configProps`, and only set if missing
         if (configProps.getString(OTEL_METRICS_EXPORTER) == null) {
           propsOverride.put(OTEL_METRICS_EXPORTER, "none");
@@ -236,25 +244,24 @@ private Map<String, String> customizeProperties(ConfigProperties configProps) {
           propsOverride.put(OTEL_JMX_TARGET_SYSTEM_CONFIG, String.join(",", jmxTargets));
         }
       }
-      return propsOverride;
     }
-    return Collections.emptyMap();
+
+    return propsOverride;
   }
 
   private Map<String, String> customizeLambdaEnvProperties(ConfigProperties configProperties) {
     if (isLambdaEnvironment()) {
       Map<String, String> propsOverride = new HashMap<>(2);
 
       // Disable other AWS Resource Providers
-      List<String> list = configProperties.getList(OTEL_DISABLED_RESOURCE_PROVIDERS_CONFIG);
-      List<String> disabledResourceProviders = new ArrayList<>(list);
-      disabledResourceProviders.add(
-          "io.opentelemetry.contrib.aws.resource.BeanstalkResourceProvider");
-      disabledResourceProviders.add("io.opentelemetry.contrib.aws.resource.Ec2ResourceProvider");
-      disabledResourceProviders.add("io.opentelemetry.contrib.aws.resource.EcsResourceProvider");
-      disabledResourceProviders.add("io.opentelemetry.contrib.aws.resource.EksResourceProvider");
-      propsOverride.put(
-          OTEL_DISABLED_RESOURCE_PROVIDERS_CONFIG, String.join(",", disabledResourceProviders));
+      List<String> disabledResourceProviders =
+          List.of(
+              "io.opentelemetry.contrib.aws.resource.BeanstalkResourceProvider",
+              "io.opentelemetry.contrib.aws.resource.Ec2ResourceProvider",
+              "io.opentelemetry.contrib.aws.resource.EcsResourceProvider",
+              "io.opentelemetry.contrib.aws.resource.EksResourceProvider");
+
+      this.disableAwsResourceProvider(propsOverride, configProperties, disabledResourceProviders);
 
       // Set the max export batch size for BatchSpanProcessors
       propsOverride.put(
@@ -265,6 +272,16 @@ private Map<String, String> customizeLambdaEnvProperties(ConfigProperties config
     return Collections.emptyMap();
   }
 
+  private void disableAwsResourceProvider(
+      Map<String, String> newProps, ConfigProperties oldProps, List<String> resourceProviders) {
+
+    List<String> list = oldProps.getList(OTEL_DISABLED_RESOURCE_PROVIDERS_CONFIG);
+    List<String> disabledResourceProviders = new ArrayList<>(list);
+    disabledResourceProviders.addAll(resourceProviders);
+    newProps.put(
+        OTEL_DISABLED_RESOURCE_PROVIDERS_CONFIG, String.join(",", disabledResourceProviders));
+  }
+
   private Resource customizeResource(Resource resource, ConfigProperties configProps) {
     if (isApplicationSignalsEnabled(configProps)) {
       AttributesBuilder builder = Attributes.builder();