From 0e675c8b61ac1d5341532163b2032caa5b10d952 Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Tue, 17 Dec 2024 20:49:21 -0500 Subject: [PATCH] [reciever/azureeventhub] Set ObservedTimestamp (#36860) --- .../azure-eventhub-observedtime-logs.yaml | 27 +++++++++++++++++++ .../rawlogs_unmarshaler.go | 3 +++ 2 files changed, 30 insertions(+) create mode 100644 .chloggen/azure-eventhub-observedtime-logs.yaml diff --git a/.chloggen/azure-eventhub-observedtime-logs.yaml b/.chloggen/azure-eventhub-observedtime-logs.yaml new file mode 100644 index 000000000000..f04dbd83a9ca --- /dev/null +++ b/.chloggen/azure-eventhub-observedtime-logs.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: receiver/azureeventhub + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Ensure that observed timestamp is set when unmarshaling logs. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [36861] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/receiver/azureeventhubreceiver/rawlogs_unmarshaler.go b/receiver/azureeventhubreceiver/rawlogs_unmarshaler.go index d0e0b5c3cf1c..e0d8e19d4cd7 100644 --- a/receiver/azureeventhubreceiver/rawlogs_unmarshaler.go +++ b/receiver/azureeventhubreceiver/rawlogs_unmarshaler.go @@ -4,6 +4,8 @@ package azureeventhubreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver" import ( + "time" + eventhub "github.com/Azure/azure-event-hubs-go/v3" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" @@ -25,6 +27,7 @@ func (r rawLogsUnmarshaler) UnmarshalLogs(event *eventhub.Event) (plog.Logs, err lr := l.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty().LogRecords().AppendEmpty() slice := lr.Body().SetEmptyBytes() slice.Append(event.Data...) + lr.SetObservedTimestamp(pcommon.NewTimestampFromTime(time.Now())) if event.SystemProperties.EnqueuedTime != nil { lr.SetTimestamp(pcommon.NewTimestampFromTime(*event.SystemProperties.EnqueuedTime)) }