Upgrade to new googlecloudexporter (#526)

GoogleCloudPlatform · Apr 21, 2022 · 25abc2c · 25abc2c
1 parent 417f4a1
commit 25abc2c
Show file tree

Hide file tree

Showing 130 changed files with 721 additions and 341 deletions.
diff --git a/apps/iis.go b/apps/iis.go
@@ -42,18 +42,18 @@ func (r MetricsReceiverIis) Pipelines() []otel.Pipeline {
 					{
 						"object":    "Web Service",
 						"instances": []string{"_Total"},
-						"counters": []string{
-							"Current Connections",
-							"Total Bytes Received",
-							"Total Bytes Sent",
-							"Total Connection Attempts (all instances)",
-							"Total Delete Requests",
-							"Total Get Requests",
-							"Total Head Requests",
-							"Total Options Requests",
-							"Total Post Requests",
-							"Total Put Requests",
-							"Total Trace Requests",
+						"counters": []map[string]string{
+							{"name": "Current Connections"},
+							{"name": "Total Bytes Received"},
+							{"name": "Total Bytes Sent"},
+							{"name": "Total Connection Attempts (all instances)"},
+							{"name": "Total Delete Requests"},
+							{"name": "Total Get Requests"},
+							{"name": "Total Head Requests"},
+							{"name": "Total Options Requests"},
+							{"name": "Total Post Requests"},
+							{"name": "Total Put Requests"},
+							{"name": "Total Trace Requests"},
 						},
 					},
 				},

diff --git a/apps/mssql.go b/apps/mssql.go
@@ -39,14 +39,14 @@ func (m MetricsReceiverMssql) Pipelines() []otel.Pipeline {
 					{
 						"object":    "SQLServer:General Statistics",
 						"instances": []string{"_Total"},
-						"counters":  []string{"User Connections"},
+						"counters":  []map[string]string{{"name": "User Connections"}},
 					},
 					{
 						"object":    "SQLServer:Databases",
 						"instances": []string{"_Total"},
-						"counters": []string{
-							"Transactions/sec",
-							"Write Transactions/sec",
+						"counters": []map[string]string{
+							{"name": "Transactions/sec"},
+							{"name": "Write Transactions/sec"},
 						},
 					},
 				},

diff --git a/cmd/ops_agent_windows/main_windows.go b/cmd/ops_agent_windows/main_windows.go
@@ -108,6 +108,7 @@ func initServices() error {
 			filepath.Join(base, "google-cloud-metrics-agent_windows_amd64.exe"),
 			[]string{
 				"--config=" + filepath.Join(configOutDir, `otel\otel.yaml`),
+				"--feature-gates=exporter.googlecloud.OTLPDirect",
 			},
 		},
 		{

diff --git a/confgenerator/confgenerator.go b/confgenerator/confgenerator.go
@@ -74,9 +74,16 @@ func (uc *UnifiedConfig) GenerateOtelConfig(hostInfo *host.InfoStat) (string, er
 				"user_agent": userAgent,
 				"metric": map[string]interface{}{
 					// Receivers are responsible for sending fully-qualified metric names.
-					// NB: If a receiver fails to send a full URL, OT will add the prefix `custom.googleapis.com/opencensus/`.
+					// NB: If a receiver fails to send a full URL, OT will add the prefix `workload.googleapis.com/{metric_name}`.
 					// TODO(b/197129428): Write a test to make sure this doesn't happen.
 					"prefix": "",
+					// OT calls CreateMetricDescriptor by default. Skip because we want
+					// descriptors to be created implicitly with new time series.
+					"skip_create_descriptor": true,
+					// Omit instrumentation labels, which break agent metrics.
+					"instrumentation_library_labels": false,
+					// Omit service labels, which break agent metrics.
+					"service_resource_labels": false,
 				},
 			},
 		},

diff --git a/...tor/testdata/valid/linux/all-backward_compatible_with_explicit_exporters/golden_otel.conf b/...tor/testdata/valid/linux/all-backward_compatible_with_explicit_exporters/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/all-built_in_config/golden_otel.conf b/confgenerator/testdata/valid/linux/all-built_in_config/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/all-user_config_file_deleted/golden_otel.conf b/confgenerator/testdata/valid/linux/all-user_config_file_deleted/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-custom_log_level/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-custom_log_level/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-default_overrides_disable_all/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-default_overrides_disable_all/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-pipeline_multiple_pipelines/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-pipeline_multiple_pipelines/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-processor_exclude_logs/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-processor_exclude_logs/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-processor_modify_fields/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-processor_modify_fields/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-processor_order/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-processor_order/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/.../testdata/valid/linux/logging-processor_parse_json_and_parse_regex_types/golden_otel.conf b/.../testdata/valid/linux/logging-processor_parse_json_and_parse_regex_types/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/...tdata/valid/linux/logging-processor_parse_regex_type_on_default_pipeline/golden_otel.conf b/...tdata/valid/linux/logging-processor_parse_regex_type_on_default_pipeline/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_apache/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_apache/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_apache_custom/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_apache_custom/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_cassandra/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_cassandra/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_cassandra_custom/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_cassandra_custom/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_couchdb/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_couchdb/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_elasticsearch/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_elasticsearch/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_elasticsearch_custom/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_elasticsearch_custom/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_files_refresh_interval/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_files_refresh_interval/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/...ator/testdata/valid/linux/logging-receiver_files_type_multiple_receivers/golden_otel.conf b/...ator/testdata/valid/linux/logging-receiver_files_type_multiple_receivers/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_forward/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_forward/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/...a/valid/linux/logging-receiver_forward_multiple_receivers_conflicting_id/golden_otel.conf b/...a/valid/linux/logging-receiver_forward_multiple_receivers_conflicting_id/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/...estdata/valid/linux/logging-receiver_forward_multiple_receivers_with_dot/golden_otel.conf b/...estdata/valid/linux/logging-receiver_forward_multiple_receivers_with_dot/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/...stdata/valid/linux/logging-receiver_forward_omitting_optional_parameters/golden_otel.conf b/...stdata/valid/linux/logging-receiver_forward_omitting_optional_parameters/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_hadoop/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_hadoop/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_hadoop_refresh_interval/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_hadoop_refresh_interval/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_hbase/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_hbase/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_kafka/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_kafka/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0:

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_kafka_custom/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_kafka_custom/golden_otel.conf
@@ -1,7 +1,10 @@
 exporters:
   googlecloud:
     metric:
+      instrumentation_library_labels: false
       prefix: ""
+      service_resource_labels: false
+      skip_create_descriptor: true
     user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
 processors:
   agentmetrics/default__pipeline_hostmetrics_0: