Skip to content

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

fix: enable metrics and logging support

Matthew Kilgorecc1b8b1e2f71
diff --git a/backend/go.mod b/backend/go.mod
index b487d4cd..2614fa0f 100644
--- a/backend/go.mod
+++ b/backend/go.mod
@@ -37,12 +37,23 @@ require (
go.balki.me/anyhttp v0.5.2
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0
go.opentelemetry.io/otel v1.39.0
+ go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.15.0
+ go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.15.0
+ go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.39.0
+ go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.39.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0
+ go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.15.0
+ go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.39.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.39.0
+ go.opentelemetry.io/otel/log v0.15.0
+ go.opentelemetry.io/otel/metric v1.39.0
go.opentelemetry.io/otel/sdk v1.39.0
+ go.opentelemetry.io/otel/sdk/log v0.15.0
+ go.opentelemetry.io/otel/sdk/metric v1.39.0
go.opentelemetry.io/otel/trace v1.39.0
+ go.opentelemetry.io/proto/otlp v1.9.0
gocloud.dev v0.44.0
gocloud.dev/pubsub/kafkapubsub v0.44.0
gocloud.dev/pubsub/natspubsub v0.44.0
@@ -52,6 +63,7 @@ require (
golang.org/x/oauth2 v0.34.0
golang.org/x/text v0.33.0
google.golang.org/grpc v1.78.0
+ google.golang.org/protobuf v1.36.11
modernc.org/sqlite v1.44.3
)
@@ -190,9 +202,6 @@ require (
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/detectors/gcp v1.38.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0 // indirect
- go.opentelemetry.io/otel/metric v1.39.0 // indirect
- go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect
- go.opentelemetry.io/proto/otlp v1.9.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
@@ -207,7 +216,6 @@ require (
google.golang.org/genproto v0.0.0-20251202230838-ff82c1b0f217 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 // indirect
- google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
modernc.org/libc v1.67.6 // indirect
modernc.org/mathutil v1.7.1 // indirect
diff --git a/backend/go.sum b/backend/go.sum
index 8a642a05..b96f3347 100644
--- a/backend/go.sum
+++ b/backend/go.sum
@@ -279,8 +279,6 @@ github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+
github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 h1:NmZ1PKzSTQbuGHw9DGPFomqkkLWMC+vZCkfs+FHv1Vg=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3/go.mod h1:zQrxl1YP88HQlA6i9c63DSVPFklWpGX4OWAc9bFuaH4=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.4 h1:kEISI/Gx67NzH3nJxAmY/dGac80kKZgZt134u7Y/k1s=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.4/go.mod h1:6Nz966r3vQYCqIzWsuEl9d7cf7mRhtDmm++sOxlnfxI=
github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
@@ -455,20 +453,40 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 h1:ssfIgGN
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0/go.mod h1:GQ/474YrbE4Jx8gZ4q5I4hrhUzM6UPzyrqJYV2AqPoQ=
go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.15.0 h1:W+m0g+/6v3pa5PgVf2xoFMi5YtNR06WtS7ve5pcvLtM=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.15.0/go.mod h1:JM31r0GGZ/GU94mX8hN4D8v6e40aFlUECSQ48HaLgHM=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.15.0 h1:EKpiGphOYq3CYnIe2eX9ftUkyU+Y8Dtte8OaWyHJ4+I=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.15.0/go.mod h1:nWFP7C+T8TygkTjJ7mAyEaFaE7wNfms3nV/vexZ6qt0=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.37.0 h1:zG8GlgXCJQd5BU98C0hZnBbElszTmUgCNCfYneaDL0A=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.37.0/go.mod h1:hOfBCz8kv/wuq73Mx2H2QnWokh/kHZxkh6SNF2bdKtw=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.39.0 h1:cEf8jF6WbuGQWUVcqgyWtTR0kOOAWY1DYZ+UhvdmQPw=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.39.0/go.mod h1:k1lzV5n5U3HkGvTCJHraTAGJ7MqsgL1wrGwTj1Isfiw=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.39.0 h1:nKP4Z2ejtHn3yShBb+2KawiXgpn8In5cT7aO2wXuOTE=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.39.0/go.mod h1:NwjeBbNigsO4Aj9WgM0C+cKIrxsZUaRmZUO7A8I7u8o=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 h1:f0cb2XPmrqn4XMy9PNliTgRKJgS5WcL/u0/WRYGz4t0=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0/go.mod h1:vnakAaFckOMiMtOIhFI2MNH4FYrZzXCYxmb1LlhoGz8=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0 h1:in9O8ESIOlwJAEGTkkf34DesGRAc/Pn8qJ7k3r/42LM=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0/go.mod h1:Rp0EXBm5tfnv0WL+ARyO/PHBEaEAT8UUHQ6AGJcSq6c=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0 h1:Ckwye2FpXkYgiHX7fyVrN1uA/UYd9ounqqTuSNAv0k4=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0/go.mod h1:teIFJh5pW2y+AN7riv6IBPX2DuesS3HgP39mwOspKwU=
+go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.15.0 h1:0BSddrtQqLEylcErkeFrJBmwFzcqfQq9+/uxfTZq+HE=
+go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.15.0/go.mod h1:87sjYuAPzaRCtdd09GU5gM1U9wQLrrcYrm77mh5EBoc=
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.37.0 h1:6VjV6Et+1Hd2iLZEPtdV7vie80Yyqf7oikJLjQ/myi0=
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.37.0/go.mod h1:u8hcp8ji5gaM/RfcOo8z9NMnf1pVLfVY7lBY2VOGuUU=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.39.0 h1:5gn2urDL/FBnK8OkCfD1j3/ER79rUuTYmCvlXBKeYL8=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.39.0/go.mod h1:0fBG6ZJxhqByfFZDwSwpZGzJU671HkwpWaNe2t4VUPI=
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.39.0 h1:8UPA4IbVZxpsD76ihGOQiFml99GPAEZLohDXvqHdi6U=
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.39.0/go.mod h1:MZ1T/+51uIVKlRzGw1Fo46KEWThjlCBZKl2LzY5nv4g=
+go.opentelemetry.io/otel/log v0.15.0 h1:0VqVnc3MgyYd7QqNVIldC3dsLFKgazR6P3P3+ypkyDY=
+go.opentelemetry.io/otel/log v0.15.0/go.mod h1:9c/G1zbyZfgu1HmQD7Qj84QMmwTp2QCQsZH1aeoWDE4=
go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
+go.opentelemetry.io/otel/sdk/log v0.15.0 h1:WgMEHOUt5gjJE93yqfqJOkRflApNif84kxoHWS9VVHE=
+go.opentelemetry.io/otel/sdk/log v0.15.0/go.mod h1:qDC/FlKQCXfH5hokGsNg9aUBGMJQsrUyeOiW5u+dKBQ=
+go.opentelemetry.io/otel/sdk/log/logtest v0.14.0 h1:Ijbtz+JKXl8T2MngiwqBlPaHqc4YCaP/i13Qrow6gAM=
+go.opentelemetry.io/otel/sdk/log/logtest v0.14.0/go.mod h1:dCU8aEL6q+L9cYTqcVOk8rM9Tp8WdnHOPLiBgp0SGOA=
go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
@@ -558,12 +576,8 @@ google.golang.org/api v0.260.0 h1:XbNi5E6bOVEj/uLXQRlt6TKuEzMD7zvW/6tNwltE4P4=
google.golang.org/api v0.260.0/go.mod h1:Shj1j0Phr/9sloYrKomICzdYgsSDImpTxME8rGLaZ/o=
google.golang.org/genproto v0.0.0-20251202230838-ff82c1b0f217 h1:GvESR9BIyHUahIb0NcTum6itIWtdoglGX+rnGxm2934=
google.golang.org/genproto v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:yJ2HH4EHEDTd3JiLmhds6NkJ17ITVYOdV3m3VKOnws0=
-google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 h1:fCvbg86sFXwdrl5LgVcTEvNC+2txB5mgROGmRL5mrls=
-google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:+rXWjjaukWZun3mLfjmVnQi18E1AsFbDN9QdJ5YXLto=
google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516 h1:vmC/ws+pLzWjj/gzApyoZuSVrDtF1aod4u/+bbj8hgM=
google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516/go.mod h1:p3MLuOwURrGBRoEyFHBT3GjUwaCQVKeNqqWxlcISGdw=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260114163908-3f89685c29c3 h1:C4WAdL+FbjnGlpp2S+HMVhBeCq2Lcib4xZqfPNF6OoQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260114163908-3f89685c29c3/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 h1:sNrWoksmOyF5bvJUcnmbeAmQi8baNhqg5IWaI3llQqU=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc=
@@ -599,8 +613,6 @@ modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
-modernc.org/sqlite v1.44.2 h1:EdYqXeBpKFJjg8QYnw6E71MpANkoxyuYi+g68ugOL8g=
-modernc.org/sqlite v1.44.2/go.mod h1:CzbrU2lSB1DKUusvwGz7rqEKIq+NUd8GWuBBZDs9/nA=
modernc.org/sqlite v1.44.3 h1:+39JvV/HWMcYslAwRxHb8067w+2zowvFOUrOWIy9PjY=
modernc.org/sqlite v1.44.3/go.mod h1:CzbrU2lSB1DKUusvwGz7rqEKIq+NUd8GWuBBZDs9/nA=
modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
diff --git a/backend/internal/sys/config/conf_otel.go b/backend/internal/sys/config/conf_otel.go
index 41e39748..5267838e 100644
--- a/backend/internal/sys/config/conf_otel.go
+++ b/backend/internal/sys/config/conf_otel.go
@@ -31,6 +31,15 @@ type OTelConfig struct {
// SampleRate is the sampling rate for traces (0.0 to 1.0, where 1.0 means all traces)
SampleRate float64 `yaml:"sample_rate" conf:"default:1.0"`
+ // EnableMetrics enables OpenTelemetry metrics collection
+ EnableMetrics bool `yaml:"enable_metrics" conf:"default:true"`
+
+ // MetricsInterval is the interval at which metrics are exported (e.g., "15s", "1m")
+ MetricsInterval string `yaml:"metrics_interval" conf:"default:15s"`
+
+ // EnableLogging enables OpenTelemetry logging
+ EnableLogging bool `yaml:"enable_logging" conf:"default:true"`
+
// EnableDatabaseTracing enables tracing for database operations
EnableDatabaseTracing bool `yaml:"enable_database_tracing" conf:"default:true"`
diff --git a/backend/internal/sys/otel/otel.go b/backend/internal/sys/otel/otel.go
index 3ebc0ce0..7b535c86 100644
--- a/backend/internal/sys/otel/otel.go
+++ b/backend/internal/sys/otel/otel.go
@@ -1,4 +1,4 @@
-// Package otel provides OpenTelemetry tracing initialization and utilities.
+// Package otel provides OpenTelemetry tracing, metrics, and logging initialization and utilities.
package otel
import (
@@ -11,11 +11,23 @@ import (
"github.com/sysadminsmedia/homebox/backend/internal/sys/config"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
+ "go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc"
+ "go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp"
+ "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc"
+ "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
+ "go.opentelemetry.io/otel/exporters/stdout/stdoutlog"
+ "go.opentelemetry.io/otel/exporters/stdout/stdoutmetric"
"go.opentelemetry.io/otel/exporters/stdout/stdouttrace"
+ otellog "go.opentelemetry.io/otel/log"
+ "go.opentelemetry.io/otel/log/global"
+ "go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/propagation"
+ sdklog "go.opentelemetry.io/otel/sdk/log"
+ sdkmetric "go.opentelemetry.io/otel/sdk/metric"
+ "go.opentelemetry.io/otel/sdk/metric/metricdata"
"go.opentelemetry.io/otel/sdk/resource"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
semconv "go.opentelemetry.io/otel/semconv/v1.24.0"
@@ -24,9 +36,11 @@ import (
"google.golang.org/grpc/credentials/insecure"
)
-// Provider wraps the OpenTelemetry TracerProvider with additional functionality.
+// Provider wraps the OpenTelemetry providers with additional functionality.
type Provider struct {
tp *sdktrace.TracerProvider
+ mp *sdkmetric.MeterProvider
+ lp *sdklog.LoggerProvider
cfg *config.OTelConfig
shutdown func(context.Context) error
}
@@ -39,11 +53,37 @@ func (p *Provider) TracerProvider() trace.TracerProvider {
return p.tp
}
+// MeterProvider returns the underlying OpenTelemetry MeterProvider.
+func (p *Provider) MeterProvider() metric.MeterProvider {
+ if p == nil || p.mp == nil {
+ return otel.GetMeterProvider()
+ }
+ return p.mp
+}
+
+// LoggerProvider returns the underlying OpenTelemetry LoggerProvider.
+func (p *Provider) LoggerProvider() otellog.LoggerProvider {
+ if p == nil || p.lp == nil {
+ return global.GetLoggerProvider()
+ }
+ return p.lp
+}
+
// Tracer returns a named tracer from this provider.
func (p *Provider) Tracer(name string, opts ...trace.TracerOption) trace.Tracer {
return p.TracerProvider().Tracer(name, opts...)
}
+// Meter returns a named meter from this provider.
+func (p *Provider) Meter(name string, opts ...metric.MeterOption) metric.Meter {
+ return p.MeterProvider().Meter(name, opts...)
+}
+
+// Logger returns a named logger from this provider.
+func (p *Provider) Logger(name string, opts ...otellog.LoggerOption) otellog.Logger {
+ return p.LoggerProvider().Logger(name, opts...)
+}
+
// Shutdown gracefully shuts down the trace provider.
func (p *Provider) Shutdown(ctx context.Context) error {
if p == nil || p.shutdown == nil {
@@ -69,7 +109,7 @@ func (p *Provider) Config() *config.OTelConfig {
// If OTel is disabled, returns a no-op provider that can still be used safely.
func NewProvider(ctx context.Context, cfg *config.OTelConfig, buildVersion string) (*Provider, error) {
if cfg == nil || !cfg.Enabled {
- log.Debug().Msg("OpenTelemetry tracing is disabled")
+ log.Debug().Msg("OpenTelemetry is disabled")
return &Provider{cfg: cfg}, nil
}
@@ -87,10 +127,14 @@ func NewProvider(ctx context.Context, cfg *config.OTelConfig, buildVersion strin
attribute.String("deployment.environment", getEnvironment()),
)
- // Create exporter based on configuration
- exporter, err := createExporter(ctx, cfg)
+ var tp *sdktrace.TracerProvider
+ var mp *sdkmetric.MeterProvider
+ var lp *sdklog.LoggerProvider
+
+ // Create trace exporter and provider
+ traceExporter, err := createTraceExporter(ctx, cfg)
if err != nil {
- return nil, fmt.Errorf("failed to create exporter: %w", err)
+ return nil, fmt.Errorf("failed to create trace exporter: %w", err)
}
// Configure sampler
@@ -105,13 +149,13 @@ func NewProvider(ctx context.Context, cfg *config.OTelConfig, buildVersion strin
}
// Create trace provider
- tp := sdktrace.NewTracerProvider(
- sdktrace.WithBatcher(exporter),
+ tp = sdktrace.NewTracerProvider(
+ sdktrace.WithBatcher(traceExporter),
sdktrace.WithResource(res),
sdktrace.WithSampler(sdktrace.ParentBased(sampler)),
)
- // Set as global provider
+ // Set as global trace provider
otel.SetTracerProvider(tp)
// Set global propagator for distributed tracing
@@ -128,20 +172,102 @@ func NewProvider(ctx context.Context, cfg *config.OTelConfig, buildVersion strin
Float64("sample_rate", cfg.SampleRate).
Msg("OpenTelemetry tracing initialized")
+ // Create metrics provider if enabled
+ if cfg.EnableMetrics {
+ metricExporter, err := createMetricExporter(ctx, cfg)
+ if err != nil {
+ // Shutdown trace provider before returning error
+ _ = tp.Shutdown(ctx)
+ return nil, fmt.Errorf("failed to create metric exporter: %w", err)
+ }
+
+ // Parse metrics interval
+ metricsInterval := 15 * time.Second
+ if cfg.MetricsInterval != "" {
+ if parsed, err := time.ParseDuration(cfg.MetricsInterval); err == nil {
+ metricsInterval = parsed
+ }
+ }
+
+ mp = sdkmetric.NewMeterProvider(
+ sdkmetric.WithResource(res),
+ sdkmetric.WithReader(sdkmetric.NewPeriodicReader(metricExporter, sdkmetric.WithInterval(metricsInterval))),
+ )
+
+ // Set as global meter provider
+ otel.SetMeterProvider(mp)
+
+ log.Info().
+ Str("exporter", cfg.Exporter).
+ Str("interval", metricsInterval.String()).
+ Msg("OpenTelemetry metrics initialized")
+ }
+
+ // Create logging provider if enabled
+ if cfg.EnableLogging {
+ logExporter, err := createLogExporter(ctx, cfg)
+ if err != nil {
+ // Shutdown previous providers before returning error
+ _ = tp.Shutdown(ctx)
+ if mp != nil {
+ _ = mp.Shutdown(ctx)
+ }
+ return nil, fmt.Errorf("failed to create log exporter: %w", err)
+ }
+
+ lp = sdklog.NewLoggerProvider(
+ sdklog.WithResource(res),
+ sdklog.WithProcessor(sdklog.NewBatchProcessor(logExporter)),
+ )
+
+ // Set as global logger provider
+ global.SetLoggerProvider(lp)
+
+ log.Info().
+ Str("exporter", cfg.Exporter).
+ Msg("OpenTelemetry logging initialized")
+ }
+
return &Provider{
tp: tp,
+ mp: mp,
+ lp: lp,
cfg: cfg,
shutdown: func(ctx context.Context) error {
- // Give pending spans time to be exported
ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
defer cancel()
- return tp.Shutdown(ctx)
+
+ var errs []error
+
+ // Shutdown logging provider first
+ if lp != nil {
+ if err := lp.Shutdown(ctx); err != nil {
+ errs = append(errs, fmt.Errorf("log provider shutdown: %w", err))
+ }
+ }
+
+ // Shutdown metrics provider
+ if mp != nil {
+ if err := mp.Shutdown(ctx); err != nil {
+ errs = append(errs, fmt.Errorf("meter provider shutdown: %w", err))
+ }
+ }
+
+ // Shutdown trace provider last
+ if err := tp.Shutdown(ctx); err != nil {
+ errs = append(errs, fmt.Errorf("trace provider shutdown: %w", err))
+ }
+
+ if len(errs) > 0 {
+ return fmt.Errorf("shutdown errors: %v", errs)
+ }
+ return nil
},
}, nil
}
-// createExporter creates the appropriate exporter based on configuration.
-func createExporter(ctx context.Context, cfg *config.OTelConfig) (sdktrace.SpanExporter, error) {
+// createTraceExporter creates the appropriate trace exporter based on configuration.
+func createTraceExporter(ctx context.Context, cfg *config.OTelConfig) (sdktrace.SpanExporter, error) {
switch strings.ToLower(cfg.Exporter) {
case "stdout":
return stdouttrace.New(stdouttrace.WithPrettyPrint())
@@ -194,6 +320,112 @@ func createOTLPExporter(ctx context.Context, cfg *config.OTelConfig) (*otlptrace
}
}
+// createMetricExporter creates the appropriate metric exporter based on configuration.
+func createMetricExporter(ctx context.Context, cfg *config.OTelConfig) (sdkmetric.Exporter, error) {
+ switch strings.ToLower(cfg.Exporter) {
+ case "stdout":
+ return stdoutmetric.New(stdoutmetric.WithPrettyPrint())
+
+ case "none", "":
+ return &noopMetricExporter{}, nil
+
+ case "otlp":
+ return createOTLPMetricExporter(ctx, cfg)
+
+ default:
+ return nil, fmt.Errorf("unsupported metric exporter type: %s", cfg.Exporter)
+ }
+}
+
+// createOTLPMetricExporter creates an OTLP metric exporter based on the protocol configuration.
+func createOTLPMetricExporter(ctx context.Context, cfg *config.OTelConfig) (sdkmetric.Exporter, error) {
+ headers := parseHeaders(cfg.Headers)
+
+ switch strings.ToLower(cfg.Protocol) {
+ case "http":
+ opts := []otlpmetrichttp.Option{}
+ if cfg.Endpoint != "" {
+ opts = append(opts, otlpmetrichttp.WithEndpoint(cfg.Endpoint))
+ }
+ if cfg.Insecure {
+ opts = append(opts, otlpmetrichttp.WithInsecure())
+ }
+ if len(headers) > 0 {
+ opts = append(opts, otlpmetrichttp.WithHeaders(headers))
+ }
+ return otlpmetrichttp.New(ctx, opts...)
+
+ case "grpc", "":
+ opts := []otlpmetricgrpc.Option{}
+ if cfg.Endpoint != "" {
+ opts = append(opts, otlpmetricgrpc.WithEndpoint(cfg.Endpoint))
+ }
+ if cfg.Insecure {
+ opts = append(opts, otlpmetricgrpc.WithInsecure())
+ }
+ if len(headers) > 0 {
+ opts = append(opts, otlpmetricgrpc.WithHeaders(headers))
+ }
+ return otlpmetricgrpc.New(ctx, opts...)
+
+ default:
+ return nil, fmt.Errorf("unsupported OTLP metric protocol: %s", cfg.Protocol)
+ }
+}
+
+// createLogExporter creates the appropriate log exporter based on configuration.
+func createLogExporter(ctx context.Context, cfg *config.OTelConfig) (sdklog.Exporter, error) {
+ switch strings.ToLower(cfg.Exporter) {
+ case "stdout":
+ return stdoutlog.New(stdoutlog.WithPrettyPrint())
+
+ case "none", "":
+ return &noopLogExporter{}, nil
+
+ case "otlp":
+ return createOTLPLogExporter(ctx, cfg)
+
+ default:
+ return nil, fmt.Errorf("unsupported log exporter type: %s", cfg.Exporter)
+ }
+}
+
+// createOTLPLogExporter creates an OTLP log exporter based on the protocol configuration.
+func createOTLPLogExporter(ctx context.Context, cfg *config.OTelConfig) (sdklog.Exporter, error) {
+ headers := parseHeaders(cfg.Headers)
+
+ switch strings.ToLower(cfg.Protocol) {
+ case "http":
+ opts := []otlploghttp.Option{}
+ if cfg.Endpoint != "" {
+ opts = append(opts, otlploghttp.WithEndpoint(cfg.Endpoint))
+ }
+ if cfg.Insecure {
+ opts = append(opts, otlploghttp.WithInsecure())
+ }
+ if len(headers) > 0 {
+ opts = append(opts, otlploghttp.WithHeaders(headers))
+ }
+ return otlploghttp.New(ctx, opts...)
+
+ case "grpc", "":
+ opts := []otlploggrpc.Option{}
+ if cfg.Endpoint != "" {
+ opts = append(opts, otlploggrpc.WithEndpoint(cfg.Endpoint))
+ }
+ if cfg.Insecure {
+ opts = append(opts, otlploggrpc.WithInsecure())
+ }
+ if len(headers) > 0 {
+ opts = append(opts, otlploggrpc.WithHeaders(headers))
+ }
+ return otlploggrpc.New(ctx, opts...)
+
+ default:
+ return nil, fmt.Errorf("unsupported OTLP log protocol: %s", cfg.Protocol)
+ }
+}
+
// parseHeaders parses a comma-separated list of key=value pairs into a map.
func parseHeaders(headerStr string) map[string]string {
headers := make(map[string]string)
@@ -216,7 +448,6 @@ func parseHeaders(headerStr string) map[string]string {
}
// getEnvironment returns the current deployment environment.
-// ...existing code...
func getEnvironment() string {
return "production"
}
@@ -231,3 +462,43 @@ func (e *noopExporter) ExportSpans(_ context.Context, _ []sdktrace.ReadOnlySpan)
func (e *noopExporter) Shutdown(_ context.Context) error {
return nil
}
+
+// noopMetricExporter is a no-op metric exporter for when metrics are disabled.
+type noopMetricExporter struct{}
+
+func (e *noopMetricExporter) Temporality(_ sdkmetric.InstrumentKind) metricdata.Temporality {
+ // Use cumulative temporality as a reasonable default for no-op exporter
+ return metricdata.CumulativeTemporality
+}
+
+func (e *noopMetricExporter) Aggregation(kind sdkmetric.InstrumentKind) sdkmetric.Aggregation {
+ // Use the SDK default aggregation for the given instrument kind
+ return sdkmetric.DefaultAggregationSelector(kind)
+}
+
+func (e *noopMetricExporter) Export(_ context.Context, _ *metricdata.ResourceMetrics) error {
+ return nil
+}
+
+func (e *noopMetricExporter) ForceFlush(_ context.Context) error {
+ return nil
+}
+
+func (e *noopMetricExporter) Shutdown(_ context.Context) error {
+ return nil
+}
+
+// noopLogExporter is a no-op log exporter for when logging is disabled.
+type noopLogExporter struct{}
+
+func (e *noopLogExporter) Export(_ context.Context, _ []sdklog.Record) error {
+ return nil
+}
+
+func (e *noopLogExporter) ForceFlush(_ context.Context) error {
+ return nil
+}
+
+func (e *noopLogExporter) Shutdown(_ context.Context) error {
+ return nil
+}