Disable insecure otlpgrpcmetric, upgrades

Add custom http listener support
Fix duplicate labels
2025-02-15 14:41:34 -05:00 · 2025-01-29 17:26:29 -05:00 · 2025-01-28 15:46:56 -05:00 · 2025-01-28 15:07:07 -05:00 · 2025-01-28 14:32:27 -05:00 · 2025-01-12 20:19:59 -05:00
15 changed files with 783 additions and 111 deletions
--- a/TODO.md
+++ b/TODO.md
@ -0,0 +1,8 @@
+# TODO
+
+- [x] Pattern for extending config
+
+## Done
+- [x] Unit tests
+- [x] HTTP Logging Middleware
+- [x] Fix panic with OTEL disabled
--- a/go.mod
+++ b/go.mod
@ -3,20 +3,20 @@ module gitea.libretechconsulting.com/rmcguire/go-app
 go 1.23.4

 require (
-	github.com/caarlos0/env/v9 v9.0.0
+	github.com/caarlos0/env/v11 v11.3.1
 	github.com/prometheus/client_golang v1.20.5
 	github.com/rs/zerolog v1.33.0
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0
-	go.opentelemetry.io/otel v1.33.0
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0
-	go.opentelemetry.io/otel/exporters/prometheus v0.55.0
-	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.33.0
-	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0
-	go.opentelemetry.io/otel/metric v1.33.0
-	go.opentelemetry.io/otel/sdk v1.33.0
-	go.opentelemetry.io/otel/sdk/metric v1.33.0
-	go.opentelemetry.io/otel/trace v1.33.0
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0
+	go.opentelemetry.io/otel v1.34.0
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0
+	go.opentelemetry.io/otel/exporters/prometheus v0.56.0
+	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.34.0
+	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.34.0
+	go.opentelemetry.io/otel/metric v1.34.0
+	go.opentelemetry.io/otel/sdk v1.34.0
+	go.opentelemetry.io/otel/sdk/metric v1.34.0
+	go.opentelemetry.io/otel/trace v1.34.0
 	gopkg.in/yaml.v3 v3.0.1
 )

