enhance context management for custom types

updates go dependencies, refactors config loading precedence, adds gRPC gateway path stripping option, and improves HTTP handler setup.
Improve serve mux path
2025-12-24 10:47:28 -05:00 · 2025-12-23 13:51:55 -05:00 · 2025-12-23 11:10:13 -05:00 · 2025-12-22 15:37:55 -05:00 · 2025-09-02 13:20:21 -04:00 · 2025-09-02 13:15:26 -04:00
18 changed files with 708 additions and 258 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # v0.12.1
 * feat: Implement custom OpenTelemetry span name formatting for HTTP requests.
 * refactor: Streamline OpenTelemetry handler integration by removing custom wrapper.
+## v0.12.2
+* chore: Update Go module dependencies, including OpenTelemetry, gRPC Gateway, gRPC, and Protobuf.
+* chore: Add new test suites for logging, OpenTelemetry initialization, gRPC server setup, and HTTP server setup.
+* chore: Enhance configuration loading tests to cover file and environment variable sources.
+* chore: Improve config test comparison robustness using JSON marshaling.
+## v0.12.3
+* chore: Upgrade to go 1.25

 # v0.12.0
 * feat: Add support for excluding HTTP request paths from logging using configurable regular expressions.
--- a/TODO.md
+++ b/TODO.md
@@ -1,7 +1,5 @@
 # TODO

- [ ] Add ability to initialize OTEL early (before app runs)
- [ ] Spruce up the README
 - [ ] Create generic interface for implementing a service
 - [ ] Create config sample not called demo, so it is more easily reused
 - [ ] Expand config test case to cover GRPC config
@@ -9,6 +7,8 @@

 ## Done

+- [x] Add ability to initialize OTEL early (before app runs)
+- [x] Spruce up the README
 - [x] Test and troubleshoot GRPC Gateway support
 - [x] Finish implementing GRPC service support
 - [x] Unit tests
--- a/go.mod
+++ b/go.mod
@@ -1,63 +1,64 @@
 module gitea.libretechconsulting.com/rmcguire/go-app

