Use hash to make receiver name consistent

jefchien · jefchien · commit bea91f61c0d0 · 2026-07-13T19:57:01.000Z
diff --git a/translator/tocwconfig/sampleConfig/opentelemetry/default_otel_config_windows.yaml b/translator/tocwconfig/sampleConfig/opentelemetry/default_otel_config_windows.yaml
@@ -194,15 +194,15 @@ processors:
         send_batch_max_size: 10000
         send_batch_size: 10000
         timeout: 30s
-    filter/windows_events_application:
+    filter/windows_events_application_1:
         error_mode: ignore
         logs:
             log_record:
                 - not((severity_number == 17 or severity_number == 13))
         metrics: {}
         spans: {}
         traces: {}
-    filter/windows_events_system:
+    filter/windows_events_system_0:
         error_mode: ignore
         logs:
             log_record:
@@ -613,7 +613,7 @@ receivers:
                 read_header_timeout: 0s
                 traces_url_path: /v1/traces
                 write_timeout: 0s
-    windowseventlog/application:
+    windowseventlog/application_2122316671:
         channel: Application
         id: windows_eventlog_input
         max_reads: 100
@@ -630,7 +630,7 @@ receivers:
         start_at: end
         storage: file_storage/opentelemetry
         type: windows_eventlog_input
-    windowseventlog/system:
+    windowseventlog/system_653521908:
         channel: System
         id: windows_eventlog_input
         max_reads: 100
@@ -680,22 +680,22 @@ service:
             receivers:
                 - otlp/grpc_127_0_0_1_4317
                 - otlp/http_127_0_0_1_4318
-        logs/windows_events_application:
+        logs/windows_events_application_1:
             exporters:
                 - forward/opentelemetry
             processors:
-                - filter/windows_events_application
+                - filter/windows_events_application_1
                 - transform/windows_events_scope
             receivers:
-                - windowseventlog/application
-        logs/windows_events_system:
+                - windowseventlog/application_2122316671
+        logs/windows_events_system_0:
             exporters:
                 - forward/opentelemetry
             processors:
-                - filter/windows_events_system
+                - filter/windows_events_system_0
                 - transform/windows_events_scope
             receivers:
-                - windowseventlog/system
+                - windowseventlog/system_653521908
         metrics/opentelemetry:
             exporters:
                 - otlphttp/metrics
diff --git a/translator/tocwconfig/sampleConfig/opentelemetry/windows_events_config.yaml b/translator/tocwconfig/sampleConfig/opentelemetry/windows_events_config.yaml
@@ -89,23 +89,23 @@ processors:
         send_batch_max_size: 10000
         send_batch_size: 10000
         timeout: 30s
-    filter/windows_events_application:
+    filter/windows_events_application_1:
         error_mode: ignore
         logs:
             log_record:
                 - not((severity_number == 17 or severity_number == 13))
         metrics: {}
         spans: {}
         traces: {}
-    filter/windows_events_system:
+    filter/windows_events_system_0:
         error_mode: ignore
         logs:
             log_record:
                 - not((severity_number == 17 or severity_number == 13 or severity_number == 9))
         metrics: {}
         spans: {}
         traces: {}
-    resource/windows_events_system:
+    resource/windows_events_system_0:
         attributes:
             - action: upsert
               converted_type: ""
@@ -466,7 +466,7 @@ processors:
         metric_statements: []
         trace_statements: []
 receivers:
-    windowseventlog/application:
+    windowseventlog/application_2122316671:
         channel: Application
         id: windows_eventlog_input
         max_reads: 100
@@ -483,7 +483,7 @@ receivers:
         start_at: end
         storage: file_storage/opentelemetry
         type: windows_eventlog_input
-    windowseventlog/system:
+    windowseventlog/system_653521908:
         channel: System
         id: windows_eventlog_input
         max_reads: 100
@@ -520,23 +520,23 @@ service:
                 - batch/opentelemetry_logs
             receivers:
                 - forward/opentelemetry
-        logs/windows_events_application:
+        logs/windows_events_application_1:
             exporters:
                 - forward/opentelemetry
             processors:
-                - filter/windows_events_application
+                - filter/windows_events_application_1
                 - transform/windows_events_scope
             receivers:
-                - windowseventlog/application
-        logs/windows_events_system:
+                - windowseventlog/application_2122316671
+        logs/windows_events_system_0:
             exporters:
                 - forward/opentelemetry
             processors:
-                - filter/windows_events_system
-                - resource/windows_events_system
+                - filter/windows_events_system_0
+                - resource/windows_events_system_0
                 - transform/windows_events_scope
             receivers:
-                - windowseventlog/system
+                - windowseventlog/system_653521908
     telemetry:
         logs:
             encoding: console
diff --git a/translator/translate/otel/pipeline/opentelemetry/windowsevents/translators.go b/translator/translate/otel/pipeline/opentelemetry/windowsevents/translators.go
@@ -11,6 +11,7 @@ import (
 	"go.opentelemetry.io/collector/confmap"
 	"go.opentelemetry.io/collector/pipeline"
 
+	"github.com/aws/amazon-cloudwatch-agent/internal/util/hash"
 	translatorconfig "github.com/aws/amazon-cloudwatch-agent/translator/config"
 	translatorcontext "github.com/aws/amazon-cloudwatch-agent/translator/context"
 	"github.com/aws/amazon-cloudwatch-agent/translator/translate/otel/common"
@@ -52,9 +53,7 @@ func parseEntries(conf *confmap.Conf) []eventEntry {
 	}
 
 	var entries []eventEntry
-	seen := map[string]int{}
-	channelReceiver := map[string]string{}
-	for _, item := range list {
+	for i, item := range list {
 		m, ok := item.(map[string]any)
 		if !ok {
 			continue
@@ -97,22 +96,9 @@ func parseEntries(conf *confmap.Conf) []eventEntry {
 		}
 
 		sanitized := sanitizeName(channel)
-		name := sanitized
-		if n := seen[sanitized]; n > 0 {
-			name = fmt.Sprintf("%s_%d", sanitized, n)
-		}
-		seen[sanitized]++
-
-		receiverName := name
-		if rn, ok := channelReceiver[channel]; ok {
-			receiverName = rn
-		} else {
-			channelReceiver[channel] = name
-		}
-
 		entries = append(entries, eventEntry{
-			name:          name,
-			receiverName:  receiverName,
+			name:          fmt.Sprintf("%s_%d", sanitized, i),
+			receiverName:  fmt.Sprintf("%s_%s", sanitized, receiverHash(channel, format)),
 			channel:       channel,
 			raw:           raw,
 			resource:      resource,
@@ -125,6 +111,10 @@ func parseEntries(conf *confmap.Conf) []eventEntry {
 	return entries
 }
 
+func receiverHash(channel, format string) string {
+	return hash.HashName(channel + "\x00" + format)
+}
+
 func sanitizeName(channel string) string {
 	return strings.Map(func(r rune) rune {
 		if 'a' <= r && r <= 'z' || '0' <= r && r <= '9' || r == '-' {
diff --git a/translator/translate/otel/pipeline/opentelemetry/windowsevents/translators_test.go b/translator/translate/otel/pipeline/opentelemetry/windowsevents/translators_test.go
@@ -76,22 +76,43 @@ func TestParseEntries(t *testing.T) {
 	entries := parseEntries(conf)
 	require.Len(t, entries, 3)
 
-	assert.Equal(t, "system", entries[0].name)
+	assert.Equal(t, "system_0", entries[0].name)
 	assert.Equal(t, "System", entries[0].channel)
 	assert.True(t, entries[0].raw)
 	assert.Equal(t, "/custom/system", entries[0].logGroupName)
 	assert.Equal(t, []string{"ERROR"}, entries[0].eventLevels)
 
-	assert.Equal(t, "application", entries[1].name)
+	assert.Equal(t, "application_1", entries[1].name)
 	assert.Equal(t, "Application", entries[1].channel)
 	assert.False(t, entries[1].raw)
 	assert.Equal(t, []int{1001}, entries[1].eventIDs)
 
-	assert.Equal(t, "microsoft-windows-powershell_operational", entries[2].name)
+	assert.Equal(t, "microsoft-windows-powershell_operational_2", entries[2].name)
 	assert.Equal(t, "Microsoft-Windows-PowerShell/Operational", entries[2].channel)
 	assert.Equal(t, []string{"WARNING"}, entries[2].eventLevels)
 }
 
+func TestParseEntries_ReceiverNames(t *testing.T) {
+	conf := confmap.NewFromStringMap(map[string]any{
+		"opentelemetry": map[string]any{
+			"collect": map[string]any{
+				"windows_events": map[string]any{
+					"collect_list": []any{
+						map[string]any{"event_name": "System", "event_levels": []any{"ERROR", "WARNING", "INFORMATION"}, "log_group_name": "/aws/cwagent/windows-events/System"},
+						map[string]any{"event_name": "Application", "event_levels": []any{"ERROR", "WARNING"}},
+					},
+				},
+			},
+		},
+	})
+	entries := parseEntries(conf)
+	require.Len(t, entries, 2)
+
+	// Receiver names are hash-based on (channel, format) and stable
+	assert.Equal(t, "system_653521908", entries[0].receiverName)
+	assert.Equal(t, "application_2122316671", entries[1].receiverName)
+}
+
 func TestParseEntries_DuplicateChannels(t *testing.T) {
 	conf := confmap.NewFromStringMap(map[string]any{
 		"opentelemetry": map[string]any{
@@ -108,14 +129,91 @@ func TestParseEntries_DuplicateChannels(t *testing.T) {
 	})
 	entries := parseEntries(conf)
 	require.Len(t, entries, 3)
-	assert.Equal(t, "system", entries[0].name)
+	assert.Equal(t, "system_0", entries[0].name)
 	assert.Equal(t, "system_1", entries[1].name)
 	assert.Equal(t, "system_2", entries[2].name)
 
-	// All entries share the same receiver (same channel = same checkpoint)
-	assert.Equal(t, "system", entries[0].receiverName)
-	assert.Equal(t, "system", entries[1].receiverName)
-	assert.Equal(t, "system", entries[2].receiverName)
+	// All entries share the same receiver (same channel + same format = same checkpoint)
+	assert.Equal(t, entries[0].receiverName, entries[1].receiverName)
+	assert.Equal(t, entries[1].receiverName, entries[2].receiverName)
+}
+
+func TestParseEntries_ReceiverNameStableAcrossReorder(t *testing.T) {
+	confAB := confmap.NewFromStringMap(map[string]any{
+		"opentelemetry": map[string]any{
+			"collect": map[string]any{
+				"windows_events": map[string]any{
+					"collect_list": []any{
+						map[string]any{"event_name": "System", "event_levels": []any{"ERROR"}},
+						map[string]any{"event_name": "Application"},
+					},
+				},
+			},
+		},
+	})
+	confBA := confmap.NewFromStringMap(map[string]any{
+		"opentelemetry": map[string]any{
+			"collect": map[string]any{
+				"windows_events": map[string]any{
+					"collect_list": []any{
+						map[string]any{"event_name": "Application"},
+						map[string]any{"event_name": "System", "event_levels": []any{"ERROR"}},
+					},
+				},
+			},
+		},
+	})
+
+	entriesAB := parseEntries(confAB)
+	entriesBA := parseEntries(confBA)
+	require.Len(t, entriesAB, 2)
+	require.Len(t, entriesBA, 2)
+
+	// Receiver name is order-independent (hash-based)
+	assert.Equal(t, entriesAB[0].receiverName, entriesBA[1].receiverName)
+	assert.Equal(t, entriesAB[1].receiverName, entriesBA[0].receiverName)
+}
+
+func TestParseEntries_DuplicateChannelsDifferentFormat(t *testing.T) {
+	conf := confmap.NewFromStringMap(map[string]any{
+		"opentelemetry": map[string]any{
+			"collect": map[string]any{
+				"windows_events": map[string]any{
+					"collect_list": []any{
+						map[string]any{"event_name": "System", "event_format": "xml"},
+						map[string]any{"event_name": "System", "event_levels": []any{"ERROR"}},
+					},
+				},
+			},
+		},
+	})
+	entries := parseEntries(conf)
+	require.Len(t, entries, 2)
+
+	// Different formats get separate receivers even for the same channel
+	assert.NotEqual(t, entries[0].receiverName, entries[1].receiverName)
+	assert.True(t, entries[0].raw)
+	assert.False(t, entries[1].raw)
+}
+
+func TestParseEntries_DuplicateChannelsSameFormatShareReceiver(t *testing.T) {
+	conf := confmap.NewFromStringMap(map[string]any{
+		"opentelemetry": map[string]any{
+			"collect": map[string]any{
+				"windows_events": map[string]any{
+					"collect_list": []any{
+						map[string]any{"event_name": "System", "event_format": "xml"},
+						map[string]any{"event_name": "System", "event_format": "xml"},
+					},
+				},
+			},
+		},
+	})
+	entries := parseEntries(conf)
+	require.Len(t, entries, 2)
+
+	// Same format + same channel still share a receiver
+	assert.Equal(t, entries[0].receiverName, entries[1].receiverName)
 }
 
 func TestParseEntries_DifferentChannelsSanitizeCollision(t *testing.T) {
@@ -136,6 +234,4 @@ func TestParseEntries_DifferentChannelsSanitizeCollision(t *testing.T) {
 
 	// Different channels get different receiver names even if they collide after sanitization
 	assert.NotEqual(t, entries[0].receiverName, entries[1].receiverName)
-	assert.Equal(t, "a_b", entries[0].receiverName)
-	assert.Equal(t, "a_b_1", entries[1].receiverName)
 }
