Update otel ops collector to v0.71.0 (#1114)

GoogleCloudPlatform · Feb 22, 2023 · 8b98234 · 8b98234
1 parent cc1de93
commit 8b98234
Show file tree

Hide file tree

Showing 186 changed files with 560 additions and 394 deletions.
diff --git a/apps/apache.go b/apps/apache.go
@@ -56,6 +56,9 @@ func (r MetricsReceiverApache) Pipelines() []otel.ReceiverPipeline {
 			otel.MetricsTransform(
 				otel.AddPrefix("workload.googleapis.com"),
 			),
+			otel.TransformationMetrics(
+				otel.FlattenResourceAttribute("apache.server.name", "server_name"),
+			),
 			otel.ModifyInstrumentationScope(r.Type(), "1.0"),
 		}},
 	}}

diff --git a/apps/hostmetrics.go b/apps/hostmetrics.go
@@ -284,14 +284,14 @@ func (r MetricsReceiverHostmetrics) Pipelines() []otel.ReceiverPipeline {
 					otel.AddLabel("process", "all"),
 				),
 				otel.RenameMetric(
-					"process.memory.physical_usage",
+					"process.memory.usage",
 					"processes/rss_usage",
 					// change data type from int64 -> double
 					otel.ToggleScalarDataType,
 					otel.AddLabel("process", "all"),
 				),
 				otel.RenameMetric(
-					"process.memory.virtual_usage",
+					"process.memory.virtual",
 					"processes/vm_usage",
 					// change data type from int64 -> double
 					otel.ToggleScalarDataType,

diff --git a/apps/mysql.go b/apps/mysql.go
@@ -62,6 +62,38 @@ func (r MetricsReceiverMySql) Pipelines() []otel.ReceiverPipeline {
 				"username":            r.Username,
 				"password":            r.Password,
 				"transport":           transport,
+				"metrics": map[string]interface{}{
+					"mysql.commands": map[string]interface{}{
+						"enabled": true,
+					},
+					"mysql.index.io.wait.count": map[string]interface{}{
+						"enabled": false,
+					},
+					"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,
+					},
+					"mysql.opened_resources": map[string]interface{}{
+						"enabled": false,
+					},
+					"mysql.tmp_resources": map[string]interface{}{
+						"enabled": false,
+					},
+					"mysql.prepared_statements": map[string]interface{}{
+						"enabled": false,
+					},
+					"mysql.table.io.wait.count": map[string]interface{}{
+						"enabled": false,
+					},
+					"mysql.table.io.wait.time": map[string]interface{}{
+						"enabled": false,
+					},
+				},
 			},
 		},
 		Processors: map[string][]otel.Component{"metrics": {

diff --git a/cmd/ops_agent_windows/main_windows.go b/cmd/ops_agent_windows/main_windows.go
@@ -143,7 +143,6 @@ 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/otel/processors.go b/confgenerator/otel/processors.go
@@ -113,7 +113,8 @@ func TransformationMetrics(queries ...TransformQuery) Component {
 	return Component{
 		Type: "transform",
 		Config: map[string]map[string]interface{}{
-			"metrics": {
+			"metric_statements": {
+				"context":    "datapoint",
 				"statements": queryStrings,
 			},
 		},

diff --git a/confgenerator/testdata/builtin/linux/builtin/golden/otel.yaml b/confgenerator/testdata/builtin/linux/builtin/golden/otel.yaml
@@ -342,15 +342,15 @@ processors:
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.physical_usage
+      include: process.memory.usage
       new_name: processes/rss_usage
       operations:
       - action: toggle_scalar_data_type
       - action: add_label
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.virtual_usage
+      include: process.memory.virtual
       new_name: processes/vm_usage
       operations:
       - action: toggle_scalar_data_type

diff --git a/confgenerator/testdata/builtin/windows/builtin/golden/otel.yaml b/confgenerator/testdata/builtin/windows/builtin/golden/otel.yaml
@@ -357,15 +357,15 @@ processors:
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.physical_usage
+      include: process.memory.usage
       new_name: processes/rss_usage
       operations:
       - action: toggle_scalar_data_type
       - action: add_label
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.virtual_usage
+      include: process.memory.virtual
       new_name: processes/vm_usage
       operations:
       - action: toggle_scalar_data_type

diff --git a/...tor/testdata/valid/linux/all-backward_compatible_with_explicit_exporters/golden/otel.yaml b/...tor/testdata/valid/linux/all-backward_compatible_with_explicit_exporters/golden/otel.yaml
@@ -337,15 +337,15 @@ processors:
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.physical_usage
+      include: process.memory.usage
       new_name: processes/rss_usage
       operations:
       - action: toggle_scalar_data_type
       - action: add_label
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.virtual_usage
+      include: process.memory.virtual
       new_name: processes/vm_usage
       operations:
       - action: toggle_scalar_data_type

diff --git a/confgenerator/testdata/valid/linux/all-custom_use_built_in_receivers/golden/otel.yaml b/confgenerator/testdata/valid/linux/all-custom_use_built_in_receivers/golden/otel.yaml
@@ -342,15 +342,15 @@ processors:
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.physical_usage
+      include: process.memory.usage
       new_name: processes/rss_usage
       operations:
       - action: toggle_scalar_data_type
       - action: add_label
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.virtual_usage
+      include: process.memory.virtual
       new_name: processes/vm_usage
       operations:
       - action: toggle_scalar_data_type

diff --git a/confgenerator/testdata/valid/linux/all-quoted_map_keys/golden/otel.yaml b/confgenerator/testdata/valid/linux/all-quoted_map_keys/golden/otel.yaml
@@ -342,15 +342,15 @@ processors:
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.physical_usage
+      include: process.memory.usage
       new_name: processes/rss_usage
       operations:
       - action: toggle_scalar_data_type
       - action: add_label
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.virtual_usage
+      include: process.memory.virtual
       new_name: processes/vm_usage
       operations:
       - action: toggle_scalar_data_type

diff --git a/confgenerator/testdata/valid/linux/all-user_config_file_deleted/golden/otel.yaml b/confgenerator/testdata/valid/linux/all-user_config_file_deleted/golden/otel.yaml
@@ -342,15 +342,15 @@ processors:
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.physical_usage
+      include: process.memory.usage
       new_name: processes/rss_usage
       operations:
       - action: toggle_scalar_data_type
       - action: add_label
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.virtual_usage
+      include: process.memory.virtual
       new_name: processes/vm_usage
       operations:
       - action: toggle_scalar_data_type

diff --git a/confgenerator/testdata/valid/linux/combined-receiver_otlp/golden/otel.yaml b/confgenerator/testdata/valid/linux/combined-receiver_otlp/golden/otel.yaml
@@ -352,15 +352,15 @@ processors:
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.physical_usage
+      include: process.memory.usage
       new_name: processes/rss_usage
       operations:
       - action: toggle_scalar_data_type
       - action: add_label
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.virtual_usage
+      include: process.memory.virtual
       new_name: processes/vm_usage
       operations:
       - action: toggle_scalar_data_type

diff --git a/...generator/testdata/valid/linux/combined-receiver_otlp_multiple_pipelines/golden/otel.yaml b/...generator/testdata/valid/linux/combined-receiver_otlp_multiple_pipelines/golden/otel.yaml
@@ -352,15 +352,15 @@ processors:
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.physical_usage
+      include: process.memory.usage
       new_name: processes/rss_usage
       operations:
       - action: toggle_scalar_data_type
       - action: add_label
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.virtual_usage
+      include: process.memory.virtual
       new_name: processes/vm_usage
       operations:
       - action: toggle_scalar_data_type

diff --git a/confgenerator/testdata/valid/linux/combined-receiver_otlp_no_traces/golden/otel.yaml b/confgenerator/testdata/valid/linux/combined-receiver_otlp_no_traces/golden/otel.yaml
@@ -352,15 +352,15 @@ processors:
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.physical_usage
+      include: process.memory.usage
       new_name: processes/rss_usage
       operations:
       - action: toggle_scalar_data_type
       - action: add_label
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.virtual_usage
+      include: process.memory.virtual
       new_name: processes/vm_usage
       operations:
       - action: toggle_scalar_data_type

diff --git a/confgenerator/testdata/valid/linux/logging-custom_log_level/golden/otel.yaml b/confgenerator/testdata/valid/linux/logging-custom_log_level/golden/otel.yaml
@@ -342,15 +342,15 @@ processors:
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.physical_usage
+      include: process.memory.usage
       new_name: processes/rss_usage
       operations:
       - action: toggle_scalar_data_type
       - action: add_label
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.virtual_usage
+      include: process.memory.virtual
       new_name: processes/vm_usage
       operations:
       - action: toggle_scalar_data_type

diff --git a/confgenerator/testdata/valid/linux/logging-default_overrides_disable_all/golden/otel.yaml b/confgenerator/testdata/valid/linux/logging-default_overrides_disable_all/golden/otel.yaml
@@ -342,15 +342,15 @@ processors:
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.physical_usage
+      include: process.memory.usage
       new_name: processes/rss_usage
       operations:
       - action: toggle_scalar_data_type
       - action: add_label
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.virtual_usage
+      include: process.memory.virtual
       new_name: processes/vm_usage
       operations:
       - action: toggle_scalar_data_type

diff --git a/confgenerator/testdata/valid/linux/logging-pipeline_multiple_pipelines/golden/otel.yaml b/confgenerator/testdata/valid/linux/logging-pipeline_multiple_pipelines/golden/otel.yaml
@@ -342,15 +342,15 @@ processors:
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.physical_usage
+      include: process.memory.usage
       new_name: processes/rss_usage
       operations:
       - action: toggle_scalar_data_type
       - action: add_label
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.virtual_usage
+      include: process.memory.virtual
       new_name: processes/vm_usage
       operations:
       - action: toggle_scalar_data_type

diff --git a/confgenerator/testdata/valid/linux/logging-processor_exclude_logs/golden/otel.yaml b/confgenerator/testdata/valid/linux/logging-processor_exclude_logs/golden/otel.yaml
@@ -342,15 +342,15 @@ processors:
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.physical_usage
+      include: process.memory.usage
       new_name: processes/rss_usage
       operations:
       - action: toggle_scalar_data_type
       - action: add_label
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.virtual_usage
+      include: process.memory.virtual
       new_name: processes/vm_usage
       operations:
       - action: toggle_scalar_data_type

diff --git a/confgenerator/testdata/valid/linux/logging-processor_modify_fields/golden/otel.yaml b/confgenerator/testdata/valid/linux/logging-processor_modify_fields/golden/otel.yaml
@@ -342,15 +342,15 @@ processors:
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.physical_usage
+      include: process.memory.usage
       new_name: processes/rss_usage
       operations:
       - action: toggle_scalar_data_type
       - action: add_label
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.virtual_usage
+      include: process.memory.virtual
       new_name: processes/vm_usage
       operations:
       - action: toggle_scalar_data_type

diff --git a/confgenerator/testdata/valid/linux/logging-processor_order/golden/otel.yaml b/confgenerator/testdata/valid/linux/logging-processor_order/golden/otel.yaml
@@ -342,15 +342,15 @@ processors:
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.physical_usage
+      include: process.memory.usage
       new_name: processes/rss_usage
       operations:
       - action: toggle_scalar_data_type
       - action: add_label
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.virtual_usage
+      include: process.memory.virtual
       new_name: processes/vm_usage
       operations:
       - action: toggle_scalar_data_type

diff --git a/.../testdata/valid/linux/logging-processor_parse_json_and_parse_regex_types/golden/otel.yaml b/.../testdata/valid/linux/logging-processor_parse_json_and_parse_regex_types/golden/otel.yaml
@@ -342,15 +342,15 @@ processors:
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.physical_usage
+      include: process.memory.usage
       new_name: processes/rss_usage
       operations:
       - action: toggle_scalar_data_type
       - action: add_label
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.virtual_usage
+      include: process.memory.virtual
       new_name: processes/vm_usage
       operations:
       - action: toggle_scalar_data_type

diff --git a/confgenerator/testdata/valid/linux/logging-processor_parse_multiline/golden/otel.yaml b/confgenerator/testdata/valid/linux/logging-processor_parse_multiline/golden/otel.yaml
@@ -342,15 +342,15 @@ processors:
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.physical_usage
+      include: process.memory.usage
       new_name: processes/rss_usage
       operations:
       - action: toggle_scalar_data_type
       - action: add_label
         new_label: process
         new_value: all
     - action: update
-      include: process.memory.virtual_usage
+      include: process.memory.virtual
       new_name: processes/vm_usage
       operations:
       - action: toggle_scalar_data_type