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

Update otelopscol Submodule #1485

Merged
merged 7 commits into from
Nov 6, 2023
Merged

Update otelopscol Submodule #1485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dfc3a33
Update otelopscol
LujieDuan Oct 30, 2023
a2f3710
Remove deprecated retry_on_failure on exporter
LujieDuan Oct 30, 2023
6b63f04
Update golden files
LujieDuan Oct 31, 2023
ab0ab46
Remove reference to deprecated mysql.locked_connects
LujieDuan Oct 31, 2023
504e33d
Add config option to remove GMP metric name suffix
LujieDuan Oct 31, 2023
406d219
Update comments
LujieDuan Nov 1, 2023
0b795f6
Update otelopscol submodule to latest master
LujieDuan Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions apps/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,6 @@ func (r MetricsReceiverMySql) Pipelines(_ context.Context) []otel.ReceiverPipeli
"mysql.index.io.wait.time": map[string]interface{}{
"enabled": false,
},
"mysql.locked_connects": map[string]interface{}{
"enabled": false,
},
"mysql.mysqlx_connections": map[string]interface{}{
"enabled": false,
},
Expand Down
13 changes: 7 additions & 6 deletions confgenerator/confgenerator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,6 @@ func googleCloudExporter(userAgent string, instrumentationLabels bool) otel.Comp
return otel.Component{
Type: "googlecloud",
Config: map[string]interface{}{
// (b/233372619) Due to a constraint in the Monarch API for retrying successful data points,
// leaving this enabled is causing adverse effects for some customers. Google OpenTelemetry team
// recommends disabling this.
"retry_on_failure": map[string]interface{}{
"enabled": false,
},
"user_agent": userAgent,
"metric": map[string]interface{}{
// Receivers are responsible for sending fully-qualified metric names.
Expand Down Expand Up @@ -68,6 +62,8 @@ func googleManagedPrometheusExporter(userAgent string) otel.Component {
// (b/233372619) Due to a constraint in the Monarch API for retrying successful data points,
// leaving this enabled is causing adverse effects for some customers. Google OpenTelemetry team
// recommends disabling this.
// (b/308675258) Need to update the `googlemanagedprometheus` exporter in otelopscol to deprecate this
// option
"retry_on_failure": map[string]interface{}{
"enabled": false,
},
Expand All @@ -81,6 +77,11 @@ func googleManagedPrometheusExporter(userAgent string) otel.Component {
// OTLP Gauge metrics ingested by the Ops Agent, that have this key will also be treated as untyped prometheus metrics
// if it is being exported to GMP. As such, this knob can be set to true.
"untyped_double_export": true,
// The exporter has the config option addMetricSuffixes with default value true. It will add Prometheus
// style suffixes to metric names, e.g., `_total` for a counter; set to false to collect metrics as is
"metric": map[string]interface{}{
"add_metric_suffixes": false,
},
},
}
}
Expand Down
2 changes: 0 additions & 2 deletions ...stdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-gpu/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
2 changes: 0 additions & 2 deletions ...r/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
2 changes: 0 additions & 2 deletions ...ata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
2 changes: 0 additions & 2 deletions ...testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
2 changes: 0 additions & 2 deletions confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux-gpu/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
2 changes: 0 additions & 2 deletions confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
2 changes: 0 additions & 2 deletions confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-gpu/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
2 changes: 0 additions & 2 deletions confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
2 changes: 0 additions & 2 deletions confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux-gpu/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
2 changes: 0 additions & 2 deletions confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
2 changes: 0 additions & 2 deletions confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows-2012/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
2 changes: 0 additions & 2 deletions confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
2 changes: 0 additions & 2 deletions confgenerator/testdata/goldens/builtin/golden/linux-gpu/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
2 changes: 0 additions & 2 deletions confgenerator/testdata/goldens/builtin/golden/linux/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
2 changes: 0 additions & 2 deletions confgenerator/testdata/goldens/builtin/golden/windows-2012/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
2 changes: 0 additions & 2 deletions confgenerator/testdata/goldens/builtin/golden/windows/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
6 changes: 2 additions & 4 deletions confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
googlecloud/otel:
metric:
Expand All @@ -16,10 +14,10 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
googlemanagedprometheus:
metric:
add_metric_suffixes: false
retry_on_failure:
enabled: false
untyped_double_export: true
Expand Down
6 changes: 2 additions & 4 deletions confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
googlecloud/otel:
metric:
Expand All @@ -16,10 +14,10 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
googlemanagedprometheus:
metric:
add_metric_suffixes: false
retry_on_failure:
enabled: false
untyped_double_export: true
Expand Down
6 changes: 2 additions & 4 deletions confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version)
googlecloud/otel:
metric:
Expand All @@ -16,10 +14,10 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version)
googlemanagedprometheus:
metric:
add_metric_suffixes: false
retry_on_failure:
enabled: false
untyped_double_export: true
Expand Down
6 changes: 2 additions & 4 deletions confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version)
googlecloud/otel:
metric:
Expand All @@ -16,10 +14,10 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version)
googlemanagedprometheus:
metric:
add_metric_suffixes: false
retry_on_failure:
enabled: false
untyped_double_export: true
Expand Down
4 changes: 0 additions & 4 deletions .../testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-gpu/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
googlecloud/otel:
metric:
Expand All @@ -16,8 +14,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
4 changes: 0 additions & 4 deletions ...ator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
googlecloud/otel:
metric:
Expand All @@ -16,8 +14,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
4 changes: 0 additions & 4 deletions ...stdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows-2012/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version)
googlecloud/otel:
metric:
Expand All @@ -16,8 +14,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
4 changes: 0 additions & 4 deletions ...or/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version)
googlecloud/otel:
metric:
Expand All @@ -16,8 +14,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version)
processors:
agentmetrics/hostmetrics_0:
Expand Down
6 changes: 2 additions & 4 deletions ...estdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
googlecloud/otel:
metric:
Expand All @@ -16,10 +14,10 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
googlemanagedprometheus:
metric:
add_metric_suffixes: false
retry_on_failure:
enabled: false
untyped_double_export: true
Expand Down
6 changes: 2 additions & 4 deletions ...or/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
googlecloud/otel:
metric:
Expand All @@ -16,10 +14,10 @@ exporters:
resource_filters: []
service_resource_labels: false
skip_create_descriptor: true
retry_on_failure:
enabled: false
user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
googlemanagedprometheus:
metric:
add_metric_suffixes: false
retry_on_failure:
enabled: false
untyped_double_export: true
Expand Down
Loading
Loading