Set Cloud Account ID default to false

open-telemetry · Jan 15, 2025 · a31133b · a31133b
1 parent ba66b9c
commit a31133b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/processor/resourcedetectionprocessor/internal/aws/eks/detector.go b/processor/resourcedetectionprocessor/internal/aws/eks/detector.go
@@ -89,8 +89,8 @@ func (d *detector) Detect(ctx context.Context) (resource pcommon.Resource, schem
 	d.rb.SetCloudProvider(conventions.AttributeCloudProviderAWS)
 	d.rb.SetCloudPlatform(conventions.AttributeCloudPlatformAWSEKS)
 	if d.ra.CloudAccountID.Enabled {
-		accountId := d.utils.getCloudAccountID(ctx, d.logger)
-		d.rb.SetCloudAccountID(accountId)
+		accountID := d.utils.getCloudAccountID(ctx, d.logger)
+		d.rb.SetCloudAccountID(accountID)
 	}
 
 	if d.ra.K8sClusterName.Enabled {

diff --git a/processor/resourcedetectionprocessor/internal/aws/eks/detector_test.go b/processor/resourcedetectionprocessor/internal/aws/eks/detector_test.go
@@ -20,7 +20,7 @@ import (
 
 const (
 	clusterName    = "my-cluster"
-	cloudAccountId = "cloud1234"
+	cloudAccountID = "cloud1234"
 )
 
 type MockDetectorUtils struct {
@@ -42,7 +42,7 @@ func (detectorUtils *MockDetectorUtils) getClusterNameTagFromReservations(_ []*e
 }
 
 func (detectorUtils *MockDetectorUtils) getCloudAccountID(_ context.Context, _ *zap.Logger) string {
-	return cloudAccountId
+	return cloudAccountID
 }
 
 func TestNewDetector(t *testing.T) {
@@ -65,9 +65,8 @@ func TestEKS(t *testing.T) {
 	require.NoError(t, err)
 
 	assert.Equal(t, map[string]any{
-		"cloud.provider":   "aws",
-		"cloud.platform":   "aws_eks",
-		"cloud.account.id": "cloud1234",
+		"cloud.provider": "aws",
+		"cloud.platform": "aws_eks",
 	}, res.Attributes().AsRaw(), "Resource object returned is incorrect")
 }
 

diff --git a/processor/resourcedetectionprocessor/internal/aws/eks/documentation.md b/processor/resourcedetectionprocessor/internal/aws/eks/documentation.md
@@ -8,7 +8,7 @@
 
 | Name | Description | Values | Enabled |
 | ---- | ----------- | ------ | ------- |
-| cloud.account.id | The cloud account id | Any Str | true |
+| cloud.account.id | The cloud account id | Any Str | false |
 | cloud.platform | The cloud.platform | Any Str | true |
 | cloud.provider | The cloud.provider | Any Str | true |
 | k8s.cluster.name | The EKS cluster name. This attribute is currently only available when running on EC2 instances, and requires permission to run the EC2:DescribeInstances action. | Any Str | false |
diff --git a/processor/resourcedetectionprocessor/internal/aws/eks/internal/metadata/generated_config.go b/processor/resourcedetectionprocessor/internal/aws/eks/internal/metadata/generated_config.go
diff --git a/.../resourcedetectionprocessor/internal/aws/eks/internal/metadata/generated_resource_test.go b/.../resourcedetectionprocessor/internal/aws/eks/internal/metadata/generated_resource_test.go
diff --git a/processor/resourcedetectionprocessor/internal/aws/eks/metadata.yaml b/processor/resourcedetectionprocessor/internal/aws/eks/metadata.yaml
@@ -14,7 +14,7 @@ resource_attributes:
   cloud.account.id:
     description: The cloud account id
     type: string
-    enabled: true
+    enabled: false
   k8s.cluster.name:
     description: The EKS cluster name. This attribute is currently only available when running on EC2 instances, and requires permission to run the EC2:DescribeInstances action.
     type: string