Skip to content

Commit 6006f8d

Browse files
TravisStarkTravisStark
committed
Add support for use_all_labels_as_dimensions flag on EMF Exporter
1 parent 6d8c14a commit 6006f8d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+174
-140
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ replace github.com/influxdata/telegraf => github.com/aws/telegraf v0.10.2-0.2025
88
// to be all replaced since there are some changes that will always be from upstream
99
replace (
1010
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20250319220231-62fc4da9c51e
11-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20250319220231-62fc4da9c51e
11+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20250331153405-8dc74acd5d67
1212
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20250319220231-62fc4da9c51e
1313
)
1414

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ github.com/aliyun/alibaba-cloud-sdk-go v1.61.1483 h1:J8HaD+Zpfi1gcel3HCKpoHHEsrc
186186
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1483/go.mod h1:RcDobYh8k5VP6TNybz9m++gL3ijVI5wueVr0EM10VsU=
187187
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20250319220231-62fc4da9c51e h1:hjIuSq+rmBWSqGQ7D5kPjJhTtmofknkHq7h0QkdX0ls=
188188
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20250319220231-62fc4da9c51e/go.mod h1:xdbVYSrv7X2GXPKfEeWYhCPkC5ch4h4JKn6uzn5ytqg=
189-
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20250319220231-62fc4da9c51e h1:WvVKqRqAHrqN8iG5gHs235gT9VW76JXPBsV3OLXaVEA=
190-
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20250319220231-62fc4da9c51e/go.mod h1:4vjaqZfmvaZ0rj37LrPAwQpo/sgNLA+H65eUN0U+3fk=
189+
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20250331153405-8dc74acd5d67 h1:HqGmF4f3jp7Y2EXtnBMT3VefpM8ZRKUdfX4rCxkfQV0=
190+
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20250331153405-8dc74acd5d67/go.mod h1:4vjaqZfmvaZ0rj37LrPAwQpo/sgNLA+H65eUN0U+3fk=
191191
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20250319220231-62fc4da9c51e h1:LeDehe1BnhEBB8yIOA8gHhtPe0NgUoQ4SXLJyZUkQBM=
192192
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20250319220231-62fc4da9c51e/go.mod h1:MeHyDYE/w6i9P0HNCql6L+/CJyCgitCnyk0MLfSc+9g=
193193
github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20250319220231-62fc4da9c51e h1:X6i3Aq5QNuVvKxaJ1iek5ljWnA1YSktysi2E/48Ce78=

‎translator/tocwconfig/sampleConfig/advanced_config_darwin.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ processors:
4646
ec2_instance_tag_keys:
4747
- AutoScalingGroupName
4848
ec2_metadata_tags:
49+
- InstanceType
4950
- ImageId
5051
- InstanceId
51-
- InstanceType
5252
imds_retries: 1
5353
middleware: agenthealth/statuscode
5454
refresh_tags_interval: 0s
@@ -91,11 +91,11 @@ service:
9191
- ec2tagger
9292
- awsentity/resource
9393
receivers:
94-
- telegraf_disk
9594
- telegraf_mem
9695
- telegraf_netstat
9796
- telegraf_swap
9897
- telegraf_cpu
98+
- telegraf_disk
9999
metrics/hostDeltaMetrics:
100100
exporters:
101101
- awscloudwatch

‎translator/tocwconfig/sampleConfig/advanced_config_linux.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ service:
9999
- ec2tagger
100100
- awsentity/resource
101101
receivers:
102-
- telegraf_disk
103102
- telegraf_mem
103+
- telegraf_cpu
104+
- telegraf_disk
104105
- telegraf_netstat
105106
- telegraf_swap
106107
- telegraf_ethtool
107108
- telegraf_nvidia_smi
108-
- telegraf_cpu
109109
metrics/hostDeltaMetrics:
110110
exporters:
111111
- awscloudwatch

‎translator/tocwconfig/sampleConfig/advanced_config_windows.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ service:
9292
- ec2tagger
9393
- awsentity/resource
9494
receivers:
95+
- telegraf_win_perf_counters/3446270237
9596
- telegraf_win_perf_counters/3762679655
9697
- telegraf_win_perf_counters/2073218482
9798
- telegraf_win_perf_counters/2039663244
9899
- telegraf_win_perf_counters/4283769065
99100
- telegraf_win_perf_counters/1492679118
100101
- telegraf_win_perf_counters/3610923661
101-
- telegraf_win_perf_counters/3446270237
102102
telemetry:
103103
logs:
104104
development: false

‎translator/tocwconfig/sampleConfig/appsignals_and_ecs_config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ exporters:
127127
enabled: false
128128
retain_initial_value_of_delta_metric: false
129129
role_arn: ""
130+
use_all_labels_as_dimensions: false
130131
version: "1"
131132
awsxray/application_signals:
132133
certificate_file_path: ""

‎translator/tocwconfig/sampleConfig/appsignals_and_eks_config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ exporters:
127127
enabled: false
128128
retain_initial_value_of_delta_metric: false
129129
role_arn: ""
130+
use_all_labels_as_dimensions: false
130131
version: "1"
131132
awsemf/containerinsights:
132133
certificate_file_path: ""
@@ -236,6 +237,7 @@ exporters:
236237
enabled: true
237238
retain_initial_value_of_delta_metric: false
238239
role_arn: ""
240+
use_all_labels_as_dimensions: false
239241
version: "0"
240242
awsxray/application_signals:
241243
certificate_file_path: ""

