Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support events without domain attr #268

Merged
merged 5 commits into from
Jun 7, 2024
Merged

Support events without domain attr #268

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73bc150
Updating test case for events
LikeTheSalad Apr 25, 2024
1b24030
Adding support for device events without the domain attr
LikeTheSalad Apr 25, 2024
b883902
Identifying device crash events without the domain attr
LikeTheSalad Apr 25, 2024
beafa16
Adding comment
LikeTheSalad Jun 6, 2024
c81ea00
Merge branch 'main' into support-events-without-domain-attr
kruskall Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions input/otlp/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ package otlp
import (
"context"
"encoding/hex"
"strings"
"time"

"go.opentelemetry.io/collector/pdata/pcommon"
Expand Down Expand Up @@ -212,16 +213,17 @@ func (c *Consumer) convertLogRecord(
)
}

if eventDomain == "device" && eventName != "" {
if (eventDomain == "device" && eventName != "") || strings.HasPrefix(eventName, "device.") {
LikeTheSalad marked this conversation as resolved.
Show resolved Hide resolved
event.Event.Category = "device"
if eventName == "crash" {
action := strings.TrimPrefix(eventName, "device.")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The goal of trimming the device. prefix here is so that any existing verifications down the road for specific action names, such as crash for example, keep working as usual. However, I'm open to alternative approaches in case this change could cause issues that I might not be aware of.

if action == "crash" {
if event.Error == nil {
event.Error = modelpb.ErrorFromVTPool()
}
event.Error.Type = "crash"
} else {
event.Event.Kind = "event"
event.Event.Action = eventName
event.Event.Action = action
}
}

Expand Down
75 changes: 69 additions & 6 deletions input/otlp/logs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,13 +441,80 @@ func TestConsumerConsumeOTelEventLogs(t *testing.T) {
record1 := newLogRecord("") // no log body
record1.Attributes().PutStr("event.domain", "device")
record1.Attributes().PutStr("event.name", "MyEvent")
record1.CopyTo(scopeLogs.LogRecords().AppendEmpty())

record2 := newLogRecord("") // no log body
record2.Attributes().PutStr("event.name", "device.MyEvent2")
record2.CopyTo(scopeLogs.LogRecords().AppendEmpty())

processed := processLogEvents(t, logs)

assert.Len(t, processed, 2)
expected := []struct {
kind string
category string
action string
}{
{kind: "event", category: "device", action: "MyEvent"},
{kind: "event", category: "device", action: "MyEvent2"},
}
for i, item := range processed {
expectedValues := expected[i]
assert.Equal(t, expectedValues.kind, item.Event.Kind)
assert.Equal(t, expectedValues.category, item.Event.Category)
assert.Equal(t, expectedValues.action, item.Event.Action)
}
}

func TestConsumerConsumeLogsExceptionAsEvents(t *testing.T) {
logs := plog.NewLogs()
resourceLogs := logs.ResourceLogs().AppendEmpty()
resourceAttrs := logs.ResourceLogs().At(0).Resource().Attributes()
resourceAttrs.PutStr(semconv.AttributeTelemetrySDKLanguage, "java")
resourceAttrs.PutStr("key0", "zero")
scopeLogs := resourceLogs.ScopeLogs().AppendEmpty()

record1 := newLogRecord("bar")
record1.Attributes().PutStr("event.name", "crash")
record1.Attributes().PutStr("event.domain", "device")
record1.Attributes().PutStr("exception.type", "HighLevelException")
record1.Attributes().PutStr("exception.message", "MidLevelException: LowLevelException")
record1.Attributes().PutStr("exception.stacktrace", "HighLevelException: MidLevelException: LowLevelException")
record1.CopyTo(scopeLogs.LogRecords().AppendEmpty())

record2 := newLogRecord("bar")
record2.Attributes().PutStr("event.name", "device.crash")
record2.Attributes().PutStr("exception.type", "HighLevelException")
record2.Attributes().PutStr("exception.message", "MidLevelException: LowLevelException2")
record2.Attributes().PutStr("exception.stacktrace", "HighLevelException: MidLevelException: LowLevelException")
record2.CopyTo(scopeLogs.LogRecords().AppendEmpty())

processed := processLogEvents(t, logs)

assert.Len(t, processed, 2)
expected := []struct {
kind string
category string
eventType string
errorType string
}{
{kind: "event", category: "device", eventType: "error", errorType: "crash"},
{kind: "event", category: "device", eventType: "error", errorType: "crash"},
}
for i, item := range processed {
expectedValues := expected[i]
assert.Equal(t, expectedValues.kind, item.Event.Kind)
assert.Equal(t, expectedValues.category, item.Event.Category)
assert.Equal(t, expectedValues.eventType, item.Event.Type)
assert.Equal(t, expectedValues.errorType, item.Error.Type)
}
}

func processLogEvents(t *testing.T, logs plog.Logs) modelpb.Batch {
var processed modelpb.Batch
var processor modelpb.ProcessBatchFunc = func(_ context.Context, batch *modelpb.Batch) error {
if processed != nil {
panic("already processes batch")
panic("already processed batch")
}
processed = batch.Clone()
assert.NotZero(t, processed[0].Timestamp)
Expand All @@ -461,11 +528,7 @@ func TestConsumerConsumeOTelEventLogs(t *testing.T) {
result, err := consumer.ConsumeLogsWithResult(context.Background(), logs)
assert.NoError(t, err)
assert.Equal(t, otlp.ConsumeLogsResult{}, result)

assert.Len(t, processed, 1)
assert.Equal(t, "event", processed[0].Event.Kind)
assert.Equal(t, "device", processed[0].Event.Category)
assert.Equal(t, "MyEvent", processed[0].Event.Action)
return processed
}

func TestConsumerConsumeLogsDataStream(t *testing.T) {
Expand Down
Loading