From 4571f5153a9b17baf22a92fd16831e8fbb907998 Mon Sep 17 00:00:00 2001
From: Dylan Strohschein <dylan.strohschein@bindplane.com>
Date: Mon, 18 Aug 2025 15:08:04 +0000
Subject: [PATCH 1/5] generated golden tests

---
 .../config.yaml                               |   1 +
 .../input.log                                 |  35 ++
 .../output_fluentbit.yaml                     | 311 ++++++++++++++++++
 .../output_otel.yaml                          |   1 +
 transformation_test/transformation_test.go    |   3 +-
 5 files changed, 350 insertions(+), 1 deletion(-)
 create mode 100644 transformation_test/testdata/logging_processor-elasticsearch-gc/config.yaml
 create mode 100644 transformation_test/testdata/logging_processor-elasticsearch-gc/input.log
 create mode 100644 transformation_test/testdata/logging_processor-elasticsearch-gc/output_fluentbit.yaml
 create mode 100644 transformation_test/testdata/logging_processor-elasticsearch-gc/output_otel.yaml

diff --git a/transformation_test/testdata/logging_processor-elasticsearch-gc/config.yaml b/transformation_test/testdata/logging_processor-elasticsearch-gc/config.yaml
new file mode 100644
index 0000000000..fe0d31d3d5
--- /dev/null
+++ b/transformation_test/testdata/logging_processor-elasticsearch-gc/config.yaml
@@ -0,0 +1 @@
+- type: elasticsearch_gc
diff --git a/transformation_test/testdata/logging_processor-elasticsearch-gc/input.log b/transformation_test/testdata/logging_processor-elasticsearch-gc/input.log
new file mode 100644
index 0000000000..5c9c443ba5
--- /dev/null
+++ b/transformation_test/testdata/logging_processor-elasticsearch-gc/input.log
@@ -0,0 +1,35 @@
+[2025-08-18T10:14:37.240+0000][31245][gc,start    ] GC(0) Pause Young (Normal) (G1 Evacuation Pause)
+[2025-08-18T10:14:37.242+0000][31245][gc,heap     ] GC(0) Eden regions: 48->0(47)
+[2025-08-18T10:14:37.242+0000][31245][gc,heap     ] GC(0) Survivor regions: 0->1(7)
+[2025-08-18T10:14:37.242+0000][31245][gc,heap     ] GC(0) Old regions: 0->2
+[2025-08-18T10:14:37.242+0000][31245][gc,metaspace] GC(0) Metaspace: 18000K->18000K(1064960K)
+[2025-08-18T10:14:37.243+0000][31245][gc          ] GC(0) Pause Young (Normal) (G1 Evacuation Pause) 48M->10M(1024M) 3.456ms
+[2025-08-18T10:20:12.555+0000][31245][gc,start    ] GC(1) Pause Young (Concurrent Start) (G1 Evacuation Pause)
+[2025-08-18T10:20:12.559+0000][31245][gc,heap     ] GC(1) Eden regions: 47->0(45)
+[2025-08-18T10:20:12.559+0000][31245][gc,heap     ] GC(1) Survivor regions: 1->2(7)
+[2025-08-18T10:20:12.559+0000][31245][gc,heap     ] GC(1) Old regions: 2->3
+[2025-08-18T10:20:12.559+0000][31245][gc,metaspace] GC(1) Metaspace: 18250K->18250K(1064960K)
+[2025-08-18T10:20:12.561+0000][31245][gc          ] GC(1) Pause Young (Concurrent Start) (G1 Evacuation Pause) 58M->15M(1024M) 5.623ms
+[2025-08-18T10:20:12.561+0000][31245][gc          ] GC(1) Concurrent Cycle
+[2025-08-18T10:20:12.561+0000][31245][gc,marking  ] GC(1) Concurrent Clear Claimed Marks
+[2025-08-18T10:20:12.561+0000][31245][gc,marking  ] GC(1) Concurrent Scan Root Regions
+[2025-08-18T10:20:12.563+0000][31245][gc,marking  ] GC(1) Concurrent Mark
+[2025-08-18T10:20:12.567+0000][31245][gc,marking  ] GC(1) Concurrent Preclean
+[2025-08-18T10:20:12.568+0000][31245][gc,start    ] GC(1) Pause Remark
+[2025-08-18T10:20:12.569+0000][31245][gc          ] GC(1) Pause Remark 20M->20M(1024M) 1.234ms
+[2025-08-18T10:20:12.569+0000][31245][gc,marking  ] GC(1) Concurrent Mark Cleanup
+[2025-08-18T10:20:12.570+0000][31245][gc,start    ] GC(1) Pause Cleanup
+[2025-08-18T10:20:12.570+0000][31245][gc          ] GC(1) Pause Cleanup 20M->20M(1024M) 0.234ms
+[2025-08-18T10:20:12.571+0000][31245][gc          ] GC(1) Concurrent Cycle 10.123ms
+[2025-08-18T10:45:45.125+0000][31245][gc,start    ] GC(2) Pause Young (Normal) (G1 Evacuation Pause)
+[2025-08-18T10:45:45.129+0000][31245][gc,heap     ] GC(2) Eden regions: 46->0(48)
+[2025-08-18T10:45:45.129+0000][31245][gc,heap     ] GC(2) Survivor regions: 2->3(7)
+[2025-08-18T10:45:45.129+0000][31245][gc,heap     ] GC(2) Old regions: 3->3
+[2025-08-18T10:45:45.129+0000][31245][gc,metaspace] GC(2) Metaspace: 18500K->18500K(1064960K)
+[2025-08-18T10:45:45.130+0000][31245][gc          ] GC(2) Pause Young (Normal) (G1 Evacuation Pause) 75M->25M(1024M) 4.543ms
+[2025-08-18T11:02:10.341+0000][31245][gc,start    ] GC(3) Pause Full (System.gc())
+[2025-08-18T11:02:10.348+0000][31245][gc,heap     ] GC(3) Eden regions: 45->0(45)
+[2025-08-18T11:02:10.348+0000][31245][gc,heap     ] GC(3) Survivor regions: 3->0(7)
+[2025-08-18T11:02:10.348+0000][31245][gc,heap     ] GC(3) Old regions: 3->1
+[2025-08-18T11:02:10.349+0000][31245][gc,metaspace] GC(3) Metaspace: 18700K->18650K(1064960K)
+[2025-08-18T11:02:10.350+0000][31245][gc          ] GC(3) Pause Full (System.gc()) 100M->15M(1024M) 8.765ms
\ No newline at end of file
diff --git a/transformation_test/testdata/logging_processor-elasticsearch-gc/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-elasticsearch-gc/output_fluentbit.yaml
new file mode 100644
index 0000000000..dc27ca0c4f
--- /dev/null
+++ b/transformation_test/testdata/logging_processor-elasticsearch-gc/output_fluentbit.yaml
@@ -0,0 +1,311 @@
+- entries:
+  - jsonPayload:
+      gc_run: 0.0
+      message: Pause Young (Normal) (G1 Evacuation Pause)
+      type: gc,start
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:14:37.240000000Z
+  - jsonPayload:
+      gc_run: 0.0
+      message: "Eden regions: 48->0(47)"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:14:37.242000000Z
+  - jsonPayload:
+      gc_run: 0.0
+      message: "Survivor regions: 0->1(7)"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:14:37.242000000Z
+  - jsonPayload:
+      gc_run: 0.0
+      message: "Old regions: 0->2"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:14:37.242000000Z
+  - jsonPayload:
+      gc_run: 0.0
+      message: "Metaspace: 18000K->18000K(1064960K)"
+      type: gc,metaspace
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:14:37.242000000Z
+  - jsonPayload:
+      gc_run: 0.0
+      message: Pause Young (Normal) (G1 Evacuation Pause) 48M->10M(1024M) 3.456ms
+      type: gc
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:14:37.243000000Z
+  - jsonPayload:
+      gc_run: 1.0
+      message: Pause Young (Concurrent Start) (G1 Evacuation Pause)
+      type: gc,start
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:20:12.555000000Z
+  - jsonPayload:
+      gc_run: 1.0
+      message: "Eden regions: 47->0(45)"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:20:12.559000000Z
+  - jsonPayload:
+      gc_run: 1.0
+      message: "Survivor regions: 1->2(7)"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:20:12.559000000Z
+  - jsonPayload:
+      gc_run: 1.0
+      message: "Old regions: 2->3"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:20:12.559000000Z
+  - jsonPayload:
+      gc_run: 1.0
+      message: "Metaspace: 18250K->18250K(1064960K)"
+      type: gc,metaspace
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:20:12.559000000Z
+  - jsonPayload:
+      gc_run: 1.0
+      message: Pause Young (Concurrent Start) (G1 Evacuation Pause) 58M->15M(1024M) 5.623ms
+      type: gc
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:20:12.561000000Z
+  - jsonPayload:
+      gc_run: 1.0
+      message: Concurrent Cycle
+      type: gc
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:20:12.561000000Z
+  - jsonPayload:
+      gc_run: 1.0
+      message: Concurrent Clear Claimed Marks
+      type: gc,marking
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:20:12.561000000Z
+  - jsonPayload:
+      gc_run: 1.0
+      message: Concurrent Scan Root Regions
+      type: gc,marking
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:20:12.561000000Z
+  - jsonPayload:
+      gc_run: 1.0
+      message: Concurrent Mark
+      type: gc,marking
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:20:12.563000000Z
+  - jsonPayload:
+      gc_run: 1.0
+      message: Concurrent Preclean
+      type: gc,marking
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:20:12.567000000Z
+  - jsonPayload:
+      gc_run: 1.0
+      message: Pause Remark
+      type: gc,start
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:20:12.568000000Z
+  - jsonPayload:
+      gc_run: 1.0
+      message: Pause Remark 20M->20M(1024M) 1.234ms
+      type: gc
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:20:12.569000000Z
+  - jsonPayload:
+      gc_run: 1.0
+      message: Concurrent Mark Cleanup
+      type: gc,marking
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:20:12.569000000Z
+  - jsonPayload:
+      gc_run: 1.0
+      message: Pause Cleanup
+      type: gc,start
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:20:12.570000000Z
+  - jsonPayload:
+      gc_run: 1.0
+      message: Pause Cleanup 20M->20M(1024M) 0.234ms
+      type: gc
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:20:12.570000000Z
+  - jsonPayload:
+      gc_run: 1.0
+      message: Concurrent Cycle 10.123ms
+      type: gc
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:20:12.571000000Z
+  - jsonPayload:
+      gc_run: 2.0
+      message: Pause Young (Normal) (G1 Evacuation Pause)
+      type: gc,start
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:45:45.125000000Z
+  - jsonPayload:
+      gc_run: 2.0
+      message: "Eden regions: 46->0(48)"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:45:45.129000000Z
+  - jsonPayload:
+      gc_run: 2.0
+      message: "Survivor regions: 2->3(7)"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:45:45.129000000Z
+  - jsonPayload:
+      gc_run: 2.0
+      message: "Old regions: 3->3"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:45:45.129000000Z
+  - jsonPayload:
+      gc_run: 2.0
+      message: "Metaspace: 18500K->18500K(1064960K)"
+      type: gc,metaspace
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:45:45.129000000Z
+  - jsonPayload:
+      gc_run: 2.0
+      message: Pause Young (Normal) (G1 Evacuation Pause) 75M->25M(1024M) 4.543ms
+      type: gc
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T10:45:45.130000000Z
+  - jsonPayload:
+      gc_run: 3.0
+      message: Pause Full (System.gc())
+      type: gc,start
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T11:02:10.341000000Z
+  - jsonPayload:
+      gc_run: 3.0
+      message: "Eden regions: 45->0(45)"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T11:02:10.348000000Z
+  - jsonPayload:
+      gc_run: 3.0
+      message: "Survivor regions: 3->0(7)"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T11:02:10.348000000Z
+  - jsonPayload:
+      gc_run: 3.0
+      message: "Old regions: 3->1"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T11:02:10.348000000Z
+  - jsonPayload:
+      gc_run: 3.0
+      message: "Metaspace: 18700K->18650K(1064960K)"
+      type: gc,metaspace
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T11:02:10.349000000Z
+  partialSuccess: true
+  resource:
+    labels: {}
+    type: gce_instance
diff --git a/transformation_test/testdata/logging_processor-elasticsearch-gc/output_otel.yaml b/transformation_test/testdata/logging_processor-elasticsearch-gc/output_otel.yaml
new file mode 100644
index 0000000000..4a8920aad8
--- /dev/null
+++ b/transformation_test/testdata/logging_processor-elasticsearch-gc/output_otel.yaml
@@ -0,0 +1 @@
+- config_error: processor "processor0" not supported in pipeline "transformation_test"
diff --git a/transformation_test/transformation_test.go b/transformation_test/transformation_test.go
index 236bebdbab..53b42547b7 100644
--- a/transformation_test/transformation_test.go
+++ b/transformation_test/transformation_test.go
@@ -32,7 +32,7 @@ import (
 	"time"
 
 	logpb "cloud.google.com/go/logging/apiv2/loggingpb"
-	_ "github.com/GoogleCloudPlatform/ops-agent/apps"
+	apps "github.com/GoogleCloudPlatform/ops-agent/apps"
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator"
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator/fluentbit"
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator/otel"
@@ -595,4 +595,5 @@ func sanitizeStacktrace(t *testing.T, input string) string {
 func init() {
 	// The processors registered here are only meant to be used in transformation tests.
 	confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &confgenerator.LoggingProcessorWindowsEventLogV1{} })
+	confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &apps.LoggingProcessorElasticsearchGC{} })
 }

From 1e3df24ed7f4330ce85db6e333971fa9e5259da5 Mon Sep 17 00:00:00 2001
From: Dylan Strohschein <dylan.strohschein@bindplane.com>
Date: Mon, 18 Aug 2025 15:14:04 +0000
Subject: [PATCH 2/5] refactored elasticsearch_gc

---
 apps/elasticsearch.go                      | 54 ++++++++++------------
 transformation_test/transformation_test.go |  2 +-
 2 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/apps/elasticsearch.go b/apps/elasticsearch.go
index f6d9cb6ce0..81298bb007 100644
--- a/apps/elasticsearch.go
+++ b/apps/elasticsearch.go
@@ -19,7 +19,6 @@ import (
 	"fmt"
 
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator"
-	"github.com/GoogleCloudPlatform/ops-agent/confgenerator/fluentbit"
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator/otel"
 	"github.com/GoogleCloudPlatform/ops-agent/internal/secret"
 )
@@ -255,39 +254,33 @@ func (p LoggingProcessorMacroElasticsearchJson) nestingProcessors() []confgenera
 	return processors
 }
 
-type LoggingProcessorElasticsearchGC struct {
-	confgenerator.ConfigComponent `yaml:",inline"`
+type LoggingProcessorMacroElasticsearchGC struct {
 }
 
-func (LoggingProcessorElasticsearchGC) Type() string {
+func (LoggingProcessorMacroElasticsearchGC) Type() string {
 	return "elasticsearch_gc"
 }
 
-func (p LoggingProcessorElasticsearchGC) Components(ctx context.Context, tag, uid string) []fluentbit.Component {
-	c := []fluentbit.Component{}
-
-	regexParser := confgenerator.LoggingProcessorParseRegex{
-		// Sample log line:
-		// [2022-01-17T18:31:37.240+0000][652141][gc,start    ] GC(0) Pause Young (Normal) (G1 Evacuation Pause)
-		Regex: `\[(?<time>\d+-\d+-\d+T\d+:\d+:\d+.\d+\+\d+)\]\[\d+\]\[(?<type>[A-z,]+)\s*\]\s*(?:GC\((?<gc_run>\d+)\))?\s*(?<message>.*)`,
-		ParserShared: confgenerator.ParserShared{
-			TimeKey:    "time",
-			TimeFormat: "%Y-%m-%dT%H:%M:%S.%L%z",
-			Types: map[string]string{
-				"gc_run": "integer",
+func (p LoggingProcessorMacroElasticsearchGC) Expand(ctx context.Context) []confgenerator.InternalLoggingProcessor {
+	return []confgenerator.InternalLoggingProcessor{
+		confgenerator.LoggingProcessorParseRegex{
+			// Sample log line:
+			// [2022-01-17T18:31:37.240+0000][652141][gc,start    ] GC(0) Pause Young (Normal) (G1 Evacuation Pause)
+			Regex: `\[(?<time>\d+-\d+-\d+T\d+:\d+:\d+.\d+\+\d+)\]\[\d+\]\[(?<type>[A-z,]+)\s*\]\s*(?:GC\((?<gc_run>\d+)\))?\s*(?<message>.*)`,
+			ParserShared: confgenerator.ParserShared{
+				TimeKey:    "time",
+				TimeFormat: "%Y-%m-%dT%H:%M:%S.%L%z",
+				Types: map[string]string{
+					"gc_run": "integer",
+				},
 			},
 		},
-	}
-
-	c = append(c, regexParser.Components(ctx, tag, uid)...)
-	c = append(c,
 		confgenerator.LoggingProcessorModifyFields{
 			Fields: map[string]*confgenerator.ModifyField{
 				InstrumentationSourceLabel: instrumentationSourceValue(p.Type()),
 			},
-		}.Components(ctx, tag, uid)...,
-	)
-	return c
+		},
+	}
 }
 
 func loggingReceiverFilesMixinElasticsearchJson() confgenerator.LoggingReceiverFilesMixin {
@@ -302,12 +295,12 @@ func loggingReceiverFilesMixinElasticsearchJson() confgenerator.LoggingReceiverF
 	}
 }
 
-type LoggingReceiverElasticsearchGC struct {
-	LoggingProcessorElasticsearchGC `yaml:",inline"`
-	ReceiverMixin                   confgenerator.LoggingReceiverFilesMixin `yaml:",inline"`
+type LoggingReceiverMacroElasticsearchGC struct {
+	LoggingProcessorMacroElasticsearchGC `yaml:",inline"`
+	ReceiverMixin                        confgenerator.LoggingReceiverFilesMixin `yaml:",inline"`
 }
 
-func (r LoggingReceiverElasticsearchGC) Components(ctx context.Context, tag string) []fluentbit.Component {
+func (r LoggingReceiverMacroElasticsearchGC) Expand(ctx context.Context) (confgenerator.InternalLoggingReceiver, []confgenerator.InternalLoggingProcessor) {
 	if len(r.ReceiverMixin.IncludePaths) == 0 {
 		// Default GC log for Elasticsearch
 		r.ReceiverMixin.IncludePaths = []string{
@@ -315,11 +308,12 @@ func (r LoggingReceiverElasticsearchGC) Components(ctx context.Context, tag stri
 		}
 	}
 
-	c := r.ReceiverMixin.Components(ctx, tag)
-	return append(c, r.LoggingProcessorElasticsearchGC.Components(ctx, tag, "elasticsearch_gc")...)
+	return &r.ReceiverMixin, r.LoggingProcessorMacroElasticsearchGC.Expand(ctx)
 }
 
 func init() {
 	confgenerator.RegisterLoggingFilesProcessorMacro[LoggingProcessorMacroElasticsearchJson](loggingReceiverFilesMixinElasticsearchJson)
-	confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverElasticsearchGC{} })
+	confgenerator.RegisterLoggingReceiverMacro(func() LoggingReceiverMacroElasticsearchGC {
+		return LoggingReceiverMacroElasticsearchGC{}
+	})
 }
diff --git a/transformation_test/transformation_test.go b/transformation_test/transformation_test.go
index 53b42547b7..5f804b72b5 100644
--- a/transformation_test/transformation_test.go
+++ b/transformation_test/transformation_test.go
@@ -595,5 +595,5 @@ func sanitizeStacktrace(t *testing.T, input string) string {
 func init() {
 	// The processors registered here are only meant to be used in transformation tests.
 	confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &confgenerator.LoggingProcessorWindowsEventLogV1{} })
-	confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &apps.LoggingProcessorElasticsearchGC{} })
+	confgenerator.RegisterLoggingProcessorMacro[apps.LoggingProcessorMacroElasticsearchGC]()
 }

From 5be3d9ae36bc0536d13b9f5551fc69d5854d22d2 Mon Sep 17 00:00:00 2001
From: Dylan Strohschein <dylan.strohschein@bindplane.com>
Date: Mon, 18 Aug 2025 15:15:42 +0000
Subject: [PATCH 3/5] updated goldens

---
 confgenerator/testdata/feature/golden.csv     |   8 +-
 .../golden/linux-gpu/fluent_bit_main.conf     |   2 +-
 .../golden/linux-gpu/fluent_bit_parser.conf   |   2 +-
 .../golden/linux/fluent_bit_main.conf         |   2 +-
 .../golden/linux/fluent_bit_parser.conf       |   2 +-
 .../golden/windows-2012/fluent_bit_main.conf  |   2 +-
 .../windows-2012/fluent_bit_parser.conf       |   2 +-
 .../golden/windows/fluent_bit_main.conf       |   2 +-
 .../golden/windows/fluent_bit_parser.conf     |   2 +-
 .../golden/linux-gpu/fluent_bit_main.conf     |   4 +-
 .../golden/linux-gpu/fluent_bit_parser.conf   |   4 +-
 .../golden/linux/fluent_bit_main.conf         |   4 +-
 .../golden/linux/fluent_bit_parser.conf       |   4 +-
 .../golden/windows-2012/fluent_bit_main.conf  |   4 +-
 .../windows-2012/fluent_bit_parser.conf       |   4 +-
 .../golden/windows/fluent_bit_main.conf       |   4 +-
 .../golden/windows/fluent_bit_parser.conf     |   4 +-
 .../output_otel.yaml                          | 479 +++++++++++++++++-
 18 files changed, 506 insertions(+), 29 deletions(-)

diff --git a/confgenerator/testdata/feature/golden.csv b/confgenerator/testdata/feature/golden.csv
index 155ca0086d..c97d5c2e6a 100644
--- a/confgenerator/testdata/feature/golden.csv
+++ b/confgenerator/testdata/feature/golden.csv
@@ -45,10 +45,6 @@ App,Field,Override,
 *apps.LoggingReceiverCouchdb,confgenerator.LoggingReceiverFilesMixin.BufferInMemory,
 *apps.LoggingReceiverCouchdb,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath,
 *apps.LoggingReceiverCouchdb,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval,
-*apps.LoggingReceiverElasticsearchGC,apps.LoggingProcessorElasticsearchGC.confgenerator.ConfigComponent.Type,
-*apps.LoggingReceiverElasticsearchGC,confgenerator.LoggingReceiverFilesMixin.BufferInMemory,
-*apps.LoggingReceiverElasticsearchGC,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath,
-*apps.LoggingReceiverElasticsearchGC,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval,
 *apps.LoggingReceiverHadoop,apps.LoggingProcessorHadoop.confgenerator.ConfigComponent.Type,
 *apps.LoggingReceiverHadoop,confgenerator.LoggingReceiverFilesMixin.BufferInMemory,
 *apps.LoggingReceiverHadoop,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath,
@@ -250,3 +246,7 @@ App,Field,Override,
 *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroTomcatSystem]],confgenerator.ConfigComponent.Type,
 *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroVarnish]],ReceiverMacro,
 *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroVarnish]],confgenerator.ConfigComponent.Type,
