Skip to content

A continuation of HomeBox the inventory and organization system built for the Home User

feat: enable logging wiring

Matthew Kilgore728d1a8eecf8
diff --git a/backend/app/api/logger.go b/backend/app/api/logger.go
index 4ed5d341..e390f36b 100644
--- a/backend/app/api/logger.go
+++ b/backend/app/api/logger.go
@@ -6,6 +6,7 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/sysadminsmedia/homebox/backend/internal/sys/config"
+ appotel "github.com/sysadminsmedia/homebox/backend/internal/sys/otel"
)
// setupLogger initializes the zerolog config
@@ -25,3 +26,22 @@ func (a *app) setupLogger() {
zerolog.SetGlobalLevel(level)
}
}
+
+// setupOtelZerologBridge wires zerolog to emit OTel logs if enabled.
+func (a *app) setupOtelZerologBridge() {
+ if a == nil || a.otel == nil || !a.otel.IsEnabled() {
+ return
+ }
+ cfg := a.otel.Config()
+ if cfg == nil || !cfg.EnableLogging {
+ return
+ }
+
+ lp := a.otel.LoggerProvider()
+ hook := appotel.NewZerologOTelHook(lp, cfg.ServiceName)
+ if hook == nil {
+ return
+ }
+
+ log.Logger = log.Logger.Hook(hook)
+}
diff --git a/backend/app/api/main.go b/backend/app/api/main.go
index f16b9336..aa84fb9e 100644
--- a/backend/app/api/main.go
+++ b/backend/app/api/main.go
@@ -111,6 +111,9 @@ func run(cfg *config.Config) error {
}
app.otel = otelProvider
+ // Wire zerolog to OTel logs if enabled
+ app.setupOtelZerologBridge()
+
// =========================================================================
// Initialize Database & Repos
err = setupStorageDir(cfg)
diff --git a/backend/internal/sys/otel/zerolog_bridge.go b/backend/internal/sys/otel/zerolog_bridge.go
new file mode 100644
index 00000000..512867b0
--- /dev/null
+++ b/backend/internal/sys/otel/zerolog_bridge.go
@@ -0,0 +1,61 @@
+package otel
+
+import (
+ "context"
+ "time"
+
+ "github.com/rs/zerolog"
+ otellog "go.opentelemetry.io/otel/log"
+)
+
+// ZerologOTelHook forwards zerolog events to OpenTelemetry logs.
+type ZerologOTelHook struct {
+ logger otellog.Logger
+}
+
+// NewZerologOTelHook creates a new hook using the provided LoggerProvider and logger name.
+func NewZerologOTelHook(lp otellog.LoggerProvider, name string) *ZerologOTelHook {
+ if lp == nil {
+ return nil
+ }
+ return &ZerologOTelHook{logger: lp.Logger(name)}
+}
+
+// Run implements zerolog.Hook and emits an OTel log Record with severity and message.
+func (h *ZerologOTelHook) Run(_ *zerolog.Event, level zerolog.Level, msg string) {
+ if h == nil || h.logger == nil {
+ return
+ }
+
+ // Create a record and map the severity.
+ var rec otellog.Record
+ rec.SetTimestamp(time.Now())
+ rec.SetSeverity(mapZerologLevel(level))
+ rec.SetSeverityText(level.String())
+ rec.SetBody(otellog.StringValue(msg))
+
+ // Emit with background context; if you have a request context, prefer passing it.
+ h.logger.Emit(context.Background(), rec)
+}
+
+// mapZerologLevel converts zerolog levels to OTel log severities.
+func mapZerologLevel(level zerolog.Level) otellog.Severity {
+ switch level {
+ case zerolog.TraceLevel:
+ return otellog.SeverityTrace
+ case zerolog.DebugLevel:
+ return otellog.SeverityDebug
+ case zerolog.InfoLevel:
+ return otellog.SeverityInfo
+ case zerolog.WarnLevel:
+ return otellog.SeverityWarn
+ case zerolog.ErrorLevel:
+ return otellog.SeverityError
+ case zerolog.FatalLevel:
+ return otellog.SeverityFatal
+ case zerolog.PanicLevel:
+ return otellog.SeverityError
+ default:
+ return otellog.SeverityInfo
+ }
+}