Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump OTEL to v0.89.0 #990

Merged
merged 1 commit into from
Dec 11, 2023
Merged

Bump OTEL to v0.89.0 #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 3 additions & 1 deletion cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
313 changes: 157 additions & 156 deletions go.mod
View file
Open in desktop

Large diffs are not rendered by default.

744 changes: 295 additions & 449 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion translator/tocwconfig/sampleConfig/advanced_config_darwin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ service:
processors:
- ec2tagger
receivers:
- telegraf_mem
- telegraf_netstat
- telegraf_swap
- telegraf_cpu
- telegraf_disk
- telegraf_mem
metrics/hostDeltaMetrics:
exporters:
- awscloudwatch
Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion translator/tocwconfig/sampleConfig/advanced_config_linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions translator/tocwconfig/sampleConfig/advanced_config_windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading