Skip to content

logs: add a log.source attribute to OTel log records #380

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
def merged 1 commit into from
Oct 12, 2026
Merged

logs: add a log.source attribute to OTel log records #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 12 additions & 7 deletions containers/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1238,6 +1238,11 @@ func (c *Container) ping() map[netaddr.IP]float64 {
return rtt
}

const (
logSourceJournald = "journald"
logSourceStdout = "stdout/stderr"
)

func (c *Container) runLogParser(logPath string) {
if *flags.DisableLogParsing {
return
Expand All @@ -1257,7 +1262,7 @@ func (c *Container) runLogParser(logPath string) {
return
}
ch := make(chan logparser.LogEntry)
parser := logparser.NewParser(ch, nil, logs.OtelLogEmitter(containerId), logs.MultilineCollectorTimeout, *flags.LogPatternsPerContainer, !*flags.DisableJsonLogParsing, logs.PatternExtractionRateLimiter())
parser := logparser.NewParser(ch, nil, logs.OtelLogEmitter(containerId, logPath), logs.MultilineCollectorTimeout, *flags.LogPatternsPerContainer, !*flags.DisableJsonLogParsing, logs.PatternExtractionRateLimiter())
reader, err := logs.NewTailReader(proc.HostPath(logPath), ch)
if err != nil {
klog.Warningln(err)
Expand All @@ -1276,31 +1281,31 @@ func (c *Container) runLogParser(logPath string) {
klog.Warningln(err)
return
}
parser := logparser.NewParser(ch, nil, logs.OtelLogEmitter(containerId), logs.MultilineCollectorTimeout, *flags.LogPatternsPerContainer, !*flags.DisableJsonLogParsing, logs.PatternExtractionRateLimiter())
parser := logparser.NewParser(ch, nil, logs.OtelLogEmitter(containerId, logSourceJournald), logs.MultilineCollectorTimeout, *flags.LogPatternsPerContainer, !*flags.DisableJsonLogParsing, logs.PatternExtractionRateLimiter())
stop := func() {
JournaldUnsubscribe(c.metadata.systemd.Unit)
}
klog.InfoS("started journald logparser", "cg", c.cgroup.Id)
c.logParsers["journald"] = logs.NewPipeline(parser, stop)
c.logParsers[logSourceJournald] = logs.NewPipeline(parser, stop)

case cgroup.ContainerTypeDocker, cgroup.ContainerTypeContainerd, cgroup.ContainerTypeCrio:
if c.metadata.logPath == "" {
return
}
if parser := c.logParsers["stdout/stderr"]; parser != nil {
if parser := c.logParsers[logSourceStdout]; parser != nil {
parser.Stop()
delete(c.logParsers, "stdout/stderr")
delete(c.logParsers, logSourceStdout)
}
ch := make(chan logparser.LogEntry)
parser := logparser.NewParser(ch, c.metadata.logDecoder, logs.OtelLogEmitter(containerId), logs.MultilineCollectorTimeout, *flags.LogPatternsPerContainer, !*flags.DisableJsonLogParsing, logs.PatternExtractionRateLimiter())
parser := logparser.NewParser(ch, c.metadata.logDecoder, logs.OtelLogEmitter(containerId, logSourceStdout), logs.MultilineCollectorTimeout, *flags.LogPatternsPerContainer, !*flags.DisableJsonLogParsing, logs.PatternExtractionRateLimiter())
reader, err := logs.NewTailReader(proc.HostPath(c.metadata.logPath), ch)
if err != nil {
klog.Warningln(err)
parser.Stop()
return
}
klog.InfoS("started container logparser", "cg", c.cgroup.Id)
c.logParsers["stdout/stderr"] = logs.NewPipeline(parser, reader.Stop)
c.logParsers[logSourceStdout] = logs.NewPipeline(parser, reader.Stop)
}
}

Expand Down
13 changes: 9 additions & 4 deletions logs/otel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,14 @@ func normalizeTraceContextKey(k string) string {
return ""
}

func logRecordAttrs(patternHash string, attributes map[string]string) ([]attribute.KeyValue, *trace.TraceID, *trace.SpanID) {
func logRecordAttrs(source, patternHash string, attributes map[string]string) ([]attribute.KeyValue, *trace.TraceID, *trace.SpanID) {
var traceId *trace.TraceID
var spanId *trace.SpanID
attrs := make([]attribute.KeyValue, 0, len(attributes)+1)
attrs := make([]attribute.KeyValue, 0, len(attributes)+2)
attrs = append(attrs, attribute.Key("pattern.hash").String(patternHash))
if source != "" {
attrs = append(attrs, attribute.Key(LogSourceAttribute).String(source))
}
for k, v := range attributes {
switch normalizeTraceContextKey(k) {
case traceIdKey:
Expand All @@ -151,7 +154,9 @@ func logRecordAttrs(patternHash string, attributes map[string]string) ([]attribu
return attrs, traceId, spanId
}

func OtelLogEmitter(containerId string) logparser.OnMsgCallbackF {
const LogSourceAttribute = "log.source"

func OtelLogEmitter(containerId, source string) logparser.OnMsgCallbackF {
if otelLogger == nil {
return nil
}
Expand All @@ -171,7 +176,7 @@ func OtelLogEmitter(containerId string) logparser.OnMsgCallbackF {
severityNumber = otelLogs.DEBUG
}

attrs, traceId, spanId := logRecordAttrs(patternHash, attributes)
attrs, traceId, spanId := logRecordAttrs(source, patternHash, attributes)

otelLogger.Emit(
otelLogs.NewLogRecord(otelLogs.LogRecordConfig{
Expand Down
4 changes: 2 additions & 2 deletions windows/containers/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ func (c *Container) eventLogInput() chan logparser.LogEntry {
return c.eventLogCh
}
ch := make(chan logparser.LogEntry, 100)
parser := logparser.NewParser(ch, nil, logs.OtelLogEmitter(c.ID), logs.MultilineCollectorTimeout, *flags.LogPatternsPerContainer, !*flags.DisableJsonLogParsing, logs.PatternExtractionRateLimiter())
parser := logparser.NewParser(ch, nil, logs.OtelLogEmitter(c.ID, logSourceEventLog), logs.MultilineCollectorTimeout, *flags.LogPatternsPerContainer, !*flags.DisableJsonLogParsing, logs.PatternExtractionRateLimiter())
c.addLogParserLocked(logSourceEventLog, logs.NewPipeline(parser, nil))
c.eventLogCh = ch
return ch
Expand All @@ -279,7 +279,7 @@ func (c *Container) startLogTailer() {
defer c.lock.Unlock()
c.stopLogParserLocked(logSourceStdout)
ch := make(chan logparser.LogEntry, 100)
parser := logparser.NewParser(ch, logparser.DockerJsonDecoder{}, logs.OtelLogEmitter(c.ID), logs.MultilineCollectorTimeout, *flags.LogPatternsPerContainer, !*flags.DisableJsonLogParsing, logs.PatternExtractionRateLimiter())
parser := logparser.NewParser(ch, logparser.DockerJsonDecoder{}, logs.OtelLogEmitter(c.ID, logSourceStdout), logs.MultilineCollectorTimeout, *flags.LogPatternsPerContainer, !*flags.DisableJsonLogParsing, logs.PatternExtractionRateLimiter())
reader, err := logs.NewTailReader(c.logPath, ch)
if err != nil {
parser.Stop()
Expand Down
Loading