diff --git a/confgenerator/confgenerator.go b/confgenerator/confgenerator.go index 1b9ef31e51..7add8273d8 100644 --- a/confgenerator/confgenerator.go +++ b/confgenerator/confgenerator.go @@ -269,7 +269,7 @@ func (uc *UnifiedConfig) GenerateOtelConfig(ctx context.Context, outDir, stateDi ProcessorsByType: map[string][]otel.Component{ "logs": { otel.GCPProjectID(resource.ProjectName()), - // otel.DisableOtlpRoundTrip(), // Disable it until b/491102815 is fixed. + otel.DisableOtlpRoundTrip(), otel.PreserveInstrumentationScope(), otel.CopyServiceResourceLabels(), }, diff --git a/confgenerator/otel/processors.go b/confgenerator/otel/processors.go index d68848f750..a0ab5e0e87 100644 --- a/confgenerator/otel/processors.go +++ b/confgenerator/otel/processors.go @@ -689,10 +689,10 @@ func MetricUnknownCounter() Component { }) } -// This processor prevents telemetry.googleapis.com from populating the LogEntry.otlp field by setting the gcp.internal.omit_otlp resource attribute to true. +// This processor prevents telemetry.googleapis.com from populating the LogEntry.otlp field by setting the gcp.use_legacy_mapping resource attribute to true. func DisableOtlpRoundTrip() Component { return ResourceTransform( - map[string]string{"gcp.internal.omit_otlp": "true"}, false, + map[string]string{"gcp.use_legacy_mapping": "true"}, false, ) } diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/linux-gpu/otel.yaml index 413fb3ff73..a0eaaf3cb7 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/linux-gpu/otel.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1019,14 +1024,14 @@ processors: - copy_metric(Concat([metric.name, "unknowncounter"], ":")) where metric.metadata["prometheus.type"] == "unknown" and not HasSuffix(metric.name, ":unknowncounter") - convert_gauge_to_sum("cumulative", true) where HasSuffix(metric.name, ":unknowncounter") - set(metric.name, Substring(metric.name, 0, Len(metric.name)-Len(":unknowncounter"))) where HasSuffix(metric.name, ":unknowncounter") - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1198,8 +1203,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_file__pipeline_file__logs: @@ -1209,8 +1215,9 @@ service: - transform/file__logs_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/file__logs logs/logs_otlp_otlp: @@ -1220,8 +1227,9 @@ service: - transform/otlp_0 - resourcedetection/_global_1 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - otlp/otlp logs/logs_syslog__custom_syslog__custom: @@ -1232,8 +1240,9 @@ service: - transform/syslog__custom_1 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - syslog/syslog__custom metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/linux/otel.yaml index b0e41348ea..d670e0f374 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/linux/otel.yaml @@ -796,6 +796,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -975,14 +980,14 @@ processors: - copy_metric(Concat([metric.name, "unknowncounter"], ":")) where metric.metadata["prometheus.type"] == "unknown" and not HasSuffix(metric.name, ":unknowncounter") - convert_gauge_to_sum("cumulative", true) where HasSuffix(metric.name, ":unknowncounter") - set(metric.name, Substring(metric.name, 0, Len(metric.name)-Len(":unknowncounter"))) where HasSuffix(metric.name, ":unknowncounter") - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1152,8 +1157,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_file__pipeline_file__logs: @@ -1163,8 +1169,9 @@ service: - transform/file__logs_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/file__logs logs/logs_otlp_otlp: @@ -1174,8 +1181,9 @@ service: - transform/otlp_0 - resourcedetection/_global_1 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - otlp/otlp logs/logs_syslog__custom_syslog__custom: @@ -1186,8 +1194,9 @@ service: - transform/syslog__custom_1 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - syslog/syslog__custom metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/windows-2012/otel.yaml index f924d720a8..4a189fc6c6 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/windows-2012/otel.yaml @@ -862,6 +862,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1083,14 +1088,14 @@ processors: - copy_metric(Concat([metric.name, "unknowncounter"], ":")) where metric.metadata["prometheus.type"] == "unknown" and not HasSuffix(metric.name, ":unknowncounter") - convert_gauge_to_sum("cumulative", true) where HasSuffix(metric.name, ":unknowncounter") - set(metric.name, Substring(metric.name, 0, Len(metric.name)-Len(":unknowncounter"))) where HasSuffix(metric.name, ":unknowncounter") - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1639,8 +1644,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1652,8 +1658,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1665,8 +1672,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_file__pipeline_file__logs: @@ -1676,8 +1684,9 @@ service: - transform/file__logs_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/file__logs logs/logs_otlp_otlp: @@ -1687,8 +1696,9 @@ service: - transform/otlp_0 - resourcedetection/_global_1 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - otlp/otlp logs/logs_syslog__custom_syslog__custom: @@ -1699,8 +1709,9 @@ service: - transform/syslog__custom_1 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - syslog/syslog__custom metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/windows/otel.yaml index f924d720a8..4a189fc6c6 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/windows/otel.yaml @@ -862,6 +862,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1083,14 +1088,14 @@ processors: - copy_metric(Concat([metric.name, "unknowncounter"], ":")) where metric.metadata["prometheus.type"] == "unknown" and not HasSuffix(metric.name, ":unknowncounter") - convert_gauge_to_sum("cumulative", true) where HasSuffix(metric.name, ":unknowncounter") - set(metric.name, Substring(metric.name, 0, Len(metric.name)-Len(":unknowncounter"))) where HasSuffix(metric.name, ":unknowncounter") - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1639,8 +1644,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1652,8 +1658,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1665,8 +1672,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_file__pipeline_file__logs: @@ -1676,8 +1684,9 @@ service: - transform/file__logs_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/file__logs logs/logs_otlp_otlp: @@ -1687,8 +1696,9 @@ service: - transform/otlp_0 - resourcedetection/_global_1 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - otlp/otlp logs/logs_syslog__custom_syslog__custom: @@ -1699,8 +1709,9 @@ service: - transform/syslog__custom_1 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - syslog/syslog__custom metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux-gpu/otel.yaml index 6d47de162b..b815b7c379 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux-gpu/otel.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -990,14 +995,14 @@ processors: - copy_metric(Concat([metric.name, "unknowncounter"], ":")) where metric.metadata["prometheus.type"] == "unknown" and not HasSuffix(metric.name, ":unknowncounter") - convert_gauge_to_sum("cumulative", true) where HasSuffix(metric.name, ":unknowncounter") - set(metric.name, Substring(metric.name, 0, Len(metric.name)-Len(":unknowncounter"))) where HasSuffix(metric.name, ":unknowncounter") - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1063,8 +1068,9 @@ service: - transform/otlp_0 - resourcedetection/_global_1 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - otlp/otlp metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux/otel.yaml index daf234e842..4959103f17 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux/otel.yaml @@ -796,6 +796,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -946,14 +951,14 @@ processors: - copy_metric(Concat([metric.name, "unknowncounter"], ":")) where metric.metadata["prometheus.type"] == "unknown" and not HasSuffix(metric.name, ":unknowncounter") - convert_gauge_to_sum("cumulative", true) where HasSuffix(metric.name, ":unknowncounter") - set(metric.name, Substring(metric.name, 0, Len(metric.name)-Len(":unknowncounter"))) where HasSuffix(metric.name, ":unknowncounter") - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1017,8 +1022,9 @@ service: - transform/otlp_0 - resourcedetection/_global_1 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - otlp/otlp metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows-2012/otel.yaml index fe32261c03..a088f21468 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows-2012/otel.yaml @@ -862,6 +862,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1054,14 +1059,14 @@ processors: - copy_metric(Concat([metric.name, "unknowncounter"], ":")) where metric.metadata["prometheus.type"] == "unknown" and not HasSuffix(metric.name, ":unknowncounter") - convert_gauge_to_sum("cumulative", true) where HasSuffix(metric.name, ":unknowncounter") - set(metric.name, Substring(metric.name, 0, Len(metric.name)-Len(":unknowncounter"))) where HasSuffix(metric.name, ":unknowncounter") - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1160,8 +1165,9 @@ service: - transform/otlp_0 - resourcedetection/_global_1 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - otlp/otlp metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows/otel.yaml index fe32261c03..a088f21468 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows/otel.yaml @@ -862,6 +862,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1054,14 +1059,14 @@ processors: - copy_metric(Concat([metric.name, "unknowncounter"], ":")) where metric.metadata["prometheus.type"] == "unknown" and not HasSuffix(metric.name, ":unknowncounter") - convert_gauge_to_sum("cumulative", true) where HasSuffix(metric.name, ":unknowncounter") - set(metric.name, Substring(metric.name, 0, Len(metric.name)-Len(":unknowncounter"))) where HasSuffix(metric.name, ":unknowncounter") - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1160,8 +1165,9 @@ service: - transform/otlp_0 - resourcedetection/_global_1 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - otlp/otlp metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/otel_otlp_exporter.yaml index 3ddec68afc..e0a3239e7c 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/otel_otlp_exporter.yaml @@ -904,6 +904,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1014,14 +1019,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1168,8 +1173,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_p1_sample__logs: @@ -1202,8 +1208,9 @@ service: - filter/logs_p1_sample__logs_22 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/otel_otlp_exporter.yaml index ed68899cd4..d196218fae 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/otel_otlp_exporter.yaml @@ -875,6 +875,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -970,14 +975,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1122,8 +1127,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_p1_sample__logs: @@ -1156,8 +1162,9 @@ service: - filter/logs_p1_sample__logs_22 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/otel_otlp_exporter.yaml index 262519bcab..67035c1194 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/otel_otlp_exporter.yaml @@ -941,6 +941,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1078,14 +1083,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1609,8 +1614,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1622,8 +1628,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1635,8 +1642,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_p1_sample__logs: @@ -1669,8 +1677,9 @@ service: - filter/logs_p1_sample__logs_22 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/otel_otlp_exporter.yaml index 262519bcab..67035c1194 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/otel_otlp_exporter.yaml @@ -941,6 +941,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1078,14 +1083,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1609,8 +1614,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1622,8 +1628,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1635,8 +1642,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_p1_sample__logs: @@ -1669,8 +1677,9 @@ service: - filter/logs_p1_sample__logs_22 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel_otlp_exporter.yaml index e802571246..f71175c046 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel_otlp_exporter.yaml @@ -788,6 +788,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -987,14 +992,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1141,8 +1146,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_p1_sample__logs: @@ -1153,8 +1159,9 @@ service: - transform/logs_p1_sample__logs_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel_otlp_exporter.yaml index 583332e6b8..eaa0a89e18 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel_otlp_exporter.yaml @@ -759,6 +759,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -943,14 +948,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1095,8 +1100,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_p1_sample__logs: @@ -1107,8 +1113,9 @@ service: - transform/logs_p1_sample__logs_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel_otlp_exporter.yaml index c1210f4a51..e81fe68821 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1051,14 +1056,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1582,8 +1587,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1595,8 +1601,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1608,8 +1615,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_p1_sample__logs: @@ -1620,8 +1628,9 @@ service: - transform/logs_p1_sample__logs_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel_otlp_exporter.yaml index c1210f4a51..e81fe68821 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1051,14 +1056,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1582,8 +1587,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1595,8 +1601,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1608,8 +1615,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_p1_sample__logs: @@ -1620,8 +1628,9 @@ service: - transform/logs_p1_sample__logs_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/sample__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel_otlp_exporter.yaml index 0c5f5e1565..dcf7c08d86 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel_otlp_exporter.yaml @@ -788,6 +788,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -982,14 +987,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1108,8 +1113,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_pipeline1_log__source__id1: @@ -1120,8 +1126,9 @@ service: - transform/logs_pipeline1_log__source__id1_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/log__source__id1 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel_otlp_exporter.yaml index 172069004c..45fdb85aa3 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel_otlp_exporter.yaml @@ -759,6 +759,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -938,14 +943,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1062,8 +1067,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_pipeline1_log__source__id1: @@ -1074,8 +1080,9 @@ service: - transform/logs_pipeline1_log__source__id1_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/log__source__id1 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel_otlp_exporter.yaml index e851af3ad4..70121980fe 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1046,14 +1051,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1549,8 +1554,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1562,8 +1568,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1575,8 +1582,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_pipeline1_log__source__id1: @@ -1587,8 +1595,9 @@ service: - transform/logs_pipeline1_log__source__id1_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/log__source__id1 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel_otlp_exporter.yaml index e851af3ad4..70121980fe 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1046,14 +1051,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1549,8 +1554,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1562,8 +1568,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1575,8 +1582,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_pipeline1_log__source__id1: @@ -1587,8 +1595,9 @@ service: - transform/logs_pipeline1_log__source__id1_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/log__source__id1 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel_otlp_exporter.yaml index d4e8ee8a31..10cdb0709e 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel_otlp_exporter.yaml @@ -788,6 +788,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -953,14 +958,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1064,8 +1069,9 @@ service: - transform/logs_default__pipeline_syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel_otlp_exporter.yaml index d9c77d0f3b..881198db3d 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel_otlp_exporter.yaml @@ -759,6 +759,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -909,14 +914,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1018,8 +1023,9 @@ service: - transform/logs_default__pipeline_syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel_otlp_exporter.yaml index 54f0079beb..b67c474ba5 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1127,14 +1132,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1615,8 +1620,9 @@ service: - transform/logs_default__pipeline_windows__event__log_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1629,8 +1635,9 @@ service: - transform/logs_default__pipeline_windows__event__log_1_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1643,8 +1650,9 @@ service: - transform/logs_default__pipeline_windows__event__log_2_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel_otlp_exporter.yaml index 54f0079beb..b67c474ba5 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1127,14 +1132,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1615,8 +1620,9 @@ service: - transform/logs_default__pipeline_windows__event__log_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1629,8 +1635,9 @@ service: - transform/logs_default__pipeline_windows__event__log_1_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1643,8 +1650,9 @@ service: - transform/logs_default__pipeline_windows__event__log_2_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel_otlp_exporter.yaml index a0c8e3a0b7..fccd0afdde 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel_otlp_exporter.yaml @@ -788,6 +788,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -927,14 +932,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1053,8 +1058,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_pipeline1_log__source__id1: @@ -1064,8 +1070,9 @@ service: - transform/log__source__id1_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/log__source__id1 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel_otlp_exporter.yaml index a740907a9d..e592c946c7 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel_otlp_exporter.yaml @@ -759,6 +759,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -883,14 +888,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1007,8 +1012,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_pipeline1_log__source__id1: @@ -1018,8 +1024,9 @@ service: - transform/log__source__id1_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/log__source__id1 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel_otlp_exporter.yaml index 587f19fb8d..199522505f 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -991,14 +996,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1494,8 +1499,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1507,8 +1513,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1520,8 +1527,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_pipeline1_log__source__id1: @@ -1531,8 +1539,9 @@ service: - transform/log__source__id1_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/log__source__id1 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel_otlp_exporter.yaml index 587f19fb8d..199522505f 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -991,14 +996,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1494,8 +1499,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1507,8 +1513,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1520,8 +1527,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_pipeline1_log__source__id1: @@ -1531,8 +1539,9 @@ service: - transform/log__source__id1_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/log__source__id1 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux-gpu/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux-gpu/otel_otlp_exporter.yaml index a563c9bad1..6abc015515 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux-gpu/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux-gpu/otel_otlp_exporter.yaml @@ -788,6 +788,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -944,14 +949,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1056,8 +1061,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_fluent__forward_fluent__forward: @@ -1069,8 +1075,9 @@ service: - transform/fluent__forward_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - fluentforward/fluent__forward metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux/otel_otlp_exporter.yaml index 53fe7cf0df..efd3a2d1b9 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/linux/otel_otlp_exporter.yaml @@ -759,6 +759,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -900,14 +905,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1010,8 +1015,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_fluent__forward_fluent__forward: @@ -1023,8 +1029,9 @@ service: - transform/fluent__forward_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - fluentforward/fluent__forward metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows-2012/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows-2012/otel_otlp_exporter.yaml index 0c7b4f389b..37ade1d12e 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows-2012/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows-2012/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1008,14 +1013,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1497,8 +1502,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1510,8 +1516,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1523,8 +1530,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_fluent__forward_fluent__forward: @@ -1536,8 +1544,9 @@ service: - transform/fluent__forward_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - fluentforward/fluent__forward metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows/otel_otlp_exporter.yaml index 0c7b4f389b..37ade1d12e 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_forward/golden/windows/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1008,14 +1013,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1497,8 +1502,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1510,8 +1516,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1523,8 +1530,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_fluent__forward_fluent__forward: @@ -1536,8 +1544,9 @@ service: - transform/fluent__forward_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - fluentforward/fluent__forward metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux-gpu/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux-gpu/otel_otlp_exporter.yaml index 74f97c7b01..3e283eaeaa 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux-gpu/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux-gpu/otel_otlp_exporter.yaml @@ -801,6 +801,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1016,14 +1021,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1143,8 +1148,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_kafka_kafka: @@ -1157,8 +1163,9 @@ service: - transform/kafka_3 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/kafka metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux/otel_otlp_exporter.yaml index 45dda8f980..9804ff27f4 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux/otel_otlp_exporter.yaml @@ -772,6 +772,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -972,14 +977,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1097,8 +1102,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_kafka_kafka: @@ -1111,8 +1117,9 @@ service: - transform/kafka_3 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/kafka metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows-2012/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows-2012/otel_otlp_exporter.yaml index df6c163cd3..202815fbec 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows-2012/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows-2012/otel_otlp_exporter.yaml @@ -838,6 +838,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1080,14 +1085,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1584,8 +1589,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1597,8 +1603,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1610,8 +1617,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_kafka_kafka: @@ -1624,8 +1632,9 @@ service: - transform/kafka_3 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/kafka metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows/otel_otlp_exporter.yaml index df6c163cd3..202815fbec 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows/otel_otlp_exporter.yaml @@ -838,6 +838,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1080,14 +1085,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1584,8 +1589,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1597,8 +1603,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1610,8 +1617,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_kafka_kafka: @@ -1624,8 +1632,9 @@ service: - transform/kafka_3 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/kafka metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux-gpu/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux-gpu/otel_otlp_exporter.yaml index 05338f554c..87982197cd 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux-gpu/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux-gpu/otel_otlp_exporter.yaml @@ -788,6 +788,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1222,14 +1227,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1347,8 +1352,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_mongodb_mongodb: @@ -1371,8 +1377,9 @@ service: - transform/mongodb_13 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/mongodb metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux/otel_otlp_exporter.yaml index 29f4eecc78..195b1bb9ed 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/linux/otel_otlp_exporter.yaml @@ -759,6 +759,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1178,14 +1183,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1301,8 +1306,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_mongodb_mongodb: @@ -1325,8 +1331,9 @@ service: - transform/mongodb_13 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/mongodb metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows-2012/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows-2012/otel_otlp_exporter.yaml index 9f87dee79b..365498f619 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows-2012/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows-2012/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1286,14 +1291,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1788,8 +1793,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1801,8 +1807,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1814,8 +1821,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_mongodb_mongodb: @@ -1838,8 +1846,9 @@ service: - transform/mongodb_13 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/mongodb metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows/otel_otlp_exporter.yaml index 9f87dee79b..365498f619 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mongodb/golden/windows/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1286,14 +1291,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1788,8 +1793,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1801,8 +1807,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1814,8 +1821,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_mongodb_mongodb: @@ -1838,8 +1846,9 @@ service: - transform/mongodb_13 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/mongodb metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux-gpu/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux-gpu/otel_otlp_exporter.yaml index f8552fa92e..5427a6179d 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux-gpu/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux-gpu/otel_otlp_exporter.yaml @@ -814,6 +814,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1526,14 +1531,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1685,8 +1690,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_mysql_mysql__error: @@ -1700,8 +1706,9 @@ service: - transform/mysql__error_4 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/mysql__error logs/logs_mysql_mysql__general: @@ -1715,8 +1722,9 @@ service: - transform/mysql__general_4 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/mysql__general logs/logs_mysql_mysql__slow: @@ -1730,8 +1738,9 @@ service: - transform/mysql__slow_4 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/mysql__slow metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux/otel_otlp_exporter.yaml index e023ff7ccd..360a66aff5 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux/otel_otlp_exporter.yaml @@ -785,6 +785,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1482,14 +1487,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1639,8 +1644,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_mysql_mysql__error: @@ -1654,8 +1660,9 @@ service: - transform/mysql__error_4 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/mysql__error logs/logs_mysql_mysql__general: @@ -1669,8 +1676,9 @@ service: - transform/mysql__general_4 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/mysql__general logs/logs_mysql_mysql__slow: @@ -1684,8 +1692,9 @@ service: - transform/mysql__slow_4 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/mysql__slow metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows-2012/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows-2012/otel_otlp_exporter.yaml index 44e73dc569..46bc0b33cf 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows-2012/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows-2012/otel_otlp_exporter.yaml @@ -851,6 +851,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1590,14 +1595,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -2126,8 +2131,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -2139,8 +2145,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -2152,8 +2159,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_mysql_mysql__error: @@ -2167,8 +2175,9 @@ service: - transform/mysql__error_4 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/mysql__error logs/logs_mysql_mysql__general: @@ -2182,8 +2191,9 @@ service: - transform/mysql__general_4 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/mysql__general logs/logs_mysql_mysql__slow: @@ -2197,8 +2207,9 @@ service: - transform/mysql__slow_4 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/mysql__slow metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows/otel_otlp_exporter.yaml index 44e73dc569..46bc0b33cf 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows/otel_otlp_exporter.yaml @@ -851,6 +851,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1590,14 +1595,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -2126,8 +2131,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -2139,8 +2145,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -2152,8 +2159,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_mysql_mysql__error: @@ -2167,8 +2175,9 @@ service: - transform/mysql__error_4 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/mysql__error logs/logs_mysql_mysql__general: @@ -2182,8 +2191,9 @@ service: - transform/mysql__general_4 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/mysql__general logs/logs_mysql_mysql__slow: @@ -2197,8 +2207,9 @@ service: - transform/mysql__slow_4 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/mysql__slow metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux-gpu/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux-gpu/otel_otlp_exporter.yaml index d52459a1cc..5ae9d37cce 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux-gpu/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux-gpu/otel_otlp_exporter.yaml @@ -788,6 +788,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1176,14 +1181,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1316,8 +1321,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_nginx_nginx__access: @@ -1329,8 +1335,9 @@ service: - transform/nginx__access_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/nginx__access logs/logs_nginx_nginx__error: @@ -1342,8 +1349,9 @@ service: - transform/nginx__error_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/nginx__error metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux/otel_otlp_exporter.yaml index bba8a4ee3c..e9173b8a2f 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux/otel_otlp_exporter.yaml @@ -759,6 +759,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1132,14 +1137,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1270,8 +1275,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_nginx_nginx__access: @@ -1283,8 +1289,9 @@ service: - transform/nginx__access_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/nginx__access logs/logs_nginx_nginx__error: @@ -1296,8 +1303,9 @@ service: - transform/nginx__error_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/nginx__error metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows-2012/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows-2012/otel_otlp_exporter.yaml index b5d4c151ba..0c14e41c45 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows-2012/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows-2012/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1240,14 +1245,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1757,8 +1762,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1770,8 +1776,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1783,8 +1790,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_nginx_nginx__access: @@ -1796,8 +1804,9 @@ service: - transform/nginx__access_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/nginx__access logs/logs_nginx_nginx__error: @@ -1809,8 +1818,9 @@ service: - transform/nginx__error_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/nginx__error metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows/otel_otlp_exporter.yaml index b5d4c151ba..0c14e41c45 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1240,14 +1245,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1757,8 +1762,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1770,8 +1776,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1783,8 +1790,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_nginx_nginx__access: @@ -1796,8 +1804,9 @@ service: - transform/nginx__access_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/nginx__access logs/logs_nginx_nginx__error: @@ -1809,8 +1818,9 @@ service: - transform/nginx__error_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/nginx__error metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel_otlp_exporter.yaml index bab2f518de..0283a585d6 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel_otlp_exporter.yaml @@ -788,6 +788,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1008,14 +1013,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1167,8 +1172,9 @@ service: - transform/logs_pipeline1_test__syslog__source__id__tcp_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - syslog/test__syslog__source__id__tcp logs/logs_pipeline2_test__syslog__source__id__udp: @@ -1180,8 +1186,9 @@ service: - transform/logs_pipeline2_test__syslog__source__id__udp_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - syslog/test__syslog__source__id__udp metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/otel_otlp_exporter.yaml index 08e247e4cf..589018e7a1 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/otel_otlp_exporter.yaml @@ -759,6 +759,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -964,14 +969,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1121,8 +1126,9 @@ service: - transform/logs_pipeline1_test__syslog__source__id__tcp_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - syslog/test__syslog__source__id__tcp logs/logs_pipeline2_test__syslog__source__id__udp: @@ -1134,8 +1140,9 @@ service: - transform/logs_pipeline2_test__syslog__source__id__udp_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - syslog/test__syslog__source__id__udp metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel_otlp_exporter.yaml index 477a5e0cec..e2405670fe 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1072,14 +1077,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1264,8 +1269,9 @@ service: - transform/logs_pipeline1_test__syslog__source__id__tcp_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - syslog/test__syslog__source__id__tcp logs/logs_pipeline2_test__syslog__source__id__udp: @@ -1277,8 +1283,9 @@ service: - transform/logs_pipeline2_test__syslog__source__id__udp_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - syslog/test__syslog__source__id__udp metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/otel_otlp_exporter.yaml index 477a5e0cec..e2405670fe 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -1072,14 +1077,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1264,8 +1269,9 @@ service: - transform/logs_pipeline1_test__syslog__source__id__tcp_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - syslog/test__syslog__source__id__tcp logs/logs_pipeline2_test__syslog__source__id__udp: @@ -1277,8 +1283,9 @@ service: - transform/logs_pipeline2_test__syslog__source__id__udp_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - syslog/test__syslog__source__id__udp metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel_otlp_exporter.yaml index d8d819ce9e..e06c5d680f 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel_otlp_exporter.yaml @@ -788,6 +788,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -898,14 +903,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1077,8 +1082,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_systemd__pipeline_systemd__logs: @@ -1089,8 +1095,9 @@ service: - transform/systemd__logs_1 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - journald/systemd__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel_otlp_exporter.yaml index 757d2a93c0..d6725a087d 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel_otlp_exporter.yaml @@ -759,6 +759,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -854,14 +859,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1031,8 +1036,9 @@ service: - transform/syslog_0 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - filelog/syslog logs/logs_systemd__pipeline_systemd__logs: @@ -1043,8 +1049,9 @@ service: - transform/systemd__logs_1 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - journald/systemd__logs metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows-2012/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows-2012/otel_otlp_exporter.yaml index 115758876a..409d94a96e 100644 --- a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows-2012/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows-2012/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -962,14 +967,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1992,8 +1997,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -2005,8 +2011,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -2018,8 +2025,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_winlog2_winlog2: @@ -2031,8 +2039,9 @@ service: - transform/winlog2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/winlog2 logs/logs_winlog2_winlog2_1: @@ -2044,8 +2053,9 @@ service: - transform/winlog2_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/winlog2_1 logs/logs_winlog2_winlog2_2: @@ -2057,8 +2067,9 @@ service: - transform/winlog2_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/winlog2_2 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows/otel_otlp_exporter.yaml index 115758876a..409d94a96e 100644 --- a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -962,14 +967,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1992,8 +1997,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -2005,8 +2011,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -2018,8 +2025,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_winlog2_winlog2: @@ -2031,8 +2039,9 @@ service: - transform/winlog2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/winlog2 logs/logs_winlog2_winlog2_1: @@ -2044,8 +2053,9 @@ service: - transform/winlog2_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/winlog2_1 logs/logs_winlog2_winlog2_2: @@ -2057,8 +2067,9 @@ service: - transform/winlog2_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/winlog2_2 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows-2012/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows-2012/otel_otlp_exporter.yaml index 2a7f4adb06..3da1ab58ff 100644 --- a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows-2012/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows-2012/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -962,14 +967,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1589,8 +1594,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1602,8 +1608,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1615,8 +1622,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_winlog2_winlog2: @@ -1628,8 +1636,9 @@ service: - transform/winlog2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/winlog2 logs/logs_winlog2_winlog2_1: @@ -1641,8 +1650,9 @@ service: - transform/winlog2_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/winlog2_1 metrics/default__pipeline_hostmetrics: diff --git a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows/otel_otlp_exporter.yaml b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows/otel_otlp_exporter.yaml index 2a7f4adb06..3da1ab58ff 100644 --- a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows/otel_otlp_exporter.yaml +++ b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows/otel_otlp_exporter.yaml @@ -825,6 +825,11 @@ processors: - action: insert key: gcp.project_id value: test-project + resource/otlp_grpc/otlp_logs_logs_1: + attributes: + - action: insert + key: gcp.use_legacy_mapping + value: "true" resource/otlp_grpc/otlp_metrics_metrics_0: attributes: - action: insert @@ -962,14 +967,14 @@ processors: - context: metric statements: - extract_count_metric(true) where name == "rpc_client_call_duration" - transform/otlp_grpc/otlp_logs_logs_1: + transform/otlp_grpc/otlp_logs_logs_2: error_mode: ignore log_statements: - context: log statements: - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != "" - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != "" - transform/otlp_grpc/otlp_logs_logs_2: + transform/otlp_grpc/otlp_logs_logs_3: error_mode: ignore log_statements: - context: log @@ -1589,8 +1594,9 @@ service: - transform/windows__event__log_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log logs/logs_default__pipeline_windows__event__log_1: @@ -1602,8 +1608,9 @@ service: - transform/windows__event__log_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_1 logs/logs_default__pipeline_windows__event__log_2: @@ -1615,8 +1622,9 @@ service: - transform/windows__event__log_2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/windows__event__log_2 logs/logs_winlog2_winlog2: @@ -1628,8 +1636,9 @@ service: - transform/winlog2_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/winlog2 logs/logs_winlog2_winlog2_1: @@ -1641,8 +1650,9 @@ service: - transform/winlog2_1_2 - resourcedetection/_global_0 - resource/otlp_grpc/otlp_logs_logs_0 - - transform/otlp_grpc/otlp_logs_logs_1 + - resource/otlp_grpc/otlp_logs_logs_1 - transform/otlp_grpc/otlp_logs_logs_2 + - transform/otlp_grpc/otlp_logs_logs_3 receivers: - windowseventlog/winlog2_1 metrics/default__pipeline_hostmetrics: diff --git a/transformation_test/otlp_helpers_test.go b/transformation_test/otlp_helpers_test.go index 7e30cb9ac9..64a523c40f 100644 --- a/transformation_test/otlp_helpers_test.go +++ b/transformation_test/otlp_helpers_test.go @@ -47,6 +47,7 @@ func (transformationConfig transformationTest) generateOTelOTLPExporterConfig(ct // all late entries flushed from a multiline parser after 1s. "logs": { otel.GCPProjectID("fake-project"), + otel.DisableOtlpRoundTrip(), otel.PreserveInstrumentationScope(), otel.CopyServiceResourceLabels(), otel.BatchProcessor(500, 500, "1500ms"), diff --git a/transformation_test/testdata/logging_processor-active_directory_ds/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-active_directory_ds/output_otel_otlpexporter.yaml index c377121937..74184d6210 100644 --- a/transformation_test/testdata/logging_processor-active_directory_ds/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-active_directory_ds/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-apache-access/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-apache-access/output_otel_otlpexporter.yaml index e3d2de9838..a8a18cec9f 100644 --- a/transformation_test/testdata/logging_processor-apache-access/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-apache-access/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-apache-error/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-apache-error/output_otel_otlpexporter.yaml index fef0c25b3e..93536df024 100644 --- a/transformation_test/testdata/logging_processor-apache-error/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-apache-error/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-cassandra-debug/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-cassandra-debug/output_otel_otlpexporter.yaml index f203e42267..e3f1062ac2 100644 --- a/transformation_test/testdata/logging_processor-cassandra-debug/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-cassandra-debug/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -659,6 +662,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-cassandra-gc/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-cassandra-gc/output_otel_otlpexporter.yaml index 2b11c463c4..f07b946963 100644 --- a/transformation_test/testdata/logging_processor-cassandra-gc/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-cassandra-gc/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -156,6 +159,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-cassandra-system/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-cassandra-system/output_otel_otlpexporter.yaml index ac1234a0b7..6f056df098 100644 --- a/transformation_test/testdata/logging_processor-cassandra-system/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-cassandra-system/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -358,6 +361,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-couchbase-general/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-couchbase-general/output_otel_otlpexporter.yaml index 8a2ee783a8..8593db83be 100644 --- a/transformation_test/testdata/logging_processor-couchbase-general/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-couchbase-general/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -207,6 +210,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-couchbase-goxcdr/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-couchbase-goxcdr/output_otel_otlpexporter.yaml index 2a7a892ab1..2f2af86ba0 100644 --- a/transformation_test/testdata/logging_processor-couchbase-goxcdr/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-couchbase-goxcdr/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -149,6 +152,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-couchbase-http-access/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-couchbase-http-access/output_otel_otlpexporter.yaml index 85100337cc..d1f68195c2 100644 --- a/transformation_test/testdata/logging_processor-couchbase-http-access/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-couchbase-http-access/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-couchdb/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-couchdb/output_otel_otlpexporter.yaml index 612ac56fe4..4ab4eab672 100644 --- a/transformation_test/testdata/logging_processor-couchdb/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-couchdb/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -193,6 +196,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-elasticsearch-gc/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-elasticsearch-gc/output_otel_otlpexporter.yaml index 03d86a8575..859f2fabf8 100644 --- a/transformation_test/testdata/logging_processor-elasticsearch-gc/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-elasticsearch-gc/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-flink/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-flink/output_otel_otlpexporter.yaml index 41938aba65..14aa310baf 100644 --- a/transformation_test/testdata/logging_processor-flink/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-flink/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -364,6 +367,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-hadoop/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-hadoop/output_otel_otlpexporter.yaml index d9c730f1cf..3b8944fe5e 100644 --- a/transformation_test/testdata/logging_processor-hadoop/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-hadoop/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -171,6 +174,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-hbase-system/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-hbase-system/output_otel_otlpexporter.yaml index 5ced48d251..6ce724d03f 100644 --- a/transformation_test/testdata/logging_processor-hbase-system/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-hbase-system/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -683,6 +686,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-iis/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-iis/output_otel_otlpexporter.yaml index e0e51e589d..bfe901672e 100644 --- a/transformation_test/testdata/logging_processor-iis/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-iis/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-iis_access/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-iis_access/output_otel_otlpexporter.yaml index d7c218e7fd..fb2a963017 100644 --- a/transformation_test/testdata/logging_processor-iis_access/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-iis_access/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-jetty-access/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-jetty-access/output_otel_otlpexporter.yaml index 84ccc25c38..672f7f2d26 100644 --- a/transformation_test/testdata/logging_processor-jetty-access/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-jetty-access/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-kafka/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-kafka/output_otel_otlpexporter.yaml index 63a3695fd0..ce3165df2a 100644 --- a/transformation_test/testdata/logging_processor-kafka/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-kafka/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -358,6 +361,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-local_timezone/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-local_timezone/output_otel_otlpexporter.yaml index 90d5d9b174..530a105241 100644 --- a/transformation_test/testdata/logging_processor-local_timezone/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-local_timezone/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-modify_fields/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-modify_fields/output_otel_otlpexporter.yaml index 3862b997df..58e49a5608 100644 --- a/transformation_test/testdata/logging_processor-modify_fields/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-modify_fields/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-mongodb/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-mongodb/output_otel_otlpexporter.yaml index e4e4b101d4..194ebc0d4d 100644 --- a/transformation_test/testdata/logging_processor-mongodb/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-mongodb/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-mysql-error/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-mysql-error/output_otel_otlpexporter.yaml index 209425752b..ba0eb85302 100644 --- a/transformation_test/testdata/logging_processor-mysql-error/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-mysql-error/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-mysql-general/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-mysql-general/output_otel_otlpexporter.yaml index a5f5d0bde7..71859188d1 100644 --- a/transformation_test/testdata/logging_processor-mysql-general/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-mysql-general/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -231,6 +234,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-mysql-slow/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-mysql-slow/output_otel_otlpexporter.yaml index f1f72b636e..21c75f07d3 100644 --- a/transformation_test/testdata/logging_processor-mysql-slow/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-mysql-slow/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -266,6 +269,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-nginx-access/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-nginx-access/output_otel_otlpexporter.yaml index 2563222ced..b5a88a044d 100644 --- a/transformation_test/testdata/logging_processor-nginx-access/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-nginx-access/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-nginx-error/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-nginx-error/output_otel_otlpexporter.yaml index 8d678623e2..bf8adddba6 100644 --- a/transformation_test/testdata/logging_processor-nginx-error/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-nginx-error/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-oracledb_alert/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-oracledb_alert/output_otel_otlpexporter.yaml index 3fcf3d6d27..6045b952eb 100644 --- a/transformation_test/testdata/logging_processor-oracledb_alert/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-oracledb_alert/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -63,6 +66,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-parse_json-timestamp-format-1/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-parse_json-timestamp-format-1/output_otel_otlpexporter.yaml index d982cd3516..1aa3ad221c 100644 --- a/transformation_test/testdata/logging_processor-parse_json-timestamp-format-1/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-parse_json-timestamp-format-1/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-parse_json-timestamp-format-2/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-parse_json-timestamp-format-2/output_otel_otlpexporter.yaml index 12ffc6f062..074aa86122 100644 --- a/transformation_test/testdata/logging_processor-parse_json-timestamp-format-2/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-parse_json-timestamp-format-2/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-parse_json/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-parse_json/output_otel_otlpexporter.yaml index b3c5702c67..54a2e24da8 100644 --- a/transformation_test/testdata/logging_processor-parse_json/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-parse_json/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-parse_json_upstream/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-parse_json_upstream/output_otel_otlpexporter.yaml index 721354c99d..dcc57fb52c 100644 --- a/transformation_test/testdata/logging_processor-parse_json_upstream/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-parse_json_upstream/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-parse_regex-timestamp-format-1/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-parse_regex-timestamp-format-1/output_otel_otlpexporter.yaml index bfea79e9d8..67cbadd793 100644 --- a/transformation_test/testdata/logging_processor-parse_regex-timestamp-format-1/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-parse_regex-timestamp-format-1/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-parse_regex/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-parse_regex/output_otel_otlpexporter.yaml index 59c2438259..b0e5a6e470 100644 --- a/transformation_test/testdata/logging_processor-parse_regex/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-parse_regex/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-parse_regex_complex/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-parse_regex_complex/output_otel_otlpexporter.yaml index 24381ab1c5..0e82477195 100644 --- a/transformation_test/testdata/logging_processor-parse_regex_complex/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-parse_regex_complex/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-parse_regex_empty_fields/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-parse_regex_empty_fields/output_otel_otlpexporter.yaml index 5d02a96606..3dcb664263 100644 --- a/transformation_test/testdata/logging_processor-parse_regex_empty_fields/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-parse_regex_empty_fields/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-parse_regex_empty_fields_complex/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-parse_regex_empty_fields_complex/output_otel_otlpexporter.yaml index 0058008153..32c1039795 100644 --- a/transformation_test/testdata/logging_processor-parse_regex_empty_fields_complex/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-parse_regex_empty_fields_complex/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-parse_regex_optional_groups/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-parse_regex_optional_groups/output_otel_otlpexporter.yaml index 9b29cd5c95..5ac156580f 100644 --- a/transformation_test/testdata/logging_processor-parse_regex_optional_groups/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-parse_regex_optional_groups/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-parse_with_conflicts_with_record/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-parse_with_conflicts_with_record/output_otel_otlpexporter.yaml index 6369d6eb62..961f937d84 100644 --- a/transformation_test/testdata/logging_processor-parse_with_conflicts_with_record/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-parse_with_conflicts_with_record/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-postgresql/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-postgresql/output_otel_otlpexporter.yaml index 5a78dc52dc..fabac1deac 100644 --- a/transformation_test/testdata/logging_processor-postgresql/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-postgresql/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -638,6 +641,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-rabbitmq/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-rabbitmq/output_otel_otlpexporter.yaml index a06d4193b6..c134ea54a8 100644 --- a/transformation_test/testdata/logging_processor-rabbitmq/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-rabbitmq/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -380,6 +383,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-redis/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-redis/output_otel_otlpexporter.yaml index b862b2efb1..53decd6163 100644 --- a/transformation_test/testdata/logging_processor-redis/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-redis/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-severity/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-severity/output_otel_otlpexporter.yaml index 00e4965825..dc4f24bb0e 100644 --- a/transformation_test/testdata/logging_processor-severity/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-severity/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-solr/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-solr/output_otel_otlpexporter.yaml index 9c62d7a08d..1307c9c180 100644 --- a/transformation_test/testdata/logging_processor-solr/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-solr/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -406,6 +409,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-tomcat-access/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-tomcat-access/output_otel_otlpexporter.yaml index c2651bbab2..50b2951309 100644 --- a/transformation_test/testdata/logging_processor-tomcat-access/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-tomcat-access/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-tomcat-system/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-tomcat-system/output_otel_otlpexporter.yaml index 0c39583b87..196677cc8b 100644 --- a/transformation_test/testdata/logging_processor-tomcat-system/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-tomcat-system/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -782,6 +785,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-varnish/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-varnish/output_otel_otlpexporter.yaml index 868d26747a..4423714abe 100644 --- a/transformation_test/testdata/logging_processor-varnish/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-varnish/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-vault-audit/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-vault-audit/output_otel_otlpexporter.yaml index 1727b80765..bb825ac058 100644 --- a/transformation_test/testdata/logging_processor-vault-audit/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-vault-audit/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -327,6 +330,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-wildfly_system/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-wildfly_system/output_otel_otlpexporter.yaml index ae1ed261ac..66dea4133d 100644 --- a/transformation_test/testdata/logging_processor-wildfly_system/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-wildfly_system/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -224,6 +227,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-windows_event_log_raw_xml/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-windows_event_log_raw_xml/output_otel_otlpexporter.yaml index 8fa06bcdd1..b4fd937873 100644 --- a/transformation_test/testdata/logging_processor-windows_event_log_raw_xml/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-windows_event_log_raw_xml/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v1/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v1/output_otel_otlpexporter.yaml index 184d984016..c5cf6b24dd 100644 --- a/transformation_test/testdata/logging_processor-windows_event_log_v1/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-windows_event_log_v1/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_otel_otlpexporter.yaml index 4d93913e49..d64db27f99 100644 --- a/transformation_test/testdata/logging_processor-windows_event_log_v2/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-windows_event_log_v2/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/logging_processor-zookeeper_general/output_otel_otlpexporter.yaml b/transformation_test/testdata/logging_processor-zookeeper_general/output_otel_otlpexporter.yaml index e3f08ec051..ed957008f4 100644 --- a/transformation_test/testdata/logging_processor-zookeeper_general/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/logging_processor-zookeeper_general/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id @@ -182,6 +185,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/ops_agent_test-TestExcludeLogs-multi/output_otel_otlpexporter.yaml b/transformation_test/testdata/ops_agent_test-TestExcludeLogs-multi/output_otel_otlpexporter.yaml index c0b5152f69..4b8658fdea 100644 --- a/transformation_test/testdata/ops_agent_test-TestExcludeLogs-multi/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/ops_agent_test-TestExcludeLogs-multi/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/ops_agent_test-TestExcludeLogs-single/output_otel_otlpexporter.yaml b/transformation_test/testdata/ops_agent_test-TestExcludeLogs-single/output_otel_otlpexporter.yaml index 64f0179b32..95f0ad393e 100644 --- a/transformation_test/testdata/ops_agent_test-TestExcludeLogs-single/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/ops_agent_test-TestExcludeLogs-single/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/ops_agent_test-TestExcludeLogsModifyFieldsOrder-modify-exclude-trace/output_otel_otlpexporter.yaml b/transformation_test/testdata/ops_agent_test-TestExcludeLogsModifyFieldsOrder-modify-exclude-trace/output_otel_otlpexporter.yaml index b9a23557a1..fadb53b5b9 100644 --- a/transformation_test/testdata/ops_agent_test-TestExcludeLogsModifyFieldsOrder-modify-exclude-trace/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/ops_agent_test-TestExcludeLogsModifyFieldsOrder-modify-exclude-trace/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/ops_agent_test-TestExcludeLogsParseJsonOrder/output_otel_otlpexporter.yaml b/transformation_test/testdata/ops_agent_test-TestExcludeLogsParseJsonOrder/output_otel_otlpexporter.yaml index 2e2980f040..593b056e3c 100644 --- a/transformation_test/testdata/ops_agent_test-TestExcludeLogsParseJsonOrder/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/ops_agent_test-TestExcludeLogsParseJsonOrder/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel_otlpexporter.yaml b/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel_otlpexporter.yaml index 49bd31a16f..35b1dde205 100644 --- a/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/ops_agent_test-TestModifyFields/output_otel_otlpexporter.yaml b/transformation_test/testdata/ops_agent_test-TestModifyFields/output_otel_otlpexporter.yaml index 7e88e5331e..2ce65d8dd5 100644 --- a/transformation_test/testdata/ops_agent_test-TestModifyFields/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/ops_agent_test-TestModifyFields/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id diff --git a/transformation_test/testdata/ops_agent_test-TestProcessorOrder/output_otel_otlpexporter.yaml b/transformation_test/testdata/ops_agent_test-TestProcessorOrder/output_otel_otlpexporter.yaml index 1dd9a31681..0b5637f872 100644 --- a/transformation_test/testdata/ops_agent_test-TestProcessorOrder/output_otel_otlpexporter.yaml +++ b/transformation_test/testdata/ops_agent_test-TestProcessorOrder/output_otel_otlpexporter.yaml @@ -16,6 +16,9 @@ - key: gcp.project_id value: stringValue: fake-project + - key: gcp.use_legacy_mapping + value: + stringValue: "true" - key: host.id value: stringValue: test-instance-id