Add journald log collection support

Author: Paamicky

extension/agenthealth/handler/useragent/useragent.go

@@ -134,6 +134,8 @@ func (ua *userAgent) SetComponents(otelCfg *otelcol.Config, telegrafCfg *telegra
 			}
 		}
 	}
+	// Add journald status
+	ua.setJournaldFeatureFlags(otelCfg)
 
 	if !ua.isRoot {
 		ua.inputs.Add(flagRunAsUser)

extension/agenthealth/handler/useragent/useragent_linux.go

@@ -0,0 +1,24 @@
+//go:build linux
+
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+package useragent
+
+import (
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver"
+	"go.opentelemetry.io/collector/otelcol"
+)
+
+const (
+	flagJournaldEnabled = "jd_enabled"
+)
+
+func (ua *userAgent) setJournaldFeatureFlags(otelCfg *otelcol.Config) {
+	for _, cfg := range otelCfg.Receivers {
+		if _, ok := cfg.(*journaldreceiver.JournaldConfig); ok {
+			ua.feature.Add(flagJournaldEnabled)
+			return
+		}
+	}
+}

extension/agenthealth/handler/useragent/useragent_linux_test.go

@@ -0,0 +1,52 @@
+//go:build linux
+
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+package useragent
+
+import (
+	"testing"
+
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver"
+	"github.com/stretchr/testify/assert"
+	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/otelcol"
+)
+
+func TestSetJournaldFeatureFlags(t *testing.T) {
+	tests := []struct {
+		name          string
+		receivers     map[component.ID]component.Config
+		expectedFlags []string
+	}{
+		{
+			name:          "no receivers",
+			receivers:     map[component.ID]component.Config{},
+			expectedFlags: []string{},
+		},
+		{
+			name: "journald enabled",
+			receivers: map[component.ID]component.Config{
+				component.MustNewID("journald"): &journaldreceiver.JournaldConfig{},
+			},
+			expectedFlags: []string{flagJournaldEnabled},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ua := newUserAgent()
+			otelCfg := &otelcol.Config{
+				Receivers: tt.receivers,
+			}
+
+			ua.setJournaldFeatureFlags(otelCfg)
+
+			for _, flag := range tt.expectedFlags {
+				assert.Contains(t, ua.feature, flag)
+			}
+			assert.Len(t, ua.feature, len(tt.expectedFlags))
+		})
+	}
+}

extension/agenthealth/handler/useragent/useragent_notlinux.go

@@ -0,0 +1,14 @@
+//go:build !linux
+
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+package useragent
+
+import (
+	"go.opentelemetry.io/collector/otelcol"
+)
+
+func (ua *userAgent) setJournaldFeatureFlags(_ *otelcol.Config) {
+	// No-op on non-Linux platforms
+}

go.mod

@@ -180,6 +180,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.124.1
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.124.1
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.124.1
+	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.124.1
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.124.1
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.124.1
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.124.1

go.sum

@@ -1332,6 +1332,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsre
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.124.1/go.mod h1:3MmO+ZJLcTPyYUk8tENgen4dnmiodTfQSHokwlvNZ+A=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.124.1 h1:r20zOMMBcxzI2Sni2HyTR7TVxuNXLn1Ov6qtnlVWoJc=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.124.1/go.mod h1:1UsKa4xSNodA2i6ic5mmyd31khXyTGxsVKJoKmq/jtU=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.124.1 h1:uJNR6ZVhQaw6ziX/gFeVm8txdNQ3YQk3azSjLcTGop8=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.124.1/go.mod h1:CwbTbJLDvssj8NBQFnKKvugrKJSwODHCwTbwF+s3nWY=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.124.1 h1:Pdlf5D5gB/5Khi3t5PiojQrCulcEejecsxoSpOd0ekA=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.124.1/go.mod h1:pKNXK34B2dV0nEDAFgHtYQHBlZpQlLWcKFZpblY3xQs=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.124.1 h1:/dcNbFj4cFZRXDmyBYTFT6+lclunY9slInimPIHqWj0=

service/defaultcomponents/components.go

@@ -48,6 +48,7 @@ import (
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver"
@@ -104,6 +105,7 @@ func Factories() (otelcol.Factories, error) {
 		filelogreceiver.NewFactory(),
 		hostmetricsreceiver.NewFactory(),
 		jaegerreceiver.NewFactory(),
+		journaldreceiver.NewFactory(),
 		jmxreceiver.NewFactory(),
 		kafkareceiver.NewFactory(),
 		kubeletstatsreceiver.NewFactory(),

service/defaultcomponents/components_test.go

@@ -28,6 +28,7 @@ func TestComponents(t *testing.T) {
 		"filelog",
 		"hostmetrics",
 		"jaeger",
+		"journald",
 		"jmx",
 		"kafka",
 		"kubeletstats",

tool/data/config/logs.go

@@ -47,3 +47,10 @@ func (config *Logs) AddWindowsEvent(eventName, logGroupName, logStream, eventFor
 	}
 	config.LogsCollect.AddWindowsEvent(eventName, logGroupName, logStream, eventFormat, eventLevels, eventIDs, filters, retention, logGroupClass)
 }
+
+func (config *Logs) AddJournald(logGroupName, logStream string, units []string, priority string, matches []map[string]string, filters []*logs.JournaldFilter, retention int) {
+	if config.LogsCollect == nil {
+		config.LogsCollect = &logs.Collection{}
+	}
+	config.LogsCollect.AddJournald(logGroupName, logStream, units, priority, matches, filters, retention)
+}

tool/data/config/logs/collection.go

@@ -13,6 +13,8 @@ type Collection struct {
 	Files *Files
 	// windows events
 	WinEvents *Events
+	// journald logs
+	Journald *Journald
 }
 
 func (config *Collection) ToMap(ctx *runtime.Context) (string, map[string]interface{}) {
@@ -27,6 +29,10 @@ func (config *Collection) ToMap(ctx *runtime.Context) (string, map[string]interf
 		util.AddToMap(ctx, resultMap, config.WinEvents)
 	}
 
+	if config.Journald != nil {
+		util.AddToMap(ctx, resultMap, config.Journald)
+	}
+
 	return "logs_collected", resultMap
 }
 
@@ -43,3 +49,10 @@ func (config *Collection) AddLogFile(filePath, logGroupName, logStreamName strin
 	}
 	config.Files.AddLogFile(filePath, logGroupName, logStreamName, timestampFormat, timezone, multiLineStartPattern, encoding, retention, logGroupClass)
 }
+
+func (config *Collection) AddJournald(logGroupName, logStreamName string, units []string, priority string, matches []map[string]string, filters []*JournaldFilter, retention int) {
+	if config.Journald == nil {
+		config.Journald = &Journald{}
+	}
+	config.Journald.AddJournald(logGroupName, logStreamName, units, priority, matches, filters, retention)
+}