diff --git a/submodules/opentelemetry-operations-collector b/submodules/opentelemetry-operations-collector index 32b5f554a8..b4846e8c28 160000 --- a/submodules/opentelemetry-operations-collector +++ b/submodules/opentelemetry-operations-collector @@ -1 +1 @@ -Subproject commit 32b5f554a82ff840e690eaf325d83cbff83f3f62 +Subproject commit b4846e8c28f304f51e28ed9680baf25817b72f5b diff --git a/transformation_test/testdata/logging_processor-apache-access/output_otel.yaml b/transformation_test/testdata/logging_processor-apache-access/output_otel.yaml index 10b6ebad94..b1cbf926c6 100644 --- a/transformation_test/testdata/logging_processor-apache-access/output_otel.yaml +++ b/transformation_test/testdata/logging_processor-apache-access/output_otel.yaml @@ -1,5 +1,12 @@ - entries: - - jsonPayload: {} + - httpRequest: + protocol: HTTP/1.1 + remoteIp: 127.0.0.1 + requestMethod: GET + requestUrl: /apache_pb.gif + responseSize: "2326" + status: 200 + jsonPayload: {} labels: compute.googleapis.com/resource_name: hostname logging.googleapis.com/instrumentation_source: agent.googleapis.com/apache_access @@ -10,7 +17,16 @@ zone: test-zone type: gce_instance timestamp: 2000-10-10T20:55:36Z - - jsonPayload: + - httpRequest: + protocol: HTTP/1.1 + referer: http://www.example.com/start.html + remoteIp: 192.168.1.100 + requestMethod: GET + requestUrl: /apache_pb.gif + responseSize: "2326" + status: 200 + userAgent: Mozilla/4.08 [en] (Win98; I ;Nav) + jsonPayload: user: frank labels: compute.googleapis.com/resource_name: hostname @@ -22,7 +38,16 @@ zone: test-zone type: gce_instance timestamp: 2000-10-10T20:55:36Z - - jsonPayload: {} + - httpRequest: + protocol: HTTP/1.1 + referer: https://example.com/register + remoteIp: 10.0.0.1 + requestMethod: POST + requestUrl: /api/users + responseSize: "445" + status: 201 + userAgent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 + jsonPayload: {} labels: compute.googleapis.com/resource_name: hostname logging.googleapis.com/instrumentation_source: agent.googleapis.com/apache_access @@ -33,7 +58,15 @@ zone: test-zone type: gce_instance timestamp: 2021-08-26T16:50:15Z - - jsonPayload: + - httpRequest: + protocol: HTTP/1.1 + remoteIp: 203.0.113.4 + requestMethod: GET + requestUrl: /admin/dashboard + responseSize: "1234" + status: 403 + userAgent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 + jsonPayload: user: admin labels: compute.googleapis.com/resource_name: hostname diff --git a/transformation_test/testdata/logging_processor-couchdb/output_otel.yaml b/transformation_test/testdata/logging_processor-couchdb/output_otel.yaml index 20ba8af105..000f7c82c9 100644 --- a/transformation_test/testdata/logging_processor-couchdb/output_otel.yaml +++ b/transformation_test/testdata/logging_processor-couchdb/output_otel.yaml @@ -1,5 +1,12 @@ - entries: - - jsonPayload: + - httpRequest: + protocol: HTTP/1.1 + remoteIp: 127.0.0.1 + requestMethod: PUT + responseSize: "16" + serverIp: localhost:5984 + status: 201 + jsonPayload: host: nohost level: notice message: otelu PUT /oteld 201 ok 16 diff --git a/transformation_test/testdata/logging_processor-jetty-access/output_otel.yaml b/transformation_test/testdata/logging_processor-jetty-access/output_otel.yaml index 557582de13..d79a4f929c 100644 --- a/transformation_test/testdata/logging_processor-jetty-access/output_otel.yaml +++ b/transformation_test/testdata/logging_processor-jetty-access/output_otel.yaml @@ -1,5 +1,12 @@ - entries: - - jsonPayload: {} + - httpRequest: + protocol: HTTP/1.1 + remoteIp: 127.0.0.1 + requestMethod: GET + requestUrl: /index.html + responseSize: "2326" + status: 200 + jsonPayload: {} labels: compute.googleapis.com/resource_name: hostname logging.googleapis.com/instrumentation_source: agent.googleapis.com/jetty_access @@ -10,7 +17,15 @@ zone: test-zone type: gce_instance timestamp: 2000-10-10T20:55:36Z - - jsonPayload: {} + - httpRequest: + protocol: HTTP/1.1 + remoteIp: "::1" + requestMethod: GET + requestUrl: / + responseSize: "10701" + status: 200 + userAgent: curl/7.64.0 + jsonPayload: {} labels: compute.googleapis.com/resource_name: hostname logging.googleapis.com/instrumentation_source: agent.googleapis.com/jetty_access @@ -21,7 +36,16 @@ zone: test-zone type: gce_instance timestamp: 2021-08-26T16:49:43Z - - jsonPayload: + - httpRequest: + protocol: HTTP/1.1 + referer: http://www.example.com/start.html + remoteIp: 192.168.1.100 + requestMethod: GET + requestUrl: /forbidden.html?something=something + responseSize: "2326" + status: 403 + userAgent: Mozilla/4.08 [en] (Win98; I ;Nav) + jsonPayload: user: frank labels: compute.googleapis.com/resource_name: hostname @@ -33,7 +57,16 @@ zone: test-zone type: gce_instance timestamp: 2000-10-10T20:55:36Z - - jsonPayload: {} + - httpRequest: + protocol: HTTP/1.1 + referer: https://example.com/register + remoteIp: 10.0.0.1 + requestMethod: POST + requestUrl: /api/users + responseSize: "445" + status: 201 + userAgent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 + jsonPayload: {} labels: compute.googleapis.com/resource_name: hostname logging.googleapis.com/instrumentation_source: agent.googleapis.com/jetty_access @@ -44,7 +77,15 @@ zone: test-zone type: gce_instance timestamp: 2021-08-26T16:50:15Z - - jsonPayload: + - httpRequest: + protocol: HTTP/1.1 + remoteIp: 203.0.113.4 + requestMethod: GET + requestUrl: /admin/dashboard + responseSize: "1234" + status: 403 + userAgent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 + jsonPayload: user: admin labels: compute.googleapis.com/resource_name: hostname 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 94d709fed1..08bdbfedf8 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.138.0/parser.go:410 + - caller: ottl@v0.145.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.138.0 + service.version: v0.145.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-nginx-access/output_otel.yaml b/transformation_test/testdata/logging_processor-nginx-access/output_otel.yaml index 4b7a766bb1..06bc469a6f 100644 --- a/transformation_test/testdata/logging_processor-nginx-access/output_otel.yaml +++ b/transformation_test/testdata/logging_processor-nginx-access/output_otel.yaml @@ -1,5 +1,12 @@ - entries: - - jsonPayload: {} + - httpRequest: + protocol: HTTP/1.1 + remoteIp: 127.0.0.1 + requestMethod: GET + requestUrl: /index.html + responseSize: "2326" + status: 200 + jsonPayload: {} labels: compute.googleapis.com/resource_name: hostname logging.googleapis.com/instrumentation_source: agent.googleapis.com/nginx_access @@ -10,7 +17,15 @@ zone: test-zone type: gce_instance timestamp: 2000-10-10T20:55:36Z - - jsonPayload: {} + - httpRequest: + protocol: HTTP/1.1 + remoteIp: "::1" + requestMethod: GET + requestUrl: / + responseSize: "10701" + status: 200 + userAgent: curl/7.64.0 + jsonPayload: {} labels: compute.googleapis.com/resource_name: hostname logging.googleapis.com/instrumentation_source: agent.googleapis.com/nginx_access @@ -21,7 +36,16 @@ zone: test-zone type: gce_instance timestamp: 2021-08-26T16:49:43Z - - jsonPayload: + - httpRequest: + protocol: HTTP/1.1 + referer: http://www.example.com/start.html + remoteIp: 192.168.1.100 + requestMethod: GET + requestUrl: /apache_pb.gif + responseSize: "2326" + status: 200 + userAgent: Mozilla/4.08 [en] (Win98; I ;Nav) + jsonPayload: user: frank labels: compute.googleapis.com/resource_name: hostname @@ -33,7 +57,16 @@ zone: test-zone type: gce_instance timestamp: 2000-10-10T20:55:36Z - - jsonPayload: {} + - httpRequest: + protocol: HTTP/1.1 + referer: https://example.com/register + remoteIp: 10.0.0.1 + requestMethod: POST + requestUrl: /api/users + responseSize: "445" + status: 201 + userAgent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 + jsonPayload: {} labels: compute.googleapis.com/resource_name: hostname logging.googleapis.com/instrumentation_source: agent.googleapis.com/nginx_access @@ -44,7 +77,15 @@ zone: test-zone type: gce_instance timestamp: 2021-08-26T16:50:15Z - - jsonPayload: + - httpRequest: + protocol: HTTP/1.1 + remoteIp: 203.0.113.4 + requestMethod: GET + requestUrl: /admin/dashboard + responseSize: "1234" + status: 403 + userAgent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 + jsonPayload: user: admin labels: compute.googleapis.com/resource_name: hostname @@ -56,7 +97,16 @@ zone: test-zone type: gce_instance timestamp: 2021-08-26T16:51:22Z - - jsonPayload: {} + - httpRequest: + protocol: HTTP/1.1 + referer: https://example.com/ + remoteIp: 192.168.0.50 + requestMethod: GET + requestUrl: /images/logo.png + responseSize: "512" + status: 404 + userAgent: Mozilla/5.0 (iPhone; CPU iPhone OS 14_6 like Mac OS X) AppleWebKit/605.1.15 + jsonPayload: {} labels: compute.googleapis.com/resource_name: hostname logging.googleapis.com/instrumentation_source: agent.googleapis.com/nginx_access @@ -67,7 +117,16 @@ zone: test-zone type: gce_instance timestamp: 2021-08-26T16:52:10Z - - jsonPayload: {} + - httpRequest: + protocol: HTTP/1.1 + referer: https://api.example.com/docs + remoteIp: 172.16.0.1 + requestMethod: PUT + requestUrl: /api/data/123 + responseSize: "789" + status: 500 + userAgent: python-requests/2.25.1 + jsonPayload: {} labels: compute.googleapis.com/resource_name: hostname logging.googleapis.com/instrumentation_source: agent.googleapis.com/nginx_access @@ -78,7 +137,14 @@ zone: test-zone type: gce_instance timestamp: 2021-08-26T16:53:05Z - - jsonPayload: + - httpRequest: + protocol: HTTP/1.1 + remoteIp: 10.1.1.1 + requestMethod: DELETE + requestUrl: /api/items/456 + status: 204 + userAgent: PostmanRuntime/7.28.0 + jsonPayload: user: user123 labels: compute.googleapis.com/resource_name: hostname 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 d9a55b3b9d..f98269d5c6 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.138.0/parser.go:410 + - caller: ottl@v0.145.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.138.0 + service.version: v0.145.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.138.0/parser.go:410 + - caller: ottl@v0.145.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.138.0 + service.version: v0.145.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 93d9d4aa9e..d3acaf5601 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.138.0/parser.go:410 + - caller: ottl@v0.145.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.138.0 + service.version: v0.145.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.138.0/parser.go:410 + - caller: ottl@v0.145.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.138.0 + service.version: v0.145.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-parse_regex_invalid_regex/output_otel.yaml b/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_otel.yaml index c48d2d456a..d4a91dd87d 100644 --- a/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_otel.yaml +++ b/transformation_test/testdata/logging_processor-parse_regex_invalid_regex/output_otel.yaml @@ -2,4 +2,3 @@ - collector_errors: - stderr: | Error: invalid configuration: processors::transform/logs_transformation__test_my-log-name_0: unable to parse OTTL statement "set(log.cache[\"__parsed_regex\"], ExtractPatternsRubyRegex(log.body[\"message\"], \"^(?