Add support for deployment.environment.name (#1722)

# Description of the issue
ApplicationSignalsProcessor relies on the resource attribute `deployment.environment` as a customer-provided override for ApplicationSignals `Environment`. However, `deployment.environment` has been deprecated and replaced with `deployment.environment.name` in the upstream.

# Description of changes
In this PR, we are adding support for the new attribute, while maintaining support for the old attribute, since customers may still specify `deployment.environment`, for example, if they are running on older OTEL versions.

Callout: We are no longer getting these attribute names from semconv as:
1. We were relying on go.opentelemetry.io/collector/semconv/v1.22.0, which does not have `deployment.environment.name`
2. https://pkg.go.dev/go.opentelemetry.io/collector/semconv has been deprecated
3. It's replacement, https://pkg.go.dev/go.opentelemetry.io/otel/semconv does not include `deployment.environment.name`: https://github.com/search?q=repo%3Aopen-telemetry%2Fopentelemetry-go+deployment.environment.name&type=code
4. Nor does it include `deployment.environment` in the latest releases (1.3x): https://github.com/search?q=repo%3Aopen-telemetry%2Fopentelemetry-go+deployment.environment&type=code

So we hardcode these attributes within the processor logic.

Author: thpierce

plugins/processors/awsapplicationsignals/internal/attributes/attributes.go

@@ -27,6 +27,10 @@ const (
 	ResourceDetectionHostName = "host.name"
 	ResourceDetectionASG      = "ec2.tag.aws:autoscaling:groupName"
 
+	// deployment resource attributes
+	AttributeDeploymentEnvironment     = "deployment.environment"
+	AttributeDeploymentEnvironmentName = "deployment.environment.name"
+
 	// ApplicationSignals behaviour-changing attributes
 	AWSApplicationSignalsMetricResourceKeys = "aws.application_signals.metric_resource_keys"
 )

plugins/processors/awsapplicationsignals/internal/resolver/attributesresolver.go

@@ -9,7 +9,6 @@ import (
 	"fmt"
 
 	"go.opentelemetry.io/collector/pdata/pcommon"
-	semconv "go.opentelemetry.io/collector/semconv/v1.22.0"
 	"go.uber.org/zap"
 
 	"github.com/aws/amazon-cloudwatch-agent/plugins/processors/awsapplicationsignals/common"
@@ -28,16 +27,18 @@ const (
 )
 
 var GenericInheritedAttributes = map[string]string{
-	semconv.AttributeDeploymentEnvironment: attr.AWSLocalEnvironment,
-	attr.ResourceDetectionHostName:         common.AttributeHost,
+	attr.AttributeDeploymentEnvironment:     attr.AWSLocalEnvironment,
+	attr.AttributeDeploymentEnvironmentName: attr.AWSLocalEnvironment,
+	attr.ResourceDetectionHostName:          common.AttributeHost,
 }
 
 // DefaultInheritedAttributes is an allow-list that also renames attributes from the resource detection processor
 var DefaultInheritedAttributes = map[string]string{
-	semconv.AttributeDeploymentEnvironment: attr.AWSLocalEnvironment,
-	attr.ResourceDetectionASG:              common.AttributeEC2AutoScalingGroup,
-	attr.ResourceDetectionHostId:           common.AttributeEC2InstanceId,
-	attr.ResourceDetectionHostName:         common.AttributeHost,
+	attr.AttributeDeploymentEnvironment:     attr.AWSLocalEnvironment,
+	attr.AttributeDeploymentEnvironmentName: attr.AWSLocalEnvironment,
+	attr.ResourceDetectionASG:               common.AttributeEC2AutoScalingGroup,
+	attr.ResourceDetectionHostId:            common.AttributeEC2InstanceId,
+	attr.ResourceDetectionHostName:          common.AttributeHost,
 }
 
 type subResolver interface {

plugins/processors/awsapplicationsignals/internal/resolver/attributesresolver_test.go

@@ -131,41 +131,44 @@ func TestResourceAttributesResolverWithCustomEnvironment(t *testing.T) {
 			attributesResolver := NewAttributesResolver([]config.Resolver{tt.resolver}, logger)
 			resolver := attributesResolver.subResolvers[0]
 
-			attributes := pcommon.NewMap()
+			// Test hosted in env overrides default env
 			resourceAttributes := pcommon.NewMap()
-			// insert default env
 			resourceAttributes.PutStr(attr.ResourceDetectionASG, "my-asg")
 			resourceAttributes.PutStr(semconv.AttributeAWSECSTaskARN, "arn:aws:ecs:us-west-1:123456789123:task/my-cluster/10838bed-421f-43ef-870a-f43feacbbb5b")
+			resourceAttributes.PutStr(attr.AWSHostedInEnvironment, "hosted_in_env")
+			validateLocalEnvResolution(t, resolver, resourceAttributes, "hosted_in_env")
 
-			// insert custom env
-			resourceAttributes.PutStr(attr.AWSHostedInEnvironment, "env1")
-			resolver.Process(attributes, resourceAttributes)
-			envAttr, ok := attributes.Get(attr.AWSLocalEnvironment)
-			assert.True(t, ok)
-			assert.Equal(t, "env1", envAttr.Str())
-
-			attributes = pcommon.NewMap()
+			// Test deployment env overrides hosted in env
 			resourceAttributes = pcommon.NewMap()
+			resourceAttributes.PutStr(attr.AWSHostedInEnvironment, "hosted_in_env")
+			resourceAttributes.PutStr(attr.AttributeDeploymentEnvironment, "dep_env")
+			validateLocalEnvResolution(t, resolver, resourceAttributes, "dep_env")
 
-			resourceAttributes.PutStr(attr.AWSHostedInEnvironment, "error")
-			resourceAttributes.PutStr(semconv.AttributeDeploymentEnvironment, "env2")
-			resolver.Process(attributes, resourceAttributes)
-			envAttr, ok = attributes.Get(attr.AWSLocalEnvironment)
-			assert.True(t, ok)
-			assert.Equal(t, "env2", envAttr.Str())
+			resourceAttributes = pcommon.NewMap()
+			resourceAttributes.PutStr(attr.AWSHostedInEnvironment, "hosted_in_env")
+			resourceAttributes.PutStr(attr.AttributeDeploymentEnvironmentName, "dep_env_name")
+			validateLocalEnvResolution(t, resolver, resourceAttributes, "dep_env_name")
 
-			attributes = pcommon.NewMap()
+			// Test deployment env works standalone
 			resourceAttributes = pcommon.NewMap()
+			resourceAttributes.PutStr(attr.AttributeDeploymentEnvironment, "dep_env")
+			validateLocalEnvResolution(t, resolver, resourceAttributes, "dep_env")
 
-			resourceAttributes.PutStr(semconv.AttributeDeploymentEnvironment, "env3")
-			resolver.Process(attributes, resourceAttributes)
-			envAttr, ok = attributes.Get(attr.AWSLocalEnvironment)
-			assert.True(t, ok)
-			assert.Equal(t, "env3", envAttr.Str())
+			resourceAttributes = pcommon.NewMap()
+			resourceAttributes.PutStr(attr.AttributeDeploymentEnvironmentName, "dep_env_name")
+			validateLocalEnvResolution(t, resolver, resourceAttributes, "dep_env_name")
 		})
 	}
 }
 
+func validateLocalEnvResolution(t *testing.T, resolver subResolver, resourceAttributes pcommon.Map, expectedEnv string) {
+	attributes := pcommon.NewMap()
+	resolver.Process(attributes, resourceAttributes)
+	envAttr, ok := attributes.Get(attr.AWSLocalEnvironment)
+	assert.True(t, ok)
+	assert.Equal(t, expectedEnv, envAttr.Str())
+}
+
 func TestAttributesResolver_Process(t *testing.T) {
 	attributes := pcommon.NewMap()
 	resourceAttributes := pcommon.NewMap()