Bump OTEL to v0.89.0 (aws#990)

harrryr · Dec 11, 2023 · c17c309 · c17c309
1 parent d76ee14
commit c17c309
Show file tree

Hide file tree

Showing 38 changed files with 1,302 additions and 1,303 deletions.
diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go
@@ -351,7 +351,9 @@ func getCollectorParams(factories otelcol.Factories, provider otelcol.ConfigProv
 	level := cwaLogger.ConvertToAtomicLevel(wlog.LogLevel())
 	loggingOptions := cwaLogger.NewLoggerOptions(writer, level)
 	return otelcol.CollectorSettings{
-		Factories:      factories,
+		Factories: func() (otelcol.Factories, error) {
+			return factories, nil
+		},
 		ConfigProvider: provider,
 		// build info is essential for populating the user agent string in otel contrib upstream exporters, like the EMF exporter
 		BuildInfo: component.BuildInfo{

diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent_test.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent_test.go
@@ -34,7 +34,9 @@ func Test_getCollectorParams(t *testing.T) {
 				provider:  nil,
 			},
 			want: otelcol.CollectorSettings{
-				Factories:      otelcol.Factories{},
+				Factories: func() (otelcol.Factories, error) {
+					return otelcol.Factories{}, nil
+				},
 				ConfigProvider: nil,
 				BuildInfo: component.BuildInfo{
 					Command:     "CWAgent",

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/translator/tocwconfig/sampleConfig/advanced_config_darwin.yaml b/translator/tocwconfig/sampleConfig/advanced_config_darwin.yaml
@@ -75,11 +75,11 @@ service:
             processors:
                 - ec2tagger
             receivers:
-                - telegraf_mem
                 - telegraf_netstat
                 - telegraf_swap
                 - telegraf_cpu
                 - telegraf_disk
+                - telegraf_mem
         metrics/hostDeltaMetrics:
             exporters:
                 - awscloudwatch
@@ -100,8 +100,10 @@ service:
             output_paths:
                 - /opt/aws/amazon-cloudwatch-agent/logs/amazon-cloudwatch-agent.log
             sampling:
+                enabled: true
                 initial: 2
                 thereafter: 500
+                tick: 10s
         metrics:
             address: ""
             level: None

diff --git a/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml b/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml
@@ -83,13 +83,13 @@ service:
             processors:
                 - ec2tagger
             receivers:
-                - telegraf_disk
                 - telegraf_mem
                 - telegraf_netstat
                 - telegraf_swap
                 - telegraf_ethtool
                 - telegraf_nvidia_smi
                 - telegraf_cpu
+                - telegraf_disk
         metrics/hostDeltaMetrics:
             exporters:
                 - awscloudwatch
@@ -110,8 +110,10 @@ service:
             output_paths:
                 - /opt/aws/amazon-cloudwatch-agent/logs/amazon-cloudwatch-agent.log
             sampling:
+                enabled: true
                 initial: 2
                 thereafter: 500
+                tick: 10s
         metrics:
             address: ""
             level: None

diff --git a/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml b/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml
@@ -73,13 +73,13 @@ service:
             processors:
                 - ec2tagger
             receivers:
-                - telegraf_win_perf_counters/3446270237
-                - telegraf_win_perf_counters/3762679655
                 - telegraf_win_perf_counters/2073218482
                 - telegraf_win_perf_counters/2039663244
                 - telegraf_win_perf_counters/4283769065
                 - telegraf_win_perf_counters/1492679118
                 - telegraf_win_perf_counters/3610923661
+                - telegraf_win_perf_counters/3446270237
+                - telegraf_win_perf_counters/3762679655
     telemetry:
         logs:
             development: false
@@ -92,8 +92,10 @@ service:
             output_paths:
                 - c:\ProgramData\Amazon\AmazonCloudWatchAgent\Logs\amazon-cloudwatch-agent.log
             sampling:
+                enabled: true
                 initial: 2
                 thereafter: 500
+                tick: 10s
         metrics:
             address: ""
             level: None