+*confgenerator.loggingReceiverMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMacroElasticsearchGC],apps.LoggingReceiverMacroElasticsearchGC.confgenerator.LoggingReceiverFilesMixin.BufferInMemory,
+*confgenerator.loggingReceiverMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMacroElasticsearchGC],apps.LoggingReceiverMacroElasticsearchGC.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath,
+*confgenerator.loggingReceiverMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMacroElasticsearchGC],apps.LoggingReceiverMacroElasticsearchGC.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval,
+*confgenerator.loggingReceiverMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMacroElasticsearchGC],confgenerator.ConfigComponent.Type,
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/fluent_bit_main.conf
index 8d56064918..1d0b19670f 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/fluent_bit_main.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/fluent_bit_main.conf
@@ -117,7 +117,7 @@
     Match        elasticsearch.elasticsearch_gc
     Name         parser
     Reserve_Data True
-    Parser       elasticsearch.elasticsearch_gc.elasticsearch_gc
+    Parser       elasticsearch.elasticsearch_gc.0
 
 [FILTER]
     Match  elasticsearch.elasticsearch_gc
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/fluent_bit_parser.conf
index 03e58ad9a3..5cac609353 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/fluent_bit_parser.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/fluent_bit_parser.conf
@@ -1,6 +1,6 @@
 [PARSER]
     Format      regex
