Skip to content

otlplog: Emit Record.EventName field #6211

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

Merged
pellared merged 3 commits into from
Jan 25, 2025
Merged

otlplog: Emit Record.EventName field #6211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6699adb
otlplog: Emit Record.EventName field
pellared Jan 24, 2025
26bc55e
Add changelog entry
pellared Jan 24, 2025
65a24b1
Merge branch 'main' into otlp-evnt
pellared Jan 25, 2025
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- `AssertRecordEqual` in `go.opentelemetry.io/otel/log/logtest` checks `Record.EventName`. (#6187)
- Add `EventName` and `SetEventName` to `Record` in `go.opentelemetry.io/otel/sdk/log`. (#6193)
- Add `EventName` to `RecordFactory` in `go.opentelemetry.io/otel/sdk/log/logtest`. (#6193)
- Emit `Record.EventName` field in `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc`. (#6211)
- Emit `Record.EventName` field in `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp`. (#6211)

### Changed

Expand Down
1 change: 1 addition & 0 deletions exporters/otlp/otlplog/otlploggrpc/internal/transform/log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ func LogRecord(record log.Record) *lpb.LogRecord {
r := &lpb.LogRecord{
TimeUnixNano: timeUnixNano(record.Timestamp()),
ObservedTimeUnixNano: timeUnixNano(record.ObservedTimestamp()),
EventName: record.EventName(),
SeverityNumber: SeverityNumber(record.Severity()),
SeverityText: record.SeverityText(),
Body: LogAttrValue(record.Body()),
Expand Down
2 changes: 2 additions & 0 deletions exporters/otlp/otlplog/otlploggrpc/internal/transform/log_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ var (
out = append(out, logtest.RecordFactory{
Timestamp: ts,
ObservedTimestamp: obs,
EventName: "evnt",
Severity: sevC,
SeverityText: "C",
Body: bodyC,
Expand Down Expand Up @@ -229,6 +230,7 @@ var (
{
TimeUnixNano: uint64(ts.UnixNano()),
ObservedTimeUnixNano: uint64(obs.UnixNano()),
EventName: "evnt",
SeverityNumber: pbSevC,
SeverityText: "C",
Body: pbBodyC,
Expand Down
1 change: 1 addition & 0 deletions exporters/otlp/otlplog/otlploghttp/internal/transform/log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ func LogRecord(record log.Record) *lpb.LogRecord {
r := &lpb.LogRecord{
TimeUnixNano: timeUnixNano(record.Timestamp()),
ObservedTimeUnixNano: timeUnixNano(record.ObservedTimestamp()),
EventName: record.EventName(),
SeverityNumber: SeverityNumber(record.Severity()),
SeverityText: record.SeverityText(),
Body: LogAttrValue(record.Body()),
Expand Down
2 changes: 2 additions & 0 deletions exporters/otlp/otlplog/otlploghttp/internal/transform/log_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ var (
out = append(out, logtest.RecordFactory{
Timestamp: ts,
ObservedTimestamp: obs,
EventName: "evnt",
Severity: sevC,
SeverityText: "C",
Body: bodyC,
Expand Down Expand Up @@ -229,6 +230,7 @@ var (
{
TimeUnixNano: uint64(ts.UnixNano()),
ObservedTimeUnixNano: uint64(obs.UnixNano()),
EventName: "evnt",
SeverityNumber: pbSevC,
SeverityText: "C",
Body: pbBodyC,
Expand Down
1 change: 1 addition & 0 deletions internal/shared/otlp/otlplog/transform/log.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ func LogRecord(record log.Record) *lpb.LogRecord {
r := &lpb.LogRecord{
TimeUnixNano: timeUnixNano(record.Timestamp()),
ObservedTimeUnixNano: timeUnixNano(record.ObservedTimestamp()),
EventName: record.EventName(),
SeverityNumber: SeverityNumber(record.Severity()),
SeverityText: record.SeverityText(),
Body: LogAttrValue(record.Body()),
Expand Down
2 changes: 2 additions & 0 deletions internal/shared/otlp/otlplog/transform/log_test.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ var (
out = append(out, logtest.RecordFactory{
Timestamp: ts,
ObservedTimestamp: obs,
EventName: "evnt",
Severity: sevC,
SeverityText: "C",
Body: bodyC,
Expand Down Expand Up @@ -229,6 +230,7 @@ var (
{
TimeUnixNano: uint64(ts.UnixNano()),
ObservedTimeUnixNano: uint64(obs.UnixNano()),
EventName: "evnt",
SeverityNumber: pbSevC,
SeverityText: "C",
Body: pbBodyC,
Expand Down