Skip to content

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

Merge branch 'main' into copilot/add-opentelemetry-integration

Matt46ec3ee2c32d
diff --cc backend/app/api/app.go
index 3ff7574c,b9630fde..3a4cd205
--- a/backend/app/api/app.go
+++ b/backend/app/api/app.go
@@@ -11,13 -10,13 +11,14 @@@ import
)
type app struct {
- conf *config.Config
- mailer mailer.Mailer
- db *ent.Client
- repos *repo.AllRepos
- services *services.AllServices
- bus *eventbus.EventBus
+ conf *config.Config
+ mailer mailer.Mailer
+ db *ent.Client
+ repos *repo.AllRepos
+ services *services.AllServices
+ bus *eventbus.EventBus
+ otel *otel.Provider
+ authLimiter *authRateLimiter
}
func new(conf *config.Config) *app {
diff --cc backend/internal/sys/config/conf.go
index 09c2772e,0b34fdcf..bf1d2644
--- a/backend/internal/sys/config/conf.go
+++ b/backend/internal/sys/config/conf.go
@@@ -31,7 -31,7 +31,9 @@@ type Config struct
LabelMaker LabelMakerConf `yaml:"labelmaker"`
Thumbnail Thumbnail `yaml:"thumbnail"`
Barcode BarcodeAPIConf `yaml:"barcode"`
+ Otel OTelConfig `yaml:"otel"`
+ Auth AuthConfig `yaml:"auth"`
++
}
type Options struct {
diff --cc frontend/pnpm-lock.yaml
index b2001a67,d05a6864..1fea3230
--- a/frontend/pnpm-lock.yaml
+++ b/frontend/pnpm-lock.yaml
@@@ -7861,11 -7684,11 +7871,11 @@@ snapshots
'@nuxt/[email protected]': {}
dependencies:
- '@nuxt/kit': 4.2.2([email protected])
+ '@nuxt/kit': 4.3.0([email protected])
execa: 8.0.1
transitivePeerDependencies:
- magicast
@@@ -7880,12 -7703,12 +7890,12 @@@
prompts: 2.4.2
semver: 7.7.3
dependencies:
'@nuxt/devtools-wizard': 3.1.1
'@nuxt/kit': 4.2.2([email protected])
'@vue/devtools-kit': 8.0.5
birpc: 2.9.0
consola: 3.4.2
@@@ -8631,36 -8353,13 +8666,36 @@@
'@poppinss/[email protected]': {}
+ '@protobufjs/[email protected]': {}
+
+ '@protobufjs/[email protected]': {}
+
+ '@protobufjs/[email protected]': {}
+
+ '@protobufjs/[email protected]': {}
+
+ '@protobufjs/[email protected]':
+ dependencies:
+ '@protobufjs/aspromise': 1.1.2
+ '@protobufjs/inquire': 1.1.0
+
+ '@protobufjs/[email protected]': {}
+
+ '@protobufjs/[email protected]': {}
+
+ '@protobufjs/[email protected]': {}
+
+ '@protobufjs/[email protected]': {}
+
+ '@protobufjs/[email protected]': {}
+
'@rolldown/[email protected]': {}
- '@rolldown/[email protected]': {}
+ '@rolldown/[email protected]': {}
optionalDependencies:
- rollup: 4.55.3
+ rollup: 4.56.0
dependencies:
@@@ -9131,12 -8831,12 +9166,12 @@@
- rollup
- supports-color
dependencies:
- '@nuxt/kit': 3.20.2([email protected])
+ '@nuxt/kit': 3.21.0([email protected])
pathe: 1.1.2
ufo: 1.6.3
transitivePeerDependencies:
- magicast
- supports-color
@@@ -13566,19 -13231,19 +13596,19 @@@
magic-string: 0.30.21
pathe: 2.0.3
source-map-js: 1.2.1
vue: 3.5.27([email protected])
dependencies:
esbuild: 0.27.2
fdir: 6.5.0([email protected])
picomatch: 4.0.3
postcss: 8.5.6
- rollup: 4.55.3
+ rollup: 4.56.0
tinyglobby: 0.2.15
optionalDependencies:
- '@types/node': 24.3.0
+ '@types/node': 25.0.10
fsevents: 2.3.3
jiti: 1.21.7
terser: 5.46.0
@@@ -13590,10 -13255,10 +13620,10 @@@
fdir: 6.5.0([email protected])
picomatch: 4.0.3
postcss: 8.5.6
- rollup: 4.55.3
+ rollup: 4.56.0
tinyglobby: 0.2.15
optionalDependencies:
- '@types/node': 24.3.0
+ '@types/node': 25.0.10
fsevents: 2.3.3
jiti: 2.6.1
terser: 5.46.0