put submodules back to where they are in master and update tests

braydonk · braydonk · commit 1b0d3ad5db12 · 2024-11-15T16:50:33.000Z
diff --git a/submodules/fluent-bit b/submodules/fluent-bit
@@ -1 +1 @@
-Subproject commit 7de2c45227468b51d6337141efbe2827dc48ea5f
+Subproject commit bda73d88500166a2b8cce95aa0bad9316a9639b9
diff --git a/submodules/opentelemetry-operations-collector b/submodules/opentelemetry-operations-collector
@@ -1 +1 @@
-Subproject commit 82ff283cad6ebfc0ad598e72536ef83a2176c9a3
+Subproject commit 632661265d6d2856804c9097a232fd06aaffa0a2
diff --git a/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml b/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml
@@ -1,52 +1,47 @@
-- exit_error: exit status 2
 - collector_errors:
-  - stderr: |
-      
-      panic: runtime error: invalid memory address or nil pointer dereference
-      [signal SIGSEGV: segmentation violation code=0xX addr=0xX pc=0xX]
-      
-      goroutine N [running]:
-      go.opentelemetry.io/collector/pdata/pcommon.ByteSlice.AsRaw(...)
-      	go.opentelemetry.io/collector/pdata@v1.0.0/pcommon/generated_byteslice.go:37
-      github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector.logMapper.logToSplitEntries(...)
-      	github.com/!google!cloud!platform/opentelemetry-operations-go/exporter/collector@v0.45.0/logs.go:397 +0xX
-      github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector.logMapper.createEntries(...)
-      	github.com/!google!cloud!platform/opentelemetry-operations-go/exporter/collector@v0.45.0/logs.go:282 +0xX
-      github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector.(*LogsExporter).PushLogs(...)
-      	github.com/!google!cloud!platform/opentelemetry-operations-go/exporter/collector@v0.45.0/logs.go:199 +0xX
-      go.opentelemetry.io/collector/exporter/exporterhelper.(*logsRequest).Export(...)
-      	go.opentelemetry.io/collector/exporter@v0.91.0/exporterhelper/logs.go:58 +0xX
-      go.opentelemetry.io/collector/exporter/exporterhelper.(*timeoutSender).send(...)
-      	go.opentelemetry.io/collector/exporter@v0.91.0/exporterhelper/timeout_sender.go:38 +0xX
-      go.opentelemetry.io/collector/exporter/exporterhelper.(*baseRequestSender).send(...)
-      	go.opentelemetry.io/collector/exporter@v0.91.0/exporterhelper/common.go:33 +0xX
-      go.opentelemetry.io/collector/exporter/exporterhelper.(*logsExporterWithObservability).send(...)
-      	go.opentelemetry.io/collector/exporter@v0.91.0/exporterhelper/logs.go:170 +0xX
-      go.opentelemetry.io/collector/exporter/exporterhelper.(*baseRequestSender).send(...)
-      	go.opentelemetry.io/collector/exporter@v0.91.0/exporterhelper/common.go:33
-      go.opentelemetry.io/collector/exporter/exporterhelper.(*errorLoggingRequestSender).send(...)
-      	go.opentelemetry.io/collector/exporter@v0.91.0/exporterhelper/common.go:47 +0xX
-      go.opentelemetry.io/collector/exporter/exporterhelper.(*baseExporter).send(...)
-      	go.opentelemetry.io/collector/exporter@v0.91.0/exporterhelper/common.go:193
-      go.opentelemetry.io/collector/exporter/exporterhelper.NewLogsExporter.func1(...)
-      	go.opentelemetry.io/collector/exporter@v0.91.0/exporterhelper/logs.go:98 +0xX
-      go.opentelemetry.io/collector/consumer.ConsumeLogsFunc.ConsumeLogs(...)
-      	go.opentelemetry.io/collector/consumer@v0.91.0/logs.go:25
-      go.opentelemetry.io/collector/processor/processorhelper.NewLogsProcessor.func1(...)
-      	go.opentelemetry.io/collector/processor@v0.91.0/processorhelper/logs.go:60 +0xX
-      go.opentelemetry.io/collector/consumer.ConsumeLogsFunc.ConsumeLogs(...)
-      	go.opentelemetry.io/collector/consumer@v0.91.0/logs.go:25
-      go.opentelemetry.io/collector/processor/processorhelper.NewLogsProcessor.func1(...)
-      	go.opentelemetry.io/collector/processor@v0.91.0/processorhelper/logs.go:60 +0xX
-      go.opentelemetry.io/collector/consumer.ConsumeLogsFunc.ConsumeLogs(...)
-      	go.opentelemetry.io/collector/consumer@v0.91.0/logs.go:25
-      go.opentelemetry.io/collector/consumer.ConsumeLogsFunc.ConsumeLogs(...)
-      	go.opentelemetry.io/collector/consumer@v0.91.0/logs.go:25
-      go.opentelemetry.io/collector/internal/fanoutconsumer.(*logsConsumer).ConsumeLogs(...)
-      	go.opentelemetry.io/collector@v0.91.0/internal/fanoutconsumer/logs.go:65 +0xX
-      github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/consumerretry.(*logsConsumer).ConsumeLogs(...)
-      	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.91.1-0.20240104101950-d95d8c6f4a42/consumerretry/logs.go:37 +0xX
-      github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter.(*receiver).consumerLoop(...)
-      	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza@v0.91.0/adapter/receiver.go:125 +0xX
-      created by github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter.(*receiver).Start in goroutine N
-      	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza@v0.91.0/adapter/receiver.go:68 +0xX
+  - caller: internal/base_exporter.go:130
+    error: "could not process attribute gcp.source_location: json: cannot unmarshal string into Go struct field LogEntrySourceLocation.line of type int64"
+    level: error
+    msg: Exporting failed. Rejecting data. Try enabling sending_queue to survive temporary failures.
+    rejected_items: 1.0
+    stacktrace: |-
+      go.opentelemetry.io/collector/exporter/exporterhelper/internal.(*BaseExporter).Send
+      	go.opentelemetry.io/collector/exporter@v0.112.0/exporterhelper/internal/base_exporter.go:130
+      go.opentelemetry.io/collector/exporter/exporterhelper.NewLogsRequest.func1
+      	go.opentelemetry.io/collector/exporter@v0.112.0/exporterhelper/logs.go:138
+      go.opentelemetry.io/collector/consumer.ConsumeLogsFunc.ConsumeLogs
+      	go.opentelemetry.io/collector/consumer@v0.112.0/logs.go:26
+      go.opentelemetry.io/collector/internal/fanoutconsumer.(*logsConsumer).ConsumeLogs
+      	go.opentelemetry.io/collector@v0.112.0/internal/fanoutconsumer/logs.go:62
+      go.opentelemetry.io/collector/processor/processorhelper.NewLogs.func1
+      	go.opentelemetry.io/collector/processor@v0.112.0/processorhelper/logs.go:66
+      go.opentelemetry.io/collector/consumer.ConsumeLogsFunc.ConsumeLogs
+      	go.opentelemetry.io/collector/consumer@v0.112.0/logs.go:26
+      go.opentelemetry.io/collector/processor/processorhelper.NewLogs.func1
+      	go.opentelemetry.io/collector/processor@v0.112.0/processorhelper/logs.go:66
+      go.opentelemetry.io/collector/consumer.ConsumeLogsFunc.ConsumeLogs
+      	go.opentelemetry.io/collector/consumer@v0.112.0/logs.go:26
+      go.opentelemetry.io/collector/consumer.ConsumeLogsFunc.ConsumeLogs
+      	go.opentelemetry.io/collector/consumer@v0.112.0/logs.go:26
+      go.opentelemetry.io/collector/internal/fanoutconsumer.(*logsConsumer).ConsumeLogs
+      	go.opentelemetry.io/collector@v0.112.0/internal/fanoutconsumer/logs.go:62
+      github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/consumerretry.(*logsConsumer).ConsumeLogs
+      	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.112.0/consumerretry/logs.go:37
+      github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter.(*receiver).consumerLoop
+      	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza@v0.112.0/adapter/receiver.go:110
+  - caller: consumerretry/logs.go:39
+    error: "could not process attribute gcp.source_location: json: cannot unmarshal string into Go struct field LogEntrySourceLocation.line of type int64"
+    level: error
+    msg: ConsumeLogs() failed. Enable retry_on_failure to slow down reading logs and avoid dropping.
+    stacktrace: |-
+      github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/consumerretry.(*logsConsumer).ConsumeLogs
+      	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.112.0/consumerretry/logs.go:39
+      github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter.(*receiver).consumerLoop
+      	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza@v0.112.0/adapter/receiver.go:110
+  - caller: adapter/receiver.go:112
+    error: "could not process attribute gcp.source_location: json: cannot unmarshal string into Go struct field LogEntrySourceLocation.line of type int64"
+    level: error
+    msg: ConsumeLogs() failed
+    stacktrace: |-
+      github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter.(*receiver).consumerLoop
+      	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza@v0.112.0/adapter/receiver.go:112
diff --git a/transformation_test/testdata/parse_with_conflicts_with_record/output_otel.yaml b/transformation_test/testdata/parse_with_conflicts_with_record/output_otel.yaml
@@ -1,56 +1,21 @@
-- exit_error: exit status 2
-- collector_errors:
-  - stderr: |
-      
-      panic: runtime error: invalid memory address or nil pointer dereference
-      [signal SIGSEGV: segmentation violation code=0xX addr=0xX pc=0xX]
-      
-      goroutine N [running]:
-      go.opentelemetry.io/collector/pdata/pcommon.ByteSlice.AsRaw(...)
-      	go.opentelemetry.io/collector/pdata@v1.0.0/pcommon/generated_byteslice.go:37
-      github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector.logMapper.logToSplitEntries(...)
-      	github.com/!google!cloud!platform/opentelemetry-operations-go/exporter/collector@v0.45.0/logs.go:397 +0xX
-      github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector.logMapper.createEntries(...)
-      	github.com/!google!cloud!platform/opentelemetry-operations-go/exporter/collector@v0.45.0/logs.go:282 +0xX
-      github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector.(*LogsExporter).PushLogs(...)
-      	github.com/!google!cloud!platform/opentelemetry-operations-go/exporter/collector@v0.45.0/logs.go:199 +0xX
-      go.opentelemetry.io/collector/exporter/exporterhelper.(*logsRequest).Export(...)
-      	go.opentelemetry.io/collector/exporter@v0.91.0/exporterhelper/logs.go:58 +0xX
-      go.opentelemetry.io/collector/exporter/exporterhelper.(*timeoutSender).send(...)
-      	go.opentelemetry.io/collector/exporter@v0.91.0/exporterhelper/timeout_sender.go:38 +0xX
-      go.opentelemetry.io/collector/exporter/exporterhelper.(*baseRequestSender).send(...)
-      	go.opentelemetry.io/collector/exporter@v0.91.0/exporterhelper/common.go:33 +0xX
-      go.opentelemetry.io/collector/exporter/exporterhelper.(*logsExporterWithObservability).send(...)
-      	go.opentelemetry.io/collector/exporter@v0.91.0/exporterhelper/logs.go:170 +0xX
-      go.opentelemetry.io/collector/exporter/exporterhelper.(*baseRequestSender).send(...)
-      	go.opentelemetry.io/collector/exporter@v0.91.0/exporterhelper/common.go:33
-      go.opentelemetry.io/collector/exporter/exporterhelper.(*errorLoggingRequestSender).send(...)
-      	go.opentelemetry.io/collector/exporter@v0.91.0/exporterhelper/common.go:47 +0xX
-      go.opentelemetry.io/collector/exporter/exporterhelper.(*baseExporter).send(...)
-      	go.opentelemetry.io/collector/exporter@v0.91.0/exporterhelper/common.go:193
-      go.opentelemetry.io/collector/exporter/exporterhelper.NewLogsExporter.func1(...)
-      	go.opentelemetry.io/collector/exporter@v0.91.0/exporterhelper/logs.go:98 +0xX
-      go.opentelemetry.io/collector/consumer.ConsumeLogsFunc.ConsumeLogs(...)
-      	go.opentelemetry.io/collector/consumer@v0.91.0/logs.go:25
-      go.opentelemetry.io/collector/processor/processorhelper.NewLogsProcessor.func1(...)
-      	go.opentelemetry.io/collector/processor@v0.91.0/processorhelper/logs.go:60 +0xX
-      go.opentelemetry.io/collector/consumer.ConsumeLogsFunc.ConsumeLogs(...)
-      	go.opentelemetry.io/collector/consumer@v0.91.0/logs.go:25
-      go.opentelemetry.io/collector/processor/processorhelper.NewLogsProcessor.func1(...)
-      	go.opentelemetry.io/collector/processor@v0.91.0/processorhelper/logs.go:60 +0xX
-      go.opentelemetry.io/collector/consumer.ConsumeLogsFunc.ConsumeLogs(...)
-      	go.opentelemetry.io/collector/consumer@v0.91.0/logs.go:25
-      go.opentelemetry.io/collector/processor/processorhelper.NewLogsProcessor.func1(...)
-      	go.opentelemetry.io/collector/processor@v0.91.0/processorhelper/logs.go:60 +0xX
-      go.opentelemetry.io/collector/consumer.ConsumeLogsFunc.ConsumeLogs(...)
-      	go.opentelemetry.io/collector/consumer@v0.91.0/logs.go:25
-      go.opentelemetry.io/collector/consumer.ConsumeLogsFunc.ConsumeLogs(...)
-      	go.opentelemetry.io/collector/consumer@v0.91.0/logs.go:25
-      go.opentelemetry.io/collector/internal/fanoutconsumer.(*logsConsumer).ConsumeLogs(...)
-      	go.opentelemetry.io/collector@v0.91.0/internal/fanoutconsumer/logs.go:65 +0xX
-      github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/consumerretry.(*logsConsumer).ConsumeLogs(...)
-      	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.91.1-0.20240104101950-d95d8c6f4a42/consumerretry/logs.go:37 +0xX
-      github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter.(*receiver).consumerLoop(...)
-      	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza@v0.91.0/adapter/receiver.go:125 +0xX
-      created by github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter.(*receiver).Start in goroutine N
-      	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza@v0.91.0/adapter/receiver.go:68 +0xX
+- entries:
+  - jsonPayload:
+      non-overwritten-field: non-overwritten
+      original-field: original-value
+      overwritten-field: overwritten
+      parsed-field: parsed-value
+    labels:
+      non-overwritten-label: non-overwritten
+      original-label: original-label
+      overwritten-label: overwritten
+      parsed-label: parsed-label
+    logName: projects/my-project/logs/my-log-name
+    resource:
+      labels:
+        instance_id: test-instance-id
+        zone: test-zone
+      type: gce_instance
+    sourceLocation:
+      file: overwritten-file-path
+    timestamp: now
+  partialSuccess: true
diff --git a/transformation_test/testdata/test_timezone/output_otel.yaml b/transformation_test/testdata/test_timezone/output_otel.yaml
@@ -22,7 +22,7 @@
     timestamp: now
   partialSuccess: true
 - collector_errors:
-  - caller: ottl@v0.91.0/parser.go:273
+  - caller: ottl@v0.112.0/parser.go:292
     error: "parsing time \"unparsable time\" as \"2006-01-02T15:04\": cannot parse \"unparsable time\" as \"2006\""
     level: warn
     msg: failed to execute statement