-    Name        elasticsearch.elasticsearch_gc.elasticsearch_gc
+    Name        elasticsearch.elasticsearch_gc.0
     Regex       \[(?<time>\d+-\d+-\d+T\d+:\d+:\d+.\d+\+\d+)\]\[\d+\]\[(?<type>[A-z,]+)\s*\]\s*(?:GC\((?<gc_run>\d+)\))?\s*(?<message>.*)
     Time_Format %Y-%m-%dT%H:%M:%S.%L%z
     Time_Key    time
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/fluent_bit_main.conf
index 8d56064918..1d0b19670f 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/fluent_bit_main.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/fluent_bit_main.conf
@@ -117,7 +117,7 @@
     Match        elasticsearch.elasticsearch_gc
     Name         parser
     Reserve_Data True
-    Parser       elasticsearch.elasticsearch_gc.elasticsearch_gc
+    Parser       elasticsearch.elasticsearch_gc.0
 
 [FILTER]
     Match  elasticsearch.elasticsearch_gc
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/fluent_bit_parser.conf
index 03e58ad9a3..5cac609353 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/fluent_bit_parser.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/fluent_bit_parser.conf
@@ -1,6 +1,6 @@
 [PARSER]
     Format      regex
-    Name        elasticsearch.elasticsearch_gc.elasticsearch_gc
+    Name        elasticsearch.elasticsearch_gc.0
     Regex       \[(?<time>\d+-\d+-\d+T\d+:\d+:\d+.\d+\+\d+)\]\[\d+\]\[(?<type>[A-z,]+)\s*\]\s*(?:GC\((?<gc_run>\d+)\))?\s*(?<message>.*)
     Time_Format %Y-%m-%dT%H:%M:%S.%L%z
     Time_Key    time
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/fluent_bit_main.conf
index 34ad9c0538..71251967af 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/fluent_bit_main.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/fluent_bit_main.conf
@@ -160,7 +160,7 @@
     Match        elasticsearch.elasticsearch_gc
     Name         parser
     Reserve_Data True
-    Parser       elasticsearch.elasticsearch_gc.elasticsearch_gc
+    Parser       elasticsearch.elasticsearch_gc.0
 
 [FILTER]
     Match  elasticsearch.elasticsearch_gc
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/fluent_bit_parser.conf
index 4742085ece..eadf3f2fbd 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/fluent_bit_parser.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/fluent_bit_parser.conf
@@ -7,7 +7,7 @@
 
 [PARSER]
     Format      regex
-    Name        elasticsearch.elasticsearch_gc.elasticsearch_gc
+    Name        elasticsearch.elasticsearch_gc.0
     Regex       \[(?<time>\d+-\d+-\d+T\d+:\d+:\d+.\d+\+\d+)\]\[\d+\]\[(?<type>[A-z,]+)\s*\]\s*(?:GC\((?<gc_run>\d+)\))?\s*(?<message>.*)
     Time_Format %Y-%m-%dT%H:%M:%S.%L%z
     Time_Key    time
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/fluent_bit_main.conf
index 34ad9c0538..71251967af 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/fluent_bit_main.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/fluent_bit_main.conf
@@ -160,7 +160,7 @@
     Match        elasticsearch.elasticsearch_gc
     Name         parser
     Reserve_Data True
-    Parser       elasticsearch.elasticsearch_gc.elasticsearch_gc
+    Parser       elasticsearch.elasticsearch_gc.0
 
 [FILTER]
     Match  elasticsearch.elasticsearch_gc
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/fluent_bit_parser.conf
index 4742085ece..eadf3f2fbd 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/fluent_bit_parser.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/fluent_bit_parser.conf
@@ -7,7 +7,7 @@
 
 [PARSER]
     Format      regex
-    Name        elasticsearch.elasticsearch_gc.elasticsearch_gc
+    Name        elasticsearch.elasticsearch_gc.0
     Regex       \[(?<time>\d+-\d+-\d+T\d+:\d+:\d+.\d+\+\d+)\]\[\d+\]\[(?<type>[A-z,]+)\s*\]\s*(?:GC\((?<gc_run>\d+)\))?\s*(?<message>.*)
     Time_Format %Y-%m-%dT%H:%M:%S.%L%z
     Time_Key    time
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/fluent_bit_main.conf
index f458cda98d..155fa246f4 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/fluent_bit_main.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/fluent_bit_main.conf
@@ -150,7 +150,7 @@
     Match        elasticsearch_custom.elasticsearch_gc_custom
     Name         parser
     Reserve_Data True
-    Parser       elasticsearch_custom.elasticsearch_gc_custom.elasticsearch_gc
+    Parser       elasticsearch_custom.elasticsearch_gc_custom.0
 
 [FILTER]
     Match  elasticsearch_custom.elasticsearch_gc_custom
@@ -327,7 +327,7 @@
     Match        elasticsearch_default.elasticsearch_gc_default
     Name         parser
     Reserve_Data True
-    Parser       elasticsearch_default.elasticsearch_gc_default.elasticsearch_gc
+    Parser       elasticsearch_default.elasticsearch_gc_default.0
 
 [FILTER]
     Match  elasticsearch_default.elasticsearch_gc_default
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/fluent_bit_parser.conf
index d50c338f1c..9a66908e66 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/fluent_bit_parser.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/fluent_bit_parser.conf
@@ -1,6 +1,6 @@
 [PARSER]
     Format      regex
-    Name        elasticsearch_custom.elasticsearch_gc_custom.elasticsearch_gc
+    Name        elasticsearch_custom.elasticsearch_gc_custom.0
     Regex       \[(?<time>\d+-\d+-\d+T\d+:\d+:\d+.\d+\+\d+)\]\[\d+\]\[(?<type>[A-z,]+)\s*\]\s*(?:GC\((?<gc_run>\d+)\))?\s*(?<message>.*)
     Time_Format %Y-%m-%dT%H:%M:%S.%L%z
     Time_Key    time
@@ -14,7 +14,7 @@
 
 [PARSER]
     Format      regex
-    Name        elasticsearch_default.elasticsearch_gc_default.elasticsearch_gc
+    Name        elasticsearch_default.elasticsearch_gc_default.0
     Regex       \[(?<time>\d+-\d+-\d+T\d+:\d+:\d+.\d+\+\d+)\]\[\d+\]\[(?<type>[A-z,]+)\s*\]\s*(?:GC\((?<gc_run>\d+)\))?\s*(?<message>.*)
     Time_Format %Y-%m-%dT%H:%M:%S.%L%z
     Time_Key    time
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/fluent_bit_main.conf
index f458cda98d..155fa246f4 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/fluent_bit_main.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/fluent_bit_main.conf
@@ -150,7 +150,7 @@
     Match        elasticsearch_custom.elasticsearch_gc_custom
     Name         parser
     Reserve_Data True
-    Parser       elasticsearch_custom.elasticsearch_gc_custom.elasticsearch_gc
+    Parser       elasticsearch_custom.elasticsearch_gc_custom.0
 
 [FILTER]
     Match  elasticsearch_custom.elasticsearch_gc_custom
@@ -327,7 +327,7 @@
     Match        elasticsearch_default.elasticsearch_gc_default
     Name         parser
     Reserve_Data True