-go 1.24.2
-
-replace github.com/prometheus/otlptranslator => github.com/prometheus/otlptranslator v0.0.0-20250717125610-8549f4ab4f8f
+go 1.25

 require (
-	buf.build/go/protovalidate v0.14.0
+	buf.build/go/protovalidate v1.1.0
 	github.com/caarlos0/env/v11 v11.3.1
-	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1
-	github.com/prometheus/client_golang v1.23.0
+	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3
+	github.com/prometheus/client_golang v1.23.2
 	github.com/rs/zerolog v1.34.0
-	github.com/swaggest/jsonschema-go v0.3.78
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0
-	go.opentelemetry.io/otel v1.37.0
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.37.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0
-	go.opentelemetry.io/otel/exporters/prometheus v0.59.1
-	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.37.0
-	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.37.0
-	go.opentelemetry.io/otel/metric v1.37.0
-	go.opentelemetry.io/otel/sdk v1.37.0
-	go.opentelemetry.io/otel/sdk/metric v1.37.0
-	go.opentelemetry.io/otel/trace v1.37.0
-	google.golang.org/grpc v1.74.2
+	github.com/stretchr/testify v1.11.1
+	github.com/swaggest/jsonschema-go v0.3.79
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0
+	go.opentelemetry.io/otel v1.39.0
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.39.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0
+	go.opentelemetry.io/otel/exporters/prometheus v0.61.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/metric v1.39.0
+	go.opentelemetry.io/otel/sdk v1.39.0
+	go.opentelemetry.io/otel/sdk/metric v1.39.0
+	go.opentelemetry.io/otel/trace v1.39.0
+	google.golang.org/grpc v1.78.0
 	gopkg.in/yaml.v3 v3.0.1
 )

 require (
-	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.7-20250717185734-6c6e0d3c608e.1 // indirect
-	cel.dev/expr v0.24.0 // indirect
+	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20251209175733-2a1774d88802.1 // indirect
+	cel.dev/expr v0.25.1 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/google/cel-go v0.26.0 // indirect
+	github.com/google/cel-go v0.26.1 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.65.0 // indirect
-	github.com/prometheus/otlptranslator v0.0.0-20250717125610-8549f4ab4f8f // indirect
-	github.com/prometheus/procfs v0.17.0 // indirect
+	github.com/prometheus/common v0.67.4 // indirect
+	github.com/prometheus/otlptranslator v1.0.0 // indirect
+	github.com/prometheus/procfs v0.19.2 // indirect
 	github.com/stoewer/go-strcase v1.3.1 // indirect
 	github.com/swaggest/refl v1.4.0 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.7.1 // indirect
-	golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 // indirect
-	golang.org/x/net v0.43.0 // indirect
-	golang.org/x/sys v0.35.0 // indirect
-	golang.org/x/text v0.28.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a // indirect
-	google.golang.org/protobuf v1.36.7 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.9.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.3 // indirect
+	golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 // indirect
+	golang.org/x/net v0.48.0 // indirect
+	golang.org/x/sys v0.39.0 // indirect
+	golang.org/x/text v0.32.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20251222181119-0a764e51fe1b // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,17 +1,19 @@
-buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.7-20250717185734-6c6e0d3c608e.1 h1:/AZH8sVB6LHv8G+hZlAMCP31NevnesHwYgnlgS5Vt14=
-buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.7-20250717185734-6c6e0d3c608e.1/go.mod h1:eva/VCrd8X7xuJw+JtwCEyrCKiRRASukFqmirnWBvFU=
-buf.build/go/protovalidate v0.14.0 h1:kr/rC/no+DtRyYX+8KXLDxNnI1rINz0imk5K44ZpZ3A=
-buf.build/go/protovalidate v0.14.0/go.mod h1:+F/oISho9MO7gJQNYC2VWLzcO1fTPmaTA08SDYJZncA=
-cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
-cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
+buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20251209175733-2a1774d88802.1 h1:j9yeqTWEFrtimt8Nng2MIeRrpoCvQzM9/g25XTvqUGg=
+buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20251209175733-2a1774d88802.1/go.mod h1:tvtbpgaVXZX4g6Pn+AnzFycuRK3MOz5HJfEGeEllXYM=
+buf.build/go/protovalidate v1.1.0 h1:pQqEQRpOo4SqS60qkvmhLTTQU9JwzEvdyiqAtXa5SeY=
+buf.build/go/protovalidate v1.1.0/go.mod h1:bGZcPiAQDC3ErCHK3t74jSoJDFOs2JH3d7LWuTEIdss=
+cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=
+cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
 github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
 github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bool64/dev v0.2.39 h1:kP8DnMGlWXhGYJEZE/J0l/gVBdbuhoPGL+MJG4QbofE=
-github.com/bool64/dev v0.2.39/go.mod h1:iJbh1y/HkunEPhgebWRNcs8wfGq7sjvJ6W5iabL8ACg=
+github.com/bool64/dev v0.2.43 h1:yQ7qiZVef6WtCl2vDYU0Y+qSq+0aBrQzY8KXkklk9cQ=
+github.com/bool64/dev v0.2.43/go.mod h1:iJbh1y/HkunEPhgebWRNcs8wfGq7sjvJ6W5iabL8ACg=
 github.com/bool64/shared v0.1.5 h1:fp3eUhBsrSjNCQPcSdQqZxxh9bBwrYiZ+zOKFkM0/2E=
 github.com/bool64/shared v0.1.5/go.mod h1:081yz68YC9jeFB3+Bbmno2RFWvGKv1lPKkMP6MHJlPs=
+github.com/brianvoe/gofakeit/v6 v6.28.0 h1:Xib46XXuQfmlLS2EXRuJpqcw8St6qSZz75OUo0tgAW4=
+github.com/brianvoe/gofakeit/v6 v6.28.0/go.mod h1:Xj58BMSnFqcn/fAQeSK+/PLtC5kSb7FJIq4JyGa8vEs=
 github.com/caarlos0/env/v11 v11.3.1 h1:cArPWC15hWmEt+gWk7YBi7lEXTXCvpaSdCiZE2X5mCA=
 github.com/caarlos0/env/v11 v11.3.1/go.mod h1:qupehSf/Y0TUTsxKywqRt/vJjN5nz6vauiYEUUr8P4U=
 github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
@@ -32,18 +34,16 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/cel-go v0.26.0 h1:DPGjXackMpJWH680oGY4lZhYjIameYmR+/6RBdDGmaI=
-github.com/google/cel-go v0.26.0/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM=
+github.com/google/cel-go v0.26.1 h1:iPbVVEdkhTX++hpe3lzSk7D3G3QSYqLGoHOcEio+UXQ=
+github.com/google/cel-go v0.26.1/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 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/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248=
-github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=
-github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 h1:sGm2vDRFUrQJO/Veii4h4zG2vvqG6uWNkBHSTqXOZk0=
-github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2/go.mod h1:wd1YpapPLivG6nQgbf7ZkG1hhSOXDhhn4MLTknx2aAc=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 h1:X5VWvz21y3gzm9Nw/kaUeku/1+uBhcekkmy4IkffJww=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90=
+github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 h1:B+8ClL/kCQkRiU82d9xajRPKYMrB7E0MbtzWVi1K4ns=
+github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3/go.mod h1:NbCUVmiS4foBGBHOYlCT25+YmGpJ32dZPi75pGEUpj4=
+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/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc=
 github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
@@ -66,18 +66,20 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.23.0 h1:ust4zpdl9r4trLY/gSjlm07PuiBq2ynaXXlptpfy8Uc=
-github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4haaf2mW08I+jGAjEE=
+github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
+github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
 github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
 github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
-github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
-github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
-github.com/prometheus/otlptranslator v0.0.0-20250717125610-8549f4ab4f8f h1:QQB6SuvGZjK8kdc2YaLJpYhV8fxauOsjE6jgcL6YJ8Q=
-github.com/prometheus/otlptranslator v0.0.0-20250717125610-8549f4ab4f8f/go.mod h1:P8AwMgdD7XEr6QRUJ2QWLpiAZTgTE2UYgjlu3svompI=
-github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
-github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/prometheus/common v0.67.4 h1:yR3NqWO1/UyO1w2PhUvXlGQs/PtFmoveVO0KZ4+Lvsc=
+github.com/prometheus/common v0.67.4/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI=
+github.com/prometheus/otlptranslator v1.0.0 h1:s0LJW/iN9dkIH+EnhiD3BlkkP5QVIUVEoIwkU+A6qos=
+github.com/prometheus/otlptranslator v1.0.0/go.mod h1:vRYWnXvI6aWGpsdY/mOT/cbeVRBlPWtBNDb7kGR3uKM=
+github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws=
+github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw=
+github.com/rodaine/protogofakeit v0.1.1 h1:ZKouljuRM3A+TArppfBqnH8tGZHOwM/pjvtXe9DaXH8=
+github.com/rodaine/protogofakeit v0.1.1/go.mod h1:pXn/AstBYMaSfc1/RqH3N82pBuxtWgejz1AlYpY1mI0=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
 github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
 github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
@@ -91,69 +93,73 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/swaggest/assertjson v1.9.0 h1:dKu0BfJkIxv/xe//mkCrK5yZbs79jL7OVf9Ija7o2xQ=
 github.com/swaggest/assertjson v1.9.0/go.mod h1:b+ZKX2VRiUjxfUIal0HDN85W0nHPAYUbYH5WkkSsFsU=
-github.com/swaggest/jsonschema-go v0.3.78 h1:5+YFQrLxOR8z6CHvgtZc42WRy/Q9zRQQ4HoAxlinlHw=
-github.com/swaggest/jsonschema-go v0.3.78/go.mod h1:4nniXBuE+FIGkOGuidjOINMH7OEqZK3HCSbfDuLRI0g=
+github.com/swaggest/jsonschema-go v0.3.79 h1:0TOShCbAJ9Xjt1e2W83l+QtMQSG2pbun2EkiYTyafCs=
+github.com/swaggest/jsonschema-go v0.3.79/go.mod h1:GqVmJ+XNLeUHhFIhHNKc+C68euxfrl3a3aoZH4vTRl0=
 github.com/swaggest/refl v1.4.0 h1:CftOSdTqRqs100xpFOT/Rifss5xBV/CT0S/FN60Xe9k=
 github.com/swaggest/refl v1.4.0/go.mod h1:4uUVFVfPJ0NSX9FPwMPspeHos9wPFlCMGoPRllUbpvA=
 github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA=
 github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M=
 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
-go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
-go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0 h1:rbRJ8BBoVMsQShESYZ0FkvcITu8X8QNwJogcLUmDNNw=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0/go.mod h1:ru6KHrNtNHxM4nD/vd6QrLVWgKhxPYgblq4VAtNawTQ=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 h1:Hf9xI/XLML9ElpiHVDNwvqI0hIFlzV8dgIr35kV1kRU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0/go.mod h1:NfchwuyNoMcZ5MLHwPrODwUF1HWCXWrL31s8gSAdIKY=
-go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
-go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
-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/otlptrace v1.37.0 h1:Ahq7pZmv87yiyn3jeFz/LekZmPLLdKejuO3NcK9MssM=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0/go.mod h1:MJTqhM0im3mRLw1i8uGHnCvUEeS7VwRyxlLC78PA18M=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 h1:EtFWSnwW9hGObjkIdmlnWSydO+Qs8OwzfzXLUPg4xOc=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0/go.mod h1:QjUEoiGCPkvFZ/MjK6ZZfNOS6mfVEVKYE99dFhuN2LI=
-go.opentelemetry.io/otel/exporters/prometheus v0.59.1 h1:HcpSkTkJbggT8bjYP+BjyqPWlD17BH9C5CYNKeDzmcA=
-go.opentelemetry.io/otel/exporters/prometheus v0.59.1/go.mod h1:0FJL+gjuUoM07xzik3KPBaN+nz/CoB15kV6WLMiXZag=
-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/stdouttrace v1.37.0 h1:SNhVp/9q4Go/XHBkQ1/d5u9P/U+L1yaGPoi0x+mStaI=
-go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.37.0/go.mod h1:tx8OOlGH6R4kLV67YaYO44GFXloEjGPZuMjEkaaqIp4=
-go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
-go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
-go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI=
-go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg=
-go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc=
-go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
-go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
-go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
-go.opentelemetry.io/proto/otlp v1.7.1 h1:gTOMpGDb0WTBOP8JaO72iL3auEZhVmAQg4ipjOVAtj4=
-go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE=
+go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
+go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0 h1:RN3ifU8y4prNWeEnQp2kRRHz8UwonAEYZl8tUzHEXAk=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0/go.mod h1:habDz3tEWiFANTo6oUE99EmaFUrCNYAAg3wiVmusm70=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 h1:ssfIgGNANqpVFCndZvcuyKbl0g+UAVcbBcqGkG28H0Y=
+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/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/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/prometheus v0.61.0 h1:cCyZS4dr67d30uDyh8etKM2QyDsQ4zC9ds3bdbrVoD0=
+go.opentelemetry.io/otel/exporters/prometheus v0.61.0/go.mod h1:iivMuj3xpR2DkUrUya3TPS/Z9h3dz7h01GxU+fQBRNg=
+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/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/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=
+go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
+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.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 h1:SbTAbRFnd5kjQXbczszQ0hdk3ctwYf3qBNH9jIsGclE=
-golang.org/x/exp v0.0.0-20250813145105-42675adae3e6/go.mod h1:4QTo5u+SEIbbKW1RacMZq1YEfOBqeXa19JeshGi+zc4=
-golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
-golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
+go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
+go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
+golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 h1:fQsdNF2N+/YewlRZiricy4P1iimyPKZ/xwniHj8Q2a0=
+golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93/go.mod h1:EPRbTFwzwjXj9NpYyyrvenVh9Y+GFeEvMNh7Xuz7xgU=
+golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
+golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
-golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
-golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
-google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a h1:DMCgtIAIQGZqJXMVzJF4MV8BlWoJh2ZuFiRdAleyr58=
-google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a/go.mod h1:y2yVLIE/CSMCPXaHnSKXxu1spLPnglFLegmgdY23uuE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a h1:tPE/Kp+x9dMSwUm/uM0JKK0IfdiJkwAbSMSeZBXXJXc=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a/go.mod h1:gw1tLEfykwDz2ET4a12jcXt4couGAm7IwsVaTy0Sflo=
-google.golang.org/grpc v1.74.2 h1:WoosgB65DlWVC9FqI82dGsZhWFNBSLjQ84bjROOpMu4=
-google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM=
-google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
-google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
+golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
+gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
+gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
+google.golang.org/genproto/googleapis/api v0.0.0-20251222181119-0a764e51fe1b h1:uA40e2M6fYRBf0+8uN5mLlqUtV192iiksiICIBkYJ1E=
+google.golang.org/genproto/googleapis/api v0.0.0-20251222181119-0a764e51fe1b/go.mod h1:Xa7le7qx2vmqB/SzWUBa7KdMjpdpAHlh5QCSnjessQk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b h1:Mv8VFug0MP9e5vUxfBcE3vUkV6CImK3cMNMIDFjmzxU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
+google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc=
+google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U=
+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=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
--- a/pkg/app/run_grpc.go
+++ b/pkg/app/run_grpc.go
@@ -38,7 +38,7 @@ func (a *App) runGRPC(ctx context.Context) {

 		a.HTTP.Handlers = append(a.HTTP.Handlers, optshttp.HTTPHandler{
 			Prefix:      a.cfg.GRPC.GRPCGatewayPath,
-			StripPrefix: true,
+			StripPrefix: a.cfg.GRPC.GRPCGatewayPathStrip,
 			Handler:     a.GRPC.GetGatewayMux(),
 		})

--- a/pkg/app/setup_custom.go
+++ b/pkg/app/setup_custom.go
@@ -17,7 +17,7 @@ import (
 // that overloads *config.AppConfig. Will perform normal env
 // substitutions for AppConfig, but env overrides for custom type
 // are up to the caller.
-func MustLoadConfigInto[T any](ctx context.Context, into T) (context.Context, T) {
+func MustLoadConfigInto[T interface{ *config.AppConfig }](ctx context.Context, into T) (context.Context, T) {
 	// Step 1: Check our custom type for required *config.AppConfig
 	if err := HasAppConfig(into); err != nil {
 		panic(err)
@@ -50,13 +50,14 @@ func MustLoadConfigInto[T any](ctx context.Context, into T) (context.Context, T)
 	}

 	// Step 6: Update context, return custom type
+	ctx = config.AddToContextFor(ctx, into)
 	return ctx, into
 }

 func setAppConfig[T any](target T, appConfig *config.AppConfig) error {
 	// Ensure target is a pointer to a struct
 	v := reflect.ValueOf(target)
-	if v.Kind() != reflect.Ptr || v.IsNil() {
+	if v.Kind() != reflect.Pointer || v.IsNil() {
 		return errors.New("target must be a non-nil pointer to a struct")
 	}

@@ -68,7 +69,7 @@ func setAppConfig[T any](target T, appConfig *config.AppConfig) error {
 	// Replace *config.AppConfig
 	for i := range v.NumField() {
 		field := v.Field(i)
-		if field.Type() == reflect.TypeOf((*config.AppConfig)(nil)) {
+		if field.Type() == reflect.TypeFor[*config.AppConfig]() {
 			if !field.CanSet() {
 				return fmt.Errorf("field %q cannot be set", v.Type().Field(i).Name)
 			}
@@ -82,7 +83,7 @@ func setAppConfig[T any](target T, appConfig *config.AppConfig) error {

 func HasAppConfig[T any](target T) error {
 	v := reflect.ValueOf(target)
-	if v.Kind() != reflect.Ptr || v.IsNil() {
+	if v.Kind() != reflect.Pointer || v.IsNil() {
 		return errors.New("target must be a non-nil pointer to a struct")
 	}
 	v = v.Elem()
@@ -94,7 +95,7 @@ func HasAppConfig[T any](target T) error {
 	hasAppConfig := false
 	for i := range v.NumField() {
 		field := v.Type().Field(i)
-		if field.Type == reflect.TypeOf((*config.AppConfig)(nil)) {
+		if field.Type == reflect.TypeFor[*config.AppConfig]() {
 			hasAppConfig = true
 			break
 		}
--- a/pkg/app/setup_test.go
+++ b/pkg/app/setup_test.go
@@ -1,123 +0,0 @@
-package app
-
-import (
-	"bufio"
-	"context"
-	"flag"
-	"io"
-	"os"
-	"regexp"
-	"testing"
-
-	"github.com/rs/zerolog"
-
-	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/config"
-)
-
-func TestMustSetupConfigAndLogging(t *testing.T) {
-	// Configure app and logger
-	type inputs struct {
-		envs map[string]string
-	}
-	type outputs struct {
-		appName        string
-		logLevel       zerolog.Level
-		logRegexChecks []*regexp.Regexp
-	}
-	tests := []struct {
-		name   string
-		inputs inputs
-		want   outputs
-	}{
-		{
-			name: "Test json logging with short timestamp",
-			inputs: inputs{
-				envs: map[string]string{
-					"APP_NAME":            "testapp",
-					"APP_LOG_LEVEL":       "warn",
-					"APP_LOG_FORMAT":      "json",
-					"APP_LOG_TIME_FORMAT": "short",
-				},
-			},
-			want: outputs{
-				appName:  "testapp",
-				logLevel: zerolog.WarnLevel,
-				logRegexChecks: []*regexp.Regexp{
-					regexp.MustCompile(`^\{.*time":"\d{1,}:\d{2}`),
-				},
-			},
-		},
-		{
-			name: "Test json logging with unix timestamp",
-			inputs: inputs{
-				envs: map[string]string{
-					"APP_NAME":            "testapp",
-					"APP_LOG_LEVEL":       "info",
-					"APP_LOG_FORMAT":      "json",
-					"APP_LOG_TIME_FORMAT": "unix",
-				},
-			},
-			want: outputs{
-				appName:  "testapp",
-				logLevel: zerolog.InfoLevel,
-				logRegexChecks: []*regexp.Regexp{
-					regexp.MustCompile(`time":\d+,`),
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Set environment variables
-			for key, val := range tt.inputs.envs {
-				os.Setenv(key, val)
-			}
-
-			// Prepare config in context
-			ctx := MustSetupConfigAndLogging(context.Background())
-
-			// Retrieve config and logger from prepared context
-			cfg := config.MustFromCtx(ctx)
-			logger := zerolog.Ctx(ctx)
-
-			// Check wants
-			if cfg.Name != tt.want.appName {
-				t.Errorf("Expected app name %s, got %s", tt.want.appName, cfg.Name)
-			}
-			if logger.GetLevel() != tt.want.logLevel {
-				t.Errorf("Expected log level %#v, got %#v", tt.want.logLevel, logger.GetLevel())
-			}
-
-			// Send and capture a log
-			r, w := io.Pipe()
-			testLogger := logger.Output(w)
-			scanner := bufio.NewScanner(r)
-
-			go func() {
-				testLogger.Error().Msg("test message")
-				w.Close()
-			}()
-
-			logOut := make([]byte, 0)
-			if scanner.Scan() {
-				logOut = scanner.Bytes()
-			}
-
-			// Check all expressions
-			for _, expr := range tt.want.logRegexChecks {
-				if !expr.Match(logOut) {
-					t.Errorf("Regex %s did not match log %s", expr.String(), logOut)
-				}
-			}
-
-			// Super annoying need to reset due to app framework package
-			// using flag.Parse() and go test also using it
-			testlog := flag.Lookup("test.testlogfile").Value.String()
-			flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
-			flag.String("test.testlogfile", testlog, "")
-			flag.String("test.paniconexit0", "", "")
-			flag.String("test.v", "", "")
-			flag.Parse()
-		})
-	}
-}
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -50,6 +50,10 @@ func LoadConfig(ctx context.Context) (context.Context, error) {
 func loadConfig(configPath string) (*AppConfig, error) {
 	cfg := *DefaultConfig

+	if err := env.ParseWithOptions(&cfg, env.Options{DefaultValueTagName: "default"}); err != nil {
+		return nil, fmt.Errorf("could not parse environment variables: %w", err)
+	}
+
 	if configPath != "" {
 		file, err := os.Open(configPath)
 		if err != nil {
@@ -63,10 +67,6 @@ func loadConfig(configPath string) (*AppConfig, error) {
 		}
 	}

-	if err := env.Parse(&cfg); err != nil {
-		return nil, fmt.Errorf("could not parse environment variables: %w", err)
-	}
-
 	// Perform updates / enrichments
 	err := prepareConfig(&cfg)
 	if err != nil {
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -2,6 +2,7 @@ package config

 import (
 	"encoding/json"
+	"os"
 	"testing"
 )

@@ -61,9 +62,110 @@ func Test_loadConfig(t *testing.T) {
 			want:    testDefaultConfig,
 			wantErr: false,
 		},
+		{
+			name: "Load from file",
+			args: args{configPath: "./testdata/config.yaml"},
+			want: &AppConfig{
+				Name:        "test-app",
+				Environment: "development",
+				Version:     getVersion(),
+				Logging: &LogConfig{
+					Enabled:    true,
+					Level:      "debug",
+					Format:     LogFormatJSON,
+					Output:     "stderr",
+					TimeFormat: TimeFormatLong,
+				},
+				HTTP: &HTTPConfig{
+					Enabled:      true,
+					Listen:       "127.0.0.1:9090",
+					LogRequests:  false,
+					ReadTimeout:  "10s",
+					WriteTimeout: "10s",
+					IdleTimeout:  "1m",
+				},
+				GRPC: &GRPCConfig{
+					Enabled:               false,
+					Listen:                "127.0.0.1:8081",
+					LogRequests:           false,
+					EnableReflection:      true,
+					EnableInstrumentation: true,
+				},
+				OTEL: &OTELConfig{
+					Enabled:            true,
+					PrometheusEnabled:  true,
+					PrometheusPath:     "/metrics",
+					StdoutEnabled:      false,
+					MetricIntervalSecs: 30,
+				},
+			},
+		},
+		{
+			name: "Load from env",
+			args: args{configPath: ""},
+			want: &AppConfig{
+				Name:        "test-app-env",
+				Environment: "production",
+				Version:     getVersion(),
+				Logging: &LogConfig{
+					Enabled:    false,
+					Level:      "error",
+					Format:     LogFormatConsole,
+					Output:     "stdout",
+					TimeFormat: TimeFormatUnix,
+				},
+				HTTP: &HTTPConfig{
+					Enabled:      false,
+					Listen:       "0.0.0.0:80",
+					LogRequests:  true,
+					ReadTimeout:  "15s",
+					WriteTimeout: "15s",
+					IdleTimeout:  "2m",
+				},
+				GRPC: &GRPCConfig{
+					Enabled:               true,
+					Listen:                "0.0.0.0:443",
+					LogRequests:           true,
+					EnableReflection:      false,
+					EnableInstrumentation: false,
+				},
+				OTEL: &OTELConfig{
+					Enabled:            false,
+					PrometheusEnabled:  false,
+					PrometheusPath:     "/metricsz",
+					StdoutEnabled:      true,
+					MetricIntervalSecs: 60,
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			if tt.name == "Load from env" {
+				os.Setenv("APP_NAME", "test-app-env")
+				os.Setenv("APP_ENVIRONMENT", "production")
+				os.Setenv("APP_LOG_ENABLED", "false")
+				os.Setenv("APP_LOG_LEVEL", "error")
+				os.Setenv("APP_LOG_FORMAT", "console")
+				os.Setenv("APP_LOG_OUTPUT", "stdout")
+				os.Setenv("APP_LOG_TIME_FORMAT", "unix")
+				os.Setenv("APP_HTTP_ENABLED", "false")
+				os.Setenv("APP_HTTP_LISTEN", "0.0.0.0:80")
+				os.Setenv("APP_HTTP_LOG_REQUESTS", "true")
+				os.Setenv("APP_HTTP_READ_TIMEOUT", "15s")
+				os.Setenv("APP_HTTP_WRITE_TIMEOUT", "15s")
+				os.Setenv("APP_HTTP_IDLE_TIMEOUT", "2m")
+				os.Setenv("APP_GRPC_ENABLED", "true")
+				os.Setenv("APP_GRPC_LISTEN", "0.0.0.0:443")
+				os.Setenv("APP_GRPC_LOG_REQUESTS", "true")
+				os.Setenv("APP_GRPC_ENABLE_REFLECTION", "false")
+				os.Setenv("APP_GRPC_ENABLE_INSTRUMENTATION", "false")
+				os.Setenv("APP_OTEL_ENABLED", "false")
+				os.Setenv("APP_OTEL_PROMETHEUS_ENABLED", "false")
+				os.Setenv("APP_OTEL_PROMETHEUS_PATH", "/metricsz")
+				os.Setenv("APP_OTEL_STDOUT_ENABLED", "true")
+				os.Setenv("APP_OTEL_METRIC_INTERVAL_SECS", "60")
+			}
 			got, err := loadConfig(tt.args.configPath)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("loadConfig() error = %v, wantErr %v", err, tt.wantErr)
--- a/pkg/config/ctx.go
+++ b/pkg/config/ctx.go
@@ -14,6 +14,41 @@ func (ac *AppConfig) AddToCtx(ctx context.Context) context.Context {
 	return context.WithValue(ctx, appConfigCtxKey, ac)
 }

+// Add to Ctx for custom type that embeds AppConfig
+func AddToContextFor[T interface {
+	*AppConfig
+}](ctx context.Context, cfg T) context.Context {
+	return context.WithValue(ctx, appConfigCtxKey, cfg)
+}
+
+// FromCtxFor retrieves custom config that embeds AppConfig from context
+func FromCtxFor[T interface {
+	*AppConfig
+}](ctx context.Context) (T, error) {
+	ctxData := ctx.Value(appConfigCtxKey)
+	if ctxData == nil {
+		return nil, errors.New("no config found in context")
+	}
+
+	cfg, ok := ctxData.(T)
+	if !ok {
+		return nil, errors.New("invalid config stored in context")
+	}
+
+	return cfg, nil
+}
+
+// MustFromCtxFor retrieves custom config that embeds AppConfig from context, or panics if not found.
+func MustFromCtxFor[T interface {
+	*AppConfig
+}](ctx context.Context) T {
+	cfg, err := FromCtxFor[T](ctx)
+	if err != nil {
+		panic(err)
+	}
+	return cfg
+}
+
 // MustFromCtx retrieves the AppConfig from the context, or panics if not found.
 func MustFromCtx(ctx context.Context) *AppConfig {
 	cfg, err := FromCtx(ctx)
--- a/pkg/config/testdata/config.yaml
+++ b/pkg/config/testdata/config.yaml
@@ -0,0 +1,5 @@
+name: test-app
+logging:
+  level: debug
+http:
+  listen: "127.0.0.1:9090"
--- a/pkg/config/types_grpc.go
+++ b/pkg/config/types_grpc.go
@@ -18,4 +18,5 @@ type GRPCConfig struct {
 	EnableInstrumentation bool   `yaml:"enableInstrumentation" env:"APP_GRPC_ENABLE_INSTRUMENTATION" json:"enableInstrumentation,omitempty"` // requires OTEL
 	EnableGRPCGateway     bool   `yaml:"enableGRPCGateway" json:"enableGRPCGateway,omitempty" env:"APP_GRPC_ENABLE_GATEWAY" default:"true"`
 	GRPCGatewayPath       string `yaml:"grpcGatewayPath" json:"grpcGatewayPath,omitempty" env:"APP_GRPC_GATEWAY_PATH" default:"/grpc-api"`
+	GRPCGatewayPathStrip  bool   `yaml:"grpcGatewayPathStrip" json:"grpcGatewayPathStrip,omitempty" env:"APP_GRPC_GATEWAY_PATH_STRIP" default:"false"`
 }
--- a/pkg/logging/logging_test.go
+++ b/pkg/logging/logging_test.go
@@ -0,0 +1,133 @@
+
+package logging
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"io"
+	"os"
+	"testing"
+
+	"github.com/rs/zerolog"
+	"github.com/stretchr/testify/assert"
+
+	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/config"
+)
+
+func TestMustInitLogging(t *testing.T) {
+	cfg := &config.AppConfig{
+		Logging: &config.LogConfig{
+			Level:  "info",
+			Format: "json",
+		},
+	}
+	ctx := cfg.AddToCtx(context.Background())
+
+	ctx = MustInitLogging(ctx)
+	logger := zerolog.Ctx(ctx)
+
+	assert.NotNil(t, logger)
+	assert.Equal(t, zerolog.InfoLevel, logger.GetLevel())
+}
+
+func TestConfigureLogger(t *testing.T) {
+	type args struct {
+		cfg *config.LogConfig
+	}
+	tests := []struct {
+		name      string
+		args      args
+		level     zerolog.Level
+		wantJSON  bool
+		wantTime  bool
+		assertion func(t *testing.T, output string)
+	}{
+		{
+			name: "json logger",
+			args: args{
+				cfg: &config.LogConfig{
+					Level:  "debug",
+					Format: "json",
+				},
+			},
+			level:    zerolog.DebugLevel,
+			wantJSON: true,
+		},
+		{
+			name: "console logger",
+			args: args{
+				cfg: &config.LogConfig{
+					Level:  "warn",
+					Format: "console",
+				},
+			},
+			level:    zerolog.WarnLevel,
+			wantJSON: false,
+		},
+		{
+			name: "with time",
+			args: args{
+				cfg: &config.LogConfig{
+					Level:      "info",
+					Format:     "json",
+					TimeFormat: "unix",
+				},
+			},
+			level:    zerolog.InfoLevel,
+			wantJSON: true,
+			wantTime: true,
+			assertion: func(t *testing.T, output string) {
+				var log map[string]interface{}
+				err := json.Unmarshal([]byte(output), &log)
+				assert.NoError(t, err)
+				assert.Contains(t, log, "time")
+			},
+		},
+		{
+			name: "without time",
+			args: args{
+				cfg: &config.LogConfig{
+					Level:      "info",
+					Format:     "json",
+					TimeFormat: "off",
+				},
+			},
+			level:    zerolog.InfoLevel,
+			wantJSON: true,
+			wantTime: false,
+			assertion: func(t *testing.T, output string) {
+				var log map[string]interface{}
+				err := json.Unmarshal([]byte(output), &log)
+				assert.NoError(t, err)
+				assert.NotContains(t, log, "time")
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Capture output
+			old := os.Stderr
+			r, w, _ := os.Pipe()
+			os.Stderr = w
+
+			logger, err := configureLogger(tt.args.cfg)
+			assert.NoError(t, err)
+			assert.Equal(t, tt.level, logger.GetLevel())
+
+			logger.Info().Msg("test")
+
+			w.Close()
+			os.Stderr = old
+
+			var buf bytes.Buffer
+			io.Copy(&buf, r)
+
+			output := buf.String()
+
+			if tt.assertion != nil {
+				tt.assertion(t, output)
+			}
+		})
+	}
+}
--- a/pkg/otel/otel_test.go
+++ b/pkg/otel/otel_test.go
@@ -0,0 +1,66 @@
+
+package otel
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"go.opentelemetry.io/otel/metric/noop"
+	"go.opentelemetry.io/otel/trace"
+
+	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/config"
+)
+
+func TestInit(t *testing.T) {
+	cfg := &config.AppConfig{
+		Name: "test-app",
+		OTEL: &config.OTELConfig{
+			Enabled: true,
+		},
+	}
+	ctx := cfg.AddToCtx(context.Background())
+
+	ctx, shutdown := Init(ctx)
+	defer shutdown(context.Background())
+
+	assert.NotNil(t, ctx.Value(ctxKeyTracer))
+	assert.NotNil(t, ctx.Value(ctxKeyMeter))
+}
+
+func TestInit_Disabled(t *testing.T) {
+	cfg := &config.AppConfig{
+		Name: "test-app",
+		OTEL: &config.OTELConfig{
+			Enabled: false,
+		},
+	}
+	ctx := cfg.AddToCtx(context.Background())
+
+	ctx, shutdown := Init(ctx)
+	defer shutdown(context.Background())
+
+	assert.NotNil(t, ctx.Value(ctxKeyTracer))
+	assert.NotNil(t, ctx.Value(ctxKeyMeter))
+}
+
+func TestContextFuncs(t *testing.T) {
+	tracer := trace.NewNoopTracerProvider().Tracer("test")
+	meter := noop.NewMeterProvider().Meter("test")
+
+	ctx := context.Background()
+	ctx = AddTracerToCtx(ctx, tracer)
+	ctx = AddMeterToCtx(ctx, meter)
+
+	assert.Equal(t, tracer, MustTracerFromCtx(ctx))
+	assert.Equal(t, meter, MustMeterFromCtx(ctx))
+}
+
+func TestContextFuncs_Panic(t *testing.T) {
+	assert.Panics(t, func() {
+		MustTracerFromCtx(context.Background())
+	})
+	assert.Panics(t, func() {
+		MustMeterFromCtx(context.Background())
+	})
+}
--- a/pkg/srv/grpc/grpc_test.go
+++ b/pkg/srv/grpc/grpc_test.go
@@ -0,0 +1,111 @@
+
+package grpc
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"google.golang.org/grpc"
+
+	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/config"
+	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/otel"
+	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/srv/grpc/opts"
+)
+
+// Mock gRPC service
+type mockService struct{}
+
+type MockServiceServer interface {
+	TestMethod(context.Context, *mockRequest) (*mockResponse, error)
+}
+
+type mockRequest struct{}
+type mockResponse struct{}
+
+func (s *mockService) TestMethod(ctx context.Context, req *mockRequest) (*mockResponse, error) {
+	return &mockResponse{}, nil
+}
+
+var _MockService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "test.MockService",
+	HandlerType: (*MockServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "TestMethod",
+			Handler: func(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+				in := new(mockRequest)
+				if err := dec(in); err != nil {
+					return nil, err
+				}
+				if interceptor == nil {
+					return srv.(MockServiceServer).TestMethod(ctx, in)
+				}
+				info := &grpc.UnaryServerInfo{
+					Server:     srv,
+					FullMethod: "/test.MockService/TestMethod",
+				}
+				handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+					return srv.(MockServiceServer).TestMethod(ctx, req.(*mockRequest))
+				}
+				return interceptor(ctx, in, info, handler)
+			},
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "mock.proto",
+}
+
+func TestInitGRPCServer(t *testing.T) {
+	cfg := &config.AppConfig{
+		Name: "test-app",
+		GRPC: &config.GRPCConfig{
+			Enabled: true,
+			Listen:  "127.0.0.1:0", // Use random available port
+		},
+	}
+	ctx := cfg.AddToCtx(context.Background())
+	ctx, _ = otel.Init(ctx)
+
+	grpcOpts := &opts.GRPCOpts{
+		GRPCConfig: cfg.GRPC,
+		AppGRPC: &opts.AppGRPC{
+			Services: []*opts.GRPCService{
+				{
+					Name:    "mock",
+					Type:    &_MockService_serviceDesc,
+					Service: &mockService{},
+				},
+			},
+		},
+	}
+
+	shutdown, done, err := InitGRPCServer(ctx, grpcOpts)
+	assert.NoError(t, err)
+	assert.NotNil(t, shutdown)
+	assert.NotNil(t, done)
+
+	// Shutdown the server
+	err = shutdown(context.Background())
+	assert.NoError(t, err)
+}
+
+func TestInitGRPCServer_NoServices(t *testing.T) {
+	cfg := &config.AppConfig{
+		Name: "test-app",
+		GRPC: &config.GRPCConfig{
+			Enabled: true,
+			Listen:  "127.0.0.1:0",
+		},
+	}
+	ctx := cfg.AddToCtx(context.Background())
+	ctx, _ = otel.Init(ctx)
+
+	grpcOpts := &opts.GRPCOpts{
+		GRPCConfig: cfg.GRPC,
+		AppGRPC:    &opts.AppGRPC{},
+	}
+
+	_, _, err := InitGRPCServer(ctx, grpcOpts)
+	assert.Error(t, err)
+}
--- a/pkg/srv/http/http.go
+++ b/pkg/srv/http/http.go
@@ -59,17 +59,33 @@ func prepHTTPServer(opts *opts.AppHTTP) *http.Server {
 	// Inject extra handlers if given
 	// Used for grpc-gateway runtime.ServeMux handlers
 	for _, h := range opts.Handlers {
+		var servePath string
+
+		if h.Pattern != "" && h.Prefix != "" {
+			l.Fatal().Str("ExactPath", h.Pattern).Str("Prefix", h.Prefix).
+				Msg("Can't have both pattern and prefix match for http handler")
+		} else if h.Pattern == "" && h.Prefix == "" {
+			l.Fatal().Str("ExactPath", h.Pattern).Str("Prefix", h.Prefix).
+				Msg("Must have prefix or pattern for http handler")
+		}
+
+		if h.Prefix != "" {
 			// prefix must end in / to route sub-paths
 			if !strings.HasSuffix(h.Prefix, "/") {
 				h.Prefix = h.Prefix + "/"
 			}
+			servePath = h.Prefix

 			// if enabled, the path prefix is stripped before
 			// requests are sent to the handler
 			if h.StripPrefix {
 				h.Handler = http.StripPrefix(h.Prefix[:len(h.Prefix)-1], h.Handler)
 			}
-		mux.Handle(h.Prefix, otelhttp.WithRouteTag(h.Prefix, h.Handler))
+		} else {
+			servePath = h.Pattern
+		}
+
+		mux.Handle(servePath, otelhttp.NewHandler(h.Handler, servePath))
 	}

 	// Add OTEL instrumentation, filter noise, set span names
--- a/pkg/srv/http/http_test.go
+++ b/pkg/srv/http/http_test.go
@@ -0,0 +1,88 @@
+
+package http
+
+import (
+	"context"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/config"
+	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/otel"
+	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/srv/http/opts"
+)
+
+func TestInitHTTPServer(t *testing.T) {
+	cfg := &config.AppConfig{
+		Name: "test-app",
+		HTTP: &config.HTTPConfig{
+			Enabled: true,
+			Listen:  "127.0.0.1:0", // Use random available port
+		},
+		OTEL: &config.OTELConfig{
+			Enabled: true,
+		},
+	}
+	ctx := cfg.AddToCtx(context.Background())
+	ctx, _ = otel.Init(ctx)
+
+	httpOpts := &opts.AppHTTP{
+		Ctx: ctx,
+		Funcs: []opts.HTTPFunc{
+			{
+				Path: "/test",
+				HandlerFunc: func(w http.ResponseWriter, r *http.Request) {
+					w.WriteHeader(http.StatusOK)
+				},
+			},
+		},
+	}
+
+	shutdown, done, err := InitHTTPServer(httpOpts)
+	assert.NoError(t, err)
+	assert.NotNil(t, shutdown)
+	assert.NotNil(t, done)
+
+	// Shutdown the server
+	err = shutdown(context.Background())
+	assert.NoError(t, err)
+}
+
+func TestHealthCheck(t *testing.T) {
+	req := httptest.NewRequest("GET", "/health", nil)
+	w := httptest.NewRecorder()
+
+	handleHealthCheckFunc(context.Background())(w, req)
+
+	resp := w.Result()
+	body, _ := io.ReadAll(resp.Body)
+
+	assert.Equal(t, http.StatusOK, resp.StatusCode)
+	assert.Equal(t, "ok", string(body))
+}
+
+func TestLoggingMiddleware(t *testing.T) {
+	cfg := &config.AppConfig{
+		Name: "test-app",
+		HTTP: &config.HTTPConfig{
+			LogRequests: true,
+		},
+	}
+	ctx := cfg.AddToCtx(context.Background())
+
+	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+	})
+
+	middleware := loggingMiddleware(ctx, handler)
+
+	req := httptest.NewRequest("GET", "/test", nil)
+	w := httptest.NewRecorder()
+
+	middleware.ServeHTTP(w, req)
+
+	assert.Equal(t, http.StatusOK, w.Code)
+}
--- a/pkg/srv/http/opts/http_config.go
+++ b/pkg/srv/http/opts/http_config.go
@@ -22,7 +22,8 @@ type HTTPFunc struct {
 }

 type HTTPHandler struct {
-	Prefix      string // path prefix under which to serve this handler/mux
+	Prefix      string // path prefix under which to serve this handler/mux, used for convenience
+	Pattern     string // pattern match
 	StripPrefix bool   // strip path before sending to handler/mux
 	Handler     http.Handler
 }
Author	SHA1	Message	Date
Ryan McGuire	98650211ac	enhance context management for custom types	2025-12-24 10:47:28 -05:00
Ryan D McGuire	70e99eef0e	updates go dependencies, refactors config loading precedence, adds gRPC gateway path stripping option, and improves HTTP handler setup.	2025-12-23 13:51:55 -05:00
Ryan D McGuire	7cc4e7831e	Improve serve mux path	2025-12-23 11:10:13 -05:00
Ryan McGuire	5201341251	add default tag name	2025-12-22 15:37:55 -05:00
Ryan D McGuire	854819d966	upgrade go	2025-09-02 13:20:21 -04:00
Ryan D McGuire	7f6c91ae74	update todo	2025-09-02 13:15:26 -04:00
Ryan D McGuire	11b2c2487c	update changelog	2025-09-02 13:07:06 -04:00
Ryan D McGuire	c7e42a7544	updates Go dependencies, refactors and expands unit tests for config, logging, OpenTelemetry, HTTP, and gRPC components	2025-09-02 13:06:02 -04:00
Ryan D McGuire	8d6297a0cb	Merge branch 'main' into development	2025-09-02 11:47:04 -04:00
Ryan D McGuire	f0c3bc6b9e	feat: standardize OpenTelemetry HTTP span names to include method and route pattern	2025-08-27 10:17:24 -04:00
Ryan D McGuire	00cb0d0421	refactors OpenTelemetry HTTP instrumentation by centralizing handler wrapping, adding span name formatting, and filtering health and metrics paths.	2025-08-27 10:04:05 -04:00