Skip to content

Fix otel logs #49

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
vooon merged 5 commits into from
May 17, 2026
Merged

Fix otel logs #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c2c6497
telemetry: fix otlploghttp path, add headers support
vooon May 17, 2026
3e3b827
go.mod: pin oasdiff/yaml to v0.0.9, fix header help tag
vooon May 17, 2026
8f83b34
telemetry: add --otel-logs-level to filter OTEL log output
vooon May 17, 2026
86697cf
README: document --otel-header and --otel-logs-level
vooon May 17, 2026
262e4d0
telemetry: use placeholder:URL for endpoint flags in kong help
vooon May 17, 2026
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
40 changes: 24 additions & 16 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ OpenTelemetry supports three explicit signals:
Use `--otel-endpoint` as a shared endpoint for enabled signals (recommended with OTEL Collector).
If needed, override per signal with `--otel-traces-endpoint`, `--otel-metrics-endpoint`, `--otel-logs-endpoint`.
You can enable any subset, or all three at once.

- Service name defaults to `zoneomatic`; override with `--otel-service-name`.
- Add custom HTTP headers (e.g. for authentication) with `--otel-header Key=Value` (repeatable, or via `ZM_OTEL_HEADER`).
- Control the minimum log level forwarded to the OTEL receiver with `--otel-logs-level` (`debug`|`info`|`warn`|`error`). Useful when you want quieter console output but richer data in the collector.

Example:

Expand All @@ -73,6 +76,8 @@ zoneomatic \
--otel-enable-traces \
--otel-enable-metrics \
--otel-enable-logs \
--otel-logs-level debug \
--otel-header "Authorization=Bearer mytoken" \
--otel-service-name zoneomatic-prod
```

Expand All @@ -86,22 +91,25 @@ Usage: zoneomatic --htpasswd=FILE --zone=FILE,... [flags]
DNS Zone file updater

Flags:
-h, --help Show context-sensitive help.
--listen="localhost:9999" Server listen address ($ZM_LISTEN)
--accept-proxy Accept PROXY protocol ($ZM_ACCEPT_PROXY)
--proxy-header-timeout=10s Timeout for PROXY headers ($ZM_PROXY_HEADER_TIMEOUT)
-p, --htpasswd=FILE Passwords file (bcrypt only) ($ZM_HTPASSWD)
-z, --zone=FILE,... Zone files to update ($ZM_ZONE)
--debug Enable debug logging ($ZM_DEBUG)
--version Print version and exit ($ZM_VERSION)
--otel-endpoint=STRING Shared OTLP/HTTP endpoint URL for enabled signals (typically collector URL) ($ZM_OTEL_ENDPOINT)
--otel-enable-traces Enable OpenTelemetry traces signal ($ZM_OTEL_ENABLE_TRACES)
--otel-traces-endpoint=STRING OTLP/HTTP traces endpoint URL (e.g. http://127.0.0.1:4318/v1/traces) ($ZM_OTEL_TRACES_ENDPOINT)
--otel-enable-metrics Enable OpenTelemetry metrics signal ($ZM_OTEL_ENABLE_METRICS)
--otel-metrics-endpoint=STRING OTLP/HTTP metrics endpoint URL (e.g. http://127.0.0.1:4318/v1/metrics) ($ZM_OTEL_METRICS_ENDPOINT)
--otel-enable-logs Enable OpenTelemetry logs signal ($ZM_OTEL_ENABLE_LOGS)
--otel-logs-endpoint=STRING OTLP/HTTP logs endpoint URL (e.g. http://127.0.0.1:4318/v1/logs) ($ZM_OTEL_LOGS_ENDPOINT)
--otel-service-name="zoneomatic" OpenTelemetry service name ($ZM_OTEL_SERVICE_NAME)
-h, --help Show context-sensitive help.
--listen="localhost:9999" Server listen address ($ZM_LISTEN)
--accept-proxy Accept PROXY protocol ($ZM_ACCEPT_PROXY)
--proxy-header-timeout=10s Timeout for PROXY headers ($ZM_PROXY_HEADER_TIMEOUT)
-p, --htpasswd=FILE Passwords file (bcrypt only) ($ZM_HTPASSWD)
-z, --zone=FILE,... Zone files to update ($ZM_ZONE)
--debug Enable debug logging ($ZM_DEBUG)
--version Print version and exit ($ZM_VERSION)
--otel-endpoint=URL Shared OTLP/HTTP endpoint URL for enabled signals (typically collector URL) ($ZM_OTEL_ENDPOINT)
--otel-header=KEY=VALUE;... Additional HTTP headers for all OTLP exporters, repeatable (e.g. Authorization=Bearer token) ($ZM_OTEL_HEADER)
--otel-enable-traces Enable OpenTelemetry traces signal ($ZM_OTEL_ENABLE_TRACES)
--otel-traces-endpoint=URL OTLP/HTTP traces endpoint URL (e.g. http://127.0.0.1:4318/v1/traces) ($ZM_OTEL_TRACES_ENDPOINT)
--otel-enable-metrics Enable OpenTelemetry metrics signal ($ZM_OTEL_ENABLE_METRICS)
--otel-metrics-endpoint=URL OTLP/HTTP metrics endpoint URL (e.g. http://127.0.0.1:4318/v1/metrics) ($ZM_OTEL_METRICS_ENDPOINT)
--otel-enable-logs Enable OpenTelemetry logs signal ($ZM_OTEL_ENABLE_LOGS)
--otel-logs-endpoint=URL OTLP/HTTP logs endpoint URL (e.g. http://127.0.0.1:4318/v1/logs) ($ZM_OTEL_LOGS_ENDPOINT)
--otel-logs-level="" Minimum log level forwarded to OTLP (debug|info|warn|error); defaults to same as console ($ZM_OTEL_LOGS_LEVEL)
--otel-service-name="zoneomatic"
OpenTelemetry service name ($ZM_OTEL_SERVICE_NAME)
```