-    Parser       elasticsearch_default.elasticsearch_gc_default.elasticsearch_gc
+    Parser       elasticsearch_default.elasticsearch_gc_default.0
 
 [FILTER]
     Match  elasticsearch_default.elasticsearch_gc_default
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/fluent_bit_parser.conf
index d50c338f1c..9a66908e66 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/fluent_bit_parser.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/fluent_bit_parser.conf
@@ -1,6 +1,6 @@
 [PARSER]
     Format      regex
-    Name        elasticsearch_custom.elasticsearch_gc_custom.elasticsearch_gc
+    Name        elasticsearch_custom.elasticsearch_gc_custom.0
     Regex       \[(?<time>\d+-\d+-\d+T\d+:\d+:\d+.\d+\+\d+)\]\[\d+\]\[(?<type>[A-z,]+)\s*\]\s*(?:GC\((?<gc_run>\d+)\))?\s*(?<message>.*)
     Time_Format %Y-%m-%dT%H:%M:%S.%L%z
     Time_Key    time
@@ -14,7 +14,7 @@
 
 [PARSER]
     Format      regex
-    Name        elasticsearch_default.elasticsearch_gc_default.elasticsearch_gc
+    Name        elasticsearch_default.elasticsearch_gc_default.0
     Regex       \[(?<time>\d+-\d+-\d+T\d+:\d+:\d+.\d+\+\d+)\]\[\d+\]\[(?<type>[A-z,]+)\s*\]\s*(?:GC\((?<gc_run>\d+)\))?\s*(?<message>.*)
     Time_Format %Y-%m-%dT%H:%M:%S.%L%z
     Time_Key    time
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/fluent_bit_main.conf
index e1577b4657..b5fb7556f3 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/fluent_bit_main.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/fluent_bit_main.conf
@@ -193,7 +193,7 @@
     Match        elasticsearch_custom.elasticsearch_gc_custom
     Name         parser
     Reserve_Data True
-    Parser       elasticsearch_custom.elasticsearch_gc_custom.elasticsearch_gc
+    Parser       elasticsearch_custom.elasticsearch_gc_custom.0
 
 [FILTER]
     Match  elasticsearch_custom.elasticsearch_gc_custom
@@ -370,7 +370,7 @@
     Match        elasticsearch_default.elasticsearch_gc_default
     Name         parser
     Reserve_Data True
-    Parser       elasticsearch_default.elasticsearch_gc_default.elasticsearch_gc
+    Parser       elasticsearch_default.elasticsearch_gc_default.0
 
 [FILTER]
     Match  elasticsearch_default.elasticsearch_gc_default
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/fluent_bit_parser.conf
index 91887c13e7..ad7407b332 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/fluent_bit_parser.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/fluent_bit_parser.conf
@@ -7,7 +7,7 @@
 
 [PARSER]
     Format      regex
-    Name        elasticsearch_custom.elasticsearch_gc_custom.elasticsearch_gc
+    Name        elasticsearch_custom.elasticsearch_gc_custom.0
     Regex       \[(?<time>\d+-\d+-\d+T\d+:\d+:\d+.\d+\+\d+)\]\[\d+\]\[(?<type>[A-z,]+)\s*\]\s*(?:GC\((?<gc_run>\d+)\))?\s*(?<message>.*)
     Time_Format %Y-%m-%dT%H:%M:%S.%L%z
     Time_Key    time
@@ -21,7 +21,7 @@
 
 [PARSER]
     Format      regex
-    Name        elasticsearch_default.elasticsearch_gc_default.elasticsearch_gc
+    Name        elasticsearch_default.elasticsearch_gc_default.0
     Regex       \[(?<time>\d+-\d+-\d+T\d+:\d+:\d+.\d+\+\d+)\]\[\d+\]\[(?<type>[A-z,]+)\s*\]\s*(?:GC\((?<gc_run>\d+)\))?\s*(?<message>.*)
     Time_Format %Y-%m-%dT%H:%M:%S.%L%z
     Time_Key    time
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/fluent_bit_main.conf
index e1577b4657..b5fb7556f3 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/fluent_bit_main.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/fluent_bit_main.conf
@@ -193,7 +193,7 @@
     Match        elasticsearch_custom.elasticsearch_gc_custom
     Name         parser
     Reserve_Data True
-    Parser       elasticsearch_custom.elasticsearch_gc_custom.elasticsearch_gc
+    Parser       elasticsearch_custom.elasticsearch_gc_custom.0
 
 [FILTER]
     Match  elasticsearch_custom.elasticsearch_gc_custom
@@ -370,7 +370,7 @@
     Match        elasticsearch_default.elasticsearch_gc_default
     Name         parser
     Reserve_Data True
-    Parser       elasticsearch_default.elasticsearch_gc_default.elasticsearch_gc
+    Parser       elasticsearch_default.elasticsearch_gc_default.0
 
 [FILTER]
     Match  elasticsearch_default.elasticsearch_gc_default
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/fluent_bit_parser.conf
index 91887c13e7..ad7407b332 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/fluent_bit_parser.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/fluent_bit_parser.conf
@@ -7,7 +7,7 @@
 
 [PARSER]
     Format      regex
-    Name        elasticsearch_custom.elasticsearch_gc_custom.elasticsearch_gc
+    Name        elasticsearch_custom.elasticsearch_gc_custom.0
     Regex       \[(?<time>\d+-\d+-\d+T\d+:\d+:\d+.\d+\+\d+)\]\[\d+\]\[(?<type>[A-z,]+)\s*\]\s*(?:GC\((?<gc_run>\d+)\))?\s*(?<message>.*)
     Time_Format %Y-%m-%dT%H:%M:%S.%L%z
     Time_Key    time
@@ -21,7 +21,7 @@
 
 [PARSER]
     Format      regex
-    Name        elasticsearch_default.elasticsearch_gc_default.elasticsearch_gc
+    Name        elasticsearch_default.elasticsearch_gc_default.0
     Regex       \[(?<time>\d+-\d+-\d+T\d+:\d+:\d+.\d+\+\d+)\]\[\d+\]\[(?<type>[A-z,]+)\s*\]\s*(?:GC\((?<gc_run>\d+)\))?\s*(?<message>.*)
     Time_Format %Y-%m-%dT%H:%M:%S.%L%z
     Time_Key    time
