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.

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

[DebugExporter] Add EventName from LogRecord to output #11967

Merged
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6d41b39
[DebugExporter] Add EventName to output
cijothomas Dec 20, 2024
ab5ad97
Merge branch 'main' into cijothomas/eventname-debug-exporter
cijothomas Dec 20, 2024
9708b55
Update CONTRIBUTING.md
cijothomas Dec 20, 2024
f7b0a95
Update .chloggen/add-eventname-debug-exporter.yaml
cijothomas Dec 20, 2024
47a26f5
Merge branch 'main' into cijothomas/eventname-debug-exporter
cijothomas Dec 20, 2024
5e55e8f
fix tests
cijothomas Dec 20, 2024
e6f71df
emit eventname only if not empty
cijothomas Dec 20, 2024
c7cfa25
Merge branch 'main' into cijothomas/eventname-debug-exporter
cijothomas Dec 20, 2024
059cdcf
Merge branch 'main' into cijothomas/eventname-debug-exporter
codeboten Dec 21, 2024
553e8db
add test
cijothomas Dec 22, 2024
65f13b1
Merge branch 'main' into cijothomas/eventname-debug-exporter
cijothomas Dec 23, 2024
e633aec
Merge branch 'main' into cijothomas/eventname-debug-exporter
cijothomas Dec 23, 2024
3a27ff1
Merge branch 'main' into cijothomas/eventname-debug-exporter
cijothomas Dec 26, 2024
653f703
Merge branch 'main' into cijothomas/eventname-debug-exporter
cijothomas Dec 28, 2024
ec90084
Merge branch 'main' into cijothomas/eventname-debug-exporter
cijothomas Jan 2, 2025
ee6d146
Merge branch 'main' into cijothomas/eventname-debug-exporter
cijothomas Jan 4, 2025
ac45991
Merge branch 'main' into cijothomas/eventname-debug-exporter
cijothomas Jan 6, 2025
f0f0c47
Merge branch 'main' into cijothomas/eventname-debug-exporter
codeboten Jan 6, 2025
67a302e
Merge branch 'main' into cijothomas/eventname-debug-exporter
cijothomas Jan 6, 2025
8232ddd
Merge branch 'main' into cijothomas/eventname-debug-exporter
cijothomas Jan 7, 2025
431330f
Merge branch 'main' into cijothomas/eventname-debug-exporter
cijothomas Jan 9, 2025
c969458
Merge branch 'main' into cijothomas/eventname-debug-exporter
cijothomas Jan 9, 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
25 changes: 25 additions & 0 deletions .chloggen/add-eventname-debug-exporter.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: debugexporter

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Add EventName to debug exporter for Logs. EventName was added as top-level field in the LogRecord from 1.5.0 of proto definition."

# One or more tracking issues or pull requests related to the change
issues: [11966]

# (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:

# 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: []
4 changes: 4 additions & 0 deletions examples/local/otel-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,9 @@ service:
receivers: [otlp]
processors: [memory_limiter, batch]
exporters: [debug]
logs:
receivers: [otlp]
processors: [memory_limiter, batch]
exporters: [debug]

extensions: [zpages]
3 changes: 3 additions & 0 deletions exporter/debugexporter/internal/otlptext/logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
buf.logEntry("Timestamp: %s", lr.Timestamp())
buf.logEntry("SeverityText: %s", lr.SeverityText())
buf.logEntry("SeverityNumber: %s(%d)", lr.SeverityNumber(), lr.SeverityNumber())
if lr.EventName() != "" {
cijothomas marked this conversation as resolved.
Show resolved Hide resolved
buf.logEntry("EventName: %s", lr.EventName())
}

Check warning on line 43 in exporter/debugexporter/internal/otlptext/logs.go

View check run for this annotation

Codecov / codecov/patch

exporter/debugexporter/internal/otlptext/logs.go#L42-L43

Added lines #L42 - L43 were not covered by tests
buf.logEntry("Body: %s", valueToString(lr.Body()))
buf.logAttributes("Attributes", lr.Attributes())
buf.logEntry("Trace ID: %s", lr.TraceID())
Expand Down
Loading