From 6116c9f02aee88542b881587b37a80b1942e52f9 Mon Sep 17 00:00:00 2001 From: Rafael Westphal Date: Fri, 19 Jun 2026 15:39:52 +0000 Subject: [PATCH 1/3] Update Go version to 1.26.4 and update goldens for OTel v0.154.0 on 3.0 --- Dockerfile | 2 +- confgenerator/testdata/feature/golden.csv | 2 - .../linux-gpu/feature_tracking_otlp.json | 2 +- .../golden/linux/feature_tracking_otlp.json | 2 +- .../golden/linux-gpu/features.yaml | 92 - .../golden/linux/features.yaml | 92 - .../golden/windows-2012/features.yaml | 92 - .../golden/windows/features.yaml | 92 - .../linux-gpu/feature_tracking_otlp.json | 2 +- .../golden/linux/feature_tracking_otlp.json | 2 +- .../windows-2012/feature_tracking_otlp.json | 2 +- .../golden/windows/feature_tracking_otlp.json | 2 +- .../linux-gpu/feature_tracking_otlp.json | 2 +- .../golden/linux/feature_tracking_otlp.json | 2 +- .../windows-2012/feature_tracking_otlp.json | 2 +- .../golden/windows/feature_tracking_otlp.json | 2 +- .../golden/linux-gpu/features.yaml | 4 - .../golden/linux/features.yaml | 4 - .../golden/windows-2012/features.yaml | 4 - .../golden/windows/features.yaml | 4 - .../golden/linux-gpu/features.yaml | 4 - .../golden/linux/features.yaml | 4 - .../golden/windows-2012/features.yaml | 4 - .../golden/windows/features.yaml | 4 - .../0f15dbe303dc7122d43443c9a4c31632.lua | 28 - .../4d6012ff003886818fb9b9285b4af962.lua | 19 - .../5fc5f42c16c9e1ab8292e3d42f74f3be.lua | 49 - .../b4a0dead382dce7b4fe011d3f59fdb6d.lua | 17 - .../linux-gpu/feature_tracking_otlp.json | 2 +- .../golden/linux-gpu/features.yaml | 24 - .../golden/linux-gpu/fluent_bit_main.conf | 153 -- .../golden/linux-gpu/fluent_bit_parser.conf | 13 - .../golden/linux-gpu/otel.yaml | 533 +++-- .../golden/linux-gpu/otel_otlp_exporter.yaml | 1261 ------------ .../0f15dbe303dc7122d43443c9a4c31632.lua | 28 - .../4d6012ff003886818fb9b9285b4af962.lua | 19 - .../5fc5f42c16c9e1ab8292e3d42f74f3be.lua | 49 - .../b4a0dead382dce7b4fe011d3f59fdb6d.lua | 17 - .../golden/linux/feature_tracking_otlp.json | 2 +- .../golden/linux/features.yaml | 24 - .../golden/linux/fluent_bit_main.conf | 153 -- .../golden/linux/fluent_bit_parser.conf | 13 - .../golden/linux/otel.yaml | 511 +++-- .../golden/linux/otel_otlp_exporter.yaml | 1201 ----------- .../0f15dbe303dc7122d43443c9a4c31632.lua | 28 - .../4d6012ff003886818fb9b9285b4af962.lua | 19 - .../5fc5f42c16c9e1ab8292e3d42f74f3be.lua | 49 - .../b4a0dead382dce7b4fe011d3f59fdb6d.lua | 17 - .../windows-2012/feature_tracking_otlp.json | 2 +- .../golden/windows-2012/features.yaml | 24 - .../golden/windows-2012/fluent_bit_main.conf | 153 -- .../windows-2012/fluent_bit_parser.conf | 13 - .../golden/windows-2012/otel.yaml | 567 ++++-- .../windows-2012/otel_otlp_exporter.yaml | 1751 ----------------- .../0f15dbe303dc7122d43443c9a4c31632.lua | 28 - .../4d6012ff003886818fb9b9285b4af962.lua | 19 - .../5fc5f42c16c9e1ab8292e3d42f74f3be.lua | 49 - .../b4a0dead382dce7b4fe011d3f59fdb6d.lua | 17 - .../golden/windows/feature_tracking_otlp.json | 2 +- .../golden/windows/features.yaml | 24 - .../golden/windows/fluent_bit_main.conf | 153 -- .../golden/windows/fluent_bit_parser.conf | 13 - .../golden/windows/otel.yaml | 567 ++++-- .../golden/windows/otel_otlp_exporter.yaml | 1751 ----------------- .../golden/linux-gpu/features.yaml | 92 - .../golden/linux-gpu/otel.yaml | 46 +- .../golden/linux/features.yaml | 92 - .../golden/linux/otel.yaml | 46 +- .../golden/windows-2012/features.yaml | 92 - .../golden/windows-2012/otel.yaml | 46 +- .../golden/windows/features.yaml | 92 - .../golden/windows/otel.yaml | 46 +- .../golden/linux-gpu/features.yaml | 8 - .../golden/linux-gpu/otel.yaml | 2 +- .../golden/linux/features.yaml | 8 - .../golden/linux/otel.yaml | 2 +- .../golden/windows-2012/features.yaml | 8 - .../golden/windows-2012/otel.yaml | 2 +- .../golden/windows/features.yaml | 8 - .../golden/windows/otel.yaml | 2 +- .../linux-gpu/feature_tracking_otlp.json | 2 +- .../golden/linux-gpu/otel.yaml | 2 +- .../golden/linux/feature_tracking_otlp.json | 2 +- .../golden/linux/otel.yaml | 2 +- .../windows-2012/feature_tracking_otlp.json | 2 +- .../golden/windows-2012/otel.yaml | 2 +- .../golden/windows/feature_tracking_otlp.json | 2 +- .../golden/windows/otel.yaml | 2 +- .../golden/linux-gpu/features.yaml | 4 - .../golden/linux/features.yaml | 4 - .../golden/windows-2012/features.yaml | 4 - .../golden/windows/features.yaml | 4 - .../golden/linux-gpu/features.yaml | 4 - .../golden/linux/features.yaml | 4 - .../golden/windows-2012/features.yaml | 4 - .../golden/windows/features.yaml | 4 - .../golden/linux-gpu/features.yaml | 4 - .../golden/linux/features.yaml | 4 - .../golden/windows-2012/features.yaml | 4 - .../golden/windows/features.yaml | 4 - .../golden/linux-gpu/features.yaml | 4 - .../golden/linux/features.yaml | 4 - .../golden/windows-2012/features.yaml | 4 - .../golden/windows/features.yaml | 4 - .../golden/linux-gpu/features.yaml | 4 - .../golden/linux/features.yaml | 4 - .../golden/windows-2012/features.yaml | 4 - .../golden/windows/features.yaml | 4 - .../golden/windows-2012/otel.yaml | 8 +- .../golden/windows/otel.yaml | 8 +- dockerfiles/template-header | 2 +- submodules/fluent-bit | 1 + 112 files changed, 1586 insertions(+), 8907 deletions(-) delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/0f15dbe303dc7122d43443c9a4c31632.lua delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/4d6012ff003886818fb9b9285b4af962.lua delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/5fc5f42c16c9e1ab8292e3d42f74f3be.lua delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/b4a0dead382dce7b4fe011d3f59fdb6d.lua delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/fluent_bit_main.conf delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/fluent_bit_parser.conf delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/otel_otlp_exporter.yaml delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux/0f15dbe303dc7122d43443c9a4c31632.lua delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux/4d6012ff003886818fb9b9285b4af962.lua delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux/5fc5f42c16c9e1ab8292e3d42f74f3be.lua delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux/b4a0dead382dce7b4fe011d3f59fdb6d.lua delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux/fluent_bit_main.conf delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux/fluent_bit_parser.conf delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux/otel_otlp_exporter.yaml delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/windows-2012/0f15dbe303dc7122d43443c9a4c31632.lua delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/windows-2012/4d6012ff003886818fb9b9285b4af962.lua delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/windows-2012/5fc5f42c16c9e1ab8292e3d42f74f3be.lua delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/windows-2012/b4a0dead382dce7b4fe011d3f59fdb6d.lua delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/windows-2012/fluent_bit_main.conf delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/windows-2012/fluent_bit_parser.conf delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/windows-2012/otel_otlp_exporter.yaml delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/windows/0f15dbe303dc7122d43443c9a4c31632.lua delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/windows/4d6012ff003886818fb9b9285b4af962.lua delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/windows/5fc5f42c16c9e1ab8292e3d42f74f3be.lua delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/windows/b4a0dead382dce7b4fe011d3f59fdb6d.lua delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/windows/fluent_bit_main.conf delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/windows/fluent_bit_parser.conf delete mode 100644 confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/windows/otel_otlp_exporter.yaml create mode 160000 submodules/fluent-bit diff --git a/Dockerfile b/Dockerfile index e2e0d8b334..945499a942 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ ARG CMAKE_VERSION=3.25.2 -ARG GO_VERSION=1.25.0 +ARG GO_VERSION=1.26.4 ARG USE_PREBUILT=false ARG TARGETARCH diff --git a/confgenerator/testdata/feature/golden.csv b/confgenerator/testdata/feature/golden.csv index dec8b7bafd..65a3613a2e 100644 --- a/confgenerator/testdata/feature/golden.csv +++ b/confgenerator/testdata/feature/golden.csv @@ -11,13 +11,11 @@ App,Field,Override, *apps.ReceiverOTLP,MetricsMode, *apps.ReceiverOTLP,confgenerator.ConfigComponent.Type, *confgenerator.LoggingProcessorExcludeLogs,confgenerator.ConfigComponent.Type, -*confgenerator.LoggingProcessorExcludeLogs,has_ruby_regex *confgenerator.LoggingProcessorModifyFields,confgenerator.ConfigComponent.Type, *confgenerator.LoggingProcessorModifyFields,has_ruby_regex *confgenerator.LoggingProcessorParseJson,confgenerator.ConfigComponent.Type, *confgenerator.LoggingProcessorParseRegex,PreserveKey, *confgenerator.LoggingProcessorParseRegex,confgenerator.ConfigComponent.Type, -*confgenerator.LoggingProcessorParseRegex,has_ruby_regex *confgenerator.LoggingReceiverFiles,RecordLogFilePath, *confgenerator.LoggingReceiverFiles,WildcardRefreshInterval, *confgenerator.LoggingReceiverFiles,confgenerator.ConfigComponent.Type, diff --git a/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-gpu/feature_tracking_otlp.json b/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-gpu/feature_tracking_otlp.json index fb7093fc5b..e4d5aa492c 100644 --- a/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-gpu/feature_tracking_otlp.json +++ b/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-gpu/feature_tracking_otlp.json @@ -1 +1 @@ -{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:systemd_journald"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file +{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:systemd_journald"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].has_ruby_regex"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file diff --git a/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux/feature_tracking_otlp.json b/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux/feature_tracking_otlp.json index fb7093fc5b..e4d5aa492c 100644 --- a/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux/feature_tracking_otlp.json +++ b/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux/feature_tracking_otlp.json @@ -1 +1 @@ -{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:systemd_journald"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file +{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:systemd_journald"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].has_ruby_regex"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/features.yaml index 88604e9672..1941c92446 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/features.yaml @@ -22,10 +22,6 @@ feature: receivers:files key: "[0].include_paths.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[0].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[0].enabled" @@ -34,10 +30,6 @@ feature: processors:exclude_logs key: "[0].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[1].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[1].enabled" @@ -46,10 +38,6 @@ feature: processors:exclude_logs key: "[1].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[2].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[2].enabled" @@ -58,10 +46,6 @@ feature: processors:exclude_logs key: "[2].match_any.__length" value: "2" -- module: logging - feature: processors:exclude_logs - key: "[3].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[3].enabled" @@ -70,10 +54,6 @@ feature: processors:exclude_logs key: "[3].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[4].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[4].enabled" @@ -82,10 +62,6 @@ feature: processors:exclude_logs key: "[4].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[5].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[5].enabled" @@ -94,10 +70,6 @@ feature: processors:exclude_logs key: "[5].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[6].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[6].enabled" @@ -106,10 +78,6 @@ feature: processors:exclude_logs key: "[6].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[7].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[7].enabled" @@ -118,10 +86,6 @@ feature: processors:exclude_logs key: "[7].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[8].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[8].enabled" @@ -130,10 +94,6 @@ feature: processors:exclude_logs key: "[8].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[9].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[9].enabled" @@ -142,10 +102,6 @@ feature: processors:exclude_logs key: "[9].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[10].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[10].enabled" @@ -154,10 +110,6 @@ feature: processors:exclude_logs key: "[10].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[11].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[11].enabled" @@ -166,10 +118,6 @@ feature: processors:exclude_logs key: "[11].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[12].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[12].enabled" @@ -178,10 +126,6 @@ feature: processors:exclude_logs key: "[12].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[13].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[13].enabled" @@ -190,10 +134,6 @@ feature: processors:exclude_logs key: "[13].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[14].has_ruby_regex" - value: "true" - module: logging feature: processors:exclude_logs key: "[14].enabled" @@ -202,10 +142,6 @@ feature: processors:exclude_logs key: "[14].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[15].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[15].enabled" @@ -214,10 +150,6 @@ feature: processors:exclude_logs key: "[15].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[16].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[16].enabled" @@ -226,10 +158,6 @@ feature: processors:exclude_logs key: "[16].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[17].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[17].enabled" @@ -238,10 +166,6 @@ feature: processors:exclude_logs key: "[17].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[18].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[18].enabled" @@ -250,10 +174,6 @@ feature: processors:exclude_logs key: "[18].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[19].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[19].enabled" @@ -262,10 +182,6 @@ feature: processors:exclude_logs key: "[19].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[20].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[20].enabled" @@ -274,10 +190,6 @@ feature: processors:exclude_logs key: "[20].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[21].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[21].enabled" @@ -286,10 +198,6 @@ feature: processors:exclude_logs key: "[21].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[22].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[22].enabled" diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/features.yaml index 88604e9672..1941c92446 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/features.yaml @@ -22,10 +22,6 @@ feature: receivers:files key: "[0].include_paths.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[0].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[0].enabled" @@ -34,10 +30,6 @@ feature: processors:exclude_logs key: "[0].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[1].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[1].enabled" @@ -46,10 +38,6 @@ feature: processors:exclude_logs key: "[1].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[2].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[2].enabled" @@ -58,10 +46,6 @@ feature: processors:exclude_logs key: "[2].match_any.__length" value: "2" -- module: logging - feature: processors:exclude_logs - key: "[3].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[3].enabled" @@ -70,10 +54,6 @@ feature: processors:exclude_logs key: "[3].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[4].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[4].enabled" @@ -82,10 +62,6 @@ feature: processors:exclude_logs key: "[4].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[5].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[5].enabled" @@ -94,10 +70,6 @@ feature: processors:exclude_logs key: "[5].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[6].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[6].enabled" @@ -106,10 +78,6 @@ feature: processors:exclude_logs key: "[6].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[7].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[7].enabled" @@ -118,10 +86,6 @@ feature: processors:exclude_logs key: "[7].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[8].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[8].enabled" @@ -130,10 +94,6 @@ feature: processors:exclude_logs key: "[8].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[9].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[9].enabled" @@ -142,10 +102,6 @@ feature: processors:exclude_logs key: "[9].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[10].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[10].enabled" @@ -154,10 +110,6 @@ feature: processors:exclude_logs key: "[10].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[11].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[11].enabled" @@ -166,10 +118,6 @@ feature: processors:exclude_logs key: "[11].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[12].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[12].enabled" @@ -178,10 +126,6 @@ feature: processors:exclude_logs key: "[12].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[13].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[13].enabled" @@ -190,10 +134,6 @@ feature: processors:exclude_logs key: "[13].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[14].has_ruby_regex" - value: "true" - module: logging feature: processors:exclude_logs key: "[14].enabled" @@ -202,10 +142,6 @@ feature: processors:exclude_logs key: "[14].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[15].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[15].enabled" @@ -214,10 +150,6 @@ feature: processors:exclude_logs key: "[15].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[16].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[16].enabled" @@ -226,10 +158,6 @@ feature: processors:exclude_logs key: "[16].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[17].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[17].enabled" @@ -238,10 +166,6 @@ feature: processors:exclude_logs key: "[17].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[18].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[18].enabled" @@ -250,10 +174,6 @@ feature: processors:exclude_logs key: "[18].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[19].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[19].enabled" @@ -262,10 +182,6 @@ feature: processors:exclude_logs key: "[19].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[20].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[20].enabled" @@ -274,10 +190,6 @@ feature: processors:exclude_logs key: "[20].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[21].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[21].enabled" @@ -286,10 +198,6 @@ feature: processors:exclude_logs key: "[21].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[22].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[22].enabled" diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/features.yaml index 88604e9672..1941c92446 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/features.yaml @@ -22,10 +22,6 @@ feature: receivers:files key: "[0].include_paths.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[0].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[0].enabled" @@ -34,10 +30,6 @@ feature: processors:exclude_logs key: "[0].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[1].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[1].enabled" @@ -46,10 +38,6 @@ feature: processors:exclude_logs key: "[1].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[2].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[2].enabled" @@ -58,10 +46,6 @@ feature: processors:exclude_logs key: "[2].match_any.__length" value: "2" -- module: logging - feature: processors:exclude_logs - key: "[3].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[3].enabled" @@ -70,10 +54,6 @@ feature: processors:exclude_logs key: "[3].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[4].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[4].enabled" @@ -82,10 +62,6 @@ feature: processors:exclude_logs key: "[4].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[5].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[5].enabled" @@ -94,10 +70,6 @@ feature: processors:exclude_logs key: "[5].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[6].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[6].enabled" @@ -106,10 +78,6 @@ feature: processors:exclude_logs key: "[6].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[7].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[7].enabled" @@ -118,10 +86,6 @@ feature: processors:exclude_logs key: "[7].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[8].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[8].enabled" @@ -130,10 +94,6 @@ feature: processors:exclude_logs key: "[8].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[9].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[9].enabled" @@ -142,10 +102,6 @@ feature: processors:exclude_logs key: "[9].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[10].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[10].enabled" @@ -154,10 +110,6 @@ feature: processors:exclude_logs key: "[10].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[11].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[11].enabled" @@ -166,10 +118,6 @@ feature: processors:exclude_logs key: "[11].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[12].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[12].enabled" @@ -178,10 +126,6 @@ feature: processors:exclude_logs key: "[12].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[13].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[13].enabled" @@ -190,10 +134,6 @@ feature: processors:exclude_logs key: "[13].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[14].has_ruby_regex" - value: "true" - module: logging feature: processors:exclude_logs key: "[14].enabled" @@ -202,10 +142,6 @@ feature: processors:exclude_logs key: "[14].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[15].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[15].enabled" @@ -214,10 +150,6 @@ feature: processors:exclude_logs key: "[15].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[16].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[16].enabled" @@ -226,10 +158,6 @@ feature: processors:exclude_logs key: "[16].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[17].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[17].enabled" @@ -238,10 +166,6 @@ feature: processors:exclude_logs key: "[17].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[18].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[18].enabled" @@ -250,10 +174,6 @@ feature: processors:exclude_logs key: "[18].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[19].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[19].enabled" @@ -262,10 +182,6 @@ feature: processors:exclude_logs key: "[19].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[20].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[20].enabled" @@ -274,10 +190,6 @@ feature: processors:exclude_logs key: "[20].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[21].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[21].enabled" @@ -286,10 +198,6 @@ feature: processors:exclude_logs key: "[21].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[22].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[22].enabled" diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/features.yaml index 88604e9672..1941c92446 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/features.yaml @@ -22,10 +22,6 @@ feature: receivers:files key: "[0].include_paths.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[0].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[0].enabled" @@ -34,10 +30,6 @@ feature: processors:exclude_logs key: "[0].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[1].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[1].enabled" @@ -46,10 +38,6 @@ feature: processors:exclude_logs key: "[1].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[2].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[2].enabled" @@ -58,10 +46,6 @@ feature: processors:exclude_logs key: "[2].match_any.__length" value: "2" -- module: logging - feature: processors:exclude_logs - key: "[3].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[3].enabled" @@ -70,10 +54,6 @@ feature: processors:exclude_logs key: "[3].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[4].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[4].enabled" @@ -82,10 +62,6 @@ feature: processors:exclude_logs key: "[4].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[5].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[5].enabled" @@ -94,10 +70,6 @@ feature: processors:exclude_logs key: "[5].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[6].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[6].enabled" @@ -106,10 +78,6 @@ feature: processors:exclude_logs key: "[6].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[7].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[7].enabled" @@ -118,10 +86,6 @@ feature: processors:exclude_logs key: "[7].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[8].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[8].enabled" @@ -130,10 +94,6 @@ feature: processors:exclude_logs key: "[8].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[9].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[9].enabled" @@ -142,10 +102,6 @@ feature: processors:exclude_logs key: "[9].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[10].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[10].enabled" @@ -154,10 +110,6 @@ feature: processors:exclude_logs key: "[10].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[11].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[11].enabled" @@ -166,10 +118,6 @@ feature: processors:exclude_logs key: "[11].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[12].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[12].enabled" @@ -178,10 +126,6 @@ feature: processors:exclude_logs key: "[12].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[13].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[13].enabled" @@ -190,10 +134,6 @@ feature: processors:exclude_logs key: "[13].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[14].has_ruby_regex" - value: "true" - module: logging feature: processors:exclude_logs key: "[14].enabled" @@ -202,10 +142,6 @@ feature: processors:exclude_logs key: "[14].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[15].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[15].enabled" @@ -214,10 +150,6 @@ feature: processors:exclude_logs key: "[15].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[16].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[16].enabled" @@ -226,10 +158,6 @@ feature: processors:exclude_logs key: "[16].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[17].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[17].enabled" @@ -238,10 +166,6 @@ feature: processors:exclude_logs key: "[17].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[18].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[18].enabled" @@ -250,10 +174,6 @@ feature: processors:exclude_logs key: "[18].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[19].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[19].enabled" @@ -262,10 +182,6 @@ feature: processors:exclude_logs key: "[19].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[20].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[20].enabled" @@ -274,10 +190,6 @@ feature: processors:exclude_logs key: "[20].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[21].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[21].enabled" @@ -286,10 +198,6 @@ feature: processors:exclude_logs key: "[21].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[22].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[22].enabled" diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/feature_tracking_otlp.json index 5d3088f834..6f5274049c 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/feature_tracking_otlp.json +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/feature_tracking_otlp.json @@ -1 +1 @@ -{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"experimental_otel_logging"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file +{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].has_ruby_regex"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"experimental_otel_logging"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/feature_tracking_otlp.json index 5d3088f834..6f5274049c 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/feature_tracking_otlp.json +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/feature_tracking_otlp.json @@ -1 +1 @@ -{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"experimental_otel_logging"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file +{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].has_ruby_regex"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"experimental_otel_logging"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/feature_tracking_otlp.json index 5d3088f834..6f5274049c 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/feature_tracking_otlp.json +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/feature_tracking_otlp.json @@ -1 +1 @@ -{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"experimental_otel_logging"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file +{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].has_ruby_regex"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"experimental_otel_logging"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/feature_tracking_otlp.json index 5d3088f834..6f5274049c 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/feature_tracking_otlp.json +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/feature_tracking_otlp.json @@ -1 +1 @@ -{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"experimental_otel_logging"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file +{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:files"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].has_ruby_regex"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"experimental_otel_logging"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux-gpu/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux-gpu/feature_tracking_otlp.json index 3d895e2aec..cd7db69921 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux-gpu/feature_tracking_otlp.json +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux-gpu/feature_tracking_otlp.json @@ -1 +1 @@ -{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"experimental_otel_logging"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"combined"}},{"key":"feature","value":{"stringValue":"receivers:otlp"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file +{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].has_ruby_regex"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"experimental_otel_logging"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"combined"}},{"key":"feature","value":{"stringValue":"receivers:otlp"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux/feature_tracking_otlp.json index 3d895e2aec..cd7db69921 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux/feature_tracking_otlp.json +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux/feature_tracking_otlp.json @@ -1 +1 @@ -{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"experimental_otel_logging"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"combined"}},{"key":"feature","value":{"stringValue":"receivers:otlp"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file +{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].has_ruby_regex"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"experimental_otel_logging"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"combined"}},{"key":"feature","value":{"stringValue":"receivers:otlp"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows-2012/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows-2012/feature_tracking_otlp.json index 3d895e2aec..cd7db69921 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows-2012/feature_tracking_otlp.json +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows-2012/feature_tracking_otlp.json @@ -1 +1 @@ -{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"experimental_otel_logging"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"combined"}},{"key":"feature","value":{"stringValue":"receivers:otlp"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file +{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].has_ruby_regex"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"experimental_otel_logging"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"combined"}},{"key":"feature","value":{"stringValue":"receivers:otlp"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows/feature_tracking_otlp.json index 3d895e2aec..cd7db69921 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows/feature_tracking_otlp.json +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows/feature_tracking_otlp.json @@ -1 +1 @@ -{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"experimental_otel_logging"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"combined"}},{"key":"feature","value":{"stringValue":"receivers:otlp"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file +{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].has_ruby_regex"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"experimental_otel_logging"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"combined"}},{"key":"feature","value":{"stringValue":"receivers:otlp"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/features.yaml index bbb0d63d98..de6579baf9 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/features.yaml @@ -14,10 +14,6 @@ feature: service:otel_logging key: otel_logging_supported_config value: "true" -- module: logging - feature: processors:parse_regex - key: "[0].has_ruby_regex" - value: "false" - module: logging feature: processors:parse_regex key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/features.yaml index bbb0d63d98..de6579baf9 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/features.yaml @@ -14,10 +14,6 @@ feature: service:otel_logging key: otel_logging_supported_config value: "true" -- module: logging - feature: processors:parse_regex - key: "[0].has_ruby_regex" - value: "false" - module: logging feature: processors:parse_regex key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/features.yaml index bbb0d63d98..de6579baf9 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/features.yaml @@ -14,10 +14,6 @@ feature: service:otel_logging key: otel_logging_supported_config value: "true" -- module: logging - feature: processors:parse_regex - key: "[0].has_ruby_regex" - value: "false" - module: logging feature: processors:parse_regex key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/features.yaml index bbb0d63d98..de6579baf9 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/features.yaml @@ -14,10 +14,6 @@ feature: service:otel_logging key: otel_logging_supported_config value: "true" -- module: logging - feature: processors:parse_regex - key: "[0].has_ruby_regex" - value: "false" - module: logging feature: processors:parse_regex key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/features.yaml index 67476ef6b8..c86e680b71 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/features.yaml @@ -22,10 +22,6 @@ feature: receivers:syslog key: "[1].enabled" value: "true" -- module: logging - feature: processors:parse_regex - key: "[0].has_ruby_regex" - value: "false" - module: logging feature: processors:parse_regex key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/features.yaml index 67476ef6b8..c86e680b71 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/features.yaml @@ -22,10 +22,6 @@ feature: receivers:syslog key: "[1].enabled" value: "true" -- module: logging - feature: processors:parse_regex - key: "[0].has_ruby_regex" - value: "false" - module: logging feature: processors:parse_regex key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/features.yaml index 67476ef6b8..c86e680b71 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/features.yaml @@ -22,10 +22,6 @@ feature: receivers:syslog key: "[1].enabled" value: "true" -- module: logging - feature: processors:parse_regex - key: "[0].has_ruby_regex" - value: "false" - module: logging feature: processors:parse_regex key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/features.yaml index 67476ef6b8..c86e680b71 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/features.yaml @@ -22,10 +22,6 @@ feature: receivers:syslog key: "[1].enabled" value: "true" -- module: logging - feature: processors:parse_regex - key: "[0].has_ruby_regex" - value: "false" - module: logging feature: processors:parse_regex key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/0f15dbe303dc7122d43443c9a4c31632.lua b/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/0f15dbe303dc7122d43443c9a4c31632.lua deleted file mode 100644 index dda27aee97..0000000000 --- a/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/0f15dbe303dc7122d43443c9a4c31632.lua +++ /dev/null @@ -1,28 +0,0 @@ - -function process(tag, timestamp, record) -local v = "ops-agent"; -(function(value) -if record["logging.googleapis.com/labels"] == nil -then -record["logging.googleapis.com/labels"] = {} -end -record["logging.googleapis.com/labels"]["agent.googleapis.com/health/agentKind"] = value -end)(v) -local v = "latest"; -(function(value) -if record["logging.googleapis.com/labels"] == nil -then -record["logging.googleapis.com/labels"] = {} -end -record["logging.googleapis.com/labels"]["agent.googleapis.com/health/agentVersion"] = value -end)(v) -local v = "v1"; -(function(value) -if record["logging.googleapis.com/labels"] == nil -then -record["logging.googleapis.com/labels"] = {} -end -record["logging.googleapis.com/labels"]["agent.googleapis.com/health/schemaVersion"] = value -end)(v) -return 2, timestamp, record -end diff --git a/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/4d6012ff003886818fb9b9285b4af962.lua b/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/4d6012ff003886818fb9b9285b4af962.lua deleted file mode 100644 index c225be24d5..0000000000 --- a/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/4d6012ff003886818fb9b9285b4af962.lua +++ /dev/null @@ -1,19 +0,0 @@ - -function process(tag, timestamp, record) -local __field_0 = (function() -return record["severity"] -end)(); -(function(value) -record["severity"] = value -end)(nil); -local v = __field_0; -if v == "debug" then v = "DEBUG" -elseif v == "error" then v = "ERROR" -elseif v == "info" then v = "INFO" -elseif v == "warn" then v = "WARNING" -end -(function(value) -record["logging.googleapis.com/severity"] = value -end)(v) -return 2, timestamp, record -end diff --git a/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/5fc5f42c16c9e1ab8292e3d42f74f3be.lua b/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/5fc5f42c16c9e1ab8292e3d42f74f3be.lua deleted file mode 100644 index c5465182b5..0000000000 --- a/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/5fc5f42c16c9e1ab8292e3d42f74f3be.lua +++ /dev/null @@ -1,49 +0,0 @@ - - function shallow_merge(record, parsedRecord) - -- If no exiting record exists - if (record == nil) then - return parsedRecord - end - - for k, v in pairs(parsedRecord) do - record[k] = v - end - - return record -end - -function merge(record, parsedRecord) - -- If no exiting record exists - if record == nil then - return parsedRecord - end - - -- Potentially overwrite or merge the original records. - for k, v in pairs(parsedRecord) do - -- If there is no conflict - if k == "logging.googleapis.com/logName" then - -- Ignore the parsed payload since the logName is controlled - -- by the OpsAgent. - elseif k == "logging.googleapis.com/labels" then - -- LogEntry.labels are basically a map[string]string and so only require a - -- shallow merge (one level deep merge). - record[k] = shallow_merge(record[k], v) - else - record[k] = v - end - end - - return record -end - -function parser_merge_record(tag, timestamp, record) - originalPayload = record["logging.googleapis.com/__tmp"] - if originalPayload == nil then - return 0, timestamp, record - end - - -- Remove original payload - record["logging.googleapis.com/__tmp"] = nil - record = merge(originalPayload, record) - return 2, timestamp, record -end diff --git a/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/b4a0dead382dce7b4fe011d3f59fdb6d.lua b/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/b4a0dead382dce7b4fe011d3f59fdb6d.lua deleted file mode 100644 index 6263563b66..0000000000 --- a/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/b4a0dead382dce7b4fe011d3f59fdb6d.lua +++ /dev/null @@ -1,17 +0,0 @@ - -function parser_nest(tag, timestamp, record) - local nestedRecord = {} - local parseKey = "message" - for k, v in pairs(record) do - if k ~= parseKey then - nestedRecord[k] = v - end - end - - local result = {} - result[parseKey] = record[parseKey] - result["logging.googleapis.com/__tmp"] = nestedRecord - - return 2, timestamp, result -end - diff --git a/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/feature_tracking_otlp.json index 8e0a8d4802..2f188fa681 100644 --- a/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/feature_tracking_otlp.json +++ b/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/feature_tracking_otlp.json @@ -1 +1 @@ -{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"exporters:otlp"}},{"key":"key","value":{"stringValue":"otlp_exporter"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"exporters:otlp"}},{"key":"key","value":{"stringValue":"otlp_exporter"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[0].has_ruby_regex"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[0].match_any.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[1].has_ruby_regex"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[1].match_any.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[2].has_ruby_regex"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[2].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[2].match_any.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[3].has_ruby_regex"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[3].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[3].match_any.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[4].has_ruby_regex"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[4].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[5].has_ruby_regex"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[5].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"6"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"experimental_otel_logging"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"combined"}},{"key":"feature","value":{"stringValue":"receivers:otlp"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file +{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[0].match_any.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[1].match_any.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[2].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[2].match_any.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[3].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:exclude_logs"}},{"key":"key","value":{"stringValue":"[3].match_any.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[4].has_ruby_regex"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[4].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[5].has_ruby_regex"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:modify_fields"}},{"key":"key","value":{"stringValue":"[5].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].receivers.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"pipelines.[0].processors.__length"}},{"key":"value","value":{"stringValue":"6"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:service"}},{"key":"key","value":{"stringValue":"experimental_otel_logging"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"combined"}},{"key":"feature","value":{"stringValue":"receivers:otlp"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file diff --git a/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/features.yaml index c77a571fb1..74ddccec31 100644 --- a/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/features.yaml @@ -14,18 +14,6 @@ feature: service:otel_logging key: otel_logging_supported_config value: "true" -- module: metrics - feature: exporters:otlp - key: otlp_exporter - value: "false" -- module: logging - feature: exporters:otlp - key: otlp_exporter - value: "false" -- module: logging - feature: processors:exclude_logs - key: "[0].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[0].enabled" @@ -34,10 +22,6 @@ feature: processors:exclude_logs key: "[0].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[1].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[1].enabled" @@ -46,10 +30,6 @@ feature: processors:exclude_logs key: "[1].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[2].has_ruby_regex" - value: "true" - module: logging feature: processors:exclude_logs key: "[2].enabled" @@ -58,10 +38,6 @@ feature: processors:exclude_logs key: "[2].match_any.__length" value: "1" -- module: logging - feature: processors:exclude_logs - key: "[3].has_ruby_regex" - value: "false" - module: logging feature: processors:exclude_logs key: "[3].enabled" diff --git a/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/fluent_bit_main.conf deleted file mode 100644 index 9d767d886b..0000000000 --- a/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/fluent_bit_main.conf +++ /dev/null @@ -1,153 +0,0 @@ -@SET buffers_dir=/var/lib/google-cloud-ops-agent/fluent-bit/buffers -@SET logs_dir=/var/log/google-cloud-ops-agent - -[SERVICE] - Daemon off - Flush 1 - Log_Level info - dns.resolver legacy - storage.backlog.mem_limit 50M - storage.checksum off - storage.max_chunks_up 128 - storage.metrics on - storage.sync normal - -[INPUT] - Name fluentbit_metrics - Scrape_Interval 60 - Scrape_On_Start True - -[INPUT] - Dummy {"code": "LogPingOpsAgent", "severity": "DEBUG"} - Interval_NSec 0 - Interval_Sec 600 - Name dummy - Tag ops-agent-health - -[INPUT] - Buffer_Chunk_Size 512k - Buffer_Max_Size 2M - DB ${buffers_dir}/ops-agent-fluent-bit - DB.locking true - Key message - Mem_Buf_Limit 10M - Name tail - Path ${logs_dir}/subagents/logging-module.log - Read_from_Head True - Rotate_Wait 30 - Skip_Long_Lines On - Tag ops-agent-fluent-bit - storage.type memory - -[INPUT] - Buffer_Chunk_Size 512k - Buffer_Max_Size 2M - DB ${buffers_dir}/ops-agent-health - DB.locking true - Key message - Mem_Buf_Limit 10M - Name tail - Path ${logs_dir}/health-checks.log - Read_from_Head True - Rotate_Wait 30 - Skip_Long_Lines On - Tag ops-agent-health - storage.type memory - -[FILTER] - Match ops-agent-fluent-bit - Name lua - call parser_nest - script b4a0dead382dce7b4fe011d3f59fdb6d.lua - -[FILTER] - Key_Name message - Match ops-agent-fluent-bit - Name parser - Preserve_Key True - Reserve_Data True - Parser ops-agent-fluent-bit.fluent-bit-self-log-regex-parsing - -[FILTER] - Match ops-agent-fluent-bit - Name lua - call parser_merge_record - script 5fc5f42c16c9e1ab8292e3d42f74f3be.lua - -[FILTER] - Match ops-agent-health - Name lua - call parser_nest - script b4a0dead382dce7b4fe011d3f59fdb6d.lua - -[FILTER] - Key_Name message - Match ops-agent-health - Name parser - Reserve_Data True - Parser ops-agent-health.health-checks-json - -[FILTER] - Match ops-agent-health - Name lua - call parser_merge_record - script 5fc5f42c16c9e1ab8292e3d42f74f3be.lua - -[FILTER] - Match ops-agent-health - Name grep - Regex severity INFO|ERROR|WARNING|DEBUG|info|error|warning|debug - -[FILTER] - Match ops-agent-fluent-bit - Name rewrite_tag - Rule message \[error\]\s\[lib\]\sbackend\sfailed ops-agent-health true - -[FILTER] - Name modify - Match ops-agent-health - Condition Key_value_matches message \[error\]\s\[lib\]\sbackend\sfailed - Set code LogPipelineErr - Set message "[Runtime Check] Result: FAIL, Error code: LogPipelineErr, Failure: Ops Agent logging pipeline failed, Solution: Refer to provided documentation link., Resource: https://cloud.google.com/stackdriver/docs/solutions/agents/ops-agent/troubleshoot-find-info" - -[FILTER] - Match ops-agent-fluent-bit - Name rewrite_tag - Rule message \[error\]\s\[parser\]\scannot\sparse ops-agent-health true - -[FILTER] - Name modify - Match ops-agent-health - Condition Key_value_matches message \[error\]\s\[parser\]\scannot\sparse - Set code LogParseErr - Set message "[Runtime Check] Result: WARNING, Error code: LogParseErr, Failure: Ops Agent failed to parse logs, Solution: Refer to provided documentation link., Resource: https://cloud.google.com/stackdriver/docs/solutions/agents/ops-agent/troubleshoot-find-info" - -[FILTER] - Match ops-agent-health - Name lua - call process - script 0f15dbe303dc7122d43443c9a4c31632.lua - -[FILTER] - Match ops-agent-* - Name lua - call process - script 4d6012ff003886818fb9b9285b4af962.lua - -[OUTPUT] - Match_Regex ^(ops-agent-health|ops-agent-fluent-bit)$ - Name stackdriver - Retry_Limit 3 - http_request_key logging.googleapis.com/httpRequest - net.connect_timeout_log_error False - resource gce_instance - stackdriver_agent Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) - tls On - tls.verify Off - workers 8 - -[OUTPUT] - Match * - Name prometheus_exporter - host 0.0.0.0 - port 20202 diff --git a/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/fluent_bit_parser.conf deleted file mode 100644 index 3c603780bd..0000000000 --- a/confgenerator/testdata/goldens/logging-otel-ruby_regex/golden/linux-gpu/fluent_bit_parser.conf +++ /dev/null @@ -1,13 +0,0 @@ -[PARSER] - Format regex - Name ops-agent-fluent-bit.fluent-bit-self-log-regex-parsing - Regex (?\[[ ]*(?