Skip to content

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

feat: enhance OpenTelemetry integration with validation, error handling, and dependency updates

Matthew Kilgore0ddd201b131d
diff --git a/backend/app/api/routes.go b/backend/app/api/routes.go
index 2770d2bd..058cb43b 100644
--- a/backend/app/api/routes.go
+++ b/backend/app/api/routes.go
@@ -211,7 +211,10 @@ func (a *app) mountRoutes(r *chi.Mux, chain *errchain.ErrChain, repos *repo.AllR
// OpenTelemetry proxy endpoint for frontend telemetry (requires auth)
if a.otel != nil && a.otel.IsEnabled() && a.conf.Otel.ProxyEnabled {
- r.Post("/telemetry", a.otel.ProxyHandler())
+ r.Post("/telemetry", chain.ToHandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
+ a.otel.ProxyHandler().ServeHTTP(w, r)
+ return nil
+ }, userMW...))
}
r.NotFound(http.NotFound)
diff --git a/backend/go.mod b/backend/go.mod
index b946920c..eb50a6c7 100644
--- a/backend/go.mod
+++ b/backend/go.mod
@@ -4,7 +4,7 @@ go 1.26.0
require (
entgo.io/ent v0.14.5
- github.com/XSAM/otelsql v0.40.0
+ github.com/XSAM/otelsql v0.41.0
github.com/ardanlabs/conf/v3 v3.11.0
github.com/containrrr/shoutrrr v0.8.0
github.com/coreos/go-oidc/v3 v3.17.0
@@ -39,13 +39,13 @@ require (
go.opentelemetry.io/otel v1.42.0
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.18.0
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.18.0
- go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0
+ go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.42.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.42.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0
- go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.42.0
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.18.0
- go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.37.0
+ go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.42.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.42.0
go.opentelemetry.io/otel/log v0.18.0
go.opentelemetry.io/otel/metric v1.42.0
@@ -53,15 +53,15 @@ require (
go.opentelemetry.io/otel/sdk/log v0.18.0
go.opentelemetry.io/otel/sdk/metric v1.42.0
go.opentelemetry.io/otel/trace v1.42.0
- go.opentelemetry.io/proto/otlp v1.9.0
+ go.opentelemetry.io/proto/otlp v1.10.0
gocloud.dev v0.45.0
gocloud.dev/pubsub/kafkapubsub v0.45.0
gocloud.dev/pubsub/natspubsub v0.45.0
gocloud.dev/pubsub/rabbitpubsub v0.45.0
- golang.org/x/crypto v0.48.0
- golang.org/x/image v0.36.0
+ golang.org/x/crypto v0.49.0
+ golang.org/x/image v0.37.0
golang.org/x/oauth2 v0.36.0
- golang.org/x/text v0.34.0
+ golang.org/x/text v0.35.0
google.golang.org/grpc v1.79.2
google.golang.org/protobuf v1.36.11
modernc.org/sqlite v1.46.1
@@ -208,17 +208,17 @@ require (
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
- golang.org/x/mod v0.33.0 // indirect
- golang.org/x/net v0.51.0 // indirect
+ golang.org/x/mod v0.34.0 // indirect
+ golang.org/x/net v0.52.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.42.0 // indirect
golang.org/x/time v0.15.0 // indirect
- golang.org/x/tools v0.42.0 // indirect
+ golang.org/x/tools v0.43.0 // indirect
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
google.golang.org/api v0.271.0 // indirect
google.golang.org/genproto v0.0.0-20260217215200-42d3e9bedb6d // indirect
- google.golang.org/genproto/googleapis/api v0.0.0-20260217215200-42d3e9bedb6d // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect
+ google.golang.org/genproto/googleapis/api v0.0.0-20260311181403-84a4fc48630c // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20260311181403-84a4fc48630c // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
modernc.org/libc v1.70.0 // indirect
modernc.org/mathutil v1.7.1 // indirect
diff --git a/backend/go.sum b/backend/go.sum
index 5209d9dd..9bf78e36 100644
--- a/backend/go.sum
+++ b/backend/go.sum
@@ -77,6 +77,8 @@ github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc
github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
github.com/XSAM/otelsql v0.40.0 h1:8jaiQ6KcoEXF46fBmPEqb+pp29w2xjWfuXjZXTXBjaA=
github.com/XSAM/otelsql v0.40.0/go.mod h1:/7F+1XKt3/sTlYtwKtkHQ5Gzoom+EerXmD1VdnTqfB4=
+github.com/XSAM/otelsql v0.41.0 h1:uZifjQhZhv5EDYJh+IVk1DiYxQZJBlNSen0MBFnfxB8=
+github.com/XSAM/otelsql v0.41.0/go.mod h1:NMQT0PiKoFILp9QgjQz+D5mvW+9mT0suR7OejqrtMaM=
github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
github.com/antithesishq/antithesis-sdk-go v0.5.0-default-no-op h1:Ucf+QxEKMbPogRO5guBNe5cgd9uZgfoJLOYs8WWhtjM=
@@ -476,18 +478,24 @@ go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.18.0 h1:icqq3Z34U
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.18.0/go.mod h1:W2m8P+d5Wn5kipj4/xmbt9uMqezEKfBjzVJadfABSBE=
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0 h1:vl9obrcoWVKp/lwl8tRE33853I8Xru9HFbw/skNeLs8=
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0/go.mod h1:GAXRxmLJcVM3u22IjTg74zWBrRCKq8BnOqUVLodpcpw=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.42.0 h1:MdKucPl/HbzckWWEisiNqMPhRrAOQX8r4jTuGr636gk=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.42.0/go.mod h1:RolT8tWtfHcjajEH5wFIZ4Dgh5jpPdFXYV9pTAk/qjc=
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.42.0 h1:H7O6RlGOMTizyl3R08Kn5pdM06bnH8oscSj7o11tmLA=
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.42.0/go.mod h1:mBFWu/WOVDkWWsR7Tx7h6EpQB8wsv7P0Yrh0Pb7othc=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0 h1:THuZiwpQZuHPul65w4WcwEnkX2QIuMT+UFoOrygtoJw=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0/go.mod h1:J2pvYM5NGHofZ2/Ru6zw/TNWnEQp5crgyDeSrYpXkAw=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 h1:lwI4Dc5leUqENgGuQImwLo4WnuXFPetmPpkLi2IrX54=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0/go.mod h1:Kz/oCE7z5wuyhPxsXDuaPteSWqjSBD5YaSdbxZYGbGk=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0 h1:zWWrB1U6nqhS/k6zYB74CjRpuiitRtLLi68VcgmOEto=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0/go.mod h1:2qXPNBX1OVRC0IwOnfo1ljoid+RD0QK3443EaqVlsOU=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.42.0 h1:uLXP+3mghfMf7XmV4PkGfFhFKuNWoCvvx5wP/wOXo0o=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.42.0/go.mod h1:v0Tj04armyT59mnURNUJf7RCKcKzq+lgJs6QSjHjaTc=
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.18.0 h1:KJVjPD3rcPb98rIs3HznyJlrfx9ge5oJvxxlGR+P/7s=
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.18.0/go.mod h1:K3kRa2ckmHWQaTWQdPRHc7qGXASuVuoEQXzrvlA98Ws=
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.42.0 h1:lSZHgNHfbmQTPfuTmWVkEu8J8qXaQwuV30pjCcAUvP8=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.42.0/go.mod h1:so9ounLcuoRDu033MW/E0AD4hhUjVqswrMF5FoZlBcw=
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.42.0 h1:s/1iRkCKDfhlh1JF26knRneorus8aOwVIDhvYx9WoDw=
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.42.0/go.mod h1:UI3wi0FXg1Pofb8ZBiBLhtMzgoTm1TYkMvn71fAqDzs=
go.opentelemetry.io/otel/log v0.18.0 h1:XgeQIIBjZZrliksMEbcwMZefoOSMI1hdjiLEiiB0bAg=
@@ -506,6 +514,8 @@ go.opentelemetry.io/otel/trace v1.42.0 h1:OUCgIPt+mzOnaUTpOQcBiM/PLQ/Op7oq6g4Len
go.opentelemetry.io/otel/trace v1.42.0/go.mod h1:f3K9S+IFqnumBkKhRJMeaZeNk9epyhnCmQh/EysQCdc=
go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A=
go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4=
+go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g=
+go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
@@ -526,11 +536,17 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
+golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
+golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
golang.org/x/image v0.36.0 h1:Iknbfm1afbgtwPTmHnS2gTM/6PPZfH+z2EFuOkSbqwc=
golang.org/x/image v0.36.0/go.mod h1:YsWD2TyyGKiIX1kZlu9QfKIsQ4nAAK9bdgdrIsE7xy4=
+golang.org/x/image v0.37.0 h1:ZiRjArKI8GwxZOoEtUfhrBtaCN+4b/7709dlT6SSnQA=
+golang.org/x/image v0.37.0/go.mod h1:/3f6vaXC+6CEanU4KJxbcUZyEePbyKbaLoDOe4ehFYY=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
+golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
+golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -540,6 +556,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=
+golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
+golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -570,6 +588,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
+golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
+golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -577,6 +597,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
+golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s=
+golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY=
@@ -589,8 +611,12 @@ google.golang.org/genproto v0.0.0-20260217215200-42d3e9bedb6d h1:vsOm753cOAMkt76
google.golang.org/genproto v0.0.0-20260217215200-42d3e9bedb6d/go.mod h1:0oz9d7g9QLSdv9/lgbIjowW1JoxMbxmBVNe8i6tORJI=
google.golang.org/genproto/googleapis/api v0.0.0-20260217215200-42d3e9bedb6d h1:EocjzKLywydp5uZ5tJ79iP6Q0UjDnyiHkGRWxuPBP8s=
google.golang.org/genproto/googleapis/api v0.0.0-20260217215200-42d3e9bedb6d/go.mod h1:48U2I+QQUYhsFrg2SY6r+nJzeOtjey7j//WBESw+qyQ=
+google.golang.org/genproto/googleapis/api v0.0.0-20260311181403-84a4fc48630c h1:OyQPd6I3pN/9gDxz6L13kYGJgqkpdrAohJRBeXyxlgI=
+google.golang.org/genproto/googleapis/api v0.0.0-20260311181403-84a4fc48630c/go.mod h1:X2gu9Qwng7Nn009s/r3RUxqkzQNqOrAy79bluY7ojIg=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 h1:ggcbiqK8WWh6l1dnltU4BgWGIGo+EVYxCaAPih/zQXQ=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260311181403-84a4fc48630c h1:xgCzyF2LFIO/0X2UAoVRiXKU5Xg6VjToG4i2/ecSswk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260311181403-84a4fc48630c/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
google.golang.org/grpc v1.79.2 h1:fRMD94s2tITpyJGtBBn7MkMseNpOZU8ZxgC3MMBaXRU=
google.golang.org/grpc v1.79.2/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
diff --git a/backend/internal/data/repo/repo_item_attachments.go b/backend/internal/data/repo/repo_item_attachments.go
index 3094512c..36339fba 100644
--- a/backend/internal/data/repo/repo_item_attachments.go
+++ b/backend/internal/data/repo/repo_item_attachments.go
@@ -14,13 +14,6 @@ import (
"strings"
"time"
- "github.com/sysadminsmedia/homebox/backend/internal/data/ent"
- "github.com/sysadminsmedia/homebox/backend/internal/data/ent/attachment"
- "github.com/sysadminsmedia/homebox/backend/internal/data/ent/group"
- "github.com/sysadminsmedia/homebox/backend/internal/data/ent/item"
- "github.com/sysadminsmedia/homebox/backend/internal/sys/config"
- "github.com/sysadminsmedia/homebox/backend/pkgs/utils"
-
"github.com/evanoberholster/imagemeta"
"github.com/gen2brain/avif"
"github.com/gen2brain/heic"
@@ -28,6 +21,12 @@ import (
"github.com/gen2brain/webp"
"github.com/google/uuid"
"github.com/rs/zerolog/log"
+ "github.com/sysadminsmedia/homebox/backend/internal/data/ent"
+ "github.com/sysadminsmedia/homebox/backend/internal/data/ent/attachment"
+ "github.com/sysadminsmedia/homebox/backend/internal/data/ent/group"
+ "github.com/sysadminsmedia/homebox/backend/internal/data/ent/item"
+ "github.com/sysadminsmedia/homebox/backend/internal/sys/config"
+ "github.com/sysadminsmedia/homebox/backend/pkgs/utils"
"github.com/zeebo/blake3"
"go.opentelemetry.io/otel"
"golang.org/x/image/draw"
diff --git a/backend/internal/sys/otel/database.go b/backend/internal/sys/otel/database.go
index 36270a36..ae150c6f 100644
--- a/backend/internal/sys/otel/database.go
+++ b/backend/internal/sys/otel/database.go
@@ -46,8 +46,8 @@ func (p *Provider) OpenDatabase(driverName, dataSourceName string) (*sql.DB, err
return nil, fmt.Errorf("failed to open instrumented database: %w", err)
}
- // Register stats for metrics (ignoring error as it's non-fatal)
- _ = otelsql.RegisterDBStatsMetrics(db,
+ // Register stats for metrics (ignoring registration handle and error as non-fatal)
+ _, _ = otelsql.RegisterDBStatsMetrics(db,
otelsql.WithAttributes(
semconv.DBSystemKey.String(dbSystem),
),
@@ -73,7 +73,7 @@ func getDBSystem(driverName string) string {
switch driverName {
case "sqlite3":
return "sqlite"
- case "postgres", "postgresql":
+ case "postgres", "postgresql", "pgx":
return "postgresql"
case "mysql":
return "mysql"
@@ -87,7 +87,7 @@ func mapDialect(driverName string) string {
switch driverName {
case "sqlite3":
return dialect.SQLite
- case "postgres", "postgresql":
+ case "postgres", "postgresql", "pgx":
return dialect.Postgres
case "mysql":
return dialect.MySQL
@@ -98,7 +98,7 @@ func mapDialect(driverName string) string {
// WrapEntDriver wraps an existing Ent driver with tracing.
// This is useful when you have an existing driver and want to add tracing.
-func (p *Provider) WrapEntDriver(drv *entsql.Driver, driverName string) *entsql.Driver {
+func (p *Provider) WrapEntDriver(drv *entsql.Driver, _ string) *entsql.Driver {
if p == nil || !p.IsEnabled() || p.cfg == nil || !p.cfg.EnableDatabaseTracing {
return drv
}
diff --git a/backend/internal/sys/otel/proxy.go b/backend/internal/sys/otel/proxy.go
index a89eaadd..c5c4af96 100644
--- a/backend/internal/sys/otel/proxy.go
+++ b/backend/internal/sys/otel/proxy.go
@@ -5,8 +5,10 @@ import (
"context"
"encoding/hex"
"encoding/json"
+ "errors"
"fmt"
"io"
+ "math"
"net/http"
"strings"
"time"
@@ -59,6 +61,21 @@ type TelemetryPayload struct {
// This prevents denial-of-service attacks through excessively large payloads.
const MaxTelemetryPayloadSize = 1024 * 1024 // 1MB
+const (
+ traceIDLengthBytes = 16
+ spanIDLengthBytes = 8
+ nanosPerMilli = int64(1_000_000)
+)
+
+// telemetryValidationError marks malformed telemetry that should return HTTP 400.
+type telemetryValidationError struct {
+ msg string
+}
+
+func (e *telemetryValidationError) Error() string {
+ return e.msg
+}
+
// ProxyHandler handles telemetry data from the frontend.
// This forwards frontend telemetry data to the configured OTLP endpoint,
// allowing for distributed tracing across the full stack.
@@ -75,13 +92,10 @@ func (p *Provider) ProxyHandler() http.HandlerFunc {
return
}
- // Read and parse the payload with size limit
- body, err := io.ReadAll(io.LimitReader(r.Body, MaxTelemetryPayloadSize))
- if err != nil {
- log.Error().Err(err).Msg("failed to read telemetry payload")
- http.Error(w, "Failed to read request body", http.StatusBadRequest)
- return
- }
+ // Enforce a hard request body limit and parse the payload.
+ r.Body = http.MaxBytesReader(w, r.Body, MaxTelemetryPayloadSize)
+
+ // Keep explicit body close for readability and symmetric cleanup.
defer func(Body io.ReadCloser) {
err := Body.Close()
if err != nil {
@@ -89,6 +103,17 @@ func (p *Provider) ProxyHandler() http.HandlerFunc {
}
}(r.Body)
+ body, err := io.ReadAll(r.Body)
+ if err != nil {
+ if _, ok := errors.AsType[*http.MaxBytesError](err); ok {
+ http.Error(w, "Request body too large", http.StatusRequestEntityTooLarge)
+ return
+ }
+ log.Error().Err(err).Msg("failed to read telemetry payload")
+ http.Error(w, "Failed to read request body", http.StatusBadRequest)
+ return
+ }
+
var payload TelemetryPayload
if err := json.Unmarshal(body, &payload); err != nil {
log.Error().Err(err).Msg("failed to parse telemetry payload")
@@ -98,6 +123,11 @@ func (p *Provider) ProxyHandler() http.HandlerFunc {
// Forward the spans to the OTLP endpoint
if err := p.forwardToOTLP(r.Context(), payload); err != nil {
+ if validationErr, ok := errors.AsType[*telemetryValidationError](err); ok {
+ http.Error(w, "Invalid telemetry payload: "+validationErr.Error(), http.StatusBadRequest)
+ return
+ }
+
log.Error().Err(err).Msg("failed to forward telemetry to OTLP endpoint")
http.Error(w, "Failed to forward telemetry", http.StatusInternalServerError)
return
@@ -262,6 +292,10 @@ func (p *Provider) createProxyClient(_ context.Context) (otlpClient, error) {
// convertToOTLPSpans converts frontend spans to OTLP protobuf format
func (p *Provider) convertToOTLPSpans(payload TelemetryPayload) ([]*tracepb.ResourceSpans, error) {
+ if len(payload.Spans) == 0 {
+ return nil, &telemetryValidationError{msg: "payload contains no spans"}
+ }
+
// Group spans by resource (in our case, all frontend spans share the same resource)
serviceName := p.cfg.ServiceName + "-frontend"
@@ -277,19 +311,14 @@ func (p *Provider) convertToOTLPSpans(payload TelemetryPayload) ([]*tracepb.Reso
// Convert all spans
otlpSpans := make([]*tracepb.Span, 0, len(payload.Spans))
- for _, frontendSpan := range payload.Spans {
+ for i, frontendSpan := range payload.Spans {
otlpSpan, err := convertSpanToProto(frontendSpan)
if err != nil {
- log.Warn().Err(err).Str("span", frontendSpan.Name).Msg("failed to convert span, skipping")
- continue
+ return nil, &telemetryValidationError{msg: fmt.Sprintf("span[%d] (%q): %v", i, frontendSpan.Name, err)}
}
otlpSpans = append(otlpSpans, otlpSpan)
}
- if len(otlpSpans) == 0 {
- return nil, fmt.Errorf("no valid spans to export")
- }
-
// Create the resource spans structure
resourceSpans := []*tracepb.ResourceSpans{
{
@@ -313,27 +342,41 @@ func (p *Provider) convertToOTLPSpans(payload TelemetryPayload) ([]*tracepb.Reso
// convertSpanToProto converts a single frontend span to OTLP protobuf format
func convertSpanToProto(frontendSpan FrontendSpan) (*tracepb.Span, error) {
- // Parse trace ID
- traceID, err := hex.DecodeString(frontendSpan.TraceID)
+ traceID, err := decodeHexID(frontendSpan.TraceID, traceIDLengthBytes, "trace ID")
if err != nil {
- return nil, fmt.Errorf("invalid trace ID: %w", err)
+ return nil, err
}
- // Parse span ID
- spanID, err := hex.DecodeString(frontendSpan.SpanID)
+ spanID, err := decodeHexID(frontendSpan.SpanID, spanIDLengthBytes, "span ID")
if err != nil {
- return nil, fmt.Errorf("invalid span ID: %w", err)
+ return nil, err
}
// Parse parent span ID if present
var parentSpanID []byte
if frontendSpan.ParentSpanID != "" {
- parentSpanID, err = hex.DecodeString(frontendSpan.ParentSpanID)
+ parentSpanID, err = decodeHexID(frontendSpan.ParentSpanID, spanIDLengthBytes, "parent span ID")
if err != nil {
- return nil, fmt.Errorf("invalid parent span ID: %w", err)
+ return nil, err
}
}
+ if frontendSpan.StartTime < 0 || frontendSpan.EndTime < 0 {
+ return nil, fmt.Errorf("invalid timestamps: start and end time must be non-negative")
+ }
+ if frontendSpan.EndTime < frontendSpan.StartTime {
+ return nil, fmt.Errorf("invalid timestamps: end time must be greater than or equal to start time")
+ }
+
+ startTimeUnixNano, err := millisToNanos(frontendSpan.StartTime, "startTime")
+ if err != nil {
+ return nil, err
+ }
+ endTimeUnixNano, err := millisToNanos(frontendSpan.EndTime, "endTime")
+ if err != nil {
+ return nil, err
+ }
+
// Convert span kind
spanKind := tracepb.Span_SPAN_KIND_INTERNAL
switch strings.ToLower(frontendSpan.Kind) {
@@ -356,12 +399,17 @@ func convertSpanToProto(frontendSpan FrontendSpan) (*tracepb.Span, error) {
// Convert events
events := make([]*tracepb.Span_Event, 0, len(frontendSpan.Events))
for _, event := range frontendSpan.Events {
+ eventTimeUnixNano, err := millisToNanos(event.Time, "event.time")
+ if err != nil {
+ return nil, err
+ }
+
eventAttrs := make([]*commonpb.KeyValue, 0, len(event.Attributes))
for k, v := range event.Attributes {
eventAttrs = append(eventAttrs, convertAttributeToProto(k, v))
}
events = append(events, &tracepb.Span_Event{
- TimeUnixNano: uint64(event.Time * 1000000), // Convert milliseconds to nanoseconds
+ TimeUnixNano: eventTimeUnixNano,
Name: event.Name,
Attributes: eventAttrs,
})
@@ -388,14 +436,35 @@ func convertSpanToProto(frontendSpan FrontendSpan) (*tracepb.Span, error) {
ParentSpanId: parentSpanID,
Name: frontendSpan.Name,
Kind: spanKind,
- StartTimeUnixNano: uint64(frontendSpan.StartTime * 1000000), // Convert milliseconds to nanoseconds
- EndTimeUnixNano: uint64(frontendSpan.EndTime * 1000000), // Convert milliseconds to nanoseconds
+ StartTimeUnixNano: startTimeUnixNano,
+ EndTimeUnixNano: endTimeUnixNano,
Attributes: attrs,
Events: events,
Status: status,
}, nil
}
+func decodeHexID(raw string, expectedLen int, label string) ([]byte, error) {
+ decoded, err := hex.DecodeString(raw)
+ if err != nil {
+ return nil, fmt.Errorf("invalid %s: %w", label, err)
+ }
+ if len(decoded) != expectedLen {
+ return nil, fmt.Errorf("invalid %s length: got %d bytes, want %d", label, len(decoded), expectedLen)
+ }
+ return decoded, nil
+}
+
+func millisToNanos(ms int64, field string) (uint64, error) {
+ if ms < 0 {
+ return 0, fmt.Errorf("invalid %s: must be non-negative", field)
+ }
+ if ms > math.MaxInt64/nanosPerMilli {
+ return 0, fmt.Errorf("invalid %s: value overflows nanosecond conversion", field)
+ }
+ return uint64(ms * nanosPerMilli), nil
+}
+
// convertAttributeToProto converts an attribute to OTLP protobuf format
func convertAttributeToProto(key string, value interface{}) *commonpb.KeyValue {
var anyValue *commonpb.AnyValue
diff --git a/docs/src/content/docs/en/advanced/opentelemetry.mdx b/docs/src/content/docs/en/advanced/opentelemetry.mdx
index 76e6d623..ec2d12c0 100644
--- a/docs/src/content/docs/en/advanced/opentelemetry.mdx
+++ b/docs/src/content/docs/en/advanced/opentelemetry.mdx
@@ -1,6 +1,6 @@
---
title: OpenTelemetry
-draft: true
+draft: false
---
OpenTelemetry is an open-source observability framework for cloud-native software, providing a set of APIs, libraries,