diff --git a/transformation_test/testdata/logging_processor-elasticsearch-gc/output_otel.yaml b/transformation_test/testdata/logging_processor-elasticsearch-gc/output_otel.yaml
index 4a8920aad8..e94e95dbd8 100644
--- a/transformation_test/testdata/logging_processor-elasticsearch-gc/output_otel.yaml
+++ b/transformation_test/testdata/logging_processor-elasticsearch-gc/output_otel.yaml
@@ -1 +1,478 @@
-- config_error: processor "processor0" not supported in pipeline "transformation_test"
+- entries:
+  - jsonPayload:
+      gc_run: 0
+      message: Pause Young (Normal) (G1 Evacuation Pause)
+      type: gc,start
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:14:37.240Z
+  - jsonPayload:
+      gc_run: 0
+      message: "Eden regions: 48->0(47)"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:14:37.242Z
+  - jsonPayload:
+      gc_run: 0
+      message: "Survivor regions: 0->1(7)"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:14:37.242Z
+  - jsonPayload:
+      gc_run: 0
+      message: "Old regions: 0->2"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:14:37.242Z
+  - jsonPayload:
+      gc_run: 0
+      message: "Metaspace: 18000K->18000K(1064960K)"
+      type: gc,metaspace
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:14:37.242Z
+  - jsonPayload:
+      gc_run: 0
+      message: Pause Young (Normal) (G1 Evacuation Pause) 48M->10M(1024M) 3.456ms
+      type: gc
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:14:37.243Z
+  - jsonPayload:
+      gc_run: 1
+      message: Pause Young (Concurrent Start) (G1 Evacuation Pause)
+      type: gc,start
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:20:12.555Z
+  - jsonPayload:
+      gc_run: 1
+      message: "Eden regions: 47->0(45)"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:20:12.559Z
+  - jsonPayload:
+      gc_run: 1
+      message: "Survivor regions: 1->2(7)"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:20:12.559Z
+  - jsonPayload:
+      gc_run: 1
+      message: "Old regions: 2->3"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:20:12.559Z
+  - jsonPayload:
+      gc_run: 1
+      message: "Metaspace: 18250K->18250K(1064960K)"
+      type: gc,metaspace
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:20:12.559Z
+  - jsonPayload:
+      gc_run: 1
+      message: Pause Young (Concurrent Start) (G1 Evacuation Pause) 58M->15M(1024M) 5.623ms
+      type: gc
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:20:12.561Z
+  - jsonPayload:
+      gc_run: 1
+      message: Concurrent Cycle
+      type: gc
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:20:12.561Z
+  - jsonPayload:
+      gc_run: 1
+      message: Concurrent Clear Claimed Marks
+      type: gc,marking
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:20:12.561Z
+  - jsonPayload:
+      gc_run: 1
+      message: Concurrent Scan Root Regions
+      type: gc,marking
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:20:12.561Z
+  - jsonPayload:
+      gc_run: 1
+      message: Concurrent Mark
+      type: gc,marking
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:20:12.563Z
+  - jsonPayload:
+      gc_run: 1
+      message: Concurrent Preclean
+      type: gc,marking
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:20:12.567Z
+  - jsonPayload:
+      gc_run: 1
+      message: Pause Remark
+      type: gc,start
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:20:12.568Z
+  - jsonPayload:
+      gc_run: 1
+      message: Pause Remark 20M->20M(1024M) 1.234ms
+      type: gc
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:20:12.569Z
+  - jsonPayload:
+      gc_run: 1
+      message: Concurrent Mark Cleanup
+      type: gc,marking
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:20:12.569Z
+  - jsonPayload:
+      gc_run: 1
+      message: Pause Cleanup
+      type: gc,start
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:20:12.570Z
+  - jsonPayload:
+      gc_run: 1
+      message: Pause Cleanup 20M->20M(1024M) 0.234ms
+      type: gc
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:20:12.570Z
+  - jsonPayload:
+      gc_run: 1
+      message: Concurrent Cycle 10.123ms
+      type: gc
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:20:12.571Z
+  - jsonPayload:
+      gc_run: 2
+      message: Pause Young (Normal) (G1 Evacuation Pause)
+      type: gc,start
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:45:45.125Z
+  - jsonPayload:
+      gc_run: 2
+      message: "Eden regions: 46->0(48)"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:45:45.129Z
+  - jsonPayload:
+      gc_run: 2
+      message: "Survivor regions: 2->3(7)"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:45:45.129Z
+  - jsonPayload:
+      gc_run: 2
+      message: "Old regions: 3->3"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:45:45.129Z
+  - jsonPayload:
+      gc_run: 2
+      message: "Metaspace: 18500K->18500K(1064960K)"
+      type: gc,metaspace
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:45:45.129Z
+  - jsonPayload:
+      gc_run: 2
+      message: Pause Young (Normal) (G1 Evacuation Pause) 75M->25M(1024M) 4.543ms
+      type: gc
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T10:45:45.130Z
+  - jsonPayload:
+      gc_run: 3
+      message: Pause Full (System.gc())
+      type: gc,start
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T11:02:10.341Z
+  - jsonPayload:
+      gc_run: 3
+      message: "Eden regions: 45->0(45)"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T11:02:10.348Z
+  - jsonPayload:
+      gc_run: 3
+      message: "Survivor regions: 3->0(7)"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T11:02:10.348Z
+  - jsonPayload:
+      gc_run: 3
+      message: "Old regions: 3->1"
+      type: gc,heap
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T11:02:10.348Z
+  - jsonPayload:
+      gc_run: 3
+      message: "Metaspace: 18700K->18650K(1064960K)"
+      type: gc,metaspace
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T11:02:10.349Z
+  partialSuccess: true

From 16899b5d0ffd129403f83ece3100396b8a3e3b3d Mon Sep 17 00:00:00 2001
From: Dylan Strohschein <dylan.strohschein@bindplane.com>
Date: Mon, 18 Aug 2025 17:29:04 +0000
Subject: [PATCH 4/5] updated to use new flow

---
 apps/elasticsearch.go                         | 20 +++++--------------
 confgenerator/testdata/feature/golden.csv     |  7 +++----
 .../golden/linux-gpu/error                    |  2 +-
 .../golden/linux/error                        |  2 +-
 .../golden/windows-2012/error                 |  2 +-
 .../golden/windows/error                      |  2 +-
 .../golden/linux-gpu/error                    |  2 +-
 .../golden/linux/error                        |  2 +-
 .../golden/windows-2012/error                 |  2 +-
 .../golden/windows/error                      |  2 +-
 .../linux-gpu/feature_tracking_otlp.json      |  2 +-
 .../golden/linux-gpu/features.yaml            |  4 ++++
 .../golden/linux/feature_tracking_otlp.json   |  2 +-
 .../golden/linux/features.yaml                |  4 ++++
 .../windows-2012/feature_tracking_otlp.json   |  2 +-
 .../golden/windows-2012/features.yaml         |  4 ++++
 .../golden/windows/feature_tracking_otlp.json |  2 +-
 .../golden/windows/features.yaml              |  4 ++++
 .../linux-gpu/feature_tracking_otlp.json      |  2 +-
 .../golden/linux-gpu/features.yaml            |  4 ++++
 .../golden/linux/feature_tracking_otlp.json   |  2 +-
 .../golden/linux/features.yaml                |  4 ++++
 .../windows-2012/feature_tracking_otlp.json   |  2 +-
 .../golden/windows-2012/features.yaml         |  4 ++++
 .../golden/windows/feature_tracking_otlp.json |  2 +-
 .../golden/windows/features.yaml              |  4 ++++
 transformation_test/transformation_test.go    |  3 +--
 27 files changed, 57 insertions(+), 37 deletions(-)

diff --git a/apps/elasticsearch.go b/apps/elasticsearch.go
index 81298bb007..4cb2366e82 100644
--- a/apps/elasticsearch.go
+++ b/apps/elasticsearch.go
@@ -295,25 +295,15 @@ func loggingReceiverFilesMixinElasticsearchJson() confgenerator.LoggingReceiverF
 	}
 }
 
-type LoggingReceiverMacroElasticsearchGC struct {
-	LoggingProcessorMacroElasticsearchGC `yaml:",inline"`
-	ReceiverMixin                        confgenerator.LoggingReceiverFilesMixin `yaml:",inline"`
-}
-
-func (r LoggingReceiverMacroElasticsearchGC) Expand(ctx context.Context) (confgenerator.InternalLoggingReceiver, []confgenerator.InternalLoggingProcessor) {
-	if len(r.ReceiverMixin.IncludePaths) == 0 {
-		// Default GC log for Elasticsearch
-		r.ReceiverMixin.IncludePaths = []string{
+func loggingReceiverFilesMixinElasticsearchGC() confgenerator.LoggingReceiverFilesMixin {
+	return confgenerator.LoggingReceiverFilesMixin{
+		IncludePaths: []string{
 			"/var/log/elasticsearch/gc.log",
-		}
+		},
 	}
-
-	return &r.ReceiverMixin, r.LoggingProcessorMacroElasticsearchGC.Expand(ctx)
 }
 
 func init() {
 	confgenerator.RegisterLoggingFilesProcessorMacro[LoggingProcessorMacroElasticsearchJson](loggingReceiverFilesMixinElasticsearchJson)
-	confgenerator.RegisterLoggingReceiverMacro(func() LoggingReceiverMacroElasticsearchGC {
-		return LoggingReceiverMacroElasticsearchGC{}
-	})
+	confgenerator.RegisterLoggingFilesProcessorMacro[LoggingProcessorMacroElasticsearchGC](loggingReceiverFilesMixinElasticsearchGC)
 }
diff --git a/confgenerator/testdata/feature/golden.csv b/confgenerator/testdata/feature/golden.csv
index c97d5c2e6a..8e237e0501 100644
--- a/confgenerator/testdata/feature/golden.csv
+++ b/confgenerator/testdata/feature/golden.csv
@@ -218,6 +218,7 @@ App,Field,Override,
 *confgenerator.PrometheusMetrics,config.[].scrape_configs.static_config_target_groups
 *confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroApacheAccess],confgenerator.ConfigComponent.Type,
 *confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroApacheError],confgenerator.ConfigComponent.Type,