‎translator/tocwconfig/sampleConfig/appsignals_and_k8s_config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ exporters:
127127
enabled: false
128128
retain_initial_value_of_delta_metric: false
129129
role_arn: ""
130+
use_all_labels_as_dimensions: false
130131
version: "1"
131132
awsemf/containerinsights:
132133
certificate_file_path: ""
@@ -236,6 +237,7 @@ exporters:
236237
enabled: true
237238
retain_initial_value_of_delta_metric: false
238239
role_arn: ""
240+
use_all_labels_as_dimensions: false
239241
version: "0"
240242
awsxray/application_signals:
241243
certificate_file_path: ""

‎translator/tocwconfig/sampleConfig/appsignals_fallback_and_eks_config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ exporters:
127127
enabled: false
128128
retain_initial_value_of_delta_metric: false
129129
role_arn: ""
130+
use_all_labels_as_dimensions: false
130131
version: "1"
131132
awsemf/containerinsights:
132133
certificate_file_path: ""
@@ -236,6 +237,7 @@ exporters:
236237
enabled: true
237238
retain_initial_value_of_delta_metric: false
238239
role_arn: ""
240+
use_all_labels_as_dimensions: false
239241
version: "0"
240242
awsxray/application_signals:
241243
certificate_file_path: ""

‎translator/tocwconfig/sampleConfig/appsignals_over_fallback_config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ exporters:
127127
enabled: false
128128
retain_initial_value_of_delta_metric: false
129129
role_arn: ""
130+
use_all_labels_as_dimensions: false
130131
version: "1"
131132
awsemf/containerinsights:
132133
certificate_file_path: ""
@@ -236,6 +237,7 @@ exporters:
236237
enabled: true
237238
retain_initial_value_of_delta_metric: false
238239
role_arn: ""
240+
use_all_labels_as_dimensions: false
239241
version: "0"
240242
awsxray/application_signals:
241243
certificate_file_path: ""

‎translator/tocwconfig/sampleConfig/base_appsignals_config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ exporters:
129129
role_arn: ""
130130
shared_credentials_file:
131131
- fake-path
132+
use_all_labels_as_dimensions: false
132133
version: "1"
133134
awsxray/application_signals:
134135
certificate_file_path: ""

‎translator/tocwconfig/sampleConfig/base_appsignals_fallback_config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ exporters:
129129
role_arn: ""
130130
shared_credentials_file:
131131
- fake-path
132+
use_all_labels_as_dimensions: false
132133
version: "1"
133134
awsxray/application_signals:
134135
certificate_file_path: ""

‎translator/tocwconfig/sampleConfig/base_container_insights_config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ exporters:
138138
enabled: true
139139
retain_initial_value_of_delta_metric: false
140140
role_arn: ""
141+
use_all_labels_as_dimensions: false
141142
version: "0"
142143
extensions:
143144
agenthealth/logs:

‎translator/tocwconfig/sampleConfig/basic_config_linux.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ processors:
3636
ec2_instance_tag_keys:
3737
- AutoScalingGroupName
3838
ec2_metadata_tags:
39-
- InstanceType
4039
- ImageId
4140
- InstanceId
41+
- InstanceType
4242
imds_retries: 1
4343
middleware: agenthealth/statuscode
4444
refresh_tags_interval: 0s

‎translator/tocwconfig/sampleConfig/basic_config_windows.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ service:
6767
- ec2tagger
6868
- awsentity/resource
6969
receivers:
70-
- telegraf_win_perf_counters/1492679118
7170
- telegraf_win_perf_counters/4283769065
71+
- telegraf_win_perf_counters/1492679118
7272
telemetry:
7373
logs:
7474
development: false

‎translator/tocwconfig/sampleConfig/compass_linux_config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ processors:
4747
ec2_instance_tag_keys:
4848
- AutoScalingGroupName
4949
ec2_metadata_tags:
50+
- InstanceId
5051
- InstanceType
5152
- ImageId
52-
- InstanceId
5353
imds_retries: 1
5454
middleware: agenthealth/statuscode
5555
refresh_tags_interval: 0s
@@ -76,8 +76,8 @@ service:
7676
- ec2tagger
7777
- awsentity/service/telegraf
7878
receivers:
79-
- telegraf_statsd
8079
- telegraf_socket_listener
80+
- telegraf_statsd
8181
telemetry:
8282
logs:
8383
development: false

‎translator/tocwconfig/sampleConfig/container_insights_jmx.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ exporters:
107107
enabled: true
108108
retain_initial_value_of_delta_metric: false
109109
role_arn: ""
110+
use_all_labels_as_dimensions: false
110111
version: "0"
111112
awsemf/containerinsightsjmx:
112113
certificate_file_path: ""
@@ -172,6 +173,7 @@ exporters:
172173
enabled: true
173174
retain_initial_value_of_delta_metric: false
174175
role_arn: ""
176+
use_all_labels_as_dimensions: false
175177
version: "0"
176178
extensions:
177179
agenthealth/logs:

‎translator/tocwconfig/sampleConfig/delta_net_config_linux.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ processors:
4343
ec2_instance_tag_keys:
4444
- AutoScalingGroupName
4545
ec2_metadata_tags:
46+
- ImageId
4647
- InstanceId
4748
- InstanceType
48-
- ImageId
4949
imds_retries: 1
5050
middleware: agenthealth/statuscode
5151
refresh_tags_interval: 0s

‎translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@ exporters:
388388
role_arn: ""
389389
shared_credentials_file:
390390
- /root/.aws/credentials
391+
use_all_labels_as_dimensions: false
391392
version: "0"
392393
extensions:
393394
agenthealth/logs:

0 commit comments

Comments
 (0)