> [!NOTE]
Expand Down
22 changes: 11 additions & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/vooon/zoneomatic

go 1.25.7
go 1.26.2

require (
github.com/alecthomas/kong v1.15.0
Expand All @@ -10,7 +10,7 @@ require (
github.com/otiai10/copy v1.14.1
github.com/pires/go-proxyproto v0.12.0
github.com/stretchr/testify v1.11.1
github.com/vooon/zoneomatic/pkg/dnsfmt v0.0.0-20260409134613-0f5595b196e0
github.com/vooon/zoneomatic/pkg/dnsfmt v0.0.0-20260515170731-0e587f3e21cf
go.opentelemetry.io/contrib/bridges/otelslog v0.18.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0
go.opentelemetry.io/otel v1.43.0
Expand Down Expand Up @@ -38,15 +38,15 @@ require (
github.com/gabriel-vasile/mimetype v1.4.13 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.22.5 // indirect
github.com/go-openapi/swag/jsonname v0.25.5 // indirect
github.com/go-openapi/jsonpointer v0.23.1 // indirect
github.com/go-openapi/swag/jsonname v0.26.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.30.2 // indirect
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/schema v1.4.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/mailru/easyjson v0.9.2 // indirect
Expand All @@ -62,15 +62,15 @@ require (
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
go.opentelemetry.io/otel/metric v1.43.0 // indirect
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
golang.org/x/mod v0.35.0 // indirect
golang.org/x/net v0.53.0 // indirect
golang.org/x/mod v0.36.0 // indirect
golang.org/x/net v0.54.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.44.0 // indirect
golang.org/x/text v0.37.0 // indirect
golang.org/x/tools v0.44.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260406210006-6f92a3bedf2d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d // indirect
google.golang.org/grpc v1.80.0 // indirect
golang.org/x/tools v0.45.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260511170946-3700d4141b60 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260511170946-3700d4141b60 // indirect
google.golang.org/grpc v1.81.1 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
40 changes: 20 additions & 20 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/go-openapi/jsonpointer v0.22.5 h1:8on/0Yp4uTb9f4XvTrM2+1CPrV05QPZXu+rvu2o9jcA=
github.com/go-openapi/jsonpointer v0.22.5/go.mod h1:gyUR3sCvGSWchA2sUBJGluYMbe1zazrYWIkWPjjMUY0=
github.com/go-openapi/swag/jsonname v0.25.5 h1:8p150i44rv/Drip4vWI3kGi9+4W9TdI3US3uUYSFhSo=
github.com/go-openapi/swag/jsonname v0.25.5/go.mod h1:jNqqikyiAK56uS7n8sLkdaNY/uq6+D2m2LANat09pKU=
github.com/go-openapi/testify/v2 v2.4.0 h1:8nsPrHVCWkQ4p8h1EsRVymA2XABB4OT40gcvAu+voFM=
github.com/go-openapi/testify/v2 v2.4.0/go.mod h1:HCPmvFFnheKK2BuwSA0TbbdxJ3I16pjwMkYkP4Ywn54=
github.com/go-openapi/jsonpointer v0.23.1 h1:1HBACs7XIwR2RcmItfdSFlALhGbe6S92p0ry4d1GWg4=
github.com/go-openapi/jsonpointer v0.23.1/go.mod h1:iWRmZTrGn7XwYhtPt/fvdSFj1OfNBngqRT2UG3BxSqY=
github.com/go-openapi/swag/jsonname v0.26.0 h1:gV1NFX9M8avo0YSpmWogqfQISigCmpaiNci8cGECU5w=
github.com/go-openapi/swag/jsonname v0.26.0/go.mod h1:urBBR8bZNoDYGr653ynhIx+gTeIz0ARZxHkAPktJK2M=
github.com/go-openapi/testify/v2 v2.4.2 h1:tiByHpvE9uHrrKjOszax7ZvKB7QOgizBWGBLuq0ePx4=
github.com/go-openapi/testify/v2 v2.4.2/go.mod h1:SgsVHtfooshd0tublTtJ50FPKhujf47YRqauXXOUxfw=
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
Expand All @@ -51,8 +51,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gorilla/schema v1.4.1 h1:jUg5hUjCSDZpNGLuXQOgIWGdlgrIdYvgQ0wZtdK1M3E=
github.com/gorilla/schema v1.4.1/go.mod h1:Dg5SSm5PV60mhF2NFaTV1xuYYj8tV8NOPRo4FggUMnM=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs=
github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
Expand Down Expand Up @@ -131,26 +131,26 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI=
golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8=
golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4=
golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ=
golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w=
golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ=
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c=
golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI=
golang.org/x/tools v0.45.0 h1:18qN3FAooORvApf5XjCXgsuayZOEtXf6JK18I3+ONa8=
golang.org/x/tools v0.45.0/go.mod h1:LuUGqqaXcXMEFEruIVJVm5mgDD8vww/z/SR1gQ4uE/0=
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
google.golang.org/genproto/googleapis/api v0.0.0-20260406210006-6f92a3bedf2d h1:/aDRtSZJjyLQzm75d+a1wOJaqyKBMvIAfeQmoa3ORiI=
google.golang.org/genproto/googleapis/api v0.0.0-20260406210006-6f92a3bedf2d/go.mod h1:etfGUgejTiadZAUaEP14NP97xi1RGeawqkjDARA/UOs=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d h1:wT2n40TBqFY6wiwazVK9/iTWbsQrgk5ZfCSVFLO9LQA=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM=
google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4=
google.golang.org/genproto/googleapis/api v0.0.0-20260511170946-3700d4141b60 h1:3WsB1FAbiRIf2tOxscWKs3pQBD9he1NsrnbhMuWfekc=
google.golang.org/genproto/googleapis/api v0.0.0-20260511170946-3700d4141b60/go.mod h1:7yoXV7RIh5gblj/xVYoogxAWvA9wUeVbpsK/M694l00=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260511170946-3700d4141b60 h1:seT2EwLWM78plQ7wcDfuWBc/4FAEAXDDiaSol4ku4qo=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260511170946-3700d4141b60/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ=
google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I=
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
24 changes: 24 additions & 0 deletions internal/server/slog_tee.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,27 @@ func (h *teeSlogHandler) WithGroup(name string) slog.Handler {

return &teeSlogHandler{handlers: out}
}

// levelFilterHandler wraps inner, silently dropping records below minLevel.
// Use this to give the OTEL log handler a different minimum level than the
// console handler.
type levelFilterHandler struct {
minLevel slog.Level
inner slog.Handler
}

func (f *levelFilterHandler) Enabled(ctx context.Context, level slog.Level) bool {
return level >= f.minLevel && f.inner.Enabled(ctx, level)
}

func (f *levelFilterHandler) Handle(ctx context.Context, r slog.Record) error {
return f.inner.Handle(ctx, r)
}

func (f *levelFilterHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
return &levelFilterHandler{minLevel: f.minLevel, inner: f.inner.WithAttrs(attrs)}
}

func (f *levelFilterHandler) WithGroup(name string) slog.Handler {
return &levelFilterHandler{minLevel: f.minLevel, inner: f.inner.WithGroup(name)}
}
56 changes: 43 additions & 13 deletions internal/server/telemetry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"fmt"
"log/slog"
"net/http"
"net/url"
"strings"

"go.opentelemetry.io/contrib/bridges/otelslog"
Expand All @@ -24,14 +25,16 @@ import (
)

type OTelConfig struct {
Endpoint string `name:"endpoint" help:"Shared OTLP/HTTP endpoint URL for enabled signals (typically collector URL)"`
TracesEnabled bool `name:"enable-traces" help:"Enable OpenTelemetry traces signal"`
TracesEndpoint string `name:"traces-endpoint" help:"OTLP/HTTP traces endpoint URL (e.g. http://127.0.0.1:4318/v1/traces)"`
MetricsEnabled bool `name:"enable-metrics" help:"Enable OpenTelemetry metrics signal"`
MetricsEndpoint string `name:"metrics-endpoint" help:"OTLP/HTTP metrics endpoint URL (e.g. http://127.0.0.1:4318/v1/metrics)"`
LogsEnabled bool `name:"enable-logs" help:"Enable OpenTelemetry logs signal"`
LogsEndpoint string `name:"logs-endpoint" help:"OTLP/HTTP logs endpoint URL (e.g. http://127.0.0.1:4318/v1/logs)"`
ServiceName string `name:"service-name" default:"zoneomatic" help:"OpenTelemetry service name"`
Endpoint string `name:"endpoint" placeholder:"URL" help:"Shared OTLP/HTTP endpoint URL for enabled signals (typically collector URL)"`
Headers map[string]string `name:"header" help:"Additional HTTP headers for all OTLP exporters, repeatable (e.g. Authorization=Bearer token)"`
TracesEnabled bool `name:"enable-traces" help:"Enable OpenTelemetry traces signal"`
TracesEndpoint string `name:"traces-endpoint" placeholder:"URL" help:"OTLP/HTTP traces endpoint URL (e.g. http://127.0.0.1:4318/v1/traces)"`
MetricsEnabled bool `name:"enable-metrics" help:"Enable OpenTelemetry metrics signal"`
MetricsEndpoint string `name:"metrics-endpoint" placeholder:"URL" help:"OTLP/HTTP metrics endpoint URL (e.g. http://127.0.0.1:4318/v1/metrics)"`
LogsEnabled bool `name:"enable-logs" help:"Enable OpenTelemetry logs signal"`
LogsEndpoint string `name:"logs-endpoint" placeholder:"URL" help:"OTLP/HTTP logs endpoint URL (e.g. http://127.0.0.1:4318/v1/logs)"`
LogsLevel string `name:"logs-level" help:"Minimum log level forwarded to OTLP (debug|info|warn|error); defaults to same as console" enum:"debug,info,warn,error," default:""`
ServiceName string `name:"service-name" default:"zoneomatic" help:"OpenTelemetry service name"`
}

type telemetryShutdown struct {
Expand Down Expand Up @@ -75,7 +78,11 @@ func setupTelemetry(ctx context.Context, cfg OTelConfig, includeLogSource bool)
return ret, errors.New("otel traces enabled, but neither --otel-traces-endpoint nor --otel-endpoint is set")
}

exp, err := otlptracehttp.New(ctx, otlptracehttp.WithEndpointURL(endpoint))
traceOpts := []otlptracehttp.Option{otlptracehttp.WithEndpointURL(endpoint)}
if len(cfg.Headers) > 0 {
traceOpts = append(traceOpts, otlptracehttp.WithHeaders(cfg.Headers))
}
exp, err := otlptracehttp.New(ctx, traceOpts...)
if err != nil {
return ret, fmt.Errorf("init traces exporter: %w", err)
}
Expand All @@ -95,7 +102,11 @@ func setupTelemetry(ctx context.Context, cfg OTelConfig, includeLogSource bool)
return ret, errors.New("otel metrics enabled, but neither --otel-metrics-endpoint nor --otel-endpoint is set")
}

exp, err := otlpmetrichttp.New(ctx, otlpmetrichttp.WithEndpointURL(endpoint))
metricsOpts := []otlpmetrichttp.Option{otlpmetrichttp.WithEndpointURL(endpoint)}
if len(cfg.Headers) > 0 {
metricsOpts = append(metricsOpts, otlpmetrichttp.WithHeaders(cfg.Headers))
}
exp, err := otlpmetrichttp.New(ctx, metricsOpts...)
if err != nil {
return ret, fmt.Errorf("init metrics exporter: %w", err)
}
Expand All @@ -115,7 +126,20 @@ func setupTelemetry(ctx context.Context, cfg OTelConfig, includeLogSource bool)
return ret, errors.New("otel logs enabled, but neither --otel-logs-endpoint nor --otel-endpoint is set")
}

exp, err := otlploghttp.New(ctx, otlploghttp.WithEndpointURL(endpoint))
// otlploghttp.WithEndpointURL stores the URL path via newSetting(u.Path),
// which marks the setting as explicitly set even when the path is empty.
// This prevents the fallback defaultPath ("/v1/logs") from being applied,
// unlike otlptracehttp/otlpmetrichttp which use cleanPath() internally.
// Normalise: append "/v1/logs" when the URL has no meaningful path.
logEndpoint := endpoint
if parsed, parseErr := url.Parse(endpoint); parseErr == nil && (parsed.Path == "" || parsed.Path == "/") {
logEndpoint = strings.TrimSuffix(endpoint, "/") + "/v1/logs"
}
logOpts := []otlploghttp.Option{otlploghttp.WithEndpointURL(logEndpoint)}
if len(cfg.Headers) > 0 {
logOpts = append(logOpts, otlploghttp.WithHeaders(cfg.Headers))
}
exp, err := otlploghttp.New(ctx, logOpts...)
if err != nil {
return ret, fmt.Errorf("init logs exporter: %w", err)
}
Expand All @@ -126,11 +150,17 @@ func setupTelemetry(ctx context.Context, cfg OTelConfig, includeLogSource bool)
)
global.SetLoggerProvider(lp)
shutdownFns = append(shutdownFns, lp.Shutdown)
ret.LogHandler = otelslog.NewHandler(
otelLogH := slog.Handler(otelslog.NewHandler(
"zoneomatic",
otelslog.WithLoggerProvider(lp),
otelslog.WithSource(includeLogSource),
)
))
if cfg.LogsLevel != "" {
var lvl slog.Level
_ = lvl.UnmarshalText([]byte(cfg.LogsLevel))
otelLogH = &levelFilterHandler{minLevel: lvl, inner: otelLogH}
}
ret.LogHandler = otelLogH

slog.Info("OpenTelemetry logs enabled", "endpoint", endpoint, "service_name", serviceName)
}
Expand Down