+*confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroElasticsearchGC],confgenerator.ConfigComponent.Type,
 *confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroElasticsearchJson],confgenerator.ConfigComponent.Type,
 *confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroFlink],confgenerator.ConfigComponent.Type,
 *confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroNginxAccess],confgenerator.ConfigComponent.Type,
@@ -230,6 +231,8 @@ App,Field,Override,
 *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroApacheAccess]],confgenerator.ConfigComponent.Type,
 *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroApacheError]],ReceiverMacro,
 *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroApacheError]],confgenerator.ConfigComponent.Type,
+*confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroElasticsearchGC]],ReceiverMacro,
+*confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroElasticsearchGC]],confgenerator.ConfigComponent.Type,
 *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroElasticsearchJson]],ReceiverMacro,
 *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroElasticsearchJson]],confgenerator.ConfigComponent.Type,
 *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroFlink]],ReceiverMacro,
@@ -246,7 +249,3 @@ App,Field,Override,
 *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroTomcatSystem]],confgenerator.ConfigComponent.Type,
 *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroVarnish]],ReceiverMacro,
 *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroVarnish]],confgenerator.ConfigComponent.Type,
-*confgenerator.loggingReceiverMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMacroElasticsearchGC],apps.LoggingReceiverMacroElasticsearchGC.confgenerator.LoggingReceiverFilesMixin.BufferInMemory,
-*confgenerator.loggingReceiverMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMacroElasticsearchGC],apps.LoggingReceiverMacroElasticsearchGC.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath,
-*confgenerator.loggingReceiverMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMacroElasticsearchGC],apps.LoggingReceiverMacroElasticsearchGC.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval,
-*confgenerator.loggingReceiverMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMacroElasticsearchGC],confgenerator.ConfigComponent.Type,
diff --git a/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/linux-gpu/error b/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/linux-gpu/error
index 78f8abc26d..eba9a1685b 100644
--- a/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/linux-gpu/error
+++ b/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/linux-gpu/error
@@ -1 +1 @@
-logging processor with type "unsupported" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_json, exclude_logs, flink, hbase_system, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system].
\ No newline at end of file
+logging processor with type "unsupported" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hbase_system, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system].
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/linux/error b/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/linux/error
index 78f8abc26d..eba9a1685b 100644
--- a/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/linux/error
+++ b/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/linux/error
@@ -1 +1 @@
-logging processor with type "unsupported" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_json, exclude_logs, flink, hbase_system, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system].
\ No newline at end of file
+logging processor with type "unsupported" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hbase_system, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system].
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/windows-2012/error b/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/windows-2012/error
index 3a4f1462b0..1bfa571784 100644
--- a/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/windows-2012/error
+++ b/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/windows-2012/error
@@ -1 +1 @@
-logging processor with type "unsupported" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_json, exclude_logs, flink, hbase_system, iis_access, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system].
\ No newline at end of file
+logging processor with type "unsupported" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hbase_system, iis_access, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system].
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/windows/error b/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/windows/error
index 3a4f1462b0..1bfa571784 100644
--- a/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/windows/error
+++ b/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/windows/error
@@ -1 +1 @@
-logging processor with type "unsupported" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_json, exclude_logs, flink, hbase_system, iis_access, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system].
\ No newline at end of file
+logging processor with type "unsupported" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hbase_system, iis_access, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system].
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/linux-gpu/error b/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/linux-gpu/error
index 4f3c8f92e8..f04272eb35 100644
--- a/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/linux-gpu/error
+++ b/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/linux-gpu/error
@@ -1 +1 @@
-logging processor with type "unsupported_type" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_json, exclude_logs, flink, hbase_system, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system].
\ No newline at end of file
+logging processor with type "unsupported_type" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hbase_system, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system].
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/linux/error b/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/linux/error
index 4f3c8f92e8..f04272eb35 100644
--- a/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/linux/error
+++ b/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/linux/error
@@ -1 +1 @@
-logging processor with type "unsupported_type" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_json, exclude_logs, flink, hbase_system, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system].
\ No newline at end of file
+logging processor with type "unsupported_type" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hbase_system, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system].
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/windows-2012/error b/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/windows-2012/error
index 13924fadc6..572bbf8a03 100644
--- a/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/windows-2012/error
+++ b/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/windows-2012/error
@@ -1 +1 @@
-logging processor with type "unsupported_type" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_json, exclude_logs, flink, hbase_system, iis_access, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system].
\ No newline at end of file
+logging processor with type "unsupported_type" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hbase_system, iis_access, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system].
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/windows/error b/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/windows/error
index 13924fadc6..572bbf8a03 100644
--- a/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/windows/error
+++ b/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/windows/error
@@ -1 +1 @@
-logging processor with type "unsupported_type" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_json, exclude_logs, flink, hbase_system, iis_access, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system].
\ No newline at end of file
+logging processor with type "unsupported_type" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hbase_system, iis_access, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system].
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/feature_tracking_otlp.json
index 44b1c23827..2c92b1cf78 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/feature_tracking_otlp.json
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/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":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[1].include_paths.__length"}},{"key":"value","value":{"stringValue":"5"}}],"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":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"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":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[1].include_paths.__length"}},{"key":"value","value":{"stringValue":"5"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/features.yaml
index 00d492b5d6..7a9fed60bb 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/features.yaml
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/features.yaml
@@ -18,6 +18,10 @@
   feature: receivers:elasticsearch_gc
   key: "[0].enabled"
   value: "true"
+- module: logging
+  feature: receivers:elasticsearch_gc
+  key: "[0].include_paths.__length"
+  value: "1"
 - module: logging
   feature: receivers:elasticsearch_json
   key: "[1].enabled"
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/feature_tracking_otlp.json
index 44b1c23827..2c92b1cf78 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/feature_tracking_otlp.json
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/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":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[1].include_paths.__length"}},{"key":"value","value":{"stringValue":"5"}}],"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":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"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":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[1].include_paths.__length"}},{"key":"value","value":{"stringValue":"5"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/features.yaml
index 00d492b5d6..7a9fed60bb 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/features.yaml
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/features.yaml
@@ -18,6 +18,10 @@
   feature: receivers:elasticsearch_gc
   key: "[0].enabled"
   value: "true"
+- module: logging
+  feature: receivers:elasticsearch_gc
+  key: "[0].include_paths.__length"
+  value: "1"
 - module: logging
   feature: receivers:elasticsearch_json
   key: "[1].enabled"
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/feature_tracking_otlp.json
index 44b1c23827..2c92b1cf78 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/feature_tracking_otlp.json
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/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":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[1].include_paths.__length"}},{"key":"value","value":{"stringValue":"5"}}],"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":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"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":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[1].include_paths.__length"}},{"key":"value","value":{"stringValue":"5"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/features.yaml
index 00d492b5d6..7a9fed60bb 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/features.yaml
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/features.yaml
@@ -18,6 +18,10 @@
   feature: receivers:elasticsearch_gc
   key: "[0].enabled"
   value: "true"
+- module: logging
+  feature: receivers:elasticsearch_gc
+  key: "[0].include_paths.__length"
+  value: "1"
 - module: logging
   feature: receivers:elasticsearch_json
   key: "[1].enabled"
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/feature_tracking_otlp.json
index 44b1c23827..2c92b1cf78 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/feature_tracking_otlp.json
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/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":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[1].include_paths.__length"}},{"key":"value","value":{"stringValue":"5"}}],"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":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"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":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[1].include_paths.__length"}},{"key":"value","value":{"stringValue":"5"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/features.yaml
index 00d492b5d6..7a9fed60bb 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/features.yaml
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/features.yaml
@@ -18,6 +18,10 @@
   feature: receivers:elasticsearch_gc
   key: "[0].enabled"
   value: "true"
+- module: logging
+  feature: receivers:elasticsearch_gc
+  key: "[0].include_paths.__length"
+  value: "1"
 - module: logging
   feature: receivers:elasticsearch_json
   key: "[1].enabled"
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/feature_tracking_otlp.json
index 2a3b580b36..0995abe585 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/feature_tracking_otlp.json
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/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":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"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":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[2].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[2].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[3].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[3].include_paths.__length"}},{"key":"value","value":{"stringValue":"5"}}],"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":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"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":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[1].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[2].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[2].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[3].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[3].include_paths.__length"}},{"key":"value","value":{"stringValue":"5"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/features.yaml
index 8fdb7ab11e..5d891b348d 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/features.yaml
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/features.yaml
@@ -26,6 +26,10 @@
   feature: receivers:elasticsearch_gc
   key: "[1].enabled"
   value: "true"
+- module: logging
+  feature: receivers:elasticsearch_gc
+  key: "[1].include_paths.__length"
+  value: "1"
 - module: logging
   feature: receivers:elasticsearch_json
   key: "[2].enabled"
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/feature_tracking_otlp.json
index 2a3b580b36..0995abe585 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/feature_tracking_otlp.json
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/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":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"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":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[2].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[2].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[3].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[3].include_paths.__length"}},{"key":"value","value":{"stringValue":"5"}}],"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":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"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":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[1].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[2].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[2].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[3].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[3].include_paths.__length"}},{"key":"value","value":{"stringValue":"5"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/features.yaml
index 8fdb7ab11e..5d891b348d 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/features.yaml
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/features.yaml
@@ -26,6 +26,10 @@
   feature: receivers:elasticsearch_gc
   key: "[1].enabled"
   value: "true"
+- module: logging
+  feature: receivers:elasticsearch_gc
+  key: "[1].include_paths.__length"
+  value: "1"
 - module: logging
   feature: receivers:elasticsearch_json
   key: "[2].enabled"
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/feature_tracking_otlp.json
index 2a3b580b36..0995abe585 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/feature_tracking_otlp.json
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/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":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"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":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[2].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[2].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[3].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[3].include_paths.__length"}},{"key":"value","value":{"stringValue":"5"}}],"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":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"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":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[1].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[2].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[2].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[3].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[3].include_paths.__length"}},{"key":"value","value":{"stringValue":"5"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/features.yaml
index 8fdb7ab11e..5d891b348d 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/features.yaml
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/features.yaml
@@ -26,6 +26,10 @@
   feature: receivers:elasticsearch_gc
   key: "[1].enabled"
   value: "true"
+- module: logging
+  feature: receivers:elasticsearch_gc
+  key: "[1].include_paths.__length"
+  value: "1"
 - module: logging
   feature: receivers:elasticsearch_json
   key: "[2].enabled"
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/feature_tracking_otlp.json
index 2a3b580b36..0995abe585 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/feature_tracking_otlp.json
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/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":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"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":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[2].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[2].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[3].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[3].include_paths.__length"}},{"key":"value","value":{"stringValue":"5"}}],"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":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"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":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_gc"}},{"key":"key","value":{"stringValue":"[1].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[2].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[2].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[3].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:elasticsearch_json"}},{"key":"key","value":{"stringValue":"[3].include_paths.__length"}},{"key":"value","value":{"stringValue":"5"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/features.yaml
index 8fdb7ab11e..5d891b348d 100644
--- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/features.yaml
+++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/features.yaml
@@ -26,6 +26,10 @@
   feature: receivers:elasticsearch_gc
   key: "[1].enabled"
   value: "true"
+- module: logging
+  feature: receivers:elasticsearch_gc
+  key: "[1].include_paths.__length"
+  value: "1"
 - module: logging
   feature: receivers:elasticsearch_json
   key: "[2].enabled"
diff --git a/transformation_test/transformation_test.go b/transformation_test/transformation_test.go
index 5f804b72b5..236bebdbab 100644
--- a/transformation_test/transformation_test.go
+++ b/transformation_test/transformation_test.go
@@ -32,7 +32,7 @@ import (
 	"time"
 
 	logpb "cloud.google.com/go/logging/apiv2/loggingpb"
-	apps "github.com/GoogleCloudPlatform/ops-agent/apps"
+	_ "github.com/GoogleCloudPlatform/ops-agent/apps"
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator"
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator/fluentbit"
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator/otel"
@@ -595,5 +595,4 @@ func sanitizeStacktrace(t *testing.T, input string) string {
 func init() {
 	// The processors registered here are only meant to be used in transformation tests.
 	confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &confgenerator.LoggingProcessorWindowsEventLogV1{} })
-	confgenerator.RegisterLoggingProcessorMacro[apps.LoggingProcessorMacroElasticsearchGC]()
 }

From d0ba018ee14a0c6b415a133f8b1f961fd2379c94 Mon Sep 17 00:00:00 2001
From: Dylan Strohschein <dylan.strohschein@bindplane.com>
Date: Tue, 19 Aug 2025 13:36:45 +0000
Subject: [PATCH 5/5] added new line to log file

---
 .../logging_processor-elasticsearch-gc/input.log   |  2 +-
 .../output_fluentbit.yaml                          |  9 +++++++++
 .../output_otel.yaml                               | 14 ++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/transformation_test/testdata/logging_processor-elasticsearch-gc/input.log b/transformation_test/testdata/logging_processor-elasticsearch-gc/input.log
index 5c9c443ba5..3f39058dcc 100644
--- a/transformation_test/testdata/logging_processor-elasticsearch-gc/input.log
+++ b/transformation_test/testdata/logging_processor-elasticsearch-gc/input.log
@@ -32,4 +32,4 @@
 [2025-08-18T11:02:10.348+0000][31245][gc,heap     ] GC(3) Survivor regions: 3->0(7)
 [2025-08-18T11:02:10.348+0000][31245][gc,heap     ] GC(3) Old regions: 3->1
 [2025-08-18T11:02:10.349+0000][31245][gc,metaspace] GC(3) Metaspace: 18700K->18650K(1064960K)
-[2025-08-18T11:02:10.350+0000][31245][gc          ] GC(3) Pause Full (System.gc()) 100M->15M(1024M) 8.765ms
\ No newline at end of file
+[2025-08-18T11:02:10.350+0000][31245][gc          ] GC(3) Pause Full (System.gc()) 100M->15M(1024M) 8.765ms
diff --git a/transformation_test/testdata/logging_processor-elasticsearch-gc/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-elasticsearch-gc/output_fluentbit.yaml
index dc27ca0c4f..23d1446772 100644
--- a/transformation_test/testdata/logging_processor-elasticsearch-gc/output_fluentbit.yaml
+++ b/transformation_test/testdata/logging_processor-elasticsearch-gc/output_fluentbit.yaml
@@ -305,6 +305,15 @@
       logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
     logName: projects/my-project/logs/transformation_test
     timestamp: 2025-08-18T11:02:10.349000000Z
+  - jsonPayload:
+      gc_run: 3.0
+      message: Pause Full (System.gc()) 100M->15M(1024M) 8.765ms
+      type: gc
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/transformation_test
+    timestamp: 2025-08-18T11:02:10.350000000Z
   partialSuccess: true
   resource:
     labels: {}
diff --git a/transformation_test/testdata/logging_processor-elasticsearch-gc/output_otel.yaml b/transformation_test/testdata/logging_processor-elasticsearch-gc/output_otel.yaml
index e94e95dbd8..9252eac924 100644
--- a/transformation_test/testdata/logging_processor-elasticsearch-gc/output_otel.yaml
+++ b/transformation_test/testdata/logging_processor-elasticsearch-gc/output_otel.yaml
@@ -475,4 +475,18 @@
         zone: test-zone
       type: gce_instance
     timestamp: 2025-08-18T11:02:10.349Z
+  - jsonPayload:
+      gc_run: 3
+      message: Pause Full (System.gc()) 100M->15M(1024M) 8.765ms
+      type: gc
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_gc
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    timestamp: 2025-08-18T11:02:10.350Z
   partialSuccess: true