Merge branch 'master' into martijnvans-just-try-pwsh

GoogleCloudPlatform · Nov 6, 2023 · 2b86c3c · 2b86c3c
2 parents 12e80e6 + 892bec1
commit 2b86c3c
Show file tree

Hide file tree

Showing 643 changed files with 170 additions and 1,884 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,13 +34,9 @@ jobs:
         cache: true
     - run: |
         go install golang.org/x/tools/cmd/goimports@latest
-        go install github.com/mattn/goveralls@latest
     - if: ${{ runner.os == 'Linux' }}
       run: if [ $(goimports -l .) ]; then goimports -d .; echo 'Failed the goimports format check. Please format the code using "goimports -w ."'; exit 1; fi
     - run: go test -mod=mod -coverpkg="./..." -coverprofile=covprofile ./...
-    - env:
-        COVERALLS_TOKEN: ${{ secrets.github_token }}
-      run: goveralls -coverprofile=covprofile -service=github -ignore="confgenerator/filter/internal/generated/*/*"
     - id: 'set-coverage-vars'
       if: ${{ runner.os == 'Linux' && github.event_name == 'push' && github.repository == 'GoogleCloudPlatform/ops-agent' && github.ref == 'refs/heads/master' }}
       name: 'Set Coverage Env Vars'

diff --git a/apps/mysql.go b/apps/mysql.go
@@ -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,
 						},

diff --git a/confgenerator/confgenerator.go b/confgenerator/confgenerator.go
@@ -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.
@@ -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,
 			},
@@ -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,
+			},
 		},
 	}
 }

diff --git a/...stdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-gpu/otel.yaml b/...stdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-gpu/otel.yaml
@@ -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:

diff --git a/...r/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux/otel.yaml b/...r/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux/otel.yaml
@@ -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:

diff --git a/...ata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml b/...ata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml
@@ -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:

diff --git a/...testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml b/...testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml
@@ -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:

diff --git a/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux-gpu/otel.yaml
@@ -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:

diff --git a/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux/otel.yaml b/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux/otel.yaml
@@ -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:

diff --git a/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-gpu/otel.yaml
@@ -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:

diff --git a/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux/otel.yaml b/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux/otel.yaml
@@ -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:

diff --git a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux-gpu/otel.yaml
@@ -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:

diff --git a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux/otel.yaml b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux/otel.yaml
@@ -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:

diff --git a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows-2012/otel.yaml
@@ -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:

diff --git a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows/otel.yaml b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows/otel.yaml
@@ -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:

diff --git a/confgenerator/testdata/goldens/builtin/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/builtin/golden/linux-gpu/otel.yaml
@@ -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:

diff --git a/confgenerator/testdata/goldens/builtin/golden/linux/otel.yaml b/confgenerator/testdata/goldens/builtin/golden/linux/otel.yaml
@@ -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:

diff --git a/confgenerator/testdata/goldens/builtin/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/builtin/golden/windows-2012/otel.yaml
@@ -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:

diff --git a/confgenerator/testdata/goldens/builtin/golden/windows/otel.yaml b/confgenerator/testdata/goldens/builtin/golden/windows/otel.yaml
@@ -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:

diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml
@@ -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:
@@ -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

diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml
@@ -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:
@@ -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

diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml
@@ -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:
@@ -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

diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml
@@ -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:
@@ -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

diff --git a/.../testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-gpu/otel.yaml b/.../testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-gpu/otel.yaml
@@ -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:
@@ -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:

diff --git a/...ator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux/otel.yaml b/...ator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux/otel.yaml
@@ -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:
@@ -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:

diff --git a/...stdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows-2012/otel.yaml b/...stdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows-2012/otel.yaml
@@ -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:
@@ -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:

diff --git a/...or/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows/otel.yaml b/...or/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows/otel.yaml
@@ -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:
@@ -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:

diff --git a/...estdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml b/...estdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml
@@ -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:
@@ -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