Add config option to remove GMP metric name suffix

GoogleCloudPlatform · Oct 31, 2023 · ef56905 · ef56905
1 parent ba08036
commit ef56905
Show file tree

Hide file tree

Showing 53 changed files with 107 additions and 0 deletions.
diff --git a/confgenerator/confgenerator.go b/confgenerator/confgenerator.go
@@ -75,6 +75,9 @@ 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,
+			"metric": map[string]interface{}{
+				"add_metric_suffixes": false,
+			},
 		},
 	}
 }

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
@@ -16,6 +16,8 @@ exporters:
       skip_create_descriptor: true
     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
@@ -16,6 +16,8 @@ exporters:
       skip_create_descriptor: true
     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
@@ -16,6 +16,8 @@ exporters:
       skip_create_descriptor: true
     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
@@ -16,6 +16,8 @@ exporters:
       skip_create_descriptor: true
     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/...estdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml b/...estdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml
@@ -16,6 +16,8 @@ exporters:
       skip_create_descriptor: true
     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/...or/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux/otel.yaml b/...or/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux/otel.yaml
@@ -16,6 +16,8 @@ exporters:
       skip_create_descriptor: true
     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/...data/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/otel.yaml b/...data/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/otel.yaml
@@ -16,6 +16,8 @@ exporters:
       skip_create_descriptor: true
     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_googlemanagedprometheus/golden/windows/otel.yaml b/.../testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows/otel.yaml
@@ -16,6 +16,8 @@ exporters:
       skip_create_descriptor: true
     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/...generator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-gpu/otel.yaml b/...generator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-gpu/otel.yaml
@@ -16,6 +16,8 @@ exporters:
       skip_create_descriptor: true
     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_grpcendpoint/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux/otel.yaml
@@ -16,6 +16,8 @@ exporters:
       skip_create_descriptor: true
     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/...erator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/otel.yaml b/...erator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/otel.yaml
@@ -16,6 +16,8 @@ exporters:
       skip_create_descriptor: true
     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_grpcendpoint/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows/otel.yaml
@@ -16,6 +16,8 @@ exporters:
       skip_create_descriptor: true
     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/...tor/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-gpu/otel.yaml b/...tor/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-gpu/otel.yaml
@@ -16,6 +16,8 @@ exporters:
       skip_create_descriptor: true
     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/...nerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux/otel.yaml b/...nerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux/otel.yaml
@@ -16,6 +16,8 @@ exporters:
       skip_create_descriptor: true
     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/.../testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows-2012/otel.yaml b/.../testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows-2012/otel.yaml
@@ -16,6 +16,8 @@ exporters:
       skip_create_descriptor: true
     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/...rator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows/otel.yaml b/...rator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows/otel.yaml
@@ -16,6 +16,8 @@ exporters:
       skip_create_descriptor: true
     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_no_traces/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux-gpu/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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_no_traces/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/...generator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows-2012/otel.yaml b/...generator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows-2012/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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_no_traces/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/metrics-receiver_prometheus/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux-gpu/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/metrics-receiver_prometheus/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/metrics-receiver_prometheus/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/windows-2012/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/metrics-receiver_prometheus/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/windows/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/...generator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux-gpu/otel.yaml b/...generator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux-gpu/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/metrics-receiver_prometheus_complex/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/...erator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows-2012/otel.yaml b/...erator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows-2012/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/metrics-receiver_prometheus_complex/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/...stdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux-gpu/otel.yaml b/...stdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux-gpu/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/...r/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux/otel.yaml b/...r/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/...ata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows-2012/otel.yaml b/...ata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows-2012/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/metrics-receiver_prometheus_default_replacement/golden/windows/otel.yaml b/...testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/...ta/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux-gpu/otel.yaml b/...ta/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux-gpu/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/...stdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux/otel.yaml b/...stdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/...goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows-2012/otel.yaml b/...goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows-2012/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/...data/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows/otel.yaml b/...data/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/...tor/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux-gpu/otel.yaml b/...tor/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux-gpu/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/...nerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux/otel.yaml b/...nerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/.../testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows-2012/otel.yaml b/.../testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows-2012/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/...rator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows/otel.yaml b/...rator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/...generator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux-gpu/otel.yaml b/...generator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux-gpu/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/metrics-receiver_prometheus_relabel/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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/...erator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/windows-2012/otel.yaml b/...erator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/windows-2012/otel.yaml
@@ -8,6 +8,8 @@ exporters:
       skip_create_descriptor: true
     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