From 4fdab72edbf1d1b540adc1107be98cccca2f7edb Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Mon, 9 Mar 2026 18:52:05 +0000 Subject: [PATCH 01/18] Update opentelemetry-operations-collector submodule to v0.147.0 --- go.mod | 2 +- submodules/opentelemetry-operations-collector | 2 +- .../output_otel.yaml | 24 +++++------ .../output_otel.yaml | 20 +++++----- .../output_otel.yaml | 4 +- .../output_otel.yaml | 40 +++++++++---------- .../output_otel.yaml | 8 ++-- .../output_otel.yaml | 8 ++-- .../output_otel.yaml | 40 +++++++++---------- .../output_otel.yaml | 40 +++++++++---------- .../output_otel.yaml | 24 ++++++----- 11 files changed, 107 insertions(+), 105 deletions(-) diff --git a/go.mod b/go.mod index cfd01fffb0..61d87d6cf9 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/GoogleCloudPlatform/ops-agent -go 1.24.0 +go 1.25.0 require ( cloud.google.com/go/compute/metadata v0.9.0 diff --git a/submodules/opentelemetry-operations-collector b/submodules/opentelemetry-operations-collector index b4846e8c28..81696804c2 160000 --- a/submodules/opentelemetry-operations-collector +++ b/submodules/opentelemetry-operations-collector @@ -1 +1 @@ -Subproject commit b4846e8c28f304f51e28ed9680baf25817b72f5b +Subproject commit 81696804c285f3b090610c5ba4670b4d3dd2ebc8 diff --git a/transformation_test/testdata/logging_processor-couchbase-general/output_otel.yaml b/transformation_test/testdata/logging_processor-couchbase-general/output_otel.yaml index a11b6bed04..7d0b21324a 100644 --- a/transformation_test/testdata/logging_processor-couchbase-general/output_otel.yaml +++ b/transformation_test/testdata/logging_processor-couchbase-general/output_otel.yaml @@ -112,7 +112,7 @@ timestamp: now partialSuccess: true - collector_errors: - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T09:15:12.123Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -123,9 +123,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T09:16:05.452Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -136,9 +136,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T09:16:33.764Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -149,9 +149,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T09:16:55.987Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -162,9 +162,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T09:17:30.333Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -175,9 +175,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T09:18:00.741Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -188,5 +188,5 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) diff --git a/transformation_test/testdata/logging_processor-couchbase-goxcdr/output_otel.yaml b/transformation_test/testdata/logging_processor-couchbase-goxcdr/output_otel.yaml index ce94b2bd49..d6a186d5a8 100644 --- a/transformation_test/testdata/logging_processor-couchbase-goxcdr/output_otel.yaml +++ b/transformation_test/testdata/logging_processor-couchbase-goxcdr/output_otel.yaml @@ -83,7 +83,7 @@ timestamp: now partialSuccess: true - collector_errors: - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T14:27:02.452Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -94,9 +94,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T14:27:10.874Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -107,9 +107,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T14:27:22.345Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -120,9 +120,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T14:27:45.657Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -133,9 +133,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T14:28:00.998Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -146,5 +146,5 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) diff --git a/transformation_test/testdata/logging_processor-local_timezone/output_otel.yaml b/transformation_test/testdata/logging_processor-local_timezone/output_otel.yaml index 08bdbfedf8..84ed954ace 100644 --- a/transformation_test/testdata/logging_processor-local_timezone/output_otel.yaml +++ b/transformation_test/testdata/logging_processor-local_timezone/output_otel.yaml @@ -26,7 +26,7 @@ timestamp: now partialSuccess: true - collector_errors: - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"unparsable time\" as \"%Y-%m-%dT%H:%M\": cannot parse \"unparsable time\" as \"%Y\"" level: warn msg: failed to execute statement @@ -37,5 +37,5 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M") != nil) diff --git a/transformation_test/testdata/logging_processor-mongodb/output_otel.yaml b/transformation_test/testdata/logging_processor-mongodb/output_otel.yaml index f688ae1a1a..ad727a3b67 100644 --- a/transformation_test/testdata/logging_processor-mongodb/output_otel.yaml +++ b/transformation_test/testdata/logging_processor-mongodb/output_otel.yaml @@ -1412,7 +1412,7 @@ timestamp: now partialSuccess: true - collector_errors: - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "json: float unexpected end of JSON input" level: warn msg: failed to execute statement @@ -1423,9 +1423,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__parsed_json"], ParseJSON(log.body["message"])) where (log.body != nil and log.body["message"] != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21T15:00:28.308+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -1436,9 +1436,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21T15:00:28.309+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -1449,9 +1449,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21T15:00:28.309+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -1462,9 +1462,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21T15:00:28.310+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -1475,9 +1475,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21T15:00:28.310+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -1488,9 +1488,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21T15:00:28.310+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -1501,9 +1501,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21T15:00:28.310+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -1514,9 +1514,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21T15:00:28.310+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -1527,9 +1527,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21T15:00:28.310+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -1540,5 +1540,5 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) diff --git a/transformation_test/testdata/logging_processor-oracledb_alert/output_otel.yaml b/transformation_test/testdata/logging_processor-oracledb_alert/output_otel.yaml index f98269d5c6..62cac53474 100644 --- a/transformation_test/testdata/logging_processor-oracledb_alert/output_otel.yaml +++ b/transformation_test/testdata/logging_processor-oracledb_alert/output_otel.yaml @@ -35,7 +35,7 @@ timestamp: now partialSuccess: true - collector_errors: - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2021-12-21T10:19:47.339827-05:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"-05:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -46,9 +46,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2022-03-15T14:32:18.456789+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -59,5 +59,5 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) diff --git a/transformation_test/testdata/logging_processor-parse_json-timestamp-format-1/output_otel.yaml b/transformation_test/testdata/logging_processor-parse_json-timestamp-format-1/output_otel.yaml index d3acaf5601..8f538cde9c 100644 --- a/transformation_test/testdata/logging_processor-parse_json-timestamp-format-1/output_otel.yaml +++ b/transformation_test/testdata/logging_processor-parse_json-timestamp-format-1/output_otel.yaml @@ -39,7 +39,7 @@ timestamp: now partialSuccess: true - collector_errors: - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2024-06-15T14:30:00.987654321Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -50,9 +50,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2022-12-31T23:59:59.000000000-0800\": extra text: \"-0800\"" level: warn msg: failed to execute statement @@ -63,5 +63,5 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L") != nil) diff --git a/transformation_test/testdata/logging_processor-postgresql/output_otel.yaml b/transformation_test/testdata/logging_processor-postgresql/output_otel.yaml index 2c43c6a5de..d1eef1385b 100644 --- a/transformation_test/testdata/logging_processor-postgresql/output_otel.yaml +++ b/transformation_test/testdata/logging_processor-postgresql/output_otel.yaml @@ -374,7 +374,7 @@ timestamp: now partialSuccess: true - collector_errors: - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:21.123 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -385,9 +385,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:21.124 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -398,9 +398,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:21.125 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -411,9 +411,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:22.301 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -424,9 +424,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:25.411 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -437,9 +437,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:25.411 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -450,9 +450,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:27.123 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -463,9 +463,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:30.673 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -476,9 +476,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:30.673 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -489,9 +489,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:35.987 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -502,5 +502,5 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) diff --git a/transformation_test/testdata/logging_processor-rabbitmq/output_otel.yaml b/transformation_test/testdata/logging_processor-rabbitmq/output_otel.yaml index fa37eb65ed..4aa1f74fbe 100644 --- a/transformation_test/testdata/logging_processor-rabbitmq/output_otel.yaml +++ b/transformation_test/testdata/logging_processor-rabbitmq/output_otel.yaml @@ -218,7 +218,7 @@ timestamp: now partialSuccess: true - collector_errors: - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 01:01:20.441571+00:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -229,9 +229,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 01:05:10.000123+02:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+02:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -242,9 +242,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 02:15:45.987+00:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -255,9 +255,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 02:16:01.001+00:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -268,9 +268,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 02:22:33.444+00:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -281,9 +281,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 02:23:00.999+00:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -294,9 +294,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 02:55:55.123+00:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -307,9 +307,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 03:56:01.456+00:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -320,9 +320,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 04:06:06.789+00:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -333,9 +333,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 04:06:10.101+00:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -346,5 +346,5 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) diff --git a/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml b/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml index a59fec836d..287cf69879 100644 --- a/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml +++ b/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml @@ -10,25 +10,27 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 stacktrace: |- go.opentelemetry.io/collector/exporter/exporterhelper/internal.(*BaseExporter).Send - go.opentelemetry.io/collector/exporter/exporterhelper@v0.145.0/internal/base_exporter.go:115 + go.opentelemetry.io/collector/exporter/exporterhelper@v0.147.0/internal/base_exporter.go:115 go.opentelemetry.io/collector/exporter/exporterhelper/internal.NewLogsRequest.newConsumeLogs.func1 - go.opentelemetry.io/collector/exporter/exporterhelper@v0.145.0/internal/new_request.go:70 + go.opentelemetry.io/collector/exporter/exporterhelper@v0.147.0/internal/new_request.go:70 go.opentelemetry.io/collector/consumer.ConsumeLogsFunc.ConsumeLogs - go.opentelemetry.io/collector/consumer@v1.51.0/logs.go:27 + go.opentelemetry.io/collector/consumer@v1.53.0/logs.go:27 go.opentelemetry.io/collector/service/internal/refconsumer.refLogs.ConsumeLogs - go.opentelemetry.io/collector/service@v0.145.0/internal/refconsumer/logs.go:29 + go.opentelemetry.io/collector/service@v0.147.0/internal/refconsumer/logs.go:29 go.opentelemetry.io/collector/internal/fanoutconsumer.(*logsConsumer).ConsumeLogs - go.opentelemetry.io/collector/internal/fanoutconsumer@v0.145.0/logs.go:62 + go.opentelemetry.io/collector/internal/fanoutconsumer@v0.147.0/logs.go:62 go.opentelemetry.io/collector/processor/batchprocessor.(*batchLogs).export - go.opentelemetry.io/collector/processor/batchprocessor@v0.145.0/batch_processor.go:548 + go.opentelemetry.io/collector/processor/batchprocessor@v0.147.0/batch_processor.go:545 go.opentelemetry.io/collector/processor/batchprocessor.(*shard[...]).sendItems - go.opentelemetry.io/collector/processor/batchprocessor@v0.145.0/batch_processor.go:273 + go.opentelemetry.io/collector/processor/batchprocessor@v0.147.0/batch_processor.go:270 go.opentelemetry.io/collector/processor/batchprocessor.(*shard[...]).startLoop - go.opentelemetry.io/collector/processor/batchprocessor@v0.145.0/batch_processor.go:216 - - caller: batchprocessor@v0.145.0/batch_processor.go:275 + go.opentelemetry.io/collector/processor/batchprocessor@v0.147.0/batch_processor.go:213 + sync.(*WaitGroup).Go.func1 + golang.org/toolchain@v0.0.1-go1.25.0.linux-amd64/src/sync/waitgroup.go:239 + - caller: batchprocessor@v0.147.0/batch_processor.go:272 error: "could not process attribute gcp.source_location: json: cannot unmarshal string into Go struct field LogEntrySourceLocation.line of type int64" level: warn msg: Sender failed @@ -39,4 +41,4 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 From 2991ff71b001223357c7167a739e4ba8014d93e4 Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Mon, 9 Mar 2026 19:51:12 +0000 Subject: [PATCH 02/18] Bump Go versions in CI config and integration tests to 1.25 --- .github/workflows/pr_presubmit.yaml | 2 +- integration_test/ops_agent_test/main_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr_presubmit.yaml b/.github/workflows/pr_presubmit.yaml index be3f44f3b1..2154b2d925 100644 --- a/.github/workflows/pr_presubmit.yaml +++ b/.github/workflows/pr_presubmit.yaml @@ -26,7 +26,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: 1.24.x + go-version: 1.25.x cache: true - id: files diff --git a/integration_test/ops_agent_test/main_test.go b/integration_test/ops_agent_test/main_test.go index 269787d3fa..24c95f2465 100644 --- a/integration_test/ops_agent_test/main_test.go +++ b/integration_test/ops_agent_test/main_test.go @@ -4681,7 +4681,7 @@ func installGolang(ctx context.Context, logger *log.Logger, vm *gce.VM) error { // To update this, first run `mirror_content.sh` under `integration_test`. Example: // ./mirror_content.sh https://go.dev/dl/go1.21.4.linux-{amd64,arm64}.tar.gz // Then update this version. - goVersion := "1.24.11" + goVersion := "1.25.0" goArch := "amd64" if gce.IsARM(vm.ImageSpec) { From a46a1e0df3ddebd5b7e95a5b98b5cef949f51278 Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Mon, 9 Mar 2026 19:55:19 +0000 Subject: [PATCH 03/18] Bump Go version in Docker templates to 1.25.0 --- Dockerfile | 2 +- Dockerfile.windows | 4 ++-- dockerfiles/template-header | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 489a714f51..b40ceffd00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ ARG CMAKE_VERSION=3.25.2 ARG OPENJDK_MAJOR_VERSION=17 ARG OPENJDK_FULL_VERSION=17.0.8 ARG OPENJDK_VERSION_SUFFIX=7 -ARG GO_VERSION=1.24.3 +ARG GO_VERSION=1.25.0 # Manually prepare a recent enough version of CMake. # This should be used on platforms where the default package manager diff --git a/Dockerfile.windows b/Dockerfile.windows index aff635cada..005aec772c 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -174,10 +174,10 @@ RUN Copy-Item -Path C:\Windows\System32\msvcp140.dll -Destination /work/out/bin/ # # Install Golang # -ADD https://go.dev/dl/go1.24.11.windows-amd64.msi /local/go1.24.11.windows-amd64.msi +ADD https://go.dev/dl/go1.25.0.windows-amd64.msi /local/go1.25.0.windows-amd64.msi RUN Start-Process msiexec.exe ` - -ArgumentList '/i C:\local\go1.24.11.windows-amd64.msi ', '/quiet ', ` + -ArgumentList '/i C:\local\go1.25.0.windows-amd64.msi ', '/quiet ', ` '/norestart ', 'ALLUSERS=1,INSTALLDIR=C:\Go' -NoNewWindow -Wait; # diff --git a/dockerfiles/template-header b/dockerfiles/template-header index c113fa04fb..b0bdae1f47 100644 --- a/dockerfiles/template-header +++ b/dockerfiles/template-header @@ -24,7 +24,7 @@ ARG CMAKE_VERSION=3.25.2 ARG OPENJDK_MAJOR_VERSION=17 ARG OPENJDK_FULL_VERSION=17.0.8 ARG OPENJDK_VERSION_SUFFIX=7 -ARG GO_VERSION=1.24.3 +ARG GO_VERSION=1.25.0 # Manually prepare a recent enough version of CMake. # This should be used on platforms where the default package manager From c8e7cac8019fd24cbd856362a41744a4e424f766 Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Mon, 9 Mar 2026 19:57:02 +0000 Subject: [PATCH 04/18] Revert Go version bump in integration tests --- integration_test/ops_agent_test/main_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration_test/ops_agent_test/main_test.go b/integration_test/ops_agent_test/main_test.go index 24c95f2465..269787d3fa 100644 --- a/integration_test/ops_agent_test/main_test.go +++ b/integration_test/ops_agent_test/main_test.go @@ -4681,7 +4681,7 @@ func installGolang(ctx context.Context, logger *log.Logger, vm *gce.VM) error { // To update this, first run `mirror_content.sh` under `integration_test`. Example: // ./mirror_content.sh https://go.dev/dl/go1.21.4.linux-{amd64,arm64}.tar.gz // Then update this version. - goVersion := "1.25.0" + goVersion := "1.24.11" goArch := "amd64" if gce.IsARM(vm.ImageSpec) { From 13fedd5a711af8d03d8b2236ec20f8605127492d Mon Sep 17 00:00:00 2001 From: Francisco Valente Castro <1435136+franciscovalentecastro@users.noreply.github.com> Date: Mon, 9 Mar 2026 17:33:03 -0400 Subject: [PATCH 05/18] [confgenerator ] Set `block_on_overflow` and exporter batching in Otel Cloud Logging exporter. (#2208) --- confgenerator/confgenerator.go | 22 ++++++++++++++----- .../golden/linux-gpu/otel.yaml | 16 +++++++++----- .../golden/linux/otel.yaml | 16 +++++++++----- .../golden/windows-2012/otel.yaml | 16 +++++++++----- .../golden/windows/otel.yaml | 16 +++++++++----- .../golden/linux-gpu/otel.yaml | 17 +++++++++----- .../golden/linux/otel.yaml | 17 +++++++++----- .../golden/windows-2012/otel.yaml | 19 +++++++++------- .../golden/windows/otel.yaml | 19 +++++++++------- .../golden/linux-gpu/otel.yaml | 17 +++++++++----- .../golden/linux/otel.yaml | 17 +++++++++----- .../golden/windows-2012/otel.yaml | 19 +++++++++------- .../golden/windows/otel.yaml | 19 +++++++++------- .../golden/linux-gpu/otel.yaml | 17 +++++++++----- .../golden/linux/otel.yaml | 17 +++++++++----- .../golden/windows-2012/otel.yaml | 19 +++++++++------- .../golden/windows/otel.yaml | 19 +++++++++------- .../golden/linux-gpu/otel.yaml | 17 +++++++++----- .../golden/linux/otel.yaml | 17 +++++++++----- .../golden/windows-2012/otel.yaml | 19 +++++++++------- .../golden/windows/otel.yaml | 19 +++++++++------- .../golden/linux-gpu/otel.yaml | 16 +++++++++----- .../golden/linux/otel.yaml | 16 +++++++++----- .../golden/windows-2012/otel.yaml | 18 +++++++++------ .../golden/windows/otel.yaml | 18 +++++++++------ .../golden/linux-gpu/otel.yaml | 17 +++++++++----- .../golden/linux/otel.yaml | 17 +++++++++----- .../golden/windows-2012/otel.yaml | 19 +++++++++------- .../golden/windows/otel.yaml | 19 +++++++++------- .../golden/linux-gpu/otel.yaml | 16 +++++++++----- .../golden/linux/otel.yaml | 16 +++++++++----- .../golden/windows-2012/otel.yaml | 18 +++++++++------ .../golden/windows/otel.yaml | 18 +++++++++------ .../golden/linux-gpu/otel.yaml | 17 +++++++++----- .../golden/linux/otel.yaml | 17 +++++++++----- .../golden/windows-2012/otel.yaml | 19 +++++++++------- .../golden/windows/otel.yaml | 19 +++++++++------- .../golden/linux-gpu/otel.yaml | 17 +++++++++----- .../golden/linux/otel.yaml | 17 +++++++++----- .../golden/windows-2012/otel.yaml | 19 +++++++++------- .../golden/windows/otel.yaml | 19 +++++++++------- .../golden/linux-gpu/otel.yaml | 19 +++++++++------- .../golden/linux/otel.yaml | 19 +++++++++------- .../golden/windows-2012/otel.yaml | 21 +++++++++--------- .../golden/windows/otel.yaml | 21 +++++++++--------- .../golden/linux-gpu/otel.yaml | 18 +++++++++------ .../golden/linux/otel.yaml | 18 +++++++++------ .../golden/windows-2012/otel.yaml | 20 +++++++++-------- .../golden/windows/otel.yaml | 20 +++++++++-------- .../golden/linux-gpu/otel.yaml | 17 +++++++++----- .../golden/linux/otel.yaml | 17 +++++++++----- .../golden/windows-2012/otel.yaml | 17 +++++++++----- .../golden/windows/otel.yaml | 17 +++++++++----- .../golden/linux-gpu/otel.yaml | 17 +++++++++----- .../golden/linux/otel.yaml | 17 +++++++++----- .../golden/windows-2012/otel.yaml | 21 +++++++++--------- .../golden/windows/otel.yaml | 21 +++++++++--------- .../golden/windows-2012/otel.yaml | 20 +++++++++-------- .../golden/windows/otel.yaml | 20 +++++++++-------- 59 files changed, 654 insertions(+), 412 deletions(-) diff --git a/confgenerator/confgenerator.go b/confgenerator/confgenerator.go index a78a830b4d..59a6a4dc5c 100644 --- a/confgenerator/confgenerator.go +++ b/confgenerator/confgenerator.go @@ -64,6 +64,22 @@ func googleCloudLoggingExporter() otel.Component { // Set to mirror the 60s max limit of default retry window in Google Cloud Logging apiv2 go client : // https://github.com/googleapis/google-cloud-go/blob/logging/v1.4.2/logging/apiv2/logging_client.go#L78-L90 "timeout": "60s", + "sending_queue": map[string]interface{}{ + "enabled": true, + // Set queue_size to "(num_consumers + 2)*1000" to always have a new batch ready. + "queue_size": 12000, + "num_consumers": 10, + "sizer": "items", + // Blocks the "sending_queue" on overflow to reduce log loss. + "block_on_overflow": true, + // Set batch in "sending_queue" is recommended instead of using the batch processor. + "batch": map[string]interface{}{ + "flush_timeout": "200ms", + "min_size": 1000, + "max_size": 1000, + "sizer": "items", + }, + }, }, } } @@ -228,12 +244,6 @@ func (uc *UnifiedConfig) GenerateOtelConfig(ctx context.Context, outDir, stateDi }, otel.Logging: { Exporter: googleCloudLoggingExporter(), - ProcessorsByType: map[string][]otel.Component{ - // Batching logs improves log export performance. - "logs": { - otel.BatchProcessor(1000, 1000, "200ms"), - }, - }, }, }, }.Generate(ctx) 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 index 5ca7c10732..7ef884bdcb 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s googlecloud/otel: metric: @@ -25,10 +36,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -742,7 +749,6 @@ service: processors: - transform/otlp_0 - resourcedetection/_global_1 - - batch/googlecloud/logging_logs_0 receivers: - otlp/otlp metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml index 550661cdcb..13ba565b6b 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s googlecloud/otel: metric: @@ -25,10 +36,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -711,7 +718,6 @@ service: processors: - transform/otlp_0 - resourcedetection/_global_1 - - batch/googlecloud/logging_logs_0 receivers: - otlp/otlp metrics/default__pipeline_hostmetrics: 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 index 685b78b25b..f5b9baf066 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s googlecloud/otel: metric: @@ -25,10 +36,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -824,7 +831,6 @@ service: processors: - transform/otlp_0 - resourcedetection/_global_1 - - batch/googlecloud/logging_logs_0 receivers: - otlp/otlp metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml index 685b78b25b..f5b9baf066 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s googlecloud/otel: metric: @@ -25,10 +36,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -824,7 +831,6 @@ service: processors: - transform/otlp_0 - resourcedetection/_global_1 - - batch/googlecloud/logging_logs_0 receivers: - otlp/otlp metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/otel.yaml index 1c35140d92..6663e61a4e 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -885,7 +892,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_p1_sample__logs: @@ -917,7 +923,6 @@ service: - filter/logs_p1_sample__logs_21 - filter/logs_p1_sample__logs_22 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/otel.yaml index d090fd4927..a869e40222 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -854,7 +861,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_p1_sample__logs: @@ -886,7 +892,6 @@ service: - filter/logs_p1_sample__logs_21 - filter/logs_p1_sample__logs_22 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/otel.yaml index 7557955f69..9624dddd82 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1308,7 +1315,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1319,7 +1325,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1330,7 +1335,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_p1_sample__logs: @@ -1362,7 +1366,6 @@ service: - filter/logs_p1_sample__logs_21 - filter/logs_p1_sample__logs_22 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/otel.yaml index 7557955f69..9624dddd82 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1308,7 +1315,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1319,7 +1325,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1330,7 +1335,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_p1_sample__logs: @@ -1362,7 +1366,6 @@ service: - filter/logs_p1_sample__logs_21 - filter/logs_p1_sample__logs_22 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml index 16e7bdcf04..b1f338bf1a 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -858,7 +865,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_p1_sample__logs: @@ -868,7 +874,6 @@ service: - transform/sample__logs_0 - transform/logs_p1_sample__logs_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml index ca9dacaa7a..4d2b03d9c0 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -827,7 +834,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_p1_sample__logs: @@ -837,7 +843,6 @@ service: - transform/sample__logs_0 - transform/logs_p1_sample__logs_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml index 96d0738159..78a53b9733 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1281,7 +1288,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1292,7 +1298,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1303,7 +1308,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_p1_sample__logs: @@ -1313,7 +1317,6 @@ service: - transform/sample__logs_0 - transform/logs_p1_sample__logs_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml index 96d0738159..78a53b9733 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1281,7 +1288,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1292,7 +1298,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1303,7 +1308,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_p1_sample__logs: @@ -1313,7 +1317,6 @@ service: - transform/sample__logs_0 - transform/logs_p1_sample__logs_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux-gpu/otel.yaml index 48f524e2ed..a57fb4bf40 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux-gpu/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -773,7 +780,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_p1_sample__logs: @@ -783,7 +789,6 @@ service: - transform/sample__logs_0 - transform/logs_p1_sample__logs_0 - resourcedetection/_global_1 - - batch/googlecloud/logging_logs_0 receivers: - otlp/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux/otel.yaml index 2944a3515d..674ff4c37d 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -742,7 +749,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_p1_sample__logs: @@ -752,7 +758,6 @@ service: - transform/sample__logs_0 - transform/logs_p1_sample__logs_0 - resourcedetection/_global_1 - - batch/googlecloud/logging_logs_0 receivers: - otlp/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows-2012/otel.yaml index ff10284972..2fe95c5896 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows-2012/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1196,7 +1203,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1207,7 +1213,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1218,7 +1223,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_p1_sample__logs: @@ -1228,7 +1232,6 @@ service: - transform/sample__logs_0 - transform/logs_p1_sample__logs_0 - resourcedetection/_global_1 - - batch/googlecloud/logging_logs_0 receivers: - otlp/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows/otel.yaml index ff10284972..2fe95c5896 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1196,7 +1203,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1207,7 +1213,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1218,7 +1223,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_p1_sample__logs: @@ -1228,7 +1232,6 @@ service: - transform/sample__logs_0 - transform/logs_p1_sample__logs_0 - resourcedetection/_global_1 - - batch/googlecloud/logging_logs_0 receivers: - otlp/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml index 36f63fbb45..b96b9ab313 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -825,7 +832,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_pipeline1_log__source__id1: @@ -835,7 +841,6 @@ service: - transform/log__source__id1_0 - transform/logs_pipeline1_log__source__id1_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/log__source__id1 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml index 7090d0c42e..7ab163a966 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -794,7 +801,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_pipeline1_log__source__id1: @@ -804,7 +810,6 @@ service: - transform/log__source__id1_0 - transform/logs_pipeline1_log__source__id1_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/log__source__id1 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml index 239440da56..5fc9e39d2c 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1248,7 +1255,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1259,7 +1265,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1270,7 +1275,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_pipeline1_log__source__id1: @@ -1280,7 +1284,6 @@ service: - transform/log__source__id1_0 - transform/logs_pipeline1_log__source__id1_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/log__source__id1 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml index 239440da56..5fc9e39d2c 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1248,7 +1255,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1259,7 +1265,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1270,7 +1275,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_pipeline1_log__source__id1: @@ -1280,7 +1284,6 @@ service: - transform/log__source__id1_0 - transform/logs_pipeline1_log__source__id1_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/log__source__id1 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml index 693da6dbc7..904babe6fe 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -781,7 +788,6 @@ service: - transform/syslog_0 - transform/logs_default__pipeline_syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml index acc56b4913..832d314501 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -750,7 +757,6 @@ service: - transform/syslog_0 - transform/logs_default__pipeline_syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml index 3fb93a1521..a86b3aa5cd 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1314,7 +1321,6 @@ service: - transform/windows__event__log_2 - transform/logs_default__pipeline_windows__event__log_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1326,7 +1332,6 @@ service: - transform/windows__event__log_1_2 - transform/logs_default__pipeline_windows__event__log_1_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1338,7 +1343,6 @@ service: - transform/windows__event__log_2_2 - transform/logs_default__pipeline_windows__event__log_2_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml index 3fb93a1521..a86b3aa5cd 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1314,7 +1321,6 @@ service: - transform/windows__event__log_2 - transform/logs_default__pipeline_windows__event__log_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1326,7 +1332,6 @@ service: - transform/windows__event__log_1_2 - transform/logs_default__pipeline_windows__event__log_1_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1338,7 +1343,6 @@ service: - transform/windows__event__log_2_2 - transform/logs_default__pipeline_windows__event__log_2_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml index c132d78e28..b6ee56b4b8 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -770,7 +777,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_pipeline1_log__source__id1: @@ -779,7 +785,6 @@ service: processors: - transform/log__source__id1_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/log__source__id1 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml index 44bb140cd2..14d0b74cf9 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -739,7 +746,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_pipeline1_log__source__id1: @@ -748,7 +754,6 @@ service: processors: - transform/log__source__id1_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/log__source__id1 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml index 1f4f1ea580..21c1bacc4d 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1193,7 +1200,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1204,7 +1210,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1215,7 +1220,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_pipeline1_log__source__id1: @@ -1224,7 +1228,6 @@ service: processors: - transform/log__source__id1_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/log__source__id1 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml index 1f4f1ea580..21c1bacc4d 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1193,7 +1200,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1204,7 +1210,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1215,7 +1220,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_pipeline1_log__source__id1: @@ -1224,7 +1228,6 @@ service: processors: - transform/log__source__id1_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/log__source__id1 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux-gpu/otel.yaml index bedf147f64..fa9baf4aea 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux-gpu/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s googlecloud/otel: metric: @@ -25,10 +36,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -781,7 +788,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_fluent__forward_fluent__forward: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux/otel.yaml index 4a6f5fd844..b1e2f82736 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s googlecloud/otel: metric: @@ -25,10 +36,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -750,7 +757,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_fluent__forward_fluent__forward: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows-2012/otel.yaml index 864e5ee3a1..cef5c0c132 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows-2012/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s googlecloud/otel: metric: @@ -25,10 +36,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1204,7 +1211,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1215,7 +1221,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1226,7 +1231,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_fluent__forward_fluent__forward: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows/otel.yaml index 864e5ee3a1..cef5c0c132 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s googlecloud/otel: metric: @@ -25,10 +36,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1204,7 +1211,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1215,7 +1221,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1226,7 +1231,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_fluent__forward_fluent__forward: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux-gpu/otel.yaml index 5b19988646..8949e4741a 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux-gpu/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -860,7 +867,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_kafka_kafka: @@ -872,7 +878,6 @@ service: - transform/kafka_2 - transform/kafka_3 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/kafka metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux/otel.yaml index 6966ff03e8..6ed99d5eb8 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -829,7 +836,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_kafka_kafka: @@ -841,7 +847,6 @@ service: - transform/kafka_2 - transform/kafka_3 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/kafka metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows-2012/otel.yaml index e0bc47b44c..4f40dcb921 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows-2012/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1283,7 +1290,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1294,7 +1300,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1305,7 +1310,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_kafka_kafka: @@ -1317,7 +1321,6 @@ service: - transform/kafka_2 - transform/kafka_3 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/kafka metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows/otel.yaml index e0bc47b44c..4f40dcb921 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1283,7 +1290,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1294,7 +1300,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1305,7 +1310,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_kafka_kafka: @@ -1317,7 +1321,6 @@ service: - transform/kafka_2 - transform/kafka_3 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/kafka metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux-gpu/otel.yaml index b53b747362..4642bd87ed 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux-gpu/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -1064,7 +1071,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_mongodb_mongodb: @@ -1086,7 +1092,6 @@ service: - transform/mongodb_12 - transform/mongodb_13 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/mongodb metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux/otel.yaml index 3188b09a4d..db431396d3 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -1033,7 +1040,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_mongodb_mongodb: @@ -1055,7 +1061,6 @@ service: - transform/mongodb_12 - transform/mongodb_13 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/mongodb metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows-2012/otel.yaml index eb6cc53325..995a18b938 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows-2012/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1487,7 +1494,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1498,7 +1504,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1509,7 +1514,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_mongodb_mongodb: @@ -1531,7 +1535,6 @@ service: - transform/mongodb_12 - transform/mongodb_13 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/mongodb metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows/otel.yaml index eb6cc53325..995a18b938 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1487,7 +1494,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1498,7 +1504,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1509,7 +1514,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_mongodb_mongodb: @@ -1531,7 +1535,6 @@ service: - transform/mongodb_12 - transform/mongodb_13 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/mongodb metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux-gpu/otel.yaml index 38c41059d8..7dc323f8bf 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux-gpu/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -1402,7 +1409,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_mysql_mysql__error: @@ -1415,7 +1421,6 @@ service: - transform/mysql__error_3 - transform/mysql__error_4 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/mysql__error logs/logs_mysql_mysql__general: @@ -1428,7 +1433,6 @@ service: - transform/mysql__general_3 - transform/mysql__general_4 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/mysql__general logs/logs_mysql_mysql__slow: @@ -1441,7 +1445,6 @@ service: - transform/mysql__slow_3 - transform/mysql__slow_4 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/mysql__slow metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux/otel.yaml index 23e997f5a8..636a70d334 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -1371,7 +1378,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_mysql_mysql__error: @@ -1384,7 +1390,6 @@ service: - transform/mysql__error_3 - transform/mysql__error_4 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/mysql__error logs/logs_mysql_mysql__general: @@ -1397,7 +1402,6 @@ service: - transform/mysql__general_3 - transform/mysql__general_4 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/mysql__general logs/logs_mysql_mysql__slow: @@ -1410,7 +1414,6 @@ service: - transform/mysql__slow_3 - transform/mysql__slow_4 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/mysql__slow metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows-2012/otel.yaml index 53c114f814..d54b6657e2 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows-2012/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1825,7 +1832,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1836,7 +1842,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1847,7 +1852,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_mysql_mysql__error: @@ -1860,7 +1864,6 @@ service: - transform/mysql__error_3 - transform/mysql__error_4 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/mysql__error logs/logs_mysql_mysql__general: @@ -1873,7 +1876,6 @@ service: - transform/mysql__general_3 - transform/mysql__general_4 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/mysql__general logs/logs_mysql_mysql__slow: @@ -1886,7 +1888,6 @@ service: - transform/mysql__slow_3 - transform/mysql__slow_4 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/mysql__slow metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows/otel.yaml index 53c114f814..d54b6657e2 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1825,7 +1832,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1836,7 +1842,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1847,7 +1852,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_mysql_mysql__error: @@ -1860,7 +1864,6 @@ service: - transform/mysql__error_3 - transform/mysql__error_4 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/mysql__error logs/logs_mysql_mysql__general: @@ -1873,7 +1876,6 @@ service: - transform/mysql__general_3 - transform/mysql__general_4 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/mysql__general logs/logs_mysql_mysql__slow: @@ -1886,7 +1888,6 @@ service: - transform/mysql__slow_3 - transform/mysql__slow_4 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/mysql__slow metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux-gpu/otel.yaml index dc3cc7f157..628570260b 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux-gpu/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -1033,7 +1040,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_nginx_nginx__access: @@ -1044,7 +1050,6 @@ service: - transform/nginx__access_1 - transform/nginx__access_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/nginx__access logs/logs_nginx_nginx__error: @@ -1055,7 +1060,6 @@ service: - transform/nginx__error_1 - transform/nginx__error_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/nginx__error metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux/otel.yaml index 71711b731e..563f5d2ed2 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -1002,7 +1009,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_nginx_nginx__access: @@ -1013,7 +1019,6 @@ service: - transform/nginx__access_1 - transform/nginx__access_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/nginx__access logs/logs_nginx_nginx__error: @@ -1024,7 +1029,6 @@ service: - transform/nginx__error_1 - transform/nginx__error_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/nginx__error metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows-2012/otel.yaml index e519fb0e1a..7bed928cb5 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows-2012/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1456,7 +1463,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1467,7 +1473,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1478,7 +1483,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_nginx_nginx__access: @@ -1489,7 +1493,6 @@ service: - transform/nginx__access_1 - transform/nginx__access_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/nginx__access logs/logs_nginx_nginx__error: @@ -1500,7 +1503,6 @@ service: - transform/nginx__error_1 - transform/nginx__error_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/nginx__error metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows/otel.yaml index e519fb0e1a..7bed928cb5 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1456,7 +1463,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1467,7 +1473,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1478,7 +1483,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_nginx_nginx__access: @@ -1489,7 +1493,6 @@ service: - transform/nginx__access_1 - transform/nginx__access_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/nginx__access logs/logs_nginx_nginx__error: @@ -1500,7 +1503,6 @@ service: - transform/nginx__error_1 - transform/nginx__error_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/nginx__error metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml index b50474c45d..7101a6e4a4 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -884,7 +891,6 @@ service: - transform/test__syslog__source__id__tcp_1 - transform/logs_pipeline1_test__syslog__source__id__tcp_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - syslog/test__syslog__source__id__tcp logs/logs_pipeline2_test__syslog__source__id__udp: @@ -895,7 +901,6 @@ service: - transform/test__syslog__source__id__udp_1 - transform/logs_pipeline2_test__syslog__source__id__udp_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - syslog/test__syslog__source__id__udp metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml index 81f029feef..528f94418d 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -853,7 +860,6 @@ service: - transform/test__syslog__source__id__tcp_1 - transform/logs_pipeline1_test__syslog__source__id__tcp_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - syslog/test__syslog__source__id__tcp logs/logs_pipeline2_test__syslog__source__id__udp: @@ -864,7 +870,6 @@ service: - transform/test__syslog__source__id__udp_1 - transform/logs_pipeline2_test__syslog__source__id__udp_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - syslog/test__syslog__source__id__udp metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml index b968db8cb0..e9a16dfa13 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -966,7 +973,6 @@ service: - transform/test__syslog__source__id__tcp_1 - transform/logs_pipeline1_test__syslog__source__id__tcp_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - syslog/test__syslog__source__id__tcp logs/logs_pipeline2_test__syslog__source__id__udp: @@ -977,7 +983,6 @@ service: - transform/test__syslog__source__id__udp_1 - transform/logs_pipeline2_test__syslog__source__id__udp_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - syslog/test__syslog__source__id__udp metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml index b968db8cb0..e9a16dfa13 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -966,7 +973,6 @@ service: - transform/test__syslog__source__id__tcp_1 - transform/logs_pipeline1_test__syslog__source__id__tcp_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - syslog/test__syslog__source__id__tcp logs/logs_pipeline2_test__syslog__source__id__udp: @@ -977,7 +983,6 @@ service: - transform/test__syslog__source__id__udp_1 - transform/logs_pipeline2_test__syslog__source__id__udp_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - syslog/test__syslog__source__id__udp metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel.yaml index ae8ac00ddf..c687c01ffe 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -794,7 +801,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_systemd__pipeline_systemd__logs: @@ -804,7 +810,6 @@ service: - transform/systemd__logs_0 - transform/systemd__logs_1 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - journald/systemd__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel.yaml index 85ea1ed236..40ed87dc5c 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms cumulativetodelta/loggingmetrics_4: include: match_type: strict @@ -763,7 +770,6 @@ service: processors: - transform/syslog_0 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - filelog/syslog logs/logs_systemd__pipeline_systemd__logs: @@ -773,7 +779,6 @@ service: - transform/systemd__logs_0 - transform/systemd__logs_1 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - journald/systemd__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml index 740fd32a28..a5d4a99803 100644 --- a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1688,7 +1695,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1699,7 +1705,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1710,7 +1715,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_winlog2_winlog2: @@ -1721,7 +1725,6 @@ service: - transform/winlog2_1 - transform/winlog2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/winlog2 logs/logs_winlog2_winlog2_1: @@ -1732,7 +1735,6 @@ service: - transform/winlog2_1_1 - transform/winlog2_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/winlog2_1 logs/logs_winlog2_winlog2_2: @@ -1743,7 +1745,6 @@ service: - transform/winlog2_2_1 - transform/winlog2_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/winlog2_2 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml index 740fd32a28..a5d4a99803 100644 --- a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1688,7 +1695,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1699,7 +1705,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1710,7 +1715,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_winlog2_winlog2: @@ -1721,7 +1725,6 @@ service: - transform/winlog2_1 - transform/winlog2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/winlog2 logs/logs_winlog2_winlog2_1: @@ -1732,7 +1735,6 @@ service: - transform/winlog2_1_1 - transform/winlog2_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/winlog2_1 logs/logs_winlog2_winlog2_2: @@ -1743,7 +1745,6 @@ service: - transform/winlog2_2_1 - transform/winlog2_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/winlog2_2 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml index 345a840ef8..0094fb1693 100644 --- a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1286,7 +1293,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1297,7 +1303,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1308,7 +1313,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_winlog2_winlog2: @@ -1319,7 +1323,6 @@ service: - transform/winlog2_1 - transform/winlog2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/winlog2 logs/logs_winlog2_winlog2_1: @@ -1330,7 +1333,6 @@ service: - transform/winlog2_1_1 - transform/winlog2_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/winlog2_1 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows/otel.yaml index 345a840ef8..0094fb1693 100644 --- a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows/otel.yaml @@ -8,6 +8,17 @@ 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) googlecloud/logging: + sending_queue: + batch: + flush_timeout: 200ms + max_size: 1000 + min_size: 1000 + sizer: items + block_on_overflow: true + enabled: true + num_consumers: 10 + queue_size: 12000 + sizer: items timeout: 60s extensions: file_storage: @@ -17,10 +28,6 @@ processors: agentmetrics/hostmetrics_0: blank_label_metrics: - system.cpu.utilization - batch/googlecloud/logging_logs_0: - send_batch_max_size: 1000 - send_batch_size: 1000 - timeout: 200ms casttosum/iis_1: metrics: - agent.googleapis.com/iis/network/transferred_bytes_count @@ -1286,7 +1293,6 @@ service: - transform/windows__event__log_1 - transform/windows__event__log_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1297,7 +1303,6 @@ service: - transform/windows__event__log_1_1 - transform/windows__event__log_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1308,7 +1313,6 @@ service: - transform/windows__event__log_2_1 - transform/windows__event__log_2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/windows__event__log_2 logs/logs_winlog2_winlog2: @@ -1319,7 +1323,6 @@ service: - transform/winlog2_1 - transform/winlog2_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/winlog2 logs/logs_winlog2_winlog2_1: @@ -1330,7 +1333,6 @@ service: - transform/winlog2_1_1 - transform/winlog2_1_2 - resourcedetection/_global_0 - - batch/googlecloud/logging_logs_0 receivers: - windowseventlog/winlog2_1 metrics/default__pipeline_hostmetrics: From 9e3b36fb14c18a752aeaea6e4d1308a7fcde40da Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Wed, 11 Mar 2026 15:23:50 +0000 Subject: [PATCH 06/18] Fix transformation tests stacktrace golden file shift by forcing GOTOOLCHAIN=local --- .github/workflows/pr_presubmit.yaml | 2 ++ Dockerfile | 11 +++++++++++ .../output_otel.yaml | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr_presubmit.yaml b/.github/workflows/pr_presubmit.yaml index 2154b2d925..041795ec92 100644 --- a/.github/workflows/pr_presubmit.yaml +++ b/.github/workflows/pr_presubmit.yaml @@ -55,3 +55,5 @@ jobs: ADDED_FILES: ${{ steps.files.outputs.added }} MODIFIED_FILES: ${{ steps.files.outputs.modified }} PR_LABELS: ${{ steps.get_labels.outputs.labels }} + GOTOOLCHAIN: local + diff --git a/Dockerfile b/Dockerfile index b40ceffd00..497642762c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -98,6 +98,7 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" +ENV GOTOOLCHAIN=local FROM centos8-build-base AS centos8-build-otel @@ -203,6 +204,7 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" +ENV GOTOOLCHAIN=local FROM rockylinux9-build-base AS rockylinux9-build-otel @@ -310,6 +312,7 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" +ENV GOTOOLCHAIN=local FROM rockylinux10-build-base AS rockylinux10-build-otel @@ -410,6 +413,7 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" +ENV GOTOOLCHAIN=local FROM bookworm-build-base AS bookworm-build-otel @@ -513,6 +517,7 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" +ENV GOTOOLCHAIN=local FROM bullseye-build-base AS bullseye-build-otel @@ -615,6 +620,7 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" +ENV GOTOOLCHAIN=local FROM trixie-build-base AS trixie-build-otel @@ -738,6 +744,7 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" +ENV GOTOOLCHAIN=local FROM sles12-build-base AS sles12-build-otel @@ -843,6 +850,7 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" +ENV GOTOOLCHAIN=local FROM sles15-build-base AS sles15-build-otel @@ -943,6 +951,7 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" +ENV GOTOOLCHAIN=local FROM jammy-build-base AS jammy-build-otel @@ -1043,6 +1052,7 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" +ENV GOTOOLCHAIN=local FROM noble-build-base AS noble-build-otel @@ -1143,6 +1153,7 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" +ENV GOTOOLCHAIN=local FROM questing-build-base AS questing-build-otel diff --git a/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml b/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml index 287cf69879..7b6f5a31a4 100644 --- a/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml +++ b/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml @@ -29,7 +29,7 @@ go.opentelemetry.io/collector/processor/batchprocessor.(*shard[...]).startLoop go.opentelemetry.io/collector/processor/batchprocessor@v0.147.0/batch_processor.go:213 sync.(*WaitGroup).Go.func1 - golang.org/toolchain@v0.0.1-go1.25.0.linux-amd64/src/sync/waitgroup.go:239 + /usr/local/go/src/sync/waitgroup.go:239 - caller: batchprocessor@v0.147.0/batch_processor.go:272 error: "could not process attribute gcp.source_location: json: cannot unmarshal string into Go struct field LogEntrySourceLocation.line of type int64" level: warn From a23490a3bbfaff4787a361ac8914b5e6721a13c9 Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Wed, 11 Mar 2026 15:29:02 +0000 Subject: [PATCH 07/18] Refactor setting GOTOOLCHAIN=local via templates --- Dockerfile | 11 +++++++++++ dockerfiles/template | 2 ++ 2 files changed, 13 insertions(+) diff --git a/Dockerfile b/Dockerfile index 497642762c..ad0333c75d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -101,6 +101,7 @@ ENV PATH="${PATH}:/usr/local/go/bin" ENV GOTOOLCHAIN=local + FROM centos8-build-base AS centos8-build-otel WORKDIR /work # Download golang deps @@ -207,6 +208,7 @@ ENV PATH="${PATH}:/usr/local/go/bin" ENV GOTOOLCHAIN=local + FROM rockylinux9-build-base AS rockylinux9-build-otel WORKDIR /work # Download golang deps @@ -315,6 +317,7 @@ ENV PATH="${PATH}:/usr/local/go/bin" ENV GOTOOLCHAIN=local + FROM rockylinux10-build-base AS rockylinux10-build-otel WORKDIR /work # Download golang deps @@ -416,6 +419,7 @@ ENV PATH="${PATH}:/usr/local/go/bin" ENV GOTOOLCHAIN=local + FROM bookworm-build-base AS bookworm-build-otel WORKDIR /work # Download golang deps @@ -520,6 +524,7 @@ ENV PATH="${PATH}:/usr/local/go/bin" ENV GOTOOLCHAIN=local + FROM bullseye-build-base AS bullseye-build-otel WORKDIR /work # Download golang deps @@ -623,6 +628,7 @@ ENV PATH="${PATH}:/usr/local/go/bin" ENV GOTOOLCHAIN=local + FROM trixie-build-base AS trixie-build-otel WORKDIR /work # Download golang deps @@ -747,6 +753,7 @@ ENV PATH="${PATH}:/usr/local/go/bin" ENV GOTOOLCHAIN=local + FROM sles12-build-base AS sles12-build-otel WORKDIR /work # Download golang deps @@ -853,6 +860,7 @@ ENV PATH="${PATH}:/usr/local/go/bin" ENV GOTOOLCHAIN=local + FROM sles15-build-base AS sles15-build-otel WORKDIR /work # Download golang deps @@ -954,6 +962,7 @@ ENV PATH="${PATH}:/usr/local/go/bin" ENV GOTOOLCHAIN=local + FROM jammy-build-base AS jammy-build-otel WORKDIR /work # Download golang deps @@ -1055,6 +1064,7 @@ ENV PATH="${PATH}:/usr/local/go/bin" ENV GOTOOLCHAIN=local + FROM noble-build-base AS noble-build-otel WORKDIR /work # Download golang deps @@ -1156,6 +1166,7 @@ ENV PATH="${PATH}:/usr/local/go/bin" ENV GOTOOLCHAIN=local + FROM questing-build-base AS questing-build-otel WORKDIR /work # Download golang deps diff --git a/dockerfiles/template b/dockerfiles/template index 41d6ef5c08..006484d470 100644 --- a/dockerfiles/template +++ b/dockerfiles/template @@ -16,6 +16,8 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" +ENV GOTOOLCHAIN=local + FROM {target_name}-build-base AS {target_name}-build-otel From 24a980cc81d259f88913072d3aec75a75cb189ee Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Wed, 11 Mar 2026 15:32:31 +0000 Subject: [PATCH 08/18] Remove redundant GOTOOLCHAIN=local from pr_presubmit.yaml --- .github/workflows/pr_presubmit.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_presubmit.yaml b/.github/workflows/pr_presubmit.yaml index 041795ec92..14d35a0346 100644 --- a/.github/workflows/pr_presubmit.yaml +++ b/.github/workflows/pr_presubmit.yaml @@ -55,5 +55,5 @@ jobs: ADDED_FILES: ${{ steps.files.outputs.added }} MODIFIED_FILES: ${{ steps.files.outputs.modified }} PR_LABELS: ${{ steps.get_labels.outputs.labels }} - GOTOOLCHAIN: local + From e1a35038a0d128a14b483c8a5a53be1f3269954b Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Wed, 11 Mar 2026 15:41:20 +0000 Subject: [PATCH 09/18] Cleanup trailing blank lines in pr_presubmit.yaml --- .github/workflows/pr_presubmit.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pr_presubmit.yaml b/.github/workflows/pr_presubmit.yaml index 14d35a0346..2154b2d925 100644 --- a/.github/workflows/pr_presubmit.yaml +++ b/.github/workflows/pr_presubmit.yaml @@ -55,5 +55,3 @@ jobs: ADDED_FILES: ${{ steps.files.outputs.added }} MODIFIED_FILES: ${{ steps.files.outputs.modified }} PR_LABELS: ${{ steps.get_labels.outputs.labels }} - - From 8f049209ad61b35ce9abc6e6aa8fa319c994e25e Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Thu, 12 Mar 2026 00:26:36 +0000 Subject: [PATCH 10/18] Update self-metric change --- confgenerator/agentmetrics.go | 11 ++- .../golden/linux-gpu/otel.yaml | 76 ++----------------- .../golden/linux/otel.yaml | 76 ++----------------- .../golden/linux-gpu/otel.yaml | 47 ++---------- .../golden/linux/otel.yaml | 47 ++---------- .../golden/windows-2012/otel.yaml | 47 ++---------- .../golden/windows/otel.yaml | 47 ++---------- 7 files changed, 35 insertions(+), 316 deletions(-) diff --git a/confgenerator/agentmetrics.go b/confgenerator/agentmetrics.go index 809ba0aecb..788d748589 100644 --- a/confgenerator/agentmetrics.go +++ b/confgenerator/agentmetrics.go @@ -178,11 +178,11 @@ func (r AgentSelfMetrics) OtelPipelineProcessors(ctx context.Context) []otel.Com expOtlpExporter := experimentsFromContext(ctx)["otlp_exporter"] var extraTransforms []map[string]interface{} if expOtlpExporter { - durationMetric = "rpc.client.duration" + durationMetric = "rpc.client.call.duration" filteredMetrics = []string{ "otelcol_exporter_sent_metric_points", "otelcol_exporter_send_failed_metric_points", - "rpc.client.duration_count", + "rpc.client.call.duration_count", } extraTransforms = []map[string]interface{}{ otel.UpdateMetric("otelcol_exporter_sent_metric_points", @@ -197,15 +197,14 @@ func (r AgentSelfMetrics) OtelPipelineProcessors(ctx context.Context) []otel.Com // b/468059325: Factor in partial success after upstream bug is fixed. pointCountMetric = otel.CombineMetrics("otelcol_exporter_sent_metric_points|otelcol_exporter_send_failed_metric_points", "agent/monitoring/point_count", otel.AggregateLabels("sum", "status")) - apiRequestCount = otel.RenameMetric("rpc.client.duration_count", "agent/api_request_count", - otel.RenameLabelValues("rpc.grpc.status_code", grpcToStringStatus), - otel.RenameLabel("rpc.grpc.status_code", "state"), + apiRequestCount = otel.RenameMetric("rpc.client.call.duration_count", "agent/api_request_count", + otel.RenameLabel("rpc.response.status_code", "state"), // delete all other labels, retaining only state otel.AggregateLabels("sum", "state")) metricFilter = otel.MetricsOTTLFilter([]string{}, []string{ // Filter out histogram datapoints where the rpc.service is not related to monitoring. - `metric.name == "rpc.client.duration_count" and (not IsMatch(datapoint.attributes["rpc.service"], "opentelemetry.proto.collector.metrics.v1.MetricsService"))`, + `metric.name == "rpc.client.call.duration_count" and (not IsMatch(datapoint.attributes["rpc.method"], "opentelemetry.proto.collector.metrics.v1.MetricsService/Export"))`, }) } diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux-gpu/otel.yaml index e2c58751b6..8872f6e351 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux-gpu/otel.yaml @@ -86,7 +86,7 @@ processors: filter/otel_1: metrics: datapoint: - - metric.name == "rpc.client.duration_count" and (not IsMatch(datapoint.attributes["rpc.service"], "opentelemetry.proto.collector.metrics.v1.MetricsService")) + - metric.name == "rpc.client.call.duration_count" and (not IsMatch(datapoint.attributes["rpc.method"], "opentelemetry.proto.collector.metrics.v1.MetricsService/Export")) filter/otel_2: metrics: include: @@ -96,7 +96,7 @@ processors: - otelcol_process_memory_rss - otelcol_exporter_sent_metric_points - otelcol_exporter_send_failed_metric_points - - rpc.client.duration_count + - rpc.client.call.duration_count groupbyattrs/otlp_2: keys: - namespace @@ -582,48 +582,11 @@ processors: aggregation_type: sum label_set: [] - action: update - include: rpc.client.duration_count + include: rpc.client.call.duration_count new_name: agent/api_request_count operations: - action: update_label - label: rpc.grpc.status_code - value_actions: - - new_value: OK - value: "0" - - new_value: CANCELLED - value: "1" - - new_value: ABORTED - value: "10" - - new_value: OUT_OF_RANGE - value: "11" - - new_value: UNIMPLEMENTED - value: "12" - - new_value: INTERNAL - value: "13" - - new_value: UNAVAILABLE - value: "14" - - new_value: DATA_LOSS - value: "15" - - new_value: UNAUTHENTICATED - value: "16" - - new_value: UNKNOWN - value: "2" - - new_value: INVALID_ARGUMENT - value: "3" - - new_value: DEADLINE_EXCEEDED - value: "4" - - new_value: NOT_FOUND - value: "5" - - new_value: ALREADY_EXISTS - value: "6" - - new_value: PERMISSION_DENIED - value: "7" - - new_value: RESOURCE_EXHAUSTED - value: "8" - - new_value: FAILED_PRECONDITION - value: "9" - - action: update_label - label: rpc.grpc.status_code + label: rpc.response.status_code new_label: state - action: aggregate_labels aggregation_type: sum @@ -803,36 +766,7 @@ processors: metric_statements: - context: metric statements: - - extract_count_metric(true) where name == "rpc.client.duration" - transform/otlp_0: - error_mode: ignore - log_statements: - - context: log - statements: - - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - - set(cache["__field_0"], attributes["compute.googleapis.com/instance_group_manager/name"]) where (attributes != nil and attributes["compute.googleapis.com/instance_group_manager/name"] != nil) - - delete_key(cache, "__field_1") where (cache != nil and cache["__field_1"] != nil) - - set(cache["__field_1"], attributes["compute.googleapis.com/instance_group_manager/zone"]) where (attributes != nil and attributes["compute.googleapis.com/instance_group_manager/zone"] != nil) - - delete_key(cache, "__field_2") where (cache != nil and cache["__field_2"] != nil) - - set(cache["__field_2"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) - - delete_key(cache, "__field_3") where (cache != nil and cache["__field_3"] != nil) - - set(cache["__field_3"], attributes["gcp.log_name"]) where (attributes != nil and attributes["gcp.log_name"] != nil) - - delete_key(cache, "value") where (cache != nil and cache["value"] != nil) - - set(cache["value"], cache["__field_0"]) - - set(cache["value"], "test-mig") where cache["value"] == nil - - set(attributes["compute.googleapis.com/instance_group_manager/name"], cache["value"]) where (cache != nil and cache["value"] != nil) - - delete_key(cache, "value") where (cache != nil and cache["value"] != nil) - - set(cache["value"], cache["__field_1"]) - - set(cache["value"], "test-zone") where cache["value"] == nil - - set(attributes["compute.googleapis.com/instance_group_manager/zone"], cache["value"]) where (cache != nil and cache["value"] != nil) - - delete_key(cache, "value") where (cache != nil and cache["value"] != nil) - - set(cache["value"], cache["__field_2"]) - - set(cache["value"], "") where cache["value"] == nil - - set(attributes["compute.googleapis.com/resource_name"], cache["value"]) where (cache != nil and cache["value"] != nil) - - delete_key(cache, "value") where (cache != nil and cache["value"] != nil) - - set(cache["value"], cache["__field_3"]) - - set(cache["value"], "otlp") where cache["value"] == nil - - set(attributes["gcp.log_name"], cache["value"]) where (cache != nil and cache["value"] != nil) + - extract_count_metric(true) where name == "rpc.client.call.duration" transform/otlp_1: error_mode: ignore metric_statements: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux/otel.yaml index 9b4c22ad27..e5c25f5900 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux/otel.yaml @@ -81,7 +81,7 @@ processors: filter/otel_1: metrics: datapoint: - - metric.name == "rpc.client.duration_count" and (not IsMatch(datapoint.attributes["rpc.service"], "opentelemetry.proto.collector.metrics.v1.MetricsService")) + - metric.name == "rpc.client.call.duration_count" and (not IsMatch(datapoint.attributes["rpc.method"], "opentelemetry.proto.collector.metrics.v1.MetricsService/Export")) filter/otel_2: metrics: include: @@ -91,7 +91,7 @@ processors: - otelcol_process_memory_rss - otelcol_exporter_sent_metric_points - otelcol_exporter_send_failed_metric_points - - rpc.client.duration_count + - rpc.client.call.duration_count groupbyattrs/otlp_2: keys: - namespace @@ -553,48 +553,11 @@ processors: aggregation_type: sum label_set: [] - action: update - include: rpc.client.duration_count + include: rpc.client.call.duration_count new_name: agent/api_request_count operations: - action: update_label - label: rpc.grpc.status_code - value_actions: - - new_value: OK - value: "0" - - new_value: CANCELLED - value: "1" - - new_value: ABORTED - value: "10" - - new_value: OUT_OF_RANGE - value: "11" - - new_value: UNIMPLEMENTED - value: "12" - - new_value: INTERNAL - value: "13" - - new_value: UNAVAILABLE - value: "14" - - new_value: DATA_LOSS - value: "15" - - new_value: UNAUTHENTICATED - value: "16" - - new_value: UNKNOWN - value: "2" - - new_value: INVALID_ARGUMENT - value: "3" - - new_value: DEADLINE_EXCEEDED - value: "4" - - new_value: NOT_FOUND - value: "5" - - new_value: ALREADY_EXISTS - value: "6" - - new_value: PERMISSION_DENIED - value: "7" - - new_value: RESOURCE_EXHAUSTED - value: "8" - - new_value: FAILED_PRECONDITION - value: "9" - - action: update_label - label: rpc.grpc.status_code + label: rpc.response.status_code new_label: state - action: aggregate_labels aggregation_type: sum @@ -759,36 +722,7 @@ processors: metric_statements: - context: metric statements: - - extract_count_metric(true) where name == "rpc.client.duration" - transform/otlp_0: - error_mode: ignore - log_statements: - - context: log - statements: - - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - - set(cache["__field_0"], attributes["compute.googleapis.com/instance_group_manager/name"]) where (attributes != nil and attributes["compute.googleapis.com/instance_group_manager/name"] != nil) - - delete_key(cache, "__field_1") where (cache != nil and cache["__field_1"] != nil) - - set(cache["__field_1"], attributes["compute.googleapis.com/instance_group_manager/zone"]) where (attributes != nil and attributes["compute.googleapis.com/instance_group_manager/zone"] != nil) - - delete_key(cache, "__field_2") where (cache != nil and cache["__field_2"] != nil) - - set(cache["__field_2"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) - - delete_key(cache, "__field_3") where (cache != nil and cache["__field_3"] != nil) - - set(cache["__field_3"], attributes["gcp.log_name"]) where (attributes != nil and attributes["gcp.log_name"] != nil) - - delete_key(cache, "value") where (cache != nil and cache["value"] != nil) - - set(cache["value"], cache["__field_0"]) - - set(cache["value"], "test-mig") where cache["value"] == nil - - set(attributes["compute.googleapis.com/instance_group_manager/name"], cache["value"]) where (cache != nil and cache["value"] != nil) - - delete_key(cache, "value") where (cache != nil and cache["value"] != nil) - - set(cache["value"], cache["__field_1"]) - - set(cache["value"], "test-zone") where cache["value"] == nil - - set(attributes["compute.googleapis.com/instance_group_manager/zone"], cache["value"]) where (cache != nil and cache["value"] != nil) - - delete_key(cache, "value") where (cache != nil and cache["value"] != nil) - - set(cache["value"], cache["__field_2"]) - - set(cache["value"], "") where cache["value"] == nil - - set(attributes["compute.googleapis.com/resource_name"], cache["value"]) where (cache != nil and cache["value"] != nil) - - delete_key(cache, "value") where (cache != nil and cache["value"] != nil) - - set(cache["value"], cache["__field_3"]) - - set(cache["value"], "otlp") where cache["value"] == nil - - set(attributes["gcp.log_name"], cache["value"]) where (cache != nil and cache["value"] != nil) + - extract_count_metric(true) where name == "rpc.client.call.duration" transform/otlp_1: error_mode: ignore metric_statements: diff --git a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux-gpu/otel.yaml index d72ac9fc75..2acd905527 100644 --- a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux-gpu/otel.yaml @@ -71,7 +71,7 @@ processors: filter/otel_1: metrics: datapoint: - - metric.name == "rpc.client.duration_count" and (not IsMatch(datapoint.attributes["rpc.service"], "opentelemetry.proto.collector.metrics.v1.MetricsService")) + - metric.name == "rpc.client.call.duration_count" and (not IsMatch(datapoint.attributes["rpc.method"], "opentelemetry.proto.collector.metrics.v1.MetricsService/Export")) filter/otel_2: metrics: include: @@ -81,7 +81,7 @@ processors: - otelcol_process_memory_rss - otelcol_exporter_sent_metric_points - otelcol_exporter_send_failed_metric_points - - rpc.client.duration_count + - rpc.client.call.duration_count interval/loggingmetrics_7: interval: 1m metricstarttime/otlp_grpc/otlp_metrics_1: @@ -562,48 +562,11 @@ processors: aggregation_type: sum label_set: [] - action: update - include: rpc.client.duration_count + include: rpc.client.call.duration_count new_name: agent/api_request_count operations: - action: update_label - label: rpc.grpc.status_code - value_actions: - - new_value: OK - value: "0" - - new_value: CANCELLED - value: "1" - - new_value: ABORTED - value: "10" - - new_value: OUT_OF_RANGE - value: "11" - - new_value: UNIMPLEMENTED - value: "12" - - new_value: INTERNAL - value: "13" - - new_value: UNAVAILABLE - value: "14" - - new_value: DATA_LOSS - value: "15" - - new_value: UNAUTHENTICATED - value: "16" - - new_value: UNKNOWN - value: "2" - - new_value: INVALID_ARGUMENT - value: "3" - - new_value: DEADLINE_EXCEEDED - value: "4" - - new_value: NOT_FOUND - value: "5" - - new_value: ALREADY_EXISTS - value: "6" - - new_value: PERMISSION_DENIED - value: "7" - - new_value: RESOURCE_EXHAUSTED - value: "8" - - new_value: FAILED_PRECONDITION - value: "9" - - action: update_label - label: rpc.grpc.status_code + label: rpc.response.status_code new_label: state - action: aggregate_labels aggregation_type: sum @@ -752,7 +715,7 @@ processors: metric_statements: - context: metric statements: - - extract_count_metric(true) where name == "rpc.client.duration" + - extract_count_metric(true) where name == "rpc.client.call.duration" transform/prometheus_0: metric_statements: - context: datapoint diff --git a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux/otel.yaml index fc4451e787..215dbfd850 100644 --- a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux/otel.yaml @@ -66,7 +66,7 @@ processors: filter/otel_1: metrics: datapoint: - - metric.name == "rpc.client.duration_count" and (not IsMatch(datapoint.attributes["rpc.service"], "opentelemetry.proto.collector.metrics.v1.MetricsService")) + - metric.name == "rpc.client.call.duration_count" and (not IsMatch(datapoint.attributes["rpc.method"], "opentelemetry.proto.collector.metrics.v1.MetricsService/Export")) filter/otel_2: metrics: include: @@ -76,7 +76,7 @@ processors: - otelcol_process_memory_rss - otelcol_exporter_sent_metric_points - otelcol_exporter_send_failed_metric_points - - rpc.client.duration_count + - rpc.client.call.duration_count interval/loggingmetrics_7: interval: 1m metricstarttime/otlp_grpc/otlp_metrics_1: @@ -533,48 +533,11 @@ processors: aggregation_type: sum label_set: [] - action: update - include: rpc.client.duration_count + include: rpc.client.call.duration_count new_name: agent/api_request_count operations: - action: update_label - label: rpc.grpc.status_code - value_actions: - - new_value: OK - value: "0" - - new_value: CANCELLED - value: "1" - - new_value: ABORTED - value: "10" - - new_value: OUT_OF_RANGE - value: "11" - - new_value: UNIMPLEMENTED - value: "12" - - new_value: INTERNAL - value: "13" - - new_value: UNAVAILABLE - value: "14" - - new_value: DATA_LOSS - value: "15" - - new_value: UNAUTHENTICATED - value: "16" - - new_value: UNKNOWN - value: "2" - - new_value: INVALID_ARGUMENT - value: "3" - - new_value: DEADLINE_EXCEEDED - value: "4" - - new_value: NOT_FOUND - value: "5" - - new_value: ALREADY_EXISTS - value: "6" - - new_value: PERMISSION_DENIED - value: "7" - - new_value: RESOURCE_EXHAUSTED - value: "8" - - new_value: FAILED_PRECONDITION - value: "9" - - action: update_label - label: rpc.grpc.status_code + label: rpc.response.status_code new_label: state - action: aggregate_labels aggregation_type: sum @@ -708,7 +671,7 @@ processors: metric_statements: - context: metric statements: - - extract_count_metric(true) where name == "rpc.client.duration" + - extract_count_metric(true) where name == "rpc.client.call.duration" transform/prometheus_0: metric_statements: - context: datapoint diff --git a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows-2012/otel.yaml index d3fea3c400..5bea8ee668 100644 --- a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows-2012/otel.yaml @@ -81,7 +81,7 @@ processors: filter/otel_1: metrics: datapoint: - - metric.name == "rpc.client.duration_count" and (not IsMatch(datapoint.attributes["rpc.service"], "opentelemetry.proto.collector.metrics.v1.MetricsService")) + - metric.name == "rpc.client.call.duration_count" and (not IsMatch(datapoint.attributes["rpc.method"], "opentelemetry.proto.collector.metrics.v1.MetricsService/Export")) filter/otel_2: metrics: include: @@ -91,7 +91,7 @@ processors: - otelcol_process_memory_rss - otelcol_exporter_sent_metric_points - otelcol_exporter_send_failed_metric_points - - rpc.client.duration_count + - rpc.client.call.duration_count interval/loggingmetrics_7: interval: 1m metricstarttime/otlp_grpc/otlp_metrics_1: @@ -598,48 +598,11 @@ processors: aggregation_type: sum label_set: [] - action: update - include: rpc.client.duration_count + include: rpc.client.call.duration_count new_name: agent/api_request_count operations: - action: update_label - label: rpc.grpc.status_code - value_actions: - - new_value: OK - value: "0" - - new_value: CANCELLED - value: "1" - - new_value: ABORTED - value: "10" - - new_value: OUT_OF_RANGE - value: "11" - - new_value: UNIMPLEMENTED - value: "12" - - new_value: INTERNAL - value: "13" - - new_value: UNAVAILABLE - value: "14" - - new_value: DATA_LOSS - value: "15" - - new_value: UNAUTHENTICATED - value: "16" - - new_value: UNKNOWN - value: "2" - - new_value: INVALID_ARGUMENT - value: "3" - - new_value: DEADLINE_EXCEEDED - value: "4" - - new_value: NOT_FOUND - value: "5" - - new_value: ALREADY_EXISTS - value: "6" - - new_value: PERMISSION_DENIED - value: "7" - - new_value: RESOURCE_EXHAUSTED - value: "8" - - new_value: FAILED_PRECONDITION - value: "9" - - action: update_label - label: rpc.grpc.status_code + label: rpc.response.status_code new_label: state - action: aggregate_labels aggregation_type: sum @@ -816,7 +779,7 @@ processors: metric_statements: - context: metric statements: - - extract_count_metric(true) where name == "rpc.client.duration" + - extract_count_metric(true) where name == "rpc.client.call.duration" transform/prometheus_0: metric_statements: - context: datapoint diff --git a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows/otel.yaml index d3fea3c400..5bea8ee668 100644 --- a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows/otel.yaml @@ -81,7 +81,7 @@ processors: filter/otel_1: metrics: datapoint: - - metric.name == "rpc.client.duration_count" and (not IsMatch(datapoint.attributes["rpc.service"], "opentelemetry.proto.collector.metrics.v1.MetricsService")) + - metric.name == "rpc.client.call.duration_count" and (not IsMatch(datapoint.attributes["rpc.method"], "opentelemetry.proto.collector.metrics.v1.MetricsService/Export")) filter/otel_2: metrics: include: @@ -91,7 +91,7 @@ processors: - otelcol_process_memory_rss - otelcol_exporter_sent_metric_points - otelcol_exporter_send_failed_metric_points - - rpc.client.duration_count + - rpc.client.call.duration_count interval/loggingmetrics_7: interval: 1m metricstarttime/otlp_grpc/otlp_metrics_1: @@ -598,48 +598,11 @@ processors: aggregation_type: sum label_set: [] - action: update - include: rpc.client.duration_count + include: rpc.client.call.duration_count new_name: agent/api_request_count operations: - action: update_label - label: rpc.grpc.status_code - value_actions: - - new_value: OK - value: "0" - - new_value: CANCELLED - value: "1" - - new_value: ABORTED - value: "10" - - new_value: OUT_OF_RANGE - value: "11" - - new_value: UNIMPLEMENTED - value: "12" - - new_value: INTERNAL - value: "13" - - new_value: UNAVAILABLE - value: "14" - - new_value: DATA_LOSS - value: "15" - - new_value: UNAUTHENTICATED - value: "16" - - new_value: UNKNOWN - value: "2" - - new_value: INVALID_ARGUMENT - value: "3" - - new_value: DEADLINE_EXCEEDED - value: "4" - - new_value: NOT_FOUND - value: "5" - - new_value: ALREADY_EXISTS - value: "6" - - new_value: PERMISSION_DENIED - value: "7" - - new_value: RESOURCE_EXHAUSTED - value: "8" - - new_value: FAILED_PRECONDITION - value: "9" - - action: update_label - label: rpc.grpc.status_code + label: rpc.response.status_code new_label: state - action: aggregate_labels aggregation_type: sum @@ -816,7 +779,7 @@ processors: metric_statements: - context: metric statements: - - extract_count_metric(true) where name == "rpc.client.duration" + - extract_count_metric(true) where name == "rpc.client.call.duration" transform/prometheus_0: metric_statements: - context: datapoint From 4e74d037b66aa06543926cc666d20b003fb1b407 Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Thu, 12 Mar 2026 00:32:28 +0000 Subject: [PATCH 11/18] Fixing golde --- .../golden/linux-gpu/otel.yaml | 29 ++++++++++++ .../golden/linux/otel.yaml | 29 ++++++++++++ .../golden/windows-2012/otel.yaml | 47 ++----------------- .../golden/windows/otel.yaml | 47 ++----------------- 4 files changed, 68 insertions(+), 84 deletions(-) diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux-gpu/otel.yaml index 8872f6e351..87edafacd3 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux-gpu/otel.yaml @@ -767,6 +767,35 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc.client.call.duration" + transform/otlp_0: + error_mode: ignore + log_statements: + - context: log + statements: + - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) + - set(cache["__field_0"], attributes["compute.googleapis.com/instance_group_manager/name"]) where (attributes != nil and attributes["compute.googleapis.com/instance_group_manager/name"] != nil) + - delete_key(cache, "__field_1") where (cache != nil and cache["__field_1"] != nil) + - set(cache["__field_1"], attributes["compute.googleapis.com/instance_group_manager/zone"]) where (attributes != nil and attributes["compute.googleapis.com/instance_group_manager/zone"] != nil) + - delete_key(cache, "__field_2") where (cache != nil and cache["__field_2"] != nil) + - set(cache["__field_2"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) + - delete_key(cache, "__field_3") where (cache != nil and cache["__field_3"] != nil) + - set(cache["__field_3"], attributes["gcp.log_name"]) where (attributes != nil and attributes["gcp.log_name"] != nil) + - delete_key(cache, "value") where (cache != nil and cache["value"] != nil) + - set(cache["value"], cache["__field_0"]) + - set(cache["value"], "test-mig") where cache["value"] == nil + - set(attributes["compute.googleapis.com/instance_group_manager/name"], cache["value"]) where (cache != nil and cache["value"] != nil) + - delete_key(cache, "value") where (cache != nil and cache["value"] != nil) + - set(cache["value"], cache["__field_1"]) + - set(cache["value"], "test-zone") where cache["value"] == nil + - set(attributes["compute.googleapis.com/instance_group_manager/zone"], cache["value"]) where (cache != nil and cache["value"] != nil) + - delete_key(cache, "value") where (cache != nil and cache["value"] != nil) + - set(cache["value"], cache["__field_2"]) + - set(cache["value"], "") where cache["value"] == nil + - set(attributes["compute.googleapis.com/resource_name"], cache["value"]) where (cache != nil and cache["value"] != nil) + - delete_key(cache, "value") where (cache != nil and cache["value"] != nil) + - set(cache["value"], cache["__field_3"]) + - set(cache["value"], "otlp") where cache["value"] == nil + - set(attributes["gcp.log_name"], cache["value"]) where (cache != nil and cache["value"] != nil) transform/otlp_1: error_mode: ignore metric_statements: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux/otel.yaml index e5c25f5900..5e6d39dc72 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux/otel.yaml @@ -723,6 +723,35 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc.client.call.duration" + transform/otlp_0: + error_mode: ignore + log_statements: + - context: log + statements: + - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) + - set(cache["__field_0"], attributes["compute.googleapis.com/instance_group_manager/name"]) where (attributes != nil and attributes["compute.googleapis.com/instance_group_manager/name"] != nil) + - delete_key(cache, "__field_1") where (cache != nil and cache["__field_1"] != nil) + - set(cache["__field_1"], attributes["compute.googleapis.com/instance_group_manager/zone"]) where (attributes != nil and attributes["compute.googleapis.com/instance_group_manager/zone"] != nil) + - delete_key(cache, "__field_2") where (cache != nil and cache["__field_2"] != nil) + - set(cache["__field_2"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) + - delete_key(cache, "__field_3") where (cache != nil and cache["__field_3"] != nil) + - set(cache["__field_3"], attributes["gcp.log_name"]) where (attributes != nil and attributes["gcp.log_name"] != nil) + - delete_key(cache, "value") where (cache != nil and cache["value"] != nil) + - set(cache["value"], cache["__field_0"]) + - set(cache["value"], "test-mig") where cache["value"] == nil + - set(attributes["compute.googleapis.com/instance_group_manager/name"], cache["value"]) where (cache != nil and cache["value"] != nil) + - delete_key(cache, "value") where (cache != nil and cache["value"] != nil) + - set(cache["value"], cache["__field_1"]) + - set(cache["value"], "test-zone") where cache["value"] == nil + - set(attributes["compute.googleapis.com/instance_group_manager/zone"], cache["value"]) where (cache != nil and cache["value"] != nil) + - delete_key(cache, "value") where (cache != nil and cache["value"] != nil) + - set(cache["value"], cache["__field_2"]) + - set(cache["value"], "") where cache["value"] == nil + - set(attributes["compute.googleapis.com/resource_name"], cache["value"]) where (cache != nil and cache["value"] != nil) + - delete_key(cache, "value") where (cache != nil and cache["value"] != nil) + - set(cache["value"], cache["__field_3"]) + - set(cache["value"], "otlp") where cache["value"] == nil + - set(attributes["gcp.log_name"], cache["value"]) where (cache != nil and cache["value"] != nil) transform/otlp_1: error_mode: ignore metric_statements: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows-2012/otel.yaml index 86e904a682..706aceba19 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows-2012/otel.yaml @@ -96,7 +96,7 @@ processors: filter/otel_1: metrics: datapoint: - - metric.name == "rpc.client.duration_count" and (not IsMatch(datapoint.attributes["rpc.service"], "opentelemetry.proto.collector.metrics.v1.MetricsService")) + - metric.name == "rpc.client.call.duration_count" and (not IsMatch(datapoint.attributes["rpc.method"], "opentelemetry.proto.collector.metrics.v1.MetricsService/Export")) filter/otel_2: metrics: include: @@ -106,7 +106,7 @@ processors: - otelcol_process_memory_rss - otelcol_exporter_sent_metric_points - otelcol_exporter_send_failed_metric_points - - rpc.client.duration_count + - rpc.client.call.duration_count groupbyattrs/otlp_2: keys: - namespace @@ -618,48 +618,11 @@ processors: aggregation_type: sum label_set: [] - action: update - include: rpc.client.duration_count + include: rpc.client.call.duration_count new_name: agent/api_request_count operations: - action: update_label - label: rpc.grpc.status_code - value_actions: - - new_value: OK - value: "0" - - new_value: CANCELLED - value: "1" - - new_value: ABORTED - value: "10" - - new_value: OUT_OF_RANGE - value: "11" - - new_value: UNIMPLEMENTED - value: "12" - - new_value: INTERNAL - value: "13" - - new_value: UNAVAILABLE - value: "14" - - new_value: DATA_LOSS - value: "15" - - new_value: UNAUTHENTICATED - value: "16" - - new_value: UNKNOWN - value: "2" - - new_value: INVALID_ARGUMENT - value: "3" - - new_value: DEADLINE_EXCEEDED - value: "4" - - new_value: NOT_FOUND - value: "5" - - new_value: ALREADY_EXISTS - value: "6" - - new_value: PERMISSION_DENIED - value: "7" - - new_value: RESOURCE_EXHAUSTED - value: "8" - - new_value: FAILED_PRECONDITION - value: "9" - - action: update_label - label: rpc.grpc.status_code + label: rpc.response.status_code new_label: state - action: aggregate_labels aggregation_type: sum @@ -867,7 +830,7 @@ processors: metric_statements: - context: metric statements: - - extract_count_metric(true) where name == "rpc.client.duration" + - extract_count_metric(true) where name == "rpc.client.call.duration" transform/otlp_0: error_mode: ignore log_statements: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows/otel.yaml index 86e904a682..706aceba19 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows/otel.yaml @@ -96,7 +96,7 @@ processors: filter/otel_1: metrics: datapoint: - - metric.name == "rpc.client.duration_count" and (not IsMatch(datapoint.attributes["rpc.service"], "opentelemetry.proto.collector.metrics.v1.MetricsService")) + - metric.name == "rpc.client.call.duration_count" and (not IsMatch(datapoint.attributes["rpc.method"], "opentelemetry.proto.collector.metrics.v1.MetricsService/Export")) filter/otel_2: metrics: include: @@ -106,7 +106,7 @@ processors: - otelcol_process_memory_rss - otelcol_exporter_sent_metric_points - otelcol_exporter_send_failed_metric_points - - rpc.client.duration_count + - rpc.client.call.duration_count groupbyattrs/otlp_2: keys: - namespace @@ -618,48 +618,11 @@ processors: aggregation_type: sum label_set: [] - action: update - include: rpc.client.duration_count + include: rpc.client.call.duration_count new_name: agent/api_request_count operations: - action: update_label - label: rpc.grpc.status_code - value_actions: - - new_value: OK - value: "0" - - new_value: CANCELLED - value: "1" - - new_value: ABORTED - value: "10" - - new_value: OUT_OF_RANGE - value: "11" - - new_value: UNIMPLEMENTED - value: "12" - - new_value: INTERNAL - value: "13" - - new_value: UNAVAILABLE - value: "14" - - new_value: DATA_LOSS - value: "15" - - new_value: UNAUTHENTICATED - value: "16" - - new_value: UNKNOWN - value: "2" - - new_value: INVALID_ARGUMENT - value: "3" - - new_value: DEADLINE_EXCEEDED - value: "4" - - new_value: NOT_FOUND - value: "5" - - new_value: ALREADY_EXISTS - value: "6" - - new_value: PERMISSION_DENIED - value: "7" - - new_value: RESOURCE_EXHAUSTED - value: "8" - - new_value: FAILED_PRECONDITION - value: "9" - - action: update_label - label: rpc.grpc.status_code + label: rpc.response.status_code new_label: state - action: aggregate_labels aggregation_type: sum @@ -867,7 +830,7 @@ processors: metric_statements: - context: metric statements: - - extract_count_metric(true) where name == "rpc.client.duration" + - extract_count_metric(true) where name == "rpc.client.call.duration" transform/otlp_0: error_mode: ignore log_statements: From 75006ce3ea705e3c587f009944f57d89c1d75b6a Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Thu, 12 Mar 2026 13:17:20 +0000 Subject: [PATCH 12/18] Removing troolchain hack --- Dockerfile | 33 +++++++++++---------------------- dockerfiles/template | 4 +--- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/Dockerfile b/Dockerfile index ad0333c75d..306187f144 100644 --- a/Dockerfile +++ b/Dockerfile @@ -98,8 +98,6 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" -ENV GOTOOLCHAIN=local - FROM centos8-build-base AS centos8-build-otel @@ -178,6 +176,7 @@ COPY --from=centos8-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agen COPY --from=centos8-build /google-cloud-ops-agent*.rpm / COPY --from=centos8-build /google-cloud-ops-agent-plugin*.tar.gz / + # ====================================== # Build Ops Agent for rockylinux-9 # ====================================== @@ -205,8 +204,6 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" -ENV GOTOOLCHAIN=local - FROM rockylinux9-build-base AS rockylinux9-build-otel @@ -285,6 +282,7 @@ COPY --from=rockylinux9-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops- COPY --from=rockylinux9-build /google-cloud-ops-agent*.rpm / COPY --from=rockylinux9-build /google-cloud-ops-agent-plugin*.tar.gz / + # ====================================== # Build Ops Agent for rockylinux-10 # ====================================== @@ -314,8 +312,6 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" -ENV GOTOOLCHAIN=local - FROM rockylinux10-build-base AS rockylinux10-build-otel @@ -394,6 +390,7 @@ COPY --from=rockylinux10-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops COPY --from=rockylinux10-build /google-cloud-ops-agent*.rpm / COPY --from=rockylinux10-build /google-cloud-ops-agent-plugin*.tar.gz / + # ====================================== # Build Ops Agent for debian-bookworm # ====================================== @@ -416,8 +413,6 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" -ENV GOTOOLCHAIN=local - FROM bookworm-build-base AS bookworm-build-otel @@ -496,6 +491,7 @@ COPY --from=bookworm-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-age COPY --from=bookworm-build /google-cloud-ops-agent*.deb / COPY --from=bookworm-build /google-cloud-ops-agent-plugin*.tar.gz / + # ====================================== # Build Ops Agent for debian-bullseye # ====================================== @@ -521,8 +517,6 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" -ENV GOTOOLCHAIN=local - FROM bullseye-build-base AS bullseye-build-otel @@ -601,6 +595,7 @@ COPY --from=bullseye-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-age COPY --from=bullseye-build /google-cloud-ops-agent*.deb / COPY --from=bullseye-build /google-cloud-ops-agent-plugin*.tar.gz / + # ====================================== # Build Ops Agent for debian-trixie # ====================================== @@ -625,8 +620,6 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" -ENV GOTOOLCHAIN=local - FROM trixie-build-base AS trixie-build-otel @@ -705,6 +698,7 @@ COPY --from=trixie-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent COPY --from=trixie-build /google-cloud-ops-agent*.deb / COPY --from=trixie-build /google-cloud-ops-agent-plugin*.tar.gz / + # ====================================== # Build Ops Agent for sles-12 # ====================================== @@ -750,8 +744,6 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" -ENV GOTOOLCHAIN=local - FROM sles12-build-base AS sles12-build-otel @@ -830,6 +822,7 @@ COPY --from=sles12-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent COPY --from=sles12-build /google-cloud-ops-agent*.rpm / COPY --from=sles12-build /google-cloud-ops-agent-plugin*.tar.gz / + # ====================================== # Build Ops Agent for sles-15 # ====================================== @@ -857,8 +850,6 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" -ENV GOTOOLCHAIN=local - FROM sles15-build-base AS sles15-build-otel @@ -937,6 +928,7 @@ COPY --from=sles15-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent COPY --from=sles15-build /google-cloud-ops-agent*.rpm / COPY --from=sles15-build /google-cloud-ops-agent-plugin*.tar.gz / + # ====================================== # Build Ops Agent for ubuntu-jammy # ====================================== @@ -959,8 +951,6 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" -ENV GOTOOLCHAIN=local - FROM jammy-build-base AS jammy-build-otel @@ -1039,6 +1029,7 @@ COPY --from=jammy-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent- COPY --from=jammy-build /google-cloud-ops-agent*.deb / COPY --from=jammy-build /google-cloud-ops-agent-plugin*.tar.gz / + # ====================================== # Build Ops Agent for ubuntu-noble # ====================================== @@ -1061,8 +1052,6 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" -ENV GOTOOLCHAIN=local - FROM noble-build-base AS noble-build-otel @@ -1141,6 +1130,7 @@ COPY --from=noble-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent- COPY --from=noble-build /google-cloud-ops-agent*.deb / COPY --from=noble-build /google-cloud-ops-agent-plugin*.tar.gz / + # ====================================== # Build Ops Agent for ubuntu-questing # ====================================== @@ -1163,8 +1153,6 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" -ENV GOTOOLCHAIN=local - FROM questing-build-base AS questing-build-otel @@ -1243,6 +1231,7 @@ COPY --from=questing-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-age COPY --from=questing-build /google-cloud-ops-agent*.deb / COPY --from=questing-build /google-cloud-ops-agent-plugin*.tar.gz / + FROM scratch COPY --from=centos8 /* / COPY --from=rockylinux9 /* / diff --git a/dockerfiles/template b/dockerfiles/template index 006484d470..e125f20406 100644 --- a/dockerfiles/template +++ b/dockerfiles/template @@ -16,8 +16,6 @@ ADD https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz /tmp/go${GO_VER RUN set -xe; \ tar -xf /tmp/go${GO_VERSION}.tar.gz -C /usr/local ENV PATH="${PATH}:/usr/local/go/bin" -ENV GOTOOLCHAIN=local - FROM {target_name}-build-base AS {target_name}-build-otel @@ -94,4 +92,4 @@ RUN ./pkg/plugin/build.sh /work/cache {target_name} FROM scratch AS {target_name} COPY --from={target_name}-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent-{tar_distro_name}.tgz COPY --from={target_name}-build /google-cloud-ops-agent*.{package_extension} / -COPY --from={target_name}-build /google-cloud-ops-agent-plugin*.tar.gz / \ No newline at end of file +COPY --from={target_name}-build /google-cloud-ops-agent-plugin*.tar.gz / From ccefe8a78c55a8c2d6cad4203156fd7c7c8db9d3 Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Thu, 12 Mar 2026 15:02:21 +0000 Subject: [PATCH 13/18] Removing rogue new line --- Dockerfile | 11 ----------- dockerfiles/template | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 306187f144..b40ceffd00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -176,7 +176,6 @@ COPY --from=centos8-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agen COPY --from=centos8-build /google-cloud-ops-agent*.rpm / COPY --from=centos8-build /google-cloud-ops-agent-plugin*.tar.gz / - # ====================================== # Build Ops Agent for rockylinux-9 # ====================================== @@ -282,7 +281,6 @@ COPY --from=rockylinux9-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops- COPY --from=rockylinux9-build /google-cloud-ops-agent*.rpm / COPY --from=rockylinux9-build /google-cloud-ops-agent-plugin*.tar.gz / - # ====================================== # Build Ops Agent for rockylinux-10 # ====================================== @@ -390,7 +388,6 @@ COPY --from=rockylinux10-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops COPY --from=rockylinux10-build /google-cloud-ops-agent*.rpm / COPY --from=rockylinux10-build /google-cloud-ops-agent-plugin*.tar.gz / - # ====================================== # Build Ops Agent for debian-bookworm # ====================================== @@ -491,7 +488,6 @@ COPY --from=bookworm-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-age COPY --from=bookworm-build /google-cloud-ops-agent*.deb / COPY --from=bookworm-build /google-cloud-ops-agent-plugin*.tar.gz / - # ====================================== # Build Ops Agent for debian-bullseye # ====================================== @@ -595,7 +591,6 @@ COPY --from=bullseye-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-age COPY --from=bullseye-build /google-cloud-ops-agent*.deb / COPY --from=bullseye-build /google-cloud-ops-agent-plugin*.tar.gz / - # ====================================== # Build Ops Agent for debian-trixie # ====================================== @@ -698,7 +693,6 @@ COPY --from=trixie-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent COPY --from=trixie-build /google-cloud-ops-agent*.deb / COPY --from=trixie-build /google-cloud-ops-agent-plugin*.tar.gz / - # ====================================== # Build Ops Agent for sles-12 # ====================================== @@ -822,7 +816,6 @@ COPY --from=sles12-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent COPY --from=sles12-build /google-cloud-ops-agent*.rpm / COPY --from=sles12-build /google-cloud-ops-agent-plugin*.tar.gz / - # ====================================== # Build Ops Agent for sles-15 # ====================================== @@ -928,7 +921,6 @@ COPY --from=sles15-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent COPY --from=sles15-build /google-cloud-ops-agent*.rpm / COPY --from=sles15-build /google-cloud-ops-agent-plugin*.tar.gz / - # ====================================== # Build Ops Agent for ubuntu-jammy # ====================================== @@ -1029,7 +1021,6 @@ COPY --from=jammy-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent- COPY --from=jammy-build /google-cloud-ops-agent*.deb / COPY --from=jammy-build /google-cloud-ops-agent-plugin*.tar.gz / - # ====================================== # Build Ops Agent for ubuntu-noble # ====================================== @@ -1130,7 +1121,6 @@ COPY --from=noble-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent- COPY --from=noble-build /google-cloud-ops-agent*.deb / COPY --from=noble-build /google-cloud-ops-agent-plugin*.tar.gz / - # ====================================== # Build Ops Agent for ubuntu-questing # ====================================== @@ -1231,7 +1221,6 @@ COPY --from=questing-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-age COPY --from=questing-build /google-cloud-ops-agent*.deb / COPY --from=questing-build /google-cloud-ops-agent-plugin*.tar.gz / - FROM scratch COPY --from=centos8 /* / COPY --from=rockylinux9 /* / diff --git a/dockerfiles/template b/dockerfiles/template index e125f20406..41d6ef5c08 100644 --- a/dockerfiles/template +++ b/dockerfiles/template @@ -92,4 +92,4 @@ RUN ./pkg/plugin/build.sh /work/cache {target_name} FROM scratch AS {target_name} COPY --from={target_name}-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent-{tar_distro_name}.tgz COPY --from={target_name}-build /google-cloud-ops-agent*.{package_extension} / -COPY --from={target_name}-build /google-cloud-ops-agent-plugin*.tar.gz / +COPY --from={target_name}-build /google-cloud-ops-agent-plugin*.tar.gz / \ No newline at end of file From 333c4295ac8e1406cf7f723ecca4f8e5a16d43f5 Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Thu, 12 Mar 2026 19:02:46 +0000 Subject: [PATCH 14/18] Fixing status code values --- confgenerator/agentmetrics.go | 38 +++++++++---------- .../golden/linux-gpu/otel.yaml | 37 ++++++++++++++++++ .../golden/linux/otel.yaml | 37 ++++++++++++++++++ .../golden/windows-2012/otel.yaml | 37 ++++++++++++++++++ .../golden/windows/otel.yaml | 37 ++++++++++++++++++ .../golden/linux-gpu/otel.yaml | 37 ++++++++++++++++++ .../golden/linux/otel.yaml | 37 ++++++++++++++++++ .../golden/windows-2012/otel.yaml | 37 ++++++++++++++++++ .../golden/windows/otel.yaml | 37 ++++++++++++++++++ 9 files changed, 315 insertions(+), 19 deletions(-) diff --git a/confgenerator/agentmetrics.go b/confgenerator/agentmetrics.go index 788d748589..d0242bebab 100644 --- a/confgenerator/agentmetrics.go +++ b/confgenerator/agentmetrics.go @@ -57,25 +57,24 @@ var grpcToHTTPStatus = map[string]string{ "DEADLINE_EXCEEDED": "504", } -// Following reference : https://github.com/googleapis/googleapis/blob/master/google/rpc/code.proto -var grpcToStringStatus = map[string]string{ - "0": "OK", - "1": "CANCELLED", - "2": "UNKNOWN", - "3": "INVALID_ARGUMENT", - "4": "DEADLINE_EXCEEDED", - "5": "NOT_FOUND", - "6": "ALREADY_EXISTS", - "7": "PERMISSION_DENIED", - "8": "RESOURCE_EXHAUSTED", - "9": "FAILED_PRECONDITION", - "10": "ABORTED", - "11": "OUT_OF_RANGE", - "12": "UNIMPLEMENTED", - "13": "INTERNAL", - "14": "UNAVAILABLE", - "15": "DATA_LOSS", - "16": "UNAUTHENTICATED", +var grpcCamelToSnake = map[string]string{ + "OK": "OK", + "Canceled": "CANCELLED", + "Unknown": "UNKNOWN", + "InvalidArgument": "INVALID_ARGUMENT", + "DeadlineExceeded": "DEADLINE_EXCEEDED", + "NotFound": "NOT_FOUND", + "AlreadyExists": "ALREADY_EXISTS", + "PermissionDenied": "PERMISSION_DENIED", + "ResourceExhausted": "RESOURCE_EXHAUSTED", + "FailedPrecondition": "FAILED_PRECONDITION", + "Aborted": "ABORTED", + "OutOfRange": "OUT_OF_RANGE", + "Unimplemented": "UNIMPLEMENTED", + "Internal": "INTERNAL", + "Unavailable": "UNAVAILABLE", + "DataLoss": "DATA_LOSS", + "Unauthenticated": "UNAUTHENTICATED", } func (r AgentSelfMetrics) AddSelfMetricsPipelines(receiverPipelines map[string]otel.ReceiverPipeline, pipelines map[string]otel.Pipeline, ctx context.Context) { @@ -198,6 +197,7 @@ func (r AgentSelfMetrics) OtelPipelineProcessors(ctx context.Context) []otel.Com pointCountMetric = otel.CombineMetrics("otelcol_exporter_sent_metric_points|otelcol_exporter_send_failed_metric_points", "agent/monitoring/point_count", otel.AggregateLabels("sum", "status")) apiRequestCount = otel.RenameMetric("rpc.client.call.duration_count", "agent/api_request_count", + otel.RenameLabelValues("rpc.response.status_code", grpcCamelToSnake), otel.RenameLabel("rpc.response.status_code", "state"), // delete all other labels, retaining only state otel.AggregateLabels("sum", "state")) diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux-gpu/otel.yaml index 87edafacd3..7f1b33e2a2 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux-gpu/otel.yaml @@ -585,6 +585,43 @@ processors: include: rpc.client.call.duration_count new_name: agent/api_request_count operations: + - action: update_label + label: rpc.response.status_code + value_actions: + - new_value: ABORTED + value: Aborted + - new_value: ALREADY_EXISTS + value: AlreadyExists + - new_value: CANCELLED + value: Canceled + - new_value: DATA_LOSS + value: DataLoss + - new_value: DEADLINE_EXCEEDED + value: DeadlineExceeded + - new_value: FAILED_PRECONDITION + value: FailedPrecondition + - new_value: INTERNAL + value: Internal + - new_value: INVALID_ARGUMENT + value: InvalidArgument + - new_value: NOT_FOUND + value: NotFound + - new_value: OK + value: OK + - new_value: OUT_OF_RANGE + value: OutOfRange + - new_value: PERMISSION_DENIED + value: PermissionDenied + - new_value: RESOURCE_EXHAUSTED + value: ResourceExhausted + - new_value: UNAUTHENTICATED + value: Unauthenticated + - new_value: UNAVAILABLE + value: Unavailable + - new_value: UNIMPLEMENTED + value: Unimplemented + - new_value: UNKNOWN + value: Unknown - action: update_label label: rpc.response.status_code new_label: state diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux/otel.yaml index 5e6d39dc72..85cbf550fd 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux/otel.yaml @@ -556,6 +556,43 @@ processors: include: rpc.client.call.duration_count new_name: agent/api_request_count operations: + - action: update_label + label: rpc.response.status_code + value_actions: + - new_value: ABORTED + value: Aborted + - new_value: ALREADY_EXISTS + value: AlreadyExists + - new_value: CANCELLED + value: Canceled + - new_value: DATA_LOSS + value: DataLoss + - new_value: DEADLINE_EXCEEDED + value: DeadlineExceeded + - new_value: FAILED_PRECONDITION + value: FailedPrecondition + - new_value: INTERNAL + value: Internal + - new_value: INVALID_ARGUMENT + value: InvalidArgument + - new_value: NOT_FOUND + value: NotFound + - new_value: OK + value: OK + - new_value: OUT_OF_RANGE + value: OutOfRange + - new_value: PERMISSION_DENIED + value: PermissionDenied + - new_value: RESOURCE_EXHAUSTED + value: ResourceExhausted + - new_value: UNAUTHENTICATED + value: Unauthenticated + - new_value: UNAVAILABLE + value: Unavailable + - new_value: UNIMPLEMENTED + value: Unimplemented + - new_value: UNKNOWN + value: Unknown - action: update_label label: rpc.response.status_code new_label: state diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows-2012/otel.yaml index 706aceba19..d350dd825b 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows-2012/otel.yaml @@ -621,6 +621,43 @@ processors: include: rpc.client.call.duration_count new_name: agent/api_request_count operations: + - action: update_label + label: rpc.response.status_code + value_actions: + - new_value: ABORTED + value: Aborted + - new_value: ALREADY_EXISTS + value: AlreadyExists + - new_value: CANCELLED + value: Canceled + - new_value: DATA_LOSS + value: DataLoss + - new_value: DEADLINE_EXCEEDED + value: DeadlineExceeded + - new_value: FAILED_PRECONDITION + value: FailedPrecondition + - new_value: INTERNAL + value: Internal + - new_value: INVALID_ARGUMENT + value: InvalidArgument + - new_value: NOT_FOUND + value: NotFound + - new_value: OK + value: OK + - new_value: OUT_OF_RANGE + value: OutOfRange + - new_value: PERMISSION_DENIED + value: PermissionDenied + - new_value: RESOURCE_EXHAUSTED + value: ResourceExhausted + - new_value: UNAUTHENTICATED + value: Unauthenticated + - new_value: UNAVAILABLE + value: Unavailable + - new_value: UNIMPLEMENTED + value: Unimplemented + - new_value: UNKNOWN + value: Unknown - action: update_label label: rpc.response.status_code new_label: state diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows/otel.yaml index 706aceba19..d350dd825b 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows/otel.yaml @@ -621,6 +621,43 @@ processors: include: rpc.client.call.duration_count new_name: agent/api_request_count operations: + - action: update_label + label: rpc.response.status_code + value_actions: + - new_value: ABORTED + value: Aborted + - new_value: ALREADY_EXISTS + value: AlreadyExists + - new_value: CANCELLED + value: Canceled + - new_value: DATA_LOSS + value: DataLoss + - new_value: DEADLINE_EXCEEDED + value: DeadlineExceeded + - new_value: FAILED_PRECONDITION + value: FailedPrecondition + - new_value: INTERNAL + value: Internal + - new_value: INVALID_ARGUMENT + value: InvalidArgument + - new_value: NOT_FOUND + value: NotFound + - new_value: OK + value: OK + - new_value: OUT_OF_RANGE + value: OutOfRange + - new_value: PERMISSION_DENIED + value: PermissionDenied + - new_value: RESOURCE_EXHAUSTED + value: ResourceExhausted + - new_value: UNAUTHENTICATED + value: Unauthenticated + - new_value: UNAVAILABLE + value: Unavailable + - new_value: UNIMPLEMENTED + value: Unimplemented + - new_value: UNKNOWN + value: Unknown - action: update_label label: rpc.response.status_code new_label: state diff --git a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux-gpu/otel.yaml index 2acd905527..a7d9657316 100644 --- a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux-gpu/otel.yaml @@ -565,6 +565,43 @@ processors: include: rpc.client.call.duration_count new_name: agent/api_request_count operations: + - action: update_label + label: rpc.response.status_code + value_actions: + - new_value: ABORTED + value: Aborted + - new_value: ALREADY_EXISTS + value: AlreadyExists + - new_value: CANCELLED + value: Canceled + - new_value: DATA_LOSS + value: DataLoss + - new_value: DEADLINE_EXCEEDED + value: DeadlineExceeded + - new_value: FAILED_PRECONDITION + value: FailedPrecondition + - new_value: INTERNAL + value: Internal + - new_value: INVALID_ARGUMENT + value: InvalidArgument + - new_value: NOT_FOUND + value: NotFound + - new_value: OK + value: OK + - new_value: OUT_OF_RANGE + value: OutOfRange + - new_value: PERMISSION_DENIED + value: PermissionDenied + - new_value: RESOURCE_EXHAUSTED + value: ResourceExhausted + - new_value: UNAUTHENTICATED + value: Unauthenticated + - new_value: UNAVAILABLE + value: Unavailable + - new_value: UNIMPLEMENTED + value: Unimplemented + - new_value: UNKNOWN + value: Unknown - action: update_label label: rpc.response.status_code new_label: state diff --git a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux/otel.yaml index 215dbfd850..ad26834b15 100644 --- a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux/otel.yaml @@ -536,6 +536,43 @@ processors: include: rpc.client.call.duration_count new_name: agent/api_request_count operations: + - action: update_label + label: rpc.response.status_code + value_actions: + - new_value: ABORTED + value: Aborted + - new_value: ALREADY_EXISTS + value: AlreadyExists + - new_value: CANCELLED + value: Canceled + - new_value: DATA_LOSS + value: DataLoss + - new_value: DEADLINE_EXCEEDED + value: DeadlineExceeded + - new_value: FAILED_PRECONDITION + value: FailedPrecondition + - new_value: INTERNAL + value: Internal + - new_value: INVALID_ARGUMENT + value: InvalidArgument + - new_value: NOT_FOUND + value: NotFound + - new_value: OK + value: OK + - new_value: OUT_OF_RANGE + value: OutOfRange + - new_value: PERMISSION_DENIED + value: PermissionDenied + - new_value: RESOURCE_EXHAUSTED + value: ResourceExhausted + - new_value: UNAUTHENTICATED + value: Unauthenticated + - new_value: UNAVAILABLE + value: Unavailable + - new_value: UNIMPLEMENTED + value: Unimplemented + - new_value: UNKNOWN + value: Unknown - action: update_label label: rpc.response.status_code new_label: state diff --git a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows-2012/otel.yaml index 5bea8ee668..d4d46d031b 100644 --- a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows-2012/otel.yaml @@ -601,6 +601,43 @@ processors: include: rpc.client.call.duration_count new_name: agent/api_request_count operations: + - action: update_label + label: rpc.response.status_code + value_actions: + - new_value: ABORTED + value: Aborted + - new_value: ALREADY_EXISTS + value: AlreadyExists + - new_value: CANCELLED + value: Canceled + - new_value: DATA_LOSS + value: DataLoss + - new_value: DEADLINE_EXCEEDED + value: DeadlineExceeded + - new_value: FAILED_PRECONDITION + value: FailedPrecondition + - new_value: INTERNAL + value: Internal + - new_value: INVALID_ARGUMENT + value: InvalidArgument + - new_value: NOT_FOUND + value: NotFound + - new_value: OK + value: OK + - new_value: OUT_OF_RANGE + value: OutOfRange + - new_value: PERMISSION_DENIED + value: PermissionDenied + - new_value: RESOURCE_EXHAUSTED + value: ResourceExhausted + - new_value: UNAUTHENTICATED + value: Unauthenticated + - new_value: UNAVAILABLE + value: Unavailable + - new_value: UNIMPLEMENTED + value: Unimplemented + - new_value: UNKNOWN + value: Unknown - action: update_label label: rpc.response.status_code new_label: state diff --git a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows/otel.yaml index 5bea8ee668..d4d46d031b 100644 --- a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows/otel.yaml @@ -601,6 +601,43 @@ processors: include: rpc.client.call.duration_count new_name: agent/api_request_count operations: + - action: update_label + label: rpc.response.status_code + value_actions: + - new_value: ABORTED + value: Aborted + - new_value: ALREADY_EXISTS + value: AlreadyExists + - new_value: CANCELLED + value: Canceled + - new_value: DATA_LOSS + value: DataLoss + - new_value: DEADLINE_EXCEEDED + value: DeadlineExceeded + - new_value: FAILED_PRECONDITION + value: FailedPrecondition + - new_value: INTERNAL + value: Internal + - new_value: INVALID_ARGUMENT + value: InvalidArgument + - new_value: NOT_FOUND + value: NotFound + - new_value: OK + value: OK + - new_value: OUT_OF_RANGE + value: OutOfRange + - new_value: PERMISSION_DENIED + value: PermissionDenied + - new_value: RESOURCE_EXHAUSTED + value: ResourceExhausted + - new_value: UNAUTHENTICATED + value: Unauthenticated + - new_value: UNAVAILABLE + value: Unavailable + - new_value: UNIMPLEMENTED + value: Unimplemented + - new_value: UNKNOWN + value: Unknown - action: update_label label: rpc.response.status_code new_label: state From 2c378ef24895a8275887540fe2ba0a7f6fcf56de Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Thu, 12 Mar 2026 19:04:02 +0000 Subject: [PATCH 15/18] Fix lint --- confgenerator/agentmetrics.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/confgenerator/agentmetrics.go b/confgenerator/agentmetrics.go index d0242bebab..7fc0a2e17c 100644 --- a/confgenerator/agentmetrics.go +++ b/confgenerator/agentmetrics.go @@ -58,9 +58,9 @@ var grpcToHTTPStatus = map[string]string{ } var grpcCamelToSnake = map[string]string{ - "OK": "OK", - "Canceled": "CANCELLED", - "Unknown": "UNKNOWN", + "OK": "OK", + "Canceled": "CANCELLED", + "Unknown": "UNKNOWN", "InvalidArgument": "INVALID_ARGUMENT", "DeadlineExceeded": "DEADLINE_EXCEEDED", "NotFound": "NOT_FOUND", @@ -68,13 +68,13 @@ var grpcCamelToSnake = map[string]string{ "PermissionDenied": "PERMISSION_DENIED", "ResourceExhausted": "RESOURCE_EXHAUSTED", "FailedPrecondition": "FAILED_PRECONDITION", - "Aborted": "ABORTED", - "OutOfRange": "OUT_OF_RANGE", - "Unimplemented": "UNIMPLEMENTED", - "Internal": "INTERNAL", - "Unavailable": "UNAVAILABLE", - "DataLoss": "DATA_LOSS", - "Unauthenticated": "UNAUTHENTICATED", + "Aborted": "ABORTED", + "OutOfRange": "OUT_OF_RANGE", + "Unimplemented": "UNIMPLEMENTED", + "Internal": "INTERNAL", + "Unavailable": "UNAVAILABLE", + "DataLoss": "DATA_LOSS", + "Unauthenticated": "UNAUTHENTICATED", } func (r AgentSelfMetrics) AddSelfMetricsPipelines(receiverPipelines map[string]otel.ReceiverPipeline, pipelines map[string]otel.Pipeline, ctx context.Context) { From 0da474532dc64fc6ab595c752774d0b98d117252 Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Thu, 12 Mar 2026 20:33:32 +0000 Subject: [PATCH 16/18] Fixing golden value --- .../output_otel_otlpexporter.yaml | 24 +++++------ .../output_otel_otlpexporter.yaml | 20 +++++----- .../output_otel_otlpexporter.yaml | 4 +- .../output_otel_otlpexporter.yaml | 40 +++++++++---------- .../output_otel_otlpexporter.yaml | 8 ++-- .../output_otel_otlpexporter.yaml | 8 ++-- .../output_otel_otlpexporter.yaml | 40 +++++++++---------- .../output_otel_otlpexporter.yaml | 40 +++++++++---------- .../output_otel.yaml | 2 +- 9 files changed, 93 insertions(+), 93 deletions(-) diff --git a/transformation_test/testdata/logging_processor-couchbase-general/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-couchbase-general/output_otel_otlpexporter.yaml index e8b59fb41f..8fae7a59fa 100644 --- a/transformation_test/testdata/logging_processor-couchbase-general/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-couchbase-general/output_otel_otlpexporter.yaml @@ -247,7 +247,7 @@ severityText: ERROR scope: {} - collector_errors: - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T09:15:12.123Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -258,9 +258,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T09:16:05.452Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -271,9 +271,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T09:16:33.764Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -284,9 +284,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T09:16:55.987Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -297,9 +297,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T09:17:30.333Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -310,9 +310,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T09:18:00.741Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -323,5 +323,5 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) diff --git a/transformation_test/testdata/logging_processor-couchbase-goxcdr/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-couchbase-goxcdr/output_otel_otlpexporter.yaml index 5140f18eac..d2aa416e4d 100644 --- a/transformation_test/testdata/logging_processor-couchbase-goxcdr/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-couchbase-goxcdr/output_otel_otlpexporter.yaml @@ -183,7 +183,7 @@ severityText: INFO scope: {} - collector_errors: - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T14:27:02.452Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -194,9 +194,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T14:27:10.874Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -207,9 +207,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T14:27:22.345Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -220,9 +220,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T14:27:45.657Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -233,9 +233,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18T14:28:00.998Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -246,5 +246,5 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L") != nil) diff --git a/transformation_test/testdata/logging_processor-local_timezone/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-local_timezone/output_otel_otlpexporter.yaml index 6452f6eb0b..1464cc8e72 100644 --- a/transformation_test/testdata/logging_processor-local_timezone/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-local_timezone/output_otel_otlpexporter.yaml @@ -61,7 +61,7 @@ observedTimeUnixNano: now scope: {} - collector_errors: - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"unparsable time\" as \"%Y-%m-%dT%H:%M\": cannot parse \"unparsable time\" as \"%Y\"" level: warn msg: failed to execute statement @@ -72,5 +72,5 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M") != nil) diff --git a/transformation_test/testdata/logging_processor-mongodb/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-mongodb/output_otel_otlpexporter.yaml index a26fac6e5a..c36fb874ae 100644 --- a/transformation_test/testdata/logging_processor-mongodb/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-mongodb/output_otel_otlpexporter.yaml @@ -3071,7 +3071,7 @@ severityText: INFO scope: {} - collector_errors: - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "json: float unexpected end of JSON input" level: warn msg: failed to execute statement @@ -3082,9 +3082,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__parsed_json"], ParseJSON(log.body["message"])) where (log.body != nil and log.body["message"] != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21T15:00:28.308+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -3095,9 +3095,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21T15:00:28.309+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -3108,9 +3108,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21T15:00:28.309+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -3121,9 +3121,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21T15:00:28.310+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -3134,9 +3134,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21T15:00:28.310+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -3147,9 +3147,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21T15:00:28.310+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -3160,9 +3160,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21T15:00:28.310+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -3173,9 +3173,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21T15:00:28.310+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -3186,9 +3186,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21T15:00:28.310+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -3199,5 +3199,5 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) diff --git a/transformation_test/testdata/logging_processor-oracledb_alert/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-oracledb_alert/output_otel_otlpexporter.yaml index 2e22a363a7..043c9c8e3a 100644 --- a/transformation_test/testdata/logging_processor-oracledb_alert/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-oracledb_alert/output_otel_otlpexporter.yaml @@ -94,7 +94,7 @@ severityText: ALERT scope: {} - collector_errors: - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2021-12-21T10:19:47.339827-05:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"-05:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -105,9 +105,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2022-03-15T14:32:18.456789+00:00\" as \"%Y-%m-%dT%H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -118,5 +118,5 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%dT%H:%M:%S.%L%z") != nil) diff --git a/transformation_test/testdata/logging_processor-parse_json-timestamp-format-1/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-parse_json-timestamp-format-1/output_otel_otlpexporter.yaml index e0307ff42a..2b2a435ea7 100644 --- a/transformation_test/testdata/logging_processor-parse_json-timestamp-format-1/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-parse_json-timestamp-format-1/output_otel_otlpexporter.yaml @@ -81,7 +81,7 @@ observedTimeUnixNano: now scope: {} - collector_errors: - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2024-06-15T14:30:00.987654321Z\": extra text: \"Z\"" level: warn msg: failed to execute statement @@ -92,9 +92,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2022-12-31T23:59:59.000000000-0800\": extra text: \"-0800\"" level: warn msg: failed to execute statement @@ -105,5 +105,5 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%dT%H:%M:%S.%L") != nil) diff --git a/transformation_test/testdata/logging_processor-postgresql/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-postgresql/output_otel_otlpexporter.yaml index c85936f9db..e086f00ae2 100644 --- a/transformation_test/testdata/logging_processor-postgresql/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-postgresql/output_otel_otlpexporter.yaml @@ -672,7 +672,7 @@ severityText: INFO scope: {} - collector_errors: - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:21.123 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -683,9 +683,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:21.124 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -696,9 +696,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:21.125 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -709,9 +709,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:22.301 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -722,9 +722,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:25.411 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -735,9 +735,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:25.411 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -748,9 +748,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:27.123 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -761,9 +761,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:30.673 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -774,9 +774,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:30.673 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -787,9 +787,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-07-21 10:14:35.987 UTC\" as \"%Y-%m-%d %H:%M:%S.%L %z\": cannot parse \"UTC\" as \"%z\"" level: warn msg: failed to execute statement @@ -800,5 +800,5 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["time"] != nil) and Time(log.body["time"], "%Y-%m-%d %H:%M:%S.%L %z") != nil) diff --git a/transformation_test/testdata/logging_processor-rabbitmq/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-rabbitmq/output_otel_otlpexporter.yaml index 8e7342ac3d..d88a71647e 100644 --- a/transformation_test/testdata/logging_processor-rabbitmq/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-rabbitmq/output_otel_otlpexporter.yaml @@ -414,7 +414,7 @@ severityText: DEFAULT scope: {} - collector_errors: - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 01:01:20.441571+00:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -425,9 +425,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 01:05:10.000123+02:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+02:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -438,9 +438,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 02:15:45.987+00:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -451,9 +451,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 02:16:01.001+00:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -464,9 +464,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 02:22:33.444+00:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -477,9 +477,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 02:23:00.999+00:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -490,9 +490,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 02:55:55.123+00:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -503,9 +503,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 03:56:01.456+00:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -516,9 +516,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 04:06:06.789+00:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -529,9 +529,9 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) - - caller: ottl@v0.145.0/parser.go:410 + - caller: ottl@v0.147.0/parser.go:410 error: "parsing time \"2025-08-18 04:06:10.101+00:00\" as \"%Y-%m-%d %H:%M:%S.%L%z\": cannot parse \"+00:00\" as \"%z\"" level: warn msg: failed to execute statement @@ -542,5 +542,5 @@ resource: service.instance.id: test-service-instance-id service.name: otelopscol - service.version: v0.145.0 + service.version: v0.147.0 statement: set(log.cache["__time_valid"], true) where ((log.body != nil and log.body["timestamp"] != nil) and Time(log.body["timestamp"], "%Y-%m-%d %H:%M:%S.%L%z") != nil) diff --git a/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml b/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml index 7b6f5a31a4..287cf69879 100644 --- a/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml +++ b/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml @@ -29,7 +29,7 @@ go.opentelemetry.io/collector/processor/batchprocessor.(*shard[...]).startLoop go.opentelemetry.io/collector/processor/batchprocessor@v0.147.0/batch_processor.go:213 sync.(*WaitGroup).Go.func1 - /usr/local/go/src/sync/waitgroup.go:239 + golang.org/toolchain@v0.0.1-go1.25.0.linux-amd64/src/sync/waitgroup.go:239 - caller: batchprocessor@v0.147.0/batch_processor.go:272 error: "could not process attribute gcp.source_location: json: cannot unmarshal string into Go struct field LogEntrySourceLocation.line of type int64" level: warn From 2da1c82b2f3e61a10379b4ab78439cae25c3db7b Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Fri, 13 Mar 2026 15:12:27 +0000 Subject: [PATCH 17/18] Fix golden --- .../ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml b/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml index 287cf69879..7b6f5a31a4 100644 --- a/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml +++ b/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml @@ -29,7 +29,7 @@ go.opentelemetry.io/collector/processor/batchprocessor.(*shard[...]).startLoop go.opentelemetry.io/collector/processor/batchprocessor@v0.147.0/batch_processor.go:213 sync.(*WaitGroup).Go.func1 - golang.org/toolchain@v0.0.1-go1.25.0.linux-amd64/src/sync/waitgroup.go:239 + /usr/local/go/src/sync/waitgroup.go:239 - caller: batchprocessor@v0.147.0/batch_processor.go:272 error: "could not process attribute gcp.source_location: json: cannot unmarshal string into Go struct field LogEntrySourceLocation.line of type int64" level: warn From 6126d851435a11aee3035ca51936cf48c46d65f4 Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Tue, 17 Mar 2026 14:40:29 +0000 Subject: [PATCH 18/18] Using submodulo to test fix --- submodules/opentelemetry-operations-collector | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/opentelemetry-operations-collector b/submodules/opentelemetry-operations-collector index 81696804c2..79590bc3ea 160000 --- a/submodules/opentelemetry-operations-collector +++ b/submodules/opentelemetry-operations-collector @@ -1 +1 @@ -Subproject commit 81696804c285f3b090610c5ba4670b4d3dd2ebc8 +Subproject commit 79590bc3eaadc286384551bed2143964b67ff7c4