@ -28,22 +28,22 @@ require (
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
+	github.com/klauspost/compress v1.17.11 // 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/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.61.0 // indirect
+	github.com/prometheus/common v0.62.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.4.0 // indirect
-	golang.org/x/net v0.32.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
-	google.golang.org/grpc v1.68.1 // indirect
-	google.golang.org/protobuf v1.35.2 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
+	golang.org/x/net v0.35.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250212204824-5a70512c5d8b // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b // indirect
+	google.golang.org/grpc v1.70.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -1,7 +1,7 @@
 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/caarlos0/env/v9 v9.0.0 h1:SI6JNsOA+y5gj9njpgybykATIylrRMklbs5ch6wO6pc=
-github.com/caarlos0/env/v9 v9.0.0/go.mod h1:ye5mlCVMYh6tZ+vCgrs/B95sj88cg5Tlnc0XIzgZ020=
+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/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
@ -23,10 +23,14 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 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/grpc-ecosystem/grpc-gateway/v2 v2.24.0 h1:TmHmbvxPmaegwhDubVz0lICL0J5Ka2vwTzhoePEXsGE=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0/go.mod h1:qztMSjm835F2bXf+5HKAPIS5qsmQDqZna/PgVt4rWtI=
-github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
-github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1/go.mod h1:RBRO7fro65R6tjKzYgLAFo0t1QEXY1Dp+i/bvpRiqiQ=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.0 h1:VD1gqscl4nYs1YxVuSdemTrSgTKrwOWDK0FVFMqm+Cg=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.0/go.mod h1:4EgsQoS4TOhJizV+JTFg40qx1Ofh3XmXEQNBpgvNT40=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 h1:e9Rjr40Z98/clHv5Yg79Is0NtosR5LXRvdr7o/6NwbA=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1/go.mod h1:tIxuGz/9mpox++sgp9fJjHO0+q1X9/UOWd798aAm22M=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@ -35,9 +39,12 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@ -49,6 +56,8 @@ github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
 github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ=
 github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s=
+github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
+github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
 github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
@ -62,49 +71,103 @@ go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJyS
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I=
 go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
 go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
+go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
+go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0 h1:7F29RDmnlqk6B5d+sUqemt8TBfDqxryYW5gX6L74RFA=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0/go.mod h1:ZiGDq7xwDMKmWDrN1XsXAj0iC7hns+2DhxBFSncNHSE=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0 h1:ajl4QczuJVA2TU9W9AGw++86Xga/RKt//16z/yxPgdk=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0/go.mod h1:Vn3/rlOJ3ntf/Q3zAI0V5lDnTbHGaUsNUeF6nZmm7pA=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 h1:Vh5HayB/0HHfOQA7Ctx69E/Y/DcQSMPpKANYVMQ7fBA=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0/go.mod h1:cpgtDBaqD/6ok/UG0jT15/uKjAY8mRA53diogHBg3UI=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 h1:OeNbIYk/2C15ckl7glBlOBp5+WlYsOElzTNmiPW/x60=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0/go.mod h1:7Bept48yIeqxP2OZ9/AqIpYS94h2or0aB4FypJTc8ZM=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 h1:5pojmb1U1AogINhN3SurB+zm/nIcusopeBNp42f45QM=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0/go.mod h1:57gTHJSE5S1tqg+EKsLPlTWhpHMsWlVmer+LA926XiA=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 h1:tgJ0uaNS4c98WRNUEx5U3aDlrDOI5Rs+1Vifcw4DJ8U=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0/go.mod h1:U7HYyW0zt/a9x5J1Kjs+r1f/d4ZHnYFclhYY2+YbeoE=
 go.opentelemetry.io/otel/exporters/prometheus v0.55.0 h1:sSPw658Lk2NWAv74lkD3B/RSDb+xRFx46GjkrL3VUZo=
 go.opentelemetry.io/otel/exporters/prometheus v0.55.0/go.mod h1:nC00vyCmQixoeaxF6KNyP42II/RHa9UdruK02qBmHvI=
+go.opentelemetry.io/otel/exporters/prometheus v0.56.0 h1:GnCIi0QyG0yy2MrJLzVrIM7laaJstj//flf1zEJCG+E=
+go.opentelemetry.io/otel/exporters/prometheus v0.56.0/go.mod h1:JQcVZtbIIPM+7SWBB+T6FK+xunlyidwLp++fN0sUaOk=
 go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.33.0 h1:FiOTYABOX4tdzi8A0+mtzcsTmi6WBOxk66u0f1Mj9Gs=
 go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.33.0/go.mod h1:xyo5rS8DgzV0Jtsht+LCEMwyiDbjpsxBpWETwFRF0/4=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.34.0 h1:czJDQwFrMbOr9Kk+BPo1y8WZIIFIK58SA1kykuVeiOU=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.34.0/go.mod h1:lT7bmsxOe58Tq+JIOkTQMCGXdu47oA+VJKLZHbaBKbs=
 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0 h1:W5AWUn/IVe8RFb5pZx1Uh9Laf/4+Qmm4kJL5zPuvR+0=
 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0/go.mod h1:mzKxJywMNBdEX8TSJais3NnsVZUaJ+bAy6UxPTng2vk=
+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.34.0 h1:jBpDk4HAUsrnVO1FsfCfCOTEc/MkInJmvfCHYLFiT80=
+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.34.0/go.mod h1:H9LUIM1daaeZaz91vZcfeM0fejXPmgCYE8ZhzqfJuiU=
 go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5WtEnklQ=
 go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M=
+go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
+go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
 go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM=
 go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM=
+go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
+go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
 go.opentelemetry.io/otel/sdk/metric v1.33.0 h1:Gs5VK9/WUJhNXZgn8MR6ITatvAmKeIuCtNbsP3JkNqU=
 go.opentelemetry.io/otel/sdk/metric v1.33.0/go.mod h1:dL5ykHZmm1B1nVRk9dDjChwDmt81MjVp3gLkQRwKf/Q=
+go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
+go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
 go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
 go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
+go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
+go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
 go.opentelemetry.io/proto/otlp v1.4.0 h1:TA9WRvW6zMwP+Ssb6fLoUIuirti1gGbP28GcKG1jgeg=
 go.opentelemetry.io/proto/otlp v1.4.0/go.mod h1:PPBWZIP98o2ElSqI35IHfu7hIhSwvc5N38Jw8pXuGFY=
+go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
+go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
 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/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
-golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
+golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
 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.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q=
-google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
-google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
-google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d h1:H8tOf8XM88HvKqLTxe755haY6r1fqqzLbEnfrmLXlSA=
+google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d/go.mod h1:2v7Z7gP2ZUOGsaFyxATQSRoBnKygqVq2Cwnvom7QiqY=
+google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24=
+google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
+google.golang.org/genproto/googleapis/api v0.0.0-20250127172529-29210b9bc287 h1:A2ni10G3UlplFrWdCDJTl7D7mJ7GSRm37S+PDimaKRw=
+google.golang.org/genproto/googleapis/api v0.0.0-20250127172529-29210b9bc287/go.mod h1:iYONQfRdizDB8JJBybql13nArx91jcUk7zCXEsOofM4=
+google.golang.org/genproto/googleapis/api v0.0.0-20250212204824-5a70512c5d8b h1:i+d0RZa8Hs2L/MuaOQYI+krthcxdEbEM2N+Tf3kJ4zk=
+google.golang.org/genproto/googleapis/api v0.0.0-20250212204824-5a70512c5d8b/go.mod h1:iYONQfRdizDB8JJBybql13nArx91jcUk7zCXEsOofM4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d h1:xJJRGY7TJcvIlpSrN3K6LAWgNFUILlO+OMAqtg9aqnw=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 h1:3UsHvIr4Wc2aW4brOaSCmcxh9ksica6fHEr8P1XhkYw=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 h1:J1H9f+LEdWAfHcez/4cvaVBox7cOYT+IU6rgqj5x++8=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b h1:FQtJ1MxbXoIIrZHZ33M+w5+dAP9o86rgpjoKr/ZmT7k=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk=
+google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
+google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
+google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
+google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
+google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
+google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
+google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
+google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 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/app.go
+++ b/pkg/app/app.go
@ -3,6 +3,8 @@ package app
 import (
 	"context"
 	"errors"
+	"net"
+	"net/http"

 	"github.com/rs/zerolog"
 	"go.opentelemetry.io/otel/codes"
@ -24,9 +26,11 @@ type App struct {
 }

 type AppHTTP struct {
-	Funcs        []srv.HTTPFunc
-	HealthChecks []srv.HealthCheckFunc
-	httpDone     <-chan interface{}
+	Funcs          []srv.HTTPFunc        // Handle funcs to serve
+	Middleware     []http.Handler        // Optional middleware. Next handler called by app framework.
+	HealthChecks   []srv.HealthCheckFunc // Health-check functions to be called by health endpoint
+	CustomListener net.Listener          // Optional listener for http server
+	httpDone       <-chan interface{}
 }

 type (
@ -78,9 +82,13 @@ func (a *App) MustRun() {
 func (a *App) initHTTP() {
 	var httpShutdown shutdownFunc
 	httpShutdown, a.HTTP.httpDone = srv.MustInitHTTPServer(
-		a.AppContext,
-		a.HTTP.Funcs,
-		a.HTTP.HealthChecks...,
+		&srv.HTTPServerOpts{
+			Ctx:              a.AppContext,
+			HandleFuncs:      a.HTTP.Funcs,
+			Middleware:       a.HTTP.Middleware,
+			HealthCheckFuncs: a.HTTP.HealthChecks,
+			CustomListener:   a.HTTP.CustomListener,
+		},
 	)
 	a.shutdownFuncs = append(a.shutdownFuncs, httpShutdown)
 }
--- a/pkg/app/setup.go
+++ b/pkg/app/setup.go
@ -23,3 +23,10 @@ func MustSetupConfigAndLogging(ctx context.Context) context.Context {
 	zerolog.Ctx(ctx).Trace().Any("config", *cfg).Send()
 	return ctx
 }
+
+// Unmarshal config into a custom type
+// Type MUST include *config.AppConfig
+// Stored in context as *config.AppConfig but can be asserted back
+func MustSetupConfigAndLoggingInto[T any](ctx context.Context, into T) (context.Context, T) {
+	return ctx, into
+}
--- a/pkg/app/setup_custom.go
+++ b/pkg/app/setup_custom.go
@ -0,0 +1,107 @@
+package app
+
+import (
+	"context"
+	"errors"
+	"flag"
+	"fmt"
+	"os"
+	"reflect"
+
+	"gopkg.in/yaml.v3"
+
+	"gitea.libretechconsulting.com/rmcguire/go-app/pkg/config"
+)
+
+// Used to unmarshal config and environment into a custom type
+// 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) {
+	// Step 1: Check our custom type for required *config.AppConfig
+	if err := hasAppConfig(into); err != nil {
+		panic(err)
+	}
+
+	// Step 2: Do the normal thing
+	ctx = MustSetupConfigAndLogging(ctx)
+
+	// Step 3: Extract the config
+	cfg := config.MustFromCtx(ctx)
+
+	// Step 4: Unmarshal custom config
+	configPath := flag.Lookup("config")
+	if configPath != nil && configPath.Value.String() != "" {
+		file, err := os.Open(configPath.Value.String())
+		if err != nil {
+			panic(fmt.Errorf("could not open config file: %w", err))
+		}
+		defer file.Close()
+
+		decoder := yaml.NewDecoder(file)
+		if err := decoder.Decode(into); err != nil {
+			panic(fmt.Errorf("could not decode config file: %w", err))
+		}
+	}
+
+	// Step 5: Re-apply AppConfig to custom type
+	if err := setAppConfig(into, cfg); err != nil {
+		panic(err)
+	}
+
+	// Step 6: Update context, return custom type
+	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() {
+		return errors.New("target must be a non-nil pointer to a struct")
+	}
+
+	v = v.Elem() // Dereference the pointer
+	if v.Kind() != reflect.Struct {
+		return errors.New("target must be a pointer to a struct")
+	}
+
+	// Replace *config.AppConfig
+	for i := 0; i < v.NumField(); i++ {
+		field := v.Field(i)
+		if field.Type() == reflect.TypeOf((*config.AppConfig)(nil)) {
+			if !field.CanSet() {
+				return fmt.Errorf("field %q cannot be set", v.Type().Field(i).Name)
+			}
+			field.Set(reflect.ValueOf(appConfig))
+			return nil
+		}
+	}
+
+	return errors.New("no *config.AppConfig field found in target struct")
+}
+
+func hasAppConfig[T any](target T) error {
+	v := reflect.ValueOf(target)
+	if v.Kind() != reflect.Ptr || v.IsNil() {
+		return errors.New("target must be a non-nil pointer to a struct")
+	}
+	v = v.Elem()
+
+	if v.Kind() != reflect.Struct {
+		return errors.New("target must be a pointer to a struct")
+	}
+
+	hasAppConfig := false
+	for i := 0; i < v.NumField(); i++ {
+		field := v.Type().Field(i)
+		if field.Type == reflect.TypeOf((*config.AppConfig)(nil)) {
+			hasAppConfig = true
+			break
+		}
+	}
+	if !hasAppConfig {
+		return errors.New("struct does not contain a *config.AppConfig field")
+	}
+
+	return nil
+}
--- a/pkg/app/setup_test.go
+++ b/pkg/app/setup_test.go
@ -0,0 +1,123 @@
+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
@ -2,12 +2,14 @@ package config

 import (
 	"context"
+	"errors"
 	"flag"
 	"fmt"
 	"os"
 	"runtime/debug"
+	"time"

-	"github.com/caarlos0/env/v9"
+	"github.com/caarlos0/env/v11"
 	"gopkg.in/yaml.v3"
 )

@ -39,7 +41,7 @@ func LoadConfig(ctx context.Context) (context.Context, error) {
 }

 func loadConfig(configPath string) (*AppConfig, error) {
-	cfg := newAppConfig()
+	cfg := *DefaultConfig

 	if configPath != "" {
 		file, err := os.Open(configPath)
@ -49,16 +51,59 @@ func loadConfig(configPath string) (*AppConfig, error) {
 		defer file.Close()

 		decoder := yaml.NewDecoder(file)
-		if err := decoder.Decode(cfg); err != nil {
+		if err := decoder.Decode(&cfg); err != nil {
 			return nil, fmt.Errorf("could not decode config file: %w", err)
 		}
 	}

-	if err := env.Parse(cfg); err != nil {
+	if err := env.Parse(&cfg); err != nil {
 		return nil, fmt.Errorf("could not parse environment variables: %w", err)
 	}

-	return cfg, nil
+	// Perform updates / enrichments
+	err := prepareConfig(&cfg)
+	if err != nil {
+		return nil, err
+	}
+
+	return &cfg, nil
+}
+
+func prepareConfig(cfg *AppConfig) error {
+	var errs error
+
+	// Set timeouts
+	if cfg.HTTP.ReadTimeout != "" {
+		if rT, err := time.ParseDuration(cfg.HTTP.ReadTimeout); err == nil {
+			cfg.HTTP.rT = &rT
+		} else {
+			errs = errors.Join(errs, err)
+		}
+	}
+
+	if cfg.HTTP.ReadTimeout != "" {
+		if wT, err := time.ParseDuration(cfg.HTTP.WriteTimeout); err == nil {
+			cfg.HTTP.wT = &wT
+		} else {
+			errs = errors.Join(errs, err)
+		}
+	}
+
+	if cfg.HTTP.IdleTimeout != "" {
+		if iT, err := time.ParseDuration(cfg.HTTP.IdleTimeout); err == nil {
+			cfg.HTTP.iT = &iT
+		} else {
+			errs = errors.Join(errs, err)
+		}
+	}
+
+	return errs
+}
+
+// Returns read timeout, write timeout, and idle timeout, in that order
+// nil if unset
+func (h *HTTPConfig) Timeouts() (*time.Duration, *time.Duration, *time.Duration) {
+	return h.rT, h.wT, h.iT
 }

 func getVersion() string {
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@ -0,0 +1,81 @@
+package config
+
+import (
+	"encoding/json"
+	"testing"
+)
+
+// Changing defaults could be a breaking change,
+// if this needs to be modified to pass the test,
+// an item should be added to the changelog.
+//
+// This should be maintained, as it is the primary
+// interface between an app and the app framework.
+var testDefaultConfig = &AppConfig{
+	Environment: "development",
+	Version:     getVersion(),
+	Logging: &LogConfig{
+		Enabled:    true,
+		Level:      "info",
+		Format:     LogFormatJSON,
+		Output:     "stderr",
+		TimeFormat: TimeFormatLong,
+	},
+	HTTP: &HTTPConfig{
+		Listen:       "127.0.0.1:8080",
+		LogRequests:  false,
+		ReadTimeout:  "10s",
+		WriteTimeout: "10s",
+		IdleTimeout:  "1m",
+	},
+	OTEL: &OTELConfig{
+		Enabled:            true,
+		PrometheusEnabled:  true,
+		PrometheusPath:     "/metrics",
+		StdoutEnabled:      false,
+		MetricIntervalSecs: 30,
+	},
+}
+
+func Test_loadConfig(t *testing.T) {
+	type args struct {
+		configPath string
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    *AppConfig
+		wantErr bool
+	}{
+		{
+			name:    "Ensure defaults",
+			args:    args{configPath: ""},
+			want:    testDefaultConfig,
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := loadConfig(tt.args.configPath)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("loadConfig() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+
+			// Marshal both the expected and actual structs to JSON
+			gotJSON, err := json.Marshal(got)
+			if err != nil {
+				t.Fatalf("Failed to marshal got to JSON: %v", err)
+			}
+			wantJSON, err := json.Marshal(tt.want)
+			if err != nil {
+				t.Fatalf("Failed to marshal want to JSON: %v", err)
+			}
+
+			// Compare the JSON strings
+			if string(gotJSON) != string(wantJSON) {
+				t.Errorf("loadConfig() JSON = %s, want JSON = %s", string(gotJSON), string(wantJSON))
+			}
+		})
+	}
+}
--- a/pkg/config/ctx_test.go
+++ b/pkg/config/ctx_test.go
@ -0,0 +1,43 @@
+package config
+
+import (
+	"context"
+	"testing"
+)
+
+func TestFromCtx(t *testing.T) {
+	app := &AppConfig{
+		Name: "testapp",
+	}
+	appCtx := app.AddToCtx(context.Background())
+
+	type args struct {
+		ctx context.Context
+	}
+
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{
+			name:    "Unprepared app context",
+			args:    args{ctx: context.Background()},
+			wantErr: true,
+		},
+		{
+			name:    "Prepared app context",
+			args:    args{ctx: appCtx},
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			_, err := FromCtx(tt.args.ctx)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("FromCtx() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+		})
+	}
+}
--- a/pkg/config/types.go
+++ b/pkg/config/types.go
@ -1,33 +1,53 @@
 package config

-func newAppConfig() *AppConfig {
-	return &AppConfig{
-		Version: getVersion(),
-		Logging: &LogConfig{},
-		HTTP:    &HTTPConfig{},
-		OTEL:    &OTELConfig{},
-	}
+import "time"
+
+// Default Settings
+var DefaultConfig = &AppConfig{
+	Environment: "development",
+	Version:     getVersion(),
+	Logging: &LogConfig{
+		Enabled:    true,
+		Level:      "info",
+		Format:     LogFormatJSON,
+		Output:     "stderr",
+		TimeFormat: TimeFormatLong,
+	},
+	HTTP: &HTTPConfig{
+		Listen:       "127.0.0.1:8080",
+		LogRequests:  false,
+		ReadTimeout:  "10s",
+		WriteTimeout: "10s",
+		IdleTimeout:  "1m",
+	},
+	OTEL: &OTELConfig{
+		Enabled:            true,
+		PrometheusEnabled:  true,
+		PrometheusPath:     "/metrics",
+		StdoutEnabled:      false,
+		MetricIntervalSecs: 30,
+	},
 }

 type AppConfig struct {
-	Name        string `yaml:"name" env:"APP_NAME" envDefault:"go-http-server-with-otel"`
-	Environment string `yaml:"environment" env:"APP_ENVIRONMENT" envDefault:"development"`
+	Name        string `yaml:"name,omitempty" env:"APP_NAME"`
+	Environment string `yaml:"environment,omitempty" env:"APP_ENVIRONMENT"`
 	// This should either be set by ldflags, such as with
 	// go build -ldflags "-X gitea.libretechconsulting.com/rmcguire/go-app/pkg/config.Version=$(VERSION)"
 	// or allow this to use build meta. Will default to (devel)
-	Version string      `yaml:"version" env:"APP_VERSION"`
-	Logging *LogConfig  `yaml:"logging"`
-	HTTP    *HTTPConfig `yaml:"http"`
-	OTEL    *OTELConfig `yaml:"otel"`
+	Version string      `yaml:"version,omitempty" env:"APP_VERSION"`
+	Logging *LogConfig  `yaml:"logging,omitempty"`
+	HTTP    *HTTPConfig `yaml:"http,omitempty"`
+	OTEL    *OTELConfig `yaml:"otel,omitempty"`
 }

 // Logging Configuration
 type LogConfig struct {
-	Enabled    bool       `yaml:"enabled" env:"APP_LOG_ENABLED" envDefault:"true"`
-	Level      string     `yaml:"level" env:"APP_LOG_LEVEL" envDefault:"info"`
-	Format     LogFormat  `yaml:"format" env:"APP_LOG_FORMAT" envDefault:"json"`
-	Output     LogOutput  `yaml:"output" env:"APP_LOG_OUTPUT" envDefault:"stderr"`
-	TimeFormat TimeFormat `yaml:"timeFormat" env:"APP_LOG_TIME_FORMAT" envDefault:"short"`
+	Enabled    bool       `yaml:"enabled,omitempty" env:"APP_LOG_ENABLED"`
+	Level      string     `yaml:"level,omitempty" env:"APP_LOG_LEVEL"`
+	Format     LogFormat  `yaml:"format,omitempty" env:"APP_LOG_FORMAT"`
+	Output     LogOutput  `yaml:"output,omitempty" env:"APP_LOG_OUTPUT"`
+	TimeFormat TimeFormat `yaml:"timeFormat,omitempty" env:"APP_LOG_TIME_FORMAT"`
 }

 type LogFormat string
@ -56,15 +76,21 @@ const (

 // HTTP Configuration
 type HTTPConfig struct {
-	Listen         string `yaml:"listen" env:"APP_HTTP_LISTEN" envDefault:"127.0.0.1:8080"`
-	RequestTimeout int    `yaml:"requestTimeout" env:"APP_HTTP_REQUEST_TIMEOUT" envDefault:"30"`
+	Listen       string `yaml:"listen,omitempty" env:"APP_HTTP_LISTEN"`
+	LogRequests  bool   `yaml:"logRequests" env:"APP_HTTP_LOG_REQUESTS"`
+	ReadTimeout  string `yaml:"readTimeout" env:"APP_HTTP_READ_TIMEOUT"`   // Go duration (e.g. 10s)
+	WriteTimeout string `yaml:"writeTimeout" env:"APP_HTTP_WRITE_TIMEOUT"` // Go duration (e.g. 10s)
+	IdleTimeout  string `yaml:"idleTimeout" env:"APP_HTTP_IDLE_TIMEOUT"`   // Go duration (e.g. 10s)
+	rT           *time.Duration
+	wT           *time.Duration
+	iT           *time.Duration
 }

 // OTEL Configuration
 type OTELConfig struct {
-	Enabled            bool   `yaml:"enabled" env:"APP_OTEL_ENABLED" envDefault:"true"`
-	PrometheusEnabled  bool   `yaml:"prometheusEnabled" env:"APP_OTEL_PROMETHEUS_ENABLED" envDefault:"true"`
-	PrometheusPath     string `yaml:"prometheusPath" env:"APP_OTEL_PROMETHEUS_PATH" envDefault:"/metrics"`
-	StdoutEnabled      bool   `yaml:"stdoutEnabled" env:"APP_OTEL_STDOUT_ENABLED" envDefault:"false"`
-	MetricIntervalSecs int    `yaml:"metricIntervalSecs" env:"APP_OTEL_METRIC_INTERVAL_SECS" envDefault:"15"`
+	Enabled            bool   `yaml:"enabled,omitempty" env:"APP_OTEL_ENABLED"`
+	PrometheusEnabled  bool   `yaml:"prometheusEnabled,omitempty" env:"APP_OTEL_PROMETHEUS_ENABLED"`
+	PrometheusPath     string `yaml:"prometheusPath,omitempty" env:"APP_OTEL_PROMETHEUS_PATH"`
+	StdoutEnabled      bool   `yaml:"stdoutEnabled,omitempty" env:"APP_OTEL_STDOUT_ENABLED"`
+	MetricIntervalSecs int    `yaml:"metricIntervalSecs,omitempty" env:"APP_OTEL_METRIC_INTERVAL_SECS"`
 }
--- a/pkg/otel/otel.go
+++ b/pkg/otel/otel.go
@ -8,6 +8,7 @@ import (
 	"time"

 	opentelemetry "go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc"
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
 	"go.opentelemetry.io/otel/exporters/prometheus"
@ -46,6 +47,11 @@ func Init(ctx context.Context) (context.Context, func(context.Context) error) {
 	if !cfg.OTEL.Enabled {
 		opentelemetry.SetMeterProvider(noopMetric.NewMeterProvider())
 		opentelemetry.SetTracerProvider(noop.NewTracerProvider())
+		// Won't function with noop providers
+		meter := opentelemetry.Meter(cfg.Name)
+		ctx = AddMeterToCtx(ctx, meter)
+		tracer := opentelemetry.Tracer(cfg.Name)
+		ctx = AddTracerToCtx(ctx, tracer)
 		return ctx, func(context.Context) error {
 			return nil
 		}
@ -62,12 +68,12 @@ func Init(ctx context.Context) (context.Context, func(context.Context) error) {
 	if cfg.OTEL.StdoutEnabled {
 		options = append(options, EnableStdoutExporter)
 	}
-	if cfg.OTEL.MetricIntervalSecs > 0 {
-		metricInterval = time.Duration(cfg.OTEL.MetricIntervalSecs) * time.Second
-	}
 	if cfg.OTEL.PrometheusEnabled {
 		options = append(options, EnablePrometheusExporter)
 	}
+	if cfg.OTEL.MetricIntervalSecs > 0 {
+		metricInterval = time.Duration(cfg.OTEL.MetricIntervalSecs) * time.Second
+	}
 	options = append(options,
 		WithMetricExportInterval(metricInterval))

@ -134,7 +140,7 @@ func newPropagator() propagation.TextMapPropagator {

 func (s *settings) newTracerProvider(ctx context.Context) (traceProvider *traceSDK.TracerProvider, err error) {
 	traceOpts := []traceSDK.TracerProviderOption{
-		traceSDK.WithResource(newResource()),
+		traceSDK.WithResource(newResource(ctx)),
 	}

 	host, set := os.LookupEnv("OTEL_EXPORTER_OTLP_ENDPOINT")
@ -159,8 +165,16 @@ func (s *settings) newTracerProvider(ctx context.Context) (traceProvider *traceS
 	return
 }

-func newResource() *resource.Resource {
-	return resource.NewWithAttributes(semconv.SchemaURL)
+func newResource(ctx context.Context) *resource.Resource {
+	cfg := config.MustFromCtx(ctx)
+	attributes := []attribute.KeyValue{
+		semconv.ServiceName(cfg.Name),
+		semconv.ServiceVersion(cfg.Version),
+		semconv.DeploymentEnvironment(cfg.Environment),
+		semconv.K8SPodName(os.Getenv("HOSTNAME")),
+	}
+
+	return resource.NewWithAttributes(semconv.SchemaURL, attributes...)
 }

 // Configures meter provider
@ -187,7 +201,7 @@ func (s *settings) newMeterProvider(ctx context.Context) (*metric.MeterProvider,
 	host, set := os.LookupEnv("OTEL_EXPORTER_OTLP_ENDPOINT")
 	var otlpExporter *otlpmetricgrpc.Exporter
 	if set && host != "" {
-		if exp, err := otlpmetricgrpc.New(ctx, otlpmetricgrpc.WithInsecure()); err != nil {
+		if exp, err := otlpmetricgrpc.New(ctx); err != nil {
 			return nil, fmt.Errorf("otlpmetricgrpc.New: %w", err)
 		} else {
 			otlpExporter = exp
@ -197,6 +211,7 @@ func (s *settings) newMeterProvider(ctx context.Context) (*metric.MeterProvider,
 	var meterProvider *metric.MeterProvider
 	if otlpExporter != nil {
 		metricOptions = append(metricOptions,
+			metric.WithResource(newResource(ctx)),
 			metric.WithReader(exporter),
 			metric.WithReader(
 				metric.NewPeriodicReader(
@ -204,12 +219,11 @@ func (s *settings) newMeterProvider(ctx context.Context) (*metric.MeterProvider,
 					metric.WithInterval(s.MetricExportInterval),
 				),
 			),
-			metric.WithResource(newResource()),
 		)
 	} else {
 		metricOptions = append(metricOptions,
+			metric.WithResource(newResource(ctx)),
 			metric.WithReader(exporter),
-			metric.WithResource(newResource()),
 		)
 	}

--- a/pkg/otel/util.go
+++ b/pkg/otel/util.go
@ -2,6 +2,7 @@ package otel

 import (
 	"context"
+	"os"
 	"strings"

 	"go.opentelemetry.io/otel"
@ -22,8 +23,13 @@ func GetMeter(ctx context.Context, components ...string) metric.Meter {
 func getName(ctx context.Context, components ...string) string {
 	cfg := config.MustFromCtx(ctx)

+	serviceName := cfg.Name
+	if otelEnvName := os.Getenv("OTEL_SERVICE_NAME"); otelEnvName != "" {
+		serviceName = otelEnvName
+	}
+
 	path := make([]string, 0, len(components)+1)
-	path = append(path, cfg.Name)
+	path = append(path, serviceName)
 	path = append(path, components...)

 	return strings.Join(path, ".")
--- a/pkg/srv/http.go
+++ b/pkg/srv/http.go
@ -2,8 +2,11 @@ package srv

 import (
 	"context"
+	"fmt"
+	"log"
 	"net"
 	"net/http"
+	"os"
 	"time"

 	"github.com/prometheus/client_golang/prometheus/promhttp"
@ -17,11 +20,11 @@ import (
 )

 var (
-	httpMeter    metric.Meter
-	httpTracer   trace.Tracer
-	readTimeout  = 10 * time.Second
-	writeTimeout = 10 * time.Second
-	idleTimeout  = 15 * time.Second
+	httpMeter       metric.Meter
+	httpTracer      trace.Tracer
+	defReadTimeout  = 10 * time.Second
+	defWriteTimeout = 10 * time.Second
+	defIdleTimeout  = 15 * time.Second
 )

 type HTTPFunc struct {
@ -29,10 +32,18 @@ type HTTPFunc struct {
 	HandlerFunc http.HandlerFunc
 }

-func prepHTTPServer(ctx context.Context, handleFuncs []HTTPFunc, hcFuncs ...HealthCheckFunc) *http.Server {
+type HTTPServerOpts struct {
+	Ctx              context.Context
+	HandleFuncs      []HTTPFunc
+	Middleware       []http.Handler
+	HealthCheckFuncs []HealthCheckFunc
+	CustomListener   net.Listener
+}
+
+func prepHTTPServer(opts *HTTPServerOpts) *http.Server {
 	var (
-		cfg = config.MustFromCtx(ctx)
-		l   = zerolog.Ctx(ctx)
+		cfg = config.MustFromCtx(opts.Ctx)
+		l   = zerolog.Ctx(opts.Ctx)
 		mux = &http.ServeMux{}
 	)

@ -43,11 +54,11 @@ func prepHTTPServer(ctx context.Context, handleFuncs []HTTPFunc, hcFuncs ...Heal
 		mux.Handle(pattern, handler) // Associate pattern with handler
 	}

-	healthChecks := handleHealthCheckFunc(ctx, hcFuncs...)
+	healthChecks := handleHealthCheckFunc(opts.Ctx, opts.HealthCheckFuncs...)
 	otelHandleFunc("/health", healthChecks)
 	otelHandleFunc("/", healthChecks)

-	for _, f := range handleFuncs {
+	for _, f := range opts.HandleFuncs {
 		otelHandleFunc(f.Path, f.HandlerFunc)
 	}

@ -72,24 +83,57 @@ func prepHTTPServer(ctx context.Context, handleFuncs []HTTPFunc, hcFuncs ...Heal
 			}
 		}))

+	// Set timeouts from defaults, override
+	// with config timeouts if set
+	readTimeout := defReadTimeout
+	writeTimeout := defWriteTimeout
+	idleTimeout := defIdleTimeout
+
+	rT, wT, iT := cfg.HTTP.Timeouts()
+	if rT != nil {
+		readTimeout = *rT
+	}
+	if wT != nil {
+		writeTimeout = *wT
+	}
+	if iT != nil {
+		idleTimeout = *iT
+	}
+
+	// Inject any supplied middleware
+	for i := len(opts.Middleware) - 1; i >= 0; i-- {
+		mw := opts.Middleware[i]
+		next := handler
+		handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			mw.ServeHTTP(w, r)
+			next.ServeHTTP(w, r)
+		})
+	}
+
+	// Inject logging middleware
+	if cfg.HTTP.LogRequests {
+		handler = loggingMiddleware(opts.Ctx, handler)
+	}
+
 	return &http.Server{
 		Addr:         cfg.HTTP.Listen,
 		ReadTimeout:  readTimeout,
 		WriteTimeout: writeTimeout,
 		IdleTimeout:  idleTimeout,
 		Handler:      handler,
+		ErrorLog:     log.New(os.Stderr, fmt.Sprintf("Go-HTTP[%s]", cfg.Name), log.Flags()),
 		BaseContext: func(_ net.Listener) context.Context {
-			return ctx
+			return opts.Ctx
 		},
 	}
 }

 // Returns a shutdown func and a done channel if the
 // server aborts abnormally. Panics on error.
-func MustInitHTTPServer(ctx context.Context, funcs []HTTPFunc, hcFuncs ...HealthCheckFunc) (
+func MustInitHTTPServer(opts *HTTPServerOpts) (
 	func(context.Context) error, <-chan interface{},
 ) {
-	shutdownFunc, doneChan, err := InitHTTPServer(ctx, funcs, hcFuncs...)
+	shutdownFunc, doneChan, err := InitHTTPServer(opts)
 	if err != nil {
 		panic(err)
 	}
@ -98,30 +142,40 @@ func MustInitHTTPServer(ctx context.Context, funcs []HTTPFunc, hcFuncs ...Health

 // Returns a shutdown func and a done channel if the
 // server aborts abnormally. Returns error on failure to start
-func InitHTTPServer(ctx context.Context, funcs []HTTPFunc, hcFuncs ...HealthCheckFunc) (
+func InitHTTPServer(opts *HTTPServerOpts) (
 	func(context.Context) error, <-chan interface{}, error,
 ) {
-	l := zerolog.Ctx(ctx)
+	l := zerolog.Ctx(opts.Ctx)
 	doneChan := make(chan interface{})

 	var server *http.Server

-	httpMeter = otel.GetMeter(ctx, "http")
-	httpTracer = otel.GetTracer(ctx, "http")
+	httpMeter = otel.GetMeter(opts.Ctx, "http")
+	httpTracer = otel.GetTracer(opts.Ctx, "http")

-	server = prepHTTPServer(ctx, funcs, hcFuncs...)
+	server = prepHTTPServer(opts)

 	go func() {
-		l.Debug().Msg("HTTP Server Started")
-		err := server.ListenAndServe()
+		var err error
+
+		if opts.CustomListener != nil {
+			err = server.Serve(opts.CustomListener)
+		} else {
+			err = server.ListenAndServe()
+		}
+
 		if err != nil && err != http.ErrServerClosed {
 			l.Err(err).Msg("HTTP server error")
 		} else {
 			l.Info().Msg("HTTP server shut down")
 		}
+
+		// Notify app initiator
 		doneChan <- nil
 	}()

+	l.Debug().Msg("HTTP Server Started")
+
 	// Shut down http server with a deadline
 	return func(shutdownCtx context.Context) error {
 		l.Debug().Msg("stopping http server")
--- a/pkg/srv/http_log.go
+++ b/pkg/srv/http_log.go
@ -0,0 +1,87 @@
+package srv
+
+import (
+	"bytes"
+	"context"
+	"errors"
+	"net/http"
+	"regexp"
+	"time"
+
+	"github.com/rs/zerolog"
+)
+
+var ExcludeFromLogging = regexp.MustCompile(`\/(ready|live|metrics)$`)
+
+type LoggingResponseWriter struct {
+	http.ResponseWriter
+	statusCode int
+	body       *bytes.Buffer
+}
+
+func loggingMiddleware(appCtx context.Context, next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if ExcludeFromLogging.Match([]byte(r.URL.Path)) {
+			next.ServeHTTP(w, r)
+			return
+		}
+
+		log := zerolog.Ctx(appCtx)
+
+		start := time.Now()
+		lrr := newLoggingResponseWriter(w)
+		next.ServeHTTP(lrr, r)
+
+		log.Debug().
+			Str("path", r.URL.Path).
+			Any("query", r.URL.Query()).
+			Int("statusCode", lrr.statusCode).
+			Str("protocol", r.Proto).
+			Str("remote", r.RemoteAddr).
+			Dur("duration", time.Since(start)).
+			Msg("http request served")
+
+		// Log response body
+		trcLog := log.Trace().
+			Str("path", r.URL.Path).
+			Int("statusCode", lrr.statusCode)
+
+		// Check if it's JSON
+		firstByte, err := lrr.body.ReadByte()
+		if err != nil {
+			trcLog.Err(errors.New("invalid response body")).Send()
+			return
+		}
+		lrr.body.UnreadByte()
+
+		if firstByte == '{' {
+			trcLog = trcLog.RawJSON("response", lrr.body.Bytes())
+		} else {
+			trcLog = trcLog.Bytes("response", lrr.body.Bytes())
+		}
+		trcLog.Msg("response payload")
+	})
+}
+
+// Implement Flush to support the http.Flusher interface
+func (w *LoggingResponseWriter) Flush() {
+	if flusher, ok := w.ResponseWriter.(http.Flusher); ok {
+		flusher.Flush()
+	}
+}
+
+func (w *LoggingResponseWriter) WriteHeader(code int) {
+	w.statusCode = code
+	w.ResponseWriter.WriteHeader(code)
+}
+
+func (w *LoggingResponseWriter) Write(b []byte) (int, error) {
+	w.body.Write(b)
+	return w.ResponseWriter.Write(b)
+}
+
+func newLoggingResponseWriter(w http.ResponseWriter) *LoggingResponseWriter {
+	return &LoggingResponseWriter{
+		ResponseWriter: w, statusCode: http.StatusOK, body: bytes.NewBuffer(nil),
+	}
+}
Author	SHA1	Message	Date
Ryan McGuire	96f9213213	Disable insecure otlpgrpcmetric, upgrades	2025-02-15 14:41:34 -05:00
Ryan McGuire	ae00c64684	Add custom http listener support	2025-01-29 17:26:29 -05:00
Ryan McGuire	004c1b1ee6	Fix duplicate labels	2025-01-28 15:46:56 -05:00
Ryan McGuire	861214be5d	Upgrades, error logger	2025-01-28 15:07:07 -05:00
Ryan McGuire	896225effc	Add Middleware Support	2025-01-28 14:32:27 -05:00
Ryan D McGuire	06bf7ebca7	Add resource attributes to go_ metrics	2025-01-12 20:19:59 -05:00
Ryan McGuire	15a597de1d	Update TODO	2025-01-08 16:49:51 -05:00
Ryan McGuire	56037c4b05	Support custom types	2025-01-08 16:48:34 -05:00
Ryan D McGuire	70ba85bf79	Add tests	2025-01-05 20:29:18 -05:00
Ryan D McGuire	55e3a68db6	Add logging middleware	2025-01-05 16:22:15 -05:00
Ryan D McGuire	c47eae8afa	Update TODO	2025-01-05 15:37:04 -05:00
Ryan D McGuire	c6514e0590	Improve HTTP timeout config	2025-01-05 15:35:27 -05:00
Ryan D McGuire	4a99f06987	Fix forced overrides	2025-01-05 13:09:59 -05:00
Ryan D McGuire	208e31c3d4	Prefer otel service name	2025-01-04 20:18:48 -05:00
Ryan D McGuire	4e62e11e9e	Add TODO	2025-01-04 12:25:16 -05:00