[processor/resourcedetection] Remove unnecessary resource attributes …

…from the Consul detector. (open-telemetry#30727) This PR removes several attributes which must have been added by mistake. The [docs](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourcedetectionprocessor#consul) don't mention them, and the [Detect](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/processor/resourcedetectionprocessor/internal/consul/consul.go#L66) function doesn't use them.
bogdandrutu · Jan 23, 2024 · adda8ee · adda8ee
1 parent 9549b73
commit adda8ee
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 201 deletions.
diff --git a/processor/resourcedetectionprocessor/internal/consul/internal/metadata/generated_config.go b/processor/resourcedetectionprocessor/internal/consul/internal/metadata/generated_config.go
diff --git a/...sor/resourcedetectionprocessor/internal/consul/internal/metadata/generated_config_test.go b/...sor/resourcedetectionprocessor/internal/consul/internal/metadata/generated_config_test.go
diff --git a/processor/resourcedetectionprocessor/internal/consul/internal/metadata/generated_resource.go b/processor/resourcedetectionprocessor/internal/consul/internal/metadata/generated_resource.go
diff --git a/...r/resourcedetectionprocessor/internal/consul/internal/metadata/generated_resource_test.go b/...r/resourcedetectionprocessor/internal/consul/internal/metadata/generated_resource_test.go
diff --git a/processor/resourcedetectionprocessor/internal/consul/internal/metadata/testdata/config.yaml b/processor/resourcedetectionprocessor/internal/consul/internal/metadata/testdata/config.yaml
@@ -1,20 +1,6 @@
 default:
 all_set:
  resource_attributes:
- azure.resourcegroup.name:
- enabled: true
- azure.vm.name:
- enabled: true
- azure.vm.scaleset.name:
- enabled: true
- azure.vm.size:
- enabled: true
- cloud.account.id:
- enabled: true
- cloud.platform:
- enabled: true
- cloud.provider:
- enabled: true
  cloud.region:
  enabled: true
  host.id:
@@ -23,20 +9,6 @@ all_set:
  enabled: true
 none_set:
  resource_attributes:
- azure.resourcegroup.name:
- enabled: false
- azure.vm.name:
- enabled: false
- azure.vm.scaleset.name:
- enabled: false
- azure.vm.size:
- enabled: false
- cloud.account.id:
- enabled: false
- cloud.platform:
- enabled: false
- cloud.provider:
- enabled: false
  cloud.region:
  enabled: false
  host.id:

diff --git a/processor/resourcedetectionprocessor/internal/consul/metadata.yaml b/processor/resourcedetectionprocessor/internal/consul/metadata.yaml
@@ -3,22 +3,10 @@ type: resourcedetectionprocessor/consul
 parent: resourcedetection
 
 resource_attributes:
- cloud.provider:
- description: The cloud.provider
- type: string
- enabled: true
- cloud.platform:
- description: The cloud.platform
- type: string
- enabled: true
  cloud.region:
  description: The cloud.region
  type: string
  enabled: true
- cloud.account.id:
- description: The cloud.account.id
- type: string
- enabled: true
  host.name:
  description: The hostname
  type: string
@@ -27,19 +15,3 @@ resource_attributes:
  description: The host.id
  type: string
  enabled: true
- azure.resourcegroup.name:
- description: The azure.resourcegroup.name
- enabled: true
- type: string
- azure.vm.name:
- description: The azure.vm.name
- enabled: true
- type: string
- azure.vm.scaleset.name:
- description: The azure.vm.scaleset.name
- enabled: true
- type: string
- azure.vm.size:
- description: The azure.vm.size
- enabled: true
- type: string