From e3f30858fa72f70d2354179f903abc9f04ce4bcc Mon Sep 17 00:00:00 2001
From: Dylan Strohschein <dylan.strohschein@bindplane.com>
Date: Mon, 18 Aug 2025 18:37:02 +0000
Subject: [PATCH 1/4] created test files

---
 .../logging_processor-saphana/config.yaml     |   1 +
 .../logging_processor-saphana/input.log       |   9 ++
 .../output_fluentbit.yaml                     | 130 ++++++++++++++++++
 .../output_otel.yaml                          |   1 +
 4 files changed, 141 insertions(+)
 create mode 100644 transformation_test/testdata/logging_processor-saphana/config.yaml
 create mode 100644 transformation_test/testdata/logging_processor-saphana/input.log
 create mode 100644 transformation_test/testdata/logging_processor-saphana/output_fluentbit.yaml
 create mode 100644 transformation_test/testdata/logging_processor-saphana/output_otel.yaml

diff --git a/transformation_test/testdata/logging_processor-saphana/config.yaml b/transformation_test/testdata/logging_processor-saphana/config.yaml
new file mode 100644
index 0000000000..b198c5fd0e
--- /dev/null
+++ b/transformation_test/testdata/logging_processor-saphana/config.yaml
@@ -0,0 +1 @@
+- type: saphana
diff --git a/transformation_test/testdata/logging_processor-saphana/input.log b/transformation_test/testdata/logging_processor-saphana/input.log
new file mode 100644
index 0000000000..5b7ac3d4cc
--- /dev/null
+++ b/transformation_test/testdata/logging_processor-saphana/input.log
@@ -0,0 +1,9 @@
+[12034]{-1}[-1/-1] 2025-08-18 09:12:45.123456 i indexserver           Main.cpp(00123) : Started indexserver successfully.
+[12035]{200001}[15/40637290] 2025-08-18 09:13:12.654321 w backup                BackupManager.cpp(00245) : Backup duration exceeded expected threshold.
+[12036]{-1}[-1/-1] 2025-08-18 09:14:33.987654 e commlib               commlibImpl.cpp(00456) : ERROR: comm::connect to Host: 127.0.0.1, port: 30015, Error: exception  1: no.2110021  (Basis/IO/Stream/impl/NetworkChannel.cpp:2991)
+System error: SO_ERROR has pending error for socket. rc=111: Connection refused. channel={<NetworkChannel>={<NetworkChannelBase>={this=139745749931800, fd=22, refCnt=1, local=127.0.0.1/58700_tcp, remote=127.0.0.1/30015_tcp, state=ConnectWait, pending=[----]}}}
+exception throw location:
+ 1: 0x00007f1937d9095c in .LTHUNK27.lto_priv.2256+0x558 (libhdbbasis.so)
+ 2: 0x0000563f44888831 in _GLOBAL__sub_I_setServiceStarting.cpp.lto_priv.239+0x520 (hdbnsutil)
+[12037]{-1}[-1/-1] 2025-08-18 09:15:10.555432 d statistics           StatCollector.cpp(00333) : Collected performance metrics.
+[12038]{200002}[16/40637291] 2025-08-18 09:16:20.111111 i indexserver           Main.cpp(00130) : New client connection established. thread_id=12038
diff --git a/transformation_test/testdata/logging_processor-saphana/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-saphana/output_fluentbit.yaml
new file mode 100644
index 0000000000..ccc24ca2e8
--- /dev/null
+++ b/transformation_test/testdata/logging_processor-saphana/output_fluentbit.yaml
@@ -0,0 +1,130 @@
+- entries:
+  - jsonPayload:
+      component: indexserver
+      message: Started indexserver successfully.
+      severity_flag: i
+      thread_id: "12034"
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/saphana
+    logName: projects/my-project/logs/transformation_test
+    severity: 200.0
+    sourceLocation:
+      file: Main.cpp
+      function: ""
+      line: 123.0
+    timestamp: 2025-08-18T09:12:45.123456000Z
+  - jsonPayload:
+      component: backup
+      connection_id: "200001"
+      message: Backup duration exceeded expected threshold.
+      severity_flag: w
+      thread_id: "12035"
+      transaction_id: "15"
+      update_transaction_id: "40637290"
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/saphana
+    logName: projects/my-project/logs/transformation_test
+    severity: 400.0
+    sourceLocation:
+      file: BackupManager.cpp
+      function: ""
+      line: 245.0
+    timestamp: 2025-08-18T09:13:12.654321000Z
+  - jsonPayload:
+      component: commlib
+      message: "ERROR: comm::connect to Host: 127.0.0.1, port: 30015, Error: exception  1: no.2110021  (Basis/IO/Stream/impl/NetworkChannel.cpp:2991)"
+      severity_flag: e
+      thread_id: "12036"
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/saphana
+    logName: projects/my-project/logs/transformation_test
+    severity: 500.0
+    sourceLocation:
+      file: commlibImpl.cpp
+      function: ""
+      line: 456.0
+    timestamp: 2025-08-18T09:14:33.987654000Z
+  - jsonPayload:
+      message: "System error: SO_ERROR has pending error for socket. rc=111: Connection refused. channel={<NetworkChannel>={<NetworkChannelBase>={this=139745749931800, fd=22, refCnt=1, local=127.0.0.1/58700_tcp, remote=127.0.0.1/30015_tcp, state=ConnectWait, pending=[----]}}}"
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/saphana
+    logName: projects/my-project/logs/transformation_test
+    sourceLocation:
+      file: ""
+      function: ""
+      line: 0.0
+    timestamp: now
+  - jsonPayload:
+      message: "exception throw location:"
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/saphana
+    logName: projects/my-project/logs/transformation_test
+    sourceLocation:
+      file: ""
+      function: ""
+      line: 0.0
+    timestamp: now
+  - jsonPayload:
+      message: " 1: 0x00007f1937d9095c in .LTHUNK27.lto_priv.2256+0x558 (libhdbbasis.so)"
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/saphana
+    logName: projects/my-project/logs/transformation_test
+    sourceLocation:
+      file: ""
+      function: ""
+      line: 0.0
+    timestamp: now
+  - jsonPayload:
+      message: " 2: 0x0000563f44888831 in _GLOBAL__sub_I_setServiceStarting.cpp.lto_priv.239+0x520 (hdbnsutil)"
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/saphana
+    logName: projects/my-project/logs/transformation_test
+    sourceLocation:
+      file: ""
+      function: ""
+      line: 0.0
+    timestamp: now
+  - jsonPayload:
+      component: statistics
+      message: Collected performance metrics.
+      severity_flag: d
+      thread_id: "12037"
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/saphana
+    logName: projects/my-project/logs/transformation_test
+    severity: 100.0
+    sourceLocation:
+      file: StatCollector.cpp
+      function: ""
+      line: 333.0
+    timestamp: 2025-08-18T09:15:10.555432000Z
+  - jsonPayload:
+      component: indexserver
+      connection_id: "200002"
+      message: New client connection established. thread_id=12038
+      severity_flag: i
+      thread_id: "12038"
+      transaction_id: "16"
+      update_transaction_id: "40637291"
+    labels:
+      compute.googleapis.com/resource_name: hostname
+      logging.googleapis.com/instrumentation_source: agent.googleapis.com/saphana
+    logName: projects/my-project/logs/transformation_test
+    severity: 200.0
+    sourceLocation:
+      file: Main.cpp
+      function: ""
+      line: 130.0
+    timestamp: 2025-08-18T09:16:20.111111000Z
+  partialSuccess: true
+  resource:
+    labels: {}
+    type: gce_instance
diff --git a/transformation_test/testdata/logging_processor-saphana/output_otel.yaml b/transformation_test/testdata/logging_processor-saphana/output_otel.yaml
new file mode 100644
index 0000000000..4a8920aad8
--- /dev/null
+++ b/transformation_test/testdata/logging_processor-saphana/output_otel.yaml
@@ -0,0 +1 @@
+- config_error: processor "processor0" not supported in pipeline "transformation_test"

From 9e2c3f870b142f2e4bb8bea2e854cea29dea6e2e Mon Sep 17 00:00:00 2001
From: Dylan Strohschein <dylan.strohschein@bindplane.com>
Date: Mon, 18 Aug 2025 18:45:26 +0000
Subject: [PATCH 2/4] sap hana refactor

---
 apps/saphana.go | 111 ++++++++++++++++++++----------------------------
 1 file changed, 47 insertions(+), 64 deletions(-)

diff --git a/apps/saphana.go b/apps/saphana.go
index 26f6a60c0e..db0ffa8d26 100644
--- a/apps/saphana.go
+++ b/apps/saphana.go
@@ -18,45 +18,55 @@ import (
 	"context"
 
 	"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"
 )
 
-type LoggingProcessorSapHanaTrace struct {
-	confgenerator.ConfigComponent `yaml:",inline"`
-}
+type LoggingProcessorMacroSapHanaTrace struct{}
 
-func (LoggingProcessorSapHanaTrace) Type() string {
+func (LoggingProcessorMacroSapHanaTrace) Type() string {
 	return "saphana"
 }
 
-func (p LoggingProcessorSapHanaTrace) Components(ctx context.Context, tag string, uid string) []fluentbit.Component {
-	c := confgenerator.LoggingProcessorParseRegex{
-		// Undocumented Format: [thread_id]{connection_id}[transaction_id/update_transaction_id] timestamp severity_flag component source_file : message
-		// Sample line: [7893]{200068}[20/40637286] 2021-11-04 13:13:25.025767 w FileIO           FileSystem.cpp(00085) : Unsupported file system "ext4" for "/usr/sap/MMM/SYS/global/hdb/data/mnt00001"
-		// Sample line: [18048]{-1}[-1/-1] 2020-11-10 12:24:23.424024 i Crypto           RootKeyStoreAccessor.cpp(00818) : Created new root key /usr/sap/MMM/SYS/global/hdb/security/ssfs:HDB_SERVER/3/PERSISTENCE
-		// Sample line: [18048]{-1}[-1/-1] 2020-11-10 12:24:20.988943 e commlib          commlibImpl.cpp(00986) : ERROR: comm::connect to Host: 127.0.0.1, port: 30001, Error: exception  1: no.2110017  (Basis/IO/Stream/impl/NetworkChannel.cpp:2989)
-		// 				System error: SO_ERROR has pending error for socket. rc=111: Connection refused. channel={<NetworkChannel>={<NetworkChannelBase>={this=139745749931736, fd=21, refCnt=1, local=127.0.0.1/58654_tcp, remote=127.0.0.1/30001_tcp, state=ConnectWait, pending=[----]}}}
-		// 				exception throw location:
-		// 				 1: 0x00007f1937d9095c in .LTHUNK27.lto_priv.2256+0x558 (libhdbbasis.so)
-		// 				 ...
-		//				 25: 0x0000563f44888831 in _GLOBAL__sub_I_setServiceStarting.cpp.lto_priv.239+0x520 (hdbnsutil)
-		Regex: `^\[(?<thread_id>\d+)\]\{(?<connection_id>-?\d+)\}\[(?<transaction_id>-?\d+)\/(?<update_transaction_id>-?\d+)\]\s+(?<time>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\.\d{3,6}\d+)\s+(?<severity_flag>\w+)\s+(?<component>\w+)\s+(?<source_file>[\w\.]+)(?:\((?<source_line>\d+)\))\s+:\s+(?<message>[\s\S]+)`,
-		ParserShared: confgenerator.ParserShared{
-			TimeKey:    "time",
-			TimeFormat: "%Y-%m-%d %H:%M:%S.%L",
-			Types: map[string]string{
-				"thread_id":             "int",
-				"connection_id":         "int",
-				"transaction_id":        "int",
-				"update_transaction_id": "int",
-				"source_line":           "int",
+func (p LoggingProcessorMacroSapHanaTrace) Expand(ctx context.Context) []confgenerator.InternalLoggingProcessor {
+	return []confgenerator.InternalLoggingProcessor{
+		confgenerator.LoggingProcessorParseMultilineRegex{
+			Rules: []confgenerator.MultilineRule{
+				{
+					StateName: "start_state",
+					NextState: "cont",
+					Regex:     `^\[\d+\]\{-?\d+\}`,
+				},
+				{
+					StateName: "cont",
+					NextState: "cont",
+					Regex:     `^(?!\[\d+\]\{-?\d+\})`,
+				},
+			},
+		},
+		confgenerator.LoggingProcessorParseRegex{
+			// Undocumented Format: [thread_id]{connection_id}[transaction_id/update_transaction_id] timestamp severity_flag component source_file : message
+			// Sample line: [7893]{200068}[20/40637286] 2021-11-04 13:13:25.025767 w FileIO           FileSystem.cpp(00085) : Unsupported file system "ext4" for "/usr/sap/MMM/SYS/global/hdb/data/mnt00001"
+			// Sample line: [18048]{-1}[-1/-1] 2020-11-10 12:24:23.424024 i Crypto           RootKeyStoreAccessor.cpp(00818) : Created new root key /usr/sap/MMM/SYS/global/hdb/security/ssfs:HDB_SERVER/3/PERSISTENCE
+			// Sample line: [18048]{-1}[-1/-1] 2020-11-10 12:24:20.988943 e commlib          commlibImpl.cpp(00986) : ERROR: comm::connect to Host: 127.0.0.1, port: 30001, Error: exception  1: no.2110017  (Basis/IO/Stream/impl/NetworkChannel.cpp:2989)
+			// 				System error: SO_ERROR has pending error for socket. rc=111: Connection refused. channel={<NetworkChannel>={<NetworkChannelBase>={this=139745749931736, fd=21, refCnt=1, local=127.0.0.1/58654_tcp, remote=127.0.0.1/30001_tcp, state=ConnectWait, pending=[----]}}}
+			// 				exception throw location:
+			// 				 1: 0x00007f1937d9095c in .LTHUNK27.lto_priv.2256+0x558 (libhdbbasis.so)
+			// 				 ...
+			//				 25: 0x0000563f44888831 in _GLOBAL__sub_I_setServiceStarting.cpp.lto_priv.239+0x520 (hdbnsutil)
+			Regex: `^\[(?<thread_id>\d+)\]\{(?<connection_id>-?\d+)\}\[(?<transaction_id>-?\d+)\/(?<update_transaction_id>-?\d+)\]\s+(?<time>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\.\d{3,6}\d+)\s+(?<severity_flag>\w+)\s+(?<component>\w+)\s+(?<source_file>[\w\.]+)(?:\((?<source_line>\d+)\))\s+:\s+(?<message>[\s\S]+)`,
+			ParserShared: confgenerator.ParserShared{
+				TimeKey:    "time",
+				TimeFormat: "%Y-%m-%d %H:%M:%S.%L",
+				Types: map[string]string{
+					"thread_id":             "int",
+					"connection_id":         "int",
+					"transaction_id":        "int",
+					"update_transaction_id": "int",
+					"source_line":           "int",
+				},
 			},
 		},
-	}.Components(ctx, tag, uid)
-
-	c = append(c,
 		confgenerator.LoggingProcessorModifyFields{
 			Fields: map[string]*confgenerator.ModifyField{
 				"severity": {
@@ -89,52 +99,25 @@ func (p LoggingProcessorSapHanaTrace) Components(ctx context.Context, tag string
 				},
 				InstrumentationSourceLabel: instrumentationSourceValue(p.Type()),
 			},
-		}.Components(ctx, tag, uid)...,
-	)
-
-	return c
-}
-
-type LoggingReceiverSapHanaTrace struct {
-	LoggingProcessorSapHanaTrace `yaml:",inline"`
-	ReceiverMixin                confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"`
+		},
+	}
 }
 
-func (r LoggingReceiverSapHanaTrace) Components(ctx context.Context, tag string) []fluentbit.Component {
-	if len(r.ReceiverMixin.IncludePaths) == 0 {
-		r.ReceiverMixin.IncludePaths = []string{
+func loggingReceiverFilesMixinSapHanaTrace() confgenerator.LoggingReceiverFilesMixin {
+	return confgenerator.LoggingReceiverFilesMixin{
+		IncludePaths: []string{
 			"/usr/sap/*/HDB*/${HOSTNAME}/trace/*.trc",
-		}
-	}
-	if len(r.ReceiverMixin.ExcludePaths) == 0 {
-		r.ReceiverMixin.ExcludePaths = []string{
+		},
+		ExcludePaths: []string{
 			"/usr/sap/*/HDB*/${HOSTNAME}/trace/nameserver_history*.trc",
 			"/usr/sap/*/HDB*/${HOSTNAME}/trace/nameserver*loads*.trc",
 			"/usr/sap/*/HDB*/${HOSTNAME}/trace/nameserver*executed_statements*.trc",
-		}
-	}
-
-	r.ReceiverMixin.MultilineRules = []confgenerator.MultilineRule{
-		{
-			StateName: "start_state",
-			NextState: "cont",
-			Regex:     `^\[\d+\]\{-?\d+\}`,
-		},
-		{
-			StateName: "cont",
-			NextState: "cont",
-			Regex:     `^(?!\[\d+\]\{-?\d+\})`,
 		},
 	}
-
-	c := r.ReceiverMixin.Components(ctx, tag)
-	c = append(c, r.LoggingProcessorSapHanaTrace.Components(ctx, tag, r.Type())...)
-	return c
 }
 
 func init() {
-	confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorSapHanaTrace{} })
-	confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverSapHanaTrace{} })
+	confgenerator.RegisterLoggingFilesProcessorMacro[LoggingProcessorMacroSapHanaTrace](loggingReceiverFilesMixinSapHanaTrace)
 }
 
 type MetricsReceiverSapHana struct {

From c1de2dc6f8b33010f90c949cb1141c2959a14a14 Mon Sep 17 00:00:00 2001
From: Dylan Strohschein <dylan.strohschein@bindplane.com>
Date: Mon, 18 Aug 2025 18:46:35 +0000
Subject: [PATCH 3/4] updated test files

---
 .../output_fluentbit.yaml                     | 69 ++-----------------
 .../output_otel.yaml                          |  2 +-
 2 files changed, 7 insertions(+), 64 deletions(-)

diff --git a/transformation_test/testdata/logging_processor-saphana/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-saphana/output_fluentbit.yaml
index ccc24ca2e8..6451cca5b1 100644
--- a/transformation_test/testdata/logging_processor-saphana/output_fluentbit.yaml
+++ b/transformation_test/testdata/logging_processor-saphana/output_fluentbit.yaml
@@ -34,7 +34,12 @@
     timestamp: 2025-08-18T09:13:12.654321000Z
   - jsonPayload:
       component: commlib
-      message: "ERROR: comm::connect to Host: 127.0.0.1, port: 30015, Error: exception  1: no.2110021  (Basis/IO/Stream/impl/NetworkChannel.cpp:2991)"
+      message: |-
+        ERROR: comm::connect to Host: 127.0.0.1, port: 30015, Error: exception  1: no.2110021  (Basis/IO/Stream/impl/NetworkChannel.cpp:2991)
+        System error: SO_ERROR has pending error for socket. rc=111: Connection refused. channel={<NetworkChannel>={<NetworkChannelBase>={this=139745749931800, fd=22, refCnt=1, local=127.0.0.1/58700_tcp, remote=127.0.0.1/30015_tcp, state=ConnectWait, pending=[----]}}}
+        exception throw location:
+         1: 0x00007f1937d9095c in .LTHUNK27.lto_priv.2256+0x558 (libhdbbasis.so)
+         2: 0x0000563f44888831 in _GLOBAL__sub_I_setServiceStarting.cpp.lto_priv.239+0x520 (hdbnsutil)
       severity_flag: e
       thread_id: "12036"
     labels:
@@ -47,50 +52,6 @@
       function: ""
       line: 456.0
     timestamp: 2025-08-18T09:14:33.987654000Z
-  - jsonPayload:
-      message: "System error: SO_ERROR has pending error for socket. rc=111: Connection refused. channel={<NetworkChannel>={<NetworkChannelBase>={this=139745749931800, fd=22, refCnt=1, local=127.0.0.1/58700_tcp, remote=127.0.0.1/30015_tcp, state=ConnectWait, pending=[----]}}}"
-    labels:
-      compute.googleapis.com/resource_name: hostname
-      logging.googleapis.com/instrumentation_source: agent.googleapis.com/saphana
-    logName: projects/my-project/logs/transformation_test
-    sourceLocation:
-      file: ""
-      function: ""
-      line: 0.0
-    timestamp: now
-  - jsonPayload:
-      message: "exception throw location:"
-    labels:
-      compute.googleapis.com/resource_name: hostname
-      logging.googleapis.com/instrumentation_source: agent.googleapis.com/saphana
-    logName: projects/my-project/logs/transformation_test
-    sourceLocation:
-      file: ""
-      function: ""
-      line: 0.0
-    timestamp: now
-  - jsonPayload:
-      message: " 1: 0x00007f1937d9095c in .LTHUNK27.lto_priv.2256+0x558 (libhdbbasis.so)"
-    labels:
-      compute.googleapis.com/resource_name: hostname
-      logging.googleapis.com/instrumentation_source: agent.googleapis.com/saphana
-    logName: projects/my-project/logs/transformation_test
-    sourceLocation:
-      file: ""
-      function: ""
-      line: 0.0
-    timestamp: now
-  - jsonPayload:
-      message: " 2: 0x0000563f44888831 in _GLOBAL__sub_I_setServiceStarting.cpp.lto_priv.239+0x520 (hdbnsutil)"
-    labels:
-      compute.googleapis.com/resource_name: hostname
-      logging.googleapis.com/instrumentation_source: agent.googleapis.com/saphana
-    logName: projects/my-project/logs/transformation_test
-    sourceLocation:
-      file: ""
-      function: ""
-      line: 0.0
-    timestamp: now
   - jsonPayload:
       component: statistics
       message: Collected performance metrics.
@@ -106,24 +67,6 @@
       function: ""
       line: 333.0
     timestamp: 2025-08-18T09:15:10.555432000Z
-  - jsonPayload:
-      component: indexserver
-      connection_id: "200002"
-      message: New client connection established. thread_id=12038
-      severity_flag: i
-      thread_id: "12038"
-      transaction_id: "16"
-      update_transaction_id: "40637291"
-    labels:
-      compute.googleapis.com/resource_name: hostname
-      logging.googleapis.com/instrumentation_source: agent.googleapis.com/saphana
-    logName: projects/my-project/logs/transformation_test
-    severity: 200.0
-    sourceLocation:
-      file: Main.cpp
-      function: ""
-      line: 130.0
-    timestamp: 2025-08-18T09:16:20.111111000Z
   partialSuccess: true
   resource:
     labels: {}
diff --git a/transformation_test/testdata/logging_processor-saphana/output_otel.yaml b/transformation_test/testdata/logging_processor-saphana/output_otel.yaml
index 4a8920aad8..c83821d3ed 100644
--- a/transformation_test/testdata/logging_processor-saphana/output_otel.yaml
+++ b/transformation_test/testdata/logging_processor-saphana/output_otel.yaml
@@ -1 +1 @@
-- config_error: processor "processor0" not supported in pipeline "transformation_test"
+- config_error: "processor \"processor0\" has invalid configuration: unimplemented"

From 9ef8f48be0970a7a7d407b428187534f9f77a771 Mon Sep 17 00:00:00 2001
From: Dylan Strohschein <dylan.strohschein@bindplane.com>
Date: Mon, 18 Aug 2025 18:47:16 +0000
Subject: [PATCH 4/4] updated golden files

---
 confgenerator/testdata/feature/golden.csv           |  8 +++-----
 .../golden/linux-gpu/feature_tracking_otlp.json     |  2 +-
 .../golden/linux-gpu/features.yaml                  |  8 ++++++++
 .../golden/linux-gpu/fluent_bit_main.conf           |  2 +-
 .../golden/linux-gpu/fluent_bit_parser.conf         |  2 +-
 .../golden/linux/feature_tracking_otlp.json         |  2 +-
 .../golden/linux/features.yaml                      |  8 ++++++++
 .../golden/linux/fluent_bit_main.conf               |  2 +-
 .../golden/linux/fluent_bit_parser.conf             |  2 +-
 .../golden/windows-2012/feature_tracking_otlp.json  |  2 +-
 .../golden/windows-2012/features.yaml               |  8 ++++++++
 .../golden/windows-2012/fluent_bit_main.conf        |  2 +-
 .../golden/windows-2012/fluent_bit_parser.conf      |  2 +-
 .../golden/windows/feature_tracking_otlp.json       |  2 +-
 .../golden/windows/features.yaml                    |  8 ++++++++
 .../golden/windows/fluent_bit_main.conf             |  2 +-
 .../golden/windows/fluent_bit_parser.conf           |  2 +-
 .../golden/linux-gpu/feature_tracking_otlp.json     |  2 +-
 .../golden/linux-gpu/features.yaml                  | 12 ++++++++++++
 .../golden/linux-gpu/fluent_bit_main.conf           | 12 +++++++++---
 .../golden/linux-gpu/fluent_bit_parser.conf         | 13 ++++++++++---
 .../golden/linux/feature_tracking_otlp.json         |  2 +-
 .../golden/linux/features.yaml                      | 12 ++++++++++++
 .../golden/linux/fluent_bit_main.conf               | 12 +++++++++---
 .../golden/linux/fluent_bit_parser.conf             | 13 ++++++++++---
 .../golden/windows-2012/feature_tracking_otlp.json  |  2 +-
 .../golden/windows-2012/features.yaml               | 12 ++++++++++++
 .../golden/windows-2012/fluent_bit_main.conf        | 12 +++++++++---
 .../golden/windows-2012/fluent_bit_parser.conf      | 13 ++++++++++---
 .../golden/windows/feature_tracking_otlp.json       |  2 +-
 .../golden/windows/features.yaml                    | 12 ++++++++++++
 .../golden/windows/fluent_bit_main.conf             | 12 +++++++++---
 .../golden/windows/fluent_bit_parser.conf           | 13 ++++++++++---
 33 files changed, 175 insertions(+), 45 deletions(-)

diff --git a/confgenerator/testdata/feature/golden.csv b/confgenerator/testdata/feature/golden.csv
index 9232ae218c..5f71c1c30c 100644
--- a/confgenerator/testdata/feature/golden.csv
+++ b/confgenerator/testdata/feature/golden.csv
@@ -20,7 +20,6 @@ App,Field,Override,
 *apps.LoggingProcessorOracleDBAlert,confgenerator.ConfigComponent.Type,
 *apps.LoggingProcessorOracleDBAudit,confgenerator.ConfigComponent.Type,
 *apps.LoggingProcessorPostgresql,confgenerator.ConfigComponent.Type,
-*apps.LoggingProcessorSapHanaTrace,confgenerator.ConfigComponent.Type,
 *apps.LoggingProcessorSolrSystem,confgenerator.ConfigComponent.Type,
 *apps.LoggingProcessorWildflySystem,confgenerator.ConfigComponent.Type,
 *apps.LoggingReceiverActiveDirectoryDS,confgenerator.ConfigComponent.Type,
@@ -92,10 +91,6 @@ App,Field,Override,
 *apps.LoggingReceiverRabbitmq,confgenerator.LoggingReceiverFilesMixin.BufferInMemory,
 *apps.LoggingReceiverRabbitmq,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath,
 *apps.LoggingReceiverRabbitmq,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval,
-*apps.LoggingReceiverSapHanaTrace,apps.LoggingProcessorSapHanaTrace.confgenerator.ConfigComponent.Type,
-*apps.LoggingReceiverSapHanaTrace,confgenerator.LoggingReceiverFilesMixin.BufferInMemory,
-*apps.LoggingReceiverSapHanaTrace,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath,
-*apps.LoggingReceiverSapHanaTrace,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval,
 *apps.LoggingReceiverSolrSystem,apps.LoggingProcessorSolrSystem.confgenerator.ConfigComponent.Type,
 *apps.LoggingReceiverSolrSystem,confgenerator.LoggingReceiverFilesMixin.BufferInMemory,
 *apps.LoggingReceiverSolrSystem,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath,
@@ -223,6 +218,7 @@ App,Field,Override,
 *confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroNginxAccess],confgenerator.ConfigComponent.Type,
 *confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroNginxError],confgenerator.ConfigComponent.Type,
 *confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroRedis],confgenerator.ConfigComponent.Type,
+*confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroSapHanaTrace],confgenerator.ConfigComponent.Type,
 *confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroTomcatAccess],confgenerator.ConfigComponent.Type,
 *confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroTomcatSystem],confgenerator.ConfigComponent.Type,
 *confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroVarnish],confgenerator.ConfigComponent.Type,
@@ -242,6 +238,8 @@ App,Field,Override,
 *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroNginxError]],confgenerator.ConfigComponent.Type,
 *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroRedis]],ReceiverMacro,
 *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroRedis]],confgenerator.ConfigComponent.Type,
+*confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroSapHanaTrace]],ReceiverMacro,
+*confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroSapHanaTrace]],confgenerator.ConfigComponent.Type,
 *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroTomcatAccess]],ReceiverMacro,
 *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroTomcatAccess]],confgenerator.ConfigComponent.Type,
 *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroTomcatSystem]],ReceiverMacro,
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/feature_tracking_otlp.json
index 1954e443c2..c17011c0b3 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/feature_tracking_otlp.json
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana/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:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
+{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"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:saphana"}},{"key":"key","value":{"stringValue":"[0].exclude_paths.__length"}},{"key":"value","value":{"stringValue":"3"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/features.yaml
index 4806d09ab0..5087271cd9 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/features.yaml
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/features.yaml
@@ -18,3 +18,11 @@
   feature: receivers:saphana
   key: "[0].enabled"
   value: "true"
+- module: logging
+  feature: receivers:saphana
+  key: "[0].include_paths.__length"
+  value: "1"
+- module: logging
+  feature: receivers:saphana
+  key: "[0].exclude_paths.__length"
+  value: "3"
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/fluent_bit_main.conf
index e613a16b42..e1538a654a 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/fluent_bit_main.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/fluent_bit_main.conf
@@ -114,7 +114,7 @@
     Match        saphana.saphana
     Name         parser
     Reserve_Data True
-    Parser       saphana.saphana.saphana
+    Parser       saphana.saphana.0
 
 [FILTER]
     Match  saphana.saphana
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/fluent_bit_parser.conf
index b0859de465..c27fd1ee1f 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/fluent_bit_parser.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/fluent_bit_parser.conf
@@ -1,6 +1,6 @@
 [PARSER]
     Format      regex
-    Name        saphana.saphana.saphana
+    Name        saphana.saphana.0
     Regex       ^\[(?<thread_id>\d+)\]\{(?<connection_id>-?\d+)\}\[(?<transaction_id>-?\d+)\/(?<update_transaction_id>-?\d+)\]\s+(?<time>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\.\d{3,6}\d+)\s+(?<severity_flag>\w+)\s+(?<component>\w+)\s+(?<source_file>[\w\.]+)(?:\((?<source_line>\d+)\))\s+:\s+(?<message>[\s\S]+)
     Time_Format %Y-%m-%d %H:%M:%S.%L
     Time_Key    time
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/feature_tracking_otlp.json
index 1954e443c2..c17011c0b3 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/feature_tracking_otlp.json
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana/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:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
+{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"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:saphana"}},{"key":"key","value":{"stringValue":"[0].exclude_paths.__length"}},{"key":"value","value":{"stringValue":"3"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/features.yaml
index 4806d09ab0..5087271cd9 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/features.yaml
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/features.yaml
@@ -18,3 +18,11 @@
   feature: receivers:saphana
   key: "[0].enabled"
   value: "true"
+- module: logging
+  feature: receivers:saphana
+  key: "[0].include_paths.__length"
+  value: "1"
+- module: logging
+  feature: receivers:saphana
+  key: "[0].exclude_paths.__length"
+  value: "3"
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/fluent_bit_main.conf
index e613a16b42..e1538a654a 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/fluent_bit_main.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/fluent_bit_main.conf
@@ -114,7 +114,7 @@
     Match        saphana.saphana
     Name         parser
     Reserve_Data True
-    Parser       saphana.saphana.saphana
+    Parser       saphana.saphana.0
 
 [FILTER]
     Match  saphana.saphana
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/fluent_bit_parser.conf
index b0859de465..c27fd1ee1f 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/fluent_bit_parser.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/fluent_bit_parser.conf
@@ -1,6 +1,6 @@
 [PARSER]
     Format      regex
-    Name        saphana.saphana.saphana
+    Name        saphana.saphana.0
     Regex       ^\[(?<thread_id>\d+)\]\{(?<connection_id>-?\d+)\}\[(?<transaction_id>-?\d+)\/(?<update_transaction_id>-?\d+)\]\s+(?<time>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\.\d{3,6}\d+)\s+(?<severity_flag>\w+)\s+(?<component>\w+)\s+(?<source_file>[\w\.]+)(?:\((?<source_line>\d+)\))\s+:\s+(?<message>[\s\S]+)
     Time_Format %Y-%m-%d %H:%M:%S.%L
     Time_Key    time
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/feature_tracking_otlp.json
index 1954e443c2..c17011c0b3 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/feature_tracking_otlp.json
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana/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:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
+{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"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:saphana"}},{"key":"key","value":{"stringValue":"[0].exclude_paths.__length"}},{"key":"value","value":{"stringValue":"3"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/features.yaml
index 4806d09ab0..5087271cd9 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/features.yaml
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/features.yaml
@@ -18,3 +18,11 @@
   feature: receivers:saphana
   key: "[0].enabled"
   value: "true"
+- module: logging
+  feature: receivers:saphana
+  key: "[0].include_paths.__length"
+  value: "1"
+- module: logging
+  feature: receivers:saphana
+  key: "[0].exclude_paths.__length"
+  value: "3"
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/fluent_bit_main.conf
index 5f5f28995f..bc48109015 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/fluent_bit_main.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/fluent_bit_main.conf
@@ -157,7 +157,7 @@
     Match        saphana.saphana
     Name         parser
     Reserve_Data True
-    Parser       saphana.saphana.saphana
+    Parser       saphana.saphana.0
 
 [FILTER]
     Match  saphana.saphana
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/fluent_bit_parser.conf
index b1c5feb876..3af5559af9 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/fluent_bit_parser.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/fluent_bit_parser.conf
@@ -7,7 +7,7 @@
 
 [PARSER]
     Format      regex
-    Name        saphana.saphana.saphana
+    Name        saphana.saphana.0
     Regex       ^\[(?<thread_id>\d+)\]\{(?<connection_id>-?\d+)\}\[(?<transaction_id>-?\d+)\/(?<update_transaction_id>-?\d+)\]\s+(?<time>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\.\d{3,6}\d+)\s+(?<severity_flag>\w+)\s+(?<component>\w+)\s+(?<source_file>[\w\.]+)(?:\((?<source_line>\d+)\))\s+:\s+(?<message>[\s\S]+)
     Time_Format %Y-%m-%d %H:%M:%S.%L
     Time_Key    time
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/feature_tracking_otlp.json
index 1954e443c2..c17011c0b3 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/feature_tracking_otlp.json
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana/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:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
+{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"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:saphana"}},{"key":"key","value":{"stringValue":"[0].exclude_paths.__length"}},{"key":"value","value":{"stringValue":"3"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/features.yaml
index 4806d09ab0..5087271cd9 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/features.yaml
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/features.yaml
@@ -18,3 +18,11 @@
   feature: receivers:saphana
   key: "[0].enabled"
   value: "true"
+- module: logging
+  feature: receivers:saphana
+  key: "[0].include_paths.__length"
+  value: "1"
+- module: logging
+  feature: receivers:saphana
+  key: "[0].exclude_paths.__length"
+  value: "3"
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/fluent_bit_main.conf
index 5f5f28995f..bc48109015 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/fluent_bit_main.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/fluent_bit_main.conf
@@ -157,7 +157,7 @@
     Match        saphana.saphana
     Name         parser
     Reserve_Data True
-    Parser       saphana.saphana.saphana
+    Parser       saphana.saphana.0
 
 [FILTER]
     Match  saphana.saphana
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/fluent_bit_parser.conf
index b1c5feb876..3af5559af9 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/fluent_bit_parser.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/fluent_bit_parser.conf
@@ -7,7 +7,7 @@
 
 [PARSER]
     Format      regex
-    Name        saphana.saphana.saphana
+    Name        saphana.saphana.0
     Regex       ^\[(?<thread_id>\d+)\]\{(?<connection_id>-?\d+)\}\[(?<transaction_id>-?\d+)\/(?<update_transaction_id>-?\d+)\]\s+(?<time>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\.\d{3,6}\d+)\s+(?<severity_flag>\w+)\s+(?<component>\w+)\s+(?<source_file>[\w\.]+)(?:\((?<source_line>\d+)\))\s+:\s+(?<message>[\s\S]+)
     Time_Format %Y-%m-%d %H:%M:%S.%L
     Time_Key    time
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/feature_tracking_otlp.json
index e4768a4406..d96630b0a4 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/feature_tracking_otlp.json
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana_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:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"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:syslog"}},{"key":"key","value":{"stringValue":"[2].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
+{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"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:saphana"}},{"key":"key","value":{"stringValue":"[0].exclude_paths.__length"}},{"key":"value","value":{"stringValue":"3"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"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:saphana"}},{"key":"key","value":{"stringValue":"[1].exclude_paths.__length"}},{"key":"value","value":{"stringValue":"3"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:syslog"}},{"key":"key","value":{"stringValue":"[2].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/features.yaml
index dc1dcdc001..1f01a52898 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/features.yaml
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/features.yaml
@@ -18,6 +18,14 @@
   feature: receivers:saphana
   key: "[0].enabled"
   value: "true"
+- module: logging
+  feature: receivers:saphana
+  key: "[0].include_paths.__length"
+  value: "1"
+- module: logging
+  feature: receivers:saphana
+  key: "[0].exclude_paths.__length"
+  value: "3"
 - module: logging
   feature: receivers:saphana
   key: "[1].enabled"
@@ -26,6 +34,10 @@
   feature: receivers:saphana
   key: "[1].include_paths.__length"
   value: "1"
+- module: logging
+  feature: receivers:saphana
+  key: "[1].exclude_paths.__length"
+  value: "3"
 - module: logging
   feature: receivers:syslog
   key: "[2].enabled"
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/fluent_bit_main.conf
index 23aa6718c2..15618e8891 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/fluent_bit_main.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/fluent_bit_main.conf
@@ -142,7 +142,7 @@
     Match        saphana_custom.saphana_custom
     Name         parser
     Reserve_Data True
-    Parser       saphana_custom.saphana_custom.saphana
+    Parser       saphana_custom.saphana_custom.0
 
 [FILTER]
     Match  saphana_custom.saphana_custom
@@ -184,7 +184,7 @@
     Match        saphana_default.saphana
     Name         parser
     Reserve_Data True
-    Parser       saphana_default.saphana.saphana
+    Parser       saphana_default.saphana.0
 
 [FILTER]
     Match  saphana_default.saphana
@@ -204,6 +204,12 @@
     call   process
     script 60cb553016fda409b153154b05fd54ca.lua
 
+[FILTER]
+    Match                 saphana_syslog.saphana_syslog
+    Multiline.Key_Content message
+    Multiline.Parser      saphana_syslog.saphana_syslog.0.multiline
+    Name                  multiline
+
 [FILTER]
     Match  saphana_syslog.saphana_syslog
     Name   lua
@@ -215,7 +221,7 @@
     Match        saphana_syslog.saphana_syslog
     Name         parser
     Reserve_Data True
-    Parser       saphana_syslog.saphana_syslog.0
+    Parser       saphana_syslog.saphana_syslog.1
 
 [FILTER]
     Match  saphana_syslog.saphana_syslog
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/fluent_bit_parser.conf
index 2b14c3d20b..95255a3886 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/fluent_bit_parser.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/fluent_bit_parser.conf
@@ -1,6 +1,6 @@
 [PARSER]
     Format      regex
-    Name        saphana_custom.saphana_custom.saphana
+    Name        saphana_custom.saphana_custom.0
     Regex       ^\[(?<thread_id>\d+)\]\{(?<connection_id>-?\d+)\}\[(?<transaction_id>-?\d+)\/(?<update_transaction_id>-?\d+)\]\s+(?<time>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\.\d{3,6}\d+)\s+(?<severity_flag>\w+)\s+(?<component>\w+)\s+(?<source_file>[\w\.]+)(?:\((?<source_line>\d+)\))\s+:\s+(?<message>[\s\S]+)
     Time_Format %Y-%m-%d %H:%M:%S.%L
     Time_Key    time
@@ -8,7 +8,7 @@
 
 [PARSER]
     Format      regex
-    Name        saphana_default.saphana.saphana
+    Name        saphana_default.saphana.0
     Regex       ^\[(?<thread_id>\d+)\]\{(?<connection_id>-?\d+)\}\[(?<transaction_id>-?\d+)\/(?<update_transaction_id>-?\d+)\]\s+(?<time>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\.\d{3,6}\d+)\s+(?<severity_flag>\w+)\s+(?<component>\w+)\s+(?<source_file>[\w\.]+)(?:\((?<source_line>\d+)\))\s+:\s+(?<message>[\s\S]+)
     Time_Format %Y-%m-%d %H:%M:%S.%L
     Time_Key    time
@@ -21,7 +21,7 @@
 
 [PARSER]
     Format      regex
-    Name        saphana_syslog.saphana_syslog.0
+    Name        saphana_syslog.saphana_syslog.1
     Regex       ^\[(?<thread_id>\d+)\]\{(?<connection_id>-?\d+)\}\[(?<transaction_id>-?\d+)\/(?<update_transaction_id>-?\d+)\]\s+(?<time>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\.\d{3,6}\d+)\s+(?<severity_flag>\w+)\s+(?<component>\w+)\s+(?<source_file>[\w\.]+)(?:\((?<source_line>\d+)\))\s+:\s+(?<message>[\s\S]+)
     Time_Format %Y-%m-%d %H:%M:%S.%L
     Time_Key    time
@@ -54,3 +54,10 @@
     type          regex
     rule          "start_state"    "^\[\d+\]\{-?\d+\}"    "cont"
     rule          "cont"    "^(?!\[\d+\]\{-?\d+\})"    "cont"
+
+[MULTILINE_PARSER]
+    flush_timeout 1000
+    name          saphana_syslog.saphana_syslog.0.multiline
+    type          regex
+    rule          "start_state"    "^\[\d+\]\{-?\d+\}"    "cont"
+    rule          "cont"    "^(?!\[\d+\]\{-?\d+\})"    "cont"
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/feature_tracking_otlp.json
index e4768a4406..d96630b0a4 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/feature_tracking_otlp.json
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana_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:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"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:syslog"}},{"key":"key","value":{"stringValue":"[2].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
+{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"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:saphana"}},{"key":"key","value":{"stringValue":"[0].exclude_paths.__length"}},{"key":"value","value":{"stringValue":"3"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"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:saphana"}},{"key":"key","value":{"stringValue":"[1].exclude_paths.__length"}},{"key":"value","value":{"stringValue":"3"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:syslog"}},{"key":"key","value":{"stringValue":"[2].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/features.yaml
index dc1dcdc001..1f01a52898 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/features.yaml
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/features.yaml
@@ -18,6 +18,14 @@
   feature: receivers:saphana
   key: "[0].enabled"
   value: "true"
+- module: logging
+  feature: receivers:saphana
+  key: "[0].include_paths.__length"
+  value: "1"
+- module: logging
+  feature: receivers:saphana
+  key: "[0].exclude_paths.__length"
+  value: "3"
 - module: logging
   feature: receivers:saphana
   key: "[1].enabled"
@@ -26,6 +34,10 @@
   feature: receivers:saphana
   key: "[1].include_paths.__length"
   value: "1"
+- module: logging
+  feature: receivers:saphana
+  key: "[1].exclude_paths.__length"
+  value: "3"
 - module: logging
   feature: receivers:syslog
   key: "[2].enabled"
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/fluent_bit_main.conf
index 23aa6718c2..15618e8891 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/fluent_bit_main.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/fluent_bit_main.conf
@@ -142,7 +142,7 @@
     Match        saphana_custom.saphana_custom
     Name         parser
     Reserve_Data True
-    Parser       saphana_custom.saphana_custom.saphana
+    Parser       saphana_custom.saphana_custom.0
 
 [FILTER]
     Match  saphana_custom.saphana_custom
@@ -184,7 +184,7 @@
     Match        saphana_default.saphana
     Name         parser
     Reserve_Data True
-    Parser       saphana_default.saphana.saphana
+    Parser       saphana_default.saphana.0
 
 [FILTER]
     Match  saphana_default.saphana
@@ -204,6 +204,12 @@
     call   process
     script 60cb553016fda409b153154b05fd54ca.lua
 
+[FILTER]
+    Match                 saphana_syslog.saphana_syslog
+    Multiline.Key_Content message
+    Multiline.Parser      saphana_syslog.saphana_syslog.0.multiline
+    Name                  multiline
+
 [FILTER]
     Match  saphana_syslog.saphana_syslog
     Name   lua
@@ -215,7 +221,7 @@
     Match        saphana_syslog.saphana_syslog
     Name         parser
     Reserve_Data True
-    Parser       saphana_syslog.saphana_syslog.0
+    Parser       saphana_syslog.saphana_syslog.1
 
 [FILTER]
     Match  saphana_syslog.saphana_syslog
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/fluent_bit_parser.conf
index 2b14c3d20b..95255a3886 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/fluent_bit_parser.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/fluent_bit_parser.conf
@@ -1,6 +1,6 @@
 [PARSER]
     Format      regex
-    Name        saphana_custom.saphana_custom.saphana
+    Name        saphana_custom.saphana_custom.0
     Regex       ^\[(?<thread_id>\d+)\]\{(?<connection_id>-?\d+)\}\[(?<transaction_id>-?\d+)\/(?<update_transaction_id>-?\d+)\]\s+(?<time>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\.\d{3,6}\d+)\s+(?<severity_flag>\w+)\s+(?<component>\w+)\s+(?<source_file>[\w\.]+)(?:\((?<source_line>\d+)\))\s+:\s+(?<message>[\s\S]+)
     Time_Format %Y-%m-%d %H:%M:%S.%L
     Time_Key    time
@@ -8,7 +8,7 @@
 
 [PARSER]
     Format      regex
-    Name        saphana_default.saphana.saphana
+    Name        saphana_default.saphana.0
     Regex       ^\[(?<thread_id>\d+)\]\{(?<connection_id>-?\d+)\}\[(?<transaction_id>-?\d+)\/(?<update_transaction_id>-?\d+)\]\s+(?<time>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\.\d{3,6}\d+)\s+(?<severity_flag>\w+)\s+(?<component>\w+)\s+(?<source_file>[\w\.]+)(?:\((?<source_line>\d+)\))\s+:\s+(?<message>[\s\S]+)
     Time_Format %Y-%m-%d %H:%M:%S.%L
     Time_Key    time
@@ -21,7 +21,7 @@
 
 [PARSER]
     Format      regex
-    Name        saphana_syslog.saphana_syslog.0
+    Name        saphana_syslog.saphana_syslog.1
     Regex       ^\[(?<thread_id>\d+)\]\{(?<connection_id>-?\d+)\}\[(?<transaction_id>-?\d+)\/(?<update_transaction_id>-?\d+)\]\s+(?<time>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\.\d{3,6}\d+)\s+(?<severity_flag>\w+)\s+(?<component>\w+)\s+(?<source_file>[\w\.]+)(?:\((?<source_line>\d+)\))\s+:\s+(?<message>[\s\S]+)
     Time_Format %Y-%m-%d %H:%M:%S.%L
     Time_Key    time
@@ -54,3 +54,10 @@
     type          regex
     rule          "start_state"    "^\[\d+\]\{-?\d+\}"    "cont"
     rule          "cont"    "^(?!\[\d+\]\{-?\d+\})"    "cont"
+
+[MULTILINE_PARSER]
+    flush_timeout 1000
+    name          saphana_syslog.saphana_syslog.0.multiline
+    type          regex
+    rule          "start_state"    "^\[\d+\]\{-?\d+\}"    "cont"
+    rule          "cont"    "^(?!\[\d+\]\{-?\d+\})"    "cont"
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/feature_tracking_otlp.json
index e4768a4406..d96630b0a4 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/feature_tracking_otlp.json
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana_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:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"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:syslog"}},{"key":"key","value":{"stringValue":"[2].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
+{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"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:saphana"}},{"key":"key","value":{"stringValue":"[0].exclude_paths.__length"}},{"key":"value","value":{"stringValue":"3"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"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:saphana"}},{"key":"key","value":{"stringValue":"[1].exclude_paths.__length"}},{"key":"value","value":{"stringValue":"3"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:syslog"}},{"key":"key","value":{"stringValue":"[2].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/features.yaml
index dc1dcdc001..1f01a52898 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/features.yaml
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/features.yaml
@@ -18,6 +18,14 @@
   feature: receivers:saphana
   key: "[0].enabled"
   value: "true"
+- module: logging
+  feature: receivers:saphana
+  key: "[0].include_paths.__length"
+  value: "1"
+- module: logging
+  feature: receivers:saphana
+  key: "[0].exclude_paths.__length"
+  value: "3"
 - module: logging
   feature: receivers:saphana
   key: "[1].enabled"
@@ -26,6 +34,10 @@
   feature: receivers:saphana
   key: "[1].include_paths.__length"
   value: "1"
+- module: logging
+  feature: receivers:saphana
+  key: "[1].exclude_paths.__length"
+  value: "3"
 - module: logging
   feature: receivers:syslog
   key: "[2].enabled"
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/fluent_bit_main.conf
index a75ead2a14..626bbad47d 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/fluent_bit_main.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/fluent_bit_main.conf
@@ -185,7 +185,7 @@
     Match        saphana_custom.saphana_custom
     Name         parser
     Reserve_Data True
-    Parser       saphana_custom.saphana_custom.saphana
+    Parser       saphana_custom.saphana_custom.0
 
 [FILTER]
     Match  saphana_custom.saphana_custom
@@ -227,7 +227,7 @@
     Match        saphana_default.saphana
     Name         parser
     Reserve_Data True
-    Parser       saphana_default.saphana.saphana
+    Parser       saphana_default.saphana.0
 
 [FILTER]
     Match  saphana_default.saphana
@@ -247,6 +247,12 @@
     call   process
     script 60cb553016fda409b153154b05fd54ca.lua
 
+[FILTER]
+    Match                 saphana_syslog.saphana_syslog
+    Multiline.Key_Content message
+    Multiline.Parser      saphana_syslog.saphana_syslog.0.multiline
+    Name                  multiline
+
 [FILTER]
     Match  saphana_syslog.saphana_syslog
     Name   lua
@@ -258,7 +264,7 @@
     Match        saphana_syslog.saphana_syslog
     Name         parser
     Reserve_Data True
-    Parser       saphana_syslog.saphana_syslog.0
+    Parser       saphana_syslog.saphana_syslog.1
 
 [FILTER]
     Match  saphana_syslog.saphana_syslog
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/fluent_bit_parser.conf
index 2753903543..80a791be06 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/fluent_bit_parser.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/fluent_bit_parser.conf
@@ -7,7 +7,7 @@
 
 [PARSER]
     Format      regex
-    Name        saphana_custom.saphana_custom.saphana
+    Name        saphana_custom.saphana_custom.0
     Regex       ^\[(?<thread_id>\d+)\]\{(?<connection_id>-?\d+)\}\[(?<transaction_id>-?\d+)\/(?<update_transaction_id>-?\d+)\]\s+(?<time>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\.\d{3,6}\d+)\s+(?<severity_flag>\w+)\s+(?<component>\w+)\s+(?<source_file>[\w\.]+)(?:\((?<source_line>\d+)\))\s+:\s+(?<message>[\s\S]+)
     Time_Format %Y-%m-%d %H:%M:%S.%L
     Time_Key    time
@@ -15,7 +15,7 @@
 
 [PARSER]
     Format      regex
-    Name        saphana_default.saphana.saphana
+    Name        saphana_default.saphana.0
     Regex       ^\[(?<thread_id>\d+)\]\{(?<connection_id>-?\d+)\}\[(?<transaction_id>-?\d+)\/(?<update_transaction_id>-?\d+)\]\s+(?<time>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\.\d{3,6}\d+)\s+(?<severity_flag>\w+)\s+(?<component>\w+)\s+(?<source_file>[\w\.]+)(?:\((?<source_line>\d+)\))\s+:\s+(?<message>[\s\S]+)
     Time_Format %Y-%m-%d %H:%M:%S.%L
     Time_Key    time
@@ -28,7 +28,7 @@
 
 [PARSER]
     Format      regex
-    Name        saphana_syslog.saphana_syslog.0
+    Name        saphana_syslog.saphana_syslog.1
     Regex       ^\[(?<thread_id>\d+)\]\{(?<connection_id>-?\d+)\}\[(?<transaction_id>-?\d+)\/(?<update_transaction_id>-?\d+)\]\s+(?<time>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\.\d{3,6}\d+)\s+(?<severity_flag>\w+)\s+(?<component>\w+)\s+(?<source_file>[\w\.]+)(?:\((?<source_line>\d+)\))\s+:\s+(?<message>[\s\S]+)
     Time_Format %Y-%m-%d %H:%M:%S.%L
     Time_Key    time
@@ -61,3 +61,10 @@
     type          regex
     rule          "start_state"    "^\[\d+\]\{-?\d+\}"    "cont"
     rule          "cont"    "^(?!\[\d+\]\{-?\d+\})"    "cont"
+
+[MULTILINE_PARSER]
+    flush_timeout 1000
+    name          saphana_syslog.saphana_syslog.0.multiline
+    type          regex
+    rule          "start_state"    "^\[\d+\]\{-?\d+\}"    "cont"
+    rule          "cont"    "^(?!\[\d+\]\{-?\d+\})"    "cont"
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/feature_tracking_otlp.json
index e4768a4406..d96630b0a4 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/feature_tracking_otlp.json
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana_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:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"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:syslog"}},{"key":"key","value":{"stringValue":"[2].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
+{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"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:saphana"}},{"key":"key","value":{"stringValue":"[0].exclude_paths.__length"}},{"key":"value","value":{"stringValue":"3"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"key":"key","value":{"stringValue":"[1].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:saphana"}},{"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:saphana"}},{"key":"key","value":{"stringValue":"[1].exclude_paths.__length"}},{"key":"value","value":{"stringValue":"3"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:syslog"}},{"key":"key","value":{"stringValue":"[2].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"processors:saphana"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"}]}}]}]}]}
\ No newline at end of file
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/features.yaml
index dc1dcdc001..1f01a52898 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/features.yaml
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/features.yaml
@@ -18,6 +18,14 @@
   feature: receivers:saphana
   key: "[0].enabled"
   value: "true"
+- module: logging
+  feature: receivers:saphana
+  key: "[0].include_paths.__length"
+  value: "1"
+- module: logging
+  feature: receivers:saphana
+  key: "[0].exclude_paths.__length"
+  value: "3"
 - module: logging
   feature: receivers:saphana
   key: "[1].enabled"
@@ -26,6 +34,10 @@
   feature: receivers:saphana
   key: "[1].include_paths.__length"
   value: "1"
+- module: logging
+  feature: receivers:saphana
+  key: "[1].exclude_paths.__length"
+  value: "3"
 - module: logging
   feature: receivers:syslog
   key: "[2].enabled"
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/fluent_bit_main.conf
index a75ead2a14..626bbad47d 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/fluent_bit_main.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/fluent_bit_main.conf
@@ -185,7 +185,7 @@
     Match        saphana_custom.saphana_custom
     Name         parser
     Reserve_Data True
-    Parser       saphana_custom.saphana_custom.saphana
+    Parser       saphana_custom.saphana_custom.0
 
 [FILTER]
     Match  saphana_custom.saphana_custom
@@ -227,7 +227,7 @@
     Match        saphana_default.saphana
     Name         parser
     Reserve_Data True
-    Parser       saphana_default.saphana.saphana
+    Parser       saphana_default.saphana.0
 
 [FILTER]
     Match  saphana_default.saphana
@@ -247,6 +247,12 @@
     call   process
     script 60cb553016fda409b153154b05fd54ca.lua
 
+[FILTER]
+    Match                 saphana_syslog.saphana_syslog
+    Multiline.Key_Content message
+    Multiline.Parser      saphana_syslog.saphana_syslog.0.multiline
+    Name                  multiline
+
 [FILTER]
     Match  saphana_syslog.saphana_syslog
     Name   lua
@@ -258,7 +264,7 @@
     Match        saphana_syslog.saphana_syslog
     Name         parser
     Reserve_Data True
-    Parser       saphana_syslog.saphana_syslog.0
+    Parser       saphana_syslog.saphana_syslog.1
 
 [FILTER]
     Match  saphana_syslog.saphana_syslog
diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/fluent_bit_parser.conf
index 2753903543..80a791be06 100644
--- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/fluent_bit_parser.conf
+++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/fluent_bit_parser.conf
@@ -7,7 +7,7 @@
 
 [PARSER]
     Format      regex
-    Name        saphana_custom.saphana_custom.saphana
+    Name        saphana_custom.saphana_custom.0
     Regex       ^\[(?<thread_id>\d+)\]\{(?<connection_id>-?\d+)\}\[(?<transaction_id>-?\d+)\/(?<update_transaction_id>-?\d+)\]\s+(?<time>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\.\d{3,6}\d+)\s+(?<severity_flag>\w+)\s+(?<component>\w+)\s+(?<source_file>[\w\.]+)(?:\((?<source_line>\d+)\))\s+:\s+(?<message>[\s\S]+)
     Time_Format %Y-%m-%d %H:%M:%S.%L
     Time_Key    time
@@ -15,7 +15,7 @@
 
 [PARSER]
     Format      regex
-    Name        saphana_default.saphana.saphana
+    Name        saphana_default.saphana.0
     Regex       ^\[(?<thread_id>\d+)\]\{(?<connection_id>-?\d+)\}\[(?<transaction_id>-?\d+)\/(?<update_transaction_id>-?\d+)\]\s+(?<time>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\.\d{3,6}\d+)\s+(?<severity_flag>\w+)\s+(?<component>\w+)\s+(?<source_file>[\w\.]+)(?:\((?<source_line>\d+)\))\s+:\s+(?<message>[\s\S]+)
     Time_Format %Y-%m-%d %H:%M:%S.%L
     Time_Key    time
@@ -28,7 +28,7 @@
 
 [PARSER]
     Format      regex
-    Name        saphana_syslog.saphana_syslog.0
+    Name        saphana_syslog.saphana_syslog.1
     Regex       ^\[(?<thread_id>\d+)\]\{(?<connection_id>-?\d+)\}\[(?<transaction_id>-?\d+)\/(?<update_transaction_id>-?\d+)\]\s+(?<time>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\.\d{3,6}\d+)\s+(?<severity_flag>\w+)\s+(?<component>\w+)\s+(?<source_file>[\w\.]+)(?:\((?<source_line>\d+)\))\s+:\s+(?<message>[\s\S]+)
     Time_Format %Y-%m-%d %H:%M:%S.%L
     Time_Key    time
@@ -61,3 +61,10 @@
     type          regex
     rule          "start_state"    "^\[\d+\]\{-?\d+\}"    "cont"
     rule          "cont"    "^(?!\[\d+\]\{-?\d+\})"    "cont"
+
+[MULTILINE_PARSER]
+    flush_timeout 1000
+    name          saphana_syslog.saphana_syslog.0.multiline
+    type          regex
+    rule          "start_state"    "^\[\d+\]\{-?\d+\}"    "cont"
+    rule          "cont"    "^(?!\[\d+\]\{-?\d+\})"    "cont"