chore(release): prepare for v0.4.0 (#151)

## [0.4.0] - 2026-06-16

### 🚀 Features

- *(metrics)* Add SubscriptionMetrics OTel observer for subscriptions (#150)

### 🐛 Bug Fixes

- *(deps)* Update opentelemetry-go monorepo (#146)
- *(deps)* Update module github.com/99designs/gqlgen to v0.17.91 (#148)

<!-- generated by git-cliff -->

---

**Note:** Please use **Squash Merge** when merging this PR.

Reviewed-on: #151
Co-authored-by: Unbound Releaser <releaser@unbound.se>
Co-committed-by: Unbound Releaser <releaser@unbound.se>

.version

@@ -1,3 +1,3 @@
 {
-  "version": "v0.2.7"
+  "version": "v0.4.0"
 }

CHANGELOG.md

@@ -2,6 +2,29 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.4.0] - 2026-06-16
+
+### 🚀 Features
+
+- *(metrics)* Add SubscriptionMetrics OTel observer for subscriptions (#150)
+
+### 🐛 Bug Fixes
+
+- *(deps)* Update opentelemetry-go monorepo (#146)
+- *(deps)* Update module github.com/99designs/gqlgen to v0.17.91 (#148)
+
+## [0.3.1] - 2026-05-29
+
+### 🐛 Bug Fixes
+
+- Set service.instance.id for unique instance label (#144)
+
+## [0.3.0] - 2026-05-26
+
+### 🚀 Features
+
+- Add eventsourced MetricsRecorder adapter for OpenTelemetry (#142)
+
 ## [0.2.7] - 2026-05-09
 
 ### 🐛 Bug Fixes

go.mod

@@ -3,16 +3,18 @@ module gitea.unbound.se/shiny/otelsetup
 go 1.25.0
 
 require (
-	github.com/99designs/gqlgen v0.17.90
+	github.com/99designs/gqlgen v0.17.91
-	go.opentelemetry.io/otel v1.43.0
+	gitlab.com/unboundsoftware/eventsourced/eventsourced v1.23.0
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.43.0
+	go.opentelemetry.io/otel v1.44.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.44.0
-	go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.19.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.44.0
-	go.opentelemetry.io/otel/log v0.19.0
+	go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.20.0
-	go.opentelemetry.io/otel/sdk v1.43.0
+	go.opentelemetry.io/otel/log v0.20.0
-	go.opentelemetry.io/otel/sdk/log v0.19.0
+	go.opentelemetry.io/otel/metric v1.44.0
-	go.opentelemetry.io/otel/sdk/metric v1.43.0
+	go.opentelemetry.io/otel/sdk v1.44.0
-	go.opentelemetry.io/otel/trace v1.43.0
+	go.opentelemetry.io/otel/sdk/log v0.20.0
+	go.opentelemetry.io/otel/sdk/metric v1.44.0
+	go.opentelemetry.io/otel/trace v1.44.0
 )
 
 require (
@@ -21,19 +23,18 @@ require (
 	github.com/go-logr/logr v1.4.3 // 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.28.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect
 	github.com/sosodev/duration v1.4.0 // indirect
-	github.com/vektah/gqlparser/v2 v2.5.33 // indirect
+	github.com/vektah/gqlparser/v2 v2.5.34 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.44.0 // indirect
-	go.opentelemetry.io/otel/metric v1.43.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.10.0 // indirect
-	golang.org/x/net v0.52.0 // indirect
+	golang.org/x/net v0.55.0 // indirect
 	golang.org/x/sync v0.20.0 // indirect
-	golang.org/x/sys v0.42.0 // indirect
+	golang.org/x/sys v0.45.0 // indirect
-	golang.org/x/text v0.35.0 // indirect
+	golang.org/x/text v0.37.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect
-	google.golang.org/grpc v1.80.0 // indirect
+	google.golang.org/grpc v1.81.1 // indirect
 	google.golang.org/protobuf v1.36.11 // indirect
 )

go.sum

@@ -1,9 +1,7 @@
-github.com/99designs/gqlgen v0.17.90 h1:wSv6blm/PoplU6QoNw83EcQpNtC0HX3/+44vITJOzpk=
+github.com/99designs/gqlgen v0.17.91 h1:/mIvXnN0lAorqszP3Vukw10SVRfLVUYtBTQFwmYRMmI=
-github.com/99designs/gqlgen v0.17.90/go.mod h1:GqYrEwYsqCG8VaOsq2kJUCUKwAE1T+u2i+Nj7NtXiVI=
+github.com/99designs/gqlgen v0.17.91/go.mod h1:N7+yJF6zbGIEqohF+ZtEUp/eq2dTnn0bDizLUIYPUCU=
 github.com/agnivade/levenshtein v1.2.1 h1:EHBY3UOn1gwdy/VbFwgo4cxecRznFk7fKWN1KOX7eoM=
 github.com/agnivade/levenshtein v1.2.1/go.mod h1:QVVI16kDrtSuwcpd0p1+xMC6Z/VfhtCyDIjcwga4/DU=
-github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=
-github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
 github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
@@ -21,64 +19,66 @@ 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/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs=
 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/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
-github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
 github.com/sosodev/duration v1.4.0 h1:35ed0KiVFriGHHzZZJaZLgmTEEICIyt8Sx0RQfj9IjE=
 github.com/sosodev/duration v1.4.0/go.mod h1:RQIBBX0+fMLc/D9+Jb/fwvVmo0eZvDDEERAikUR6SDg=
 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/vektah/gqlparser/v2 v2.5.33 h1:lRp8aIeNUNbimf/axZd7ETg24q06hBtPaas+TcvI/7E=
+github.com/vektah/gqlparser/v2 v2.5.34 h1:MEea5P0qhdcqfBL45ghKE+qr9laidVHTMHjav5h7ckk=
-github.com/vektah/gqlparser/v2 v2.5.33/go.mod h1:c1I28gSOVNzlfc4WuDlqU7voQnsqI6OG2amkBAFmgts=
+github.com/vektah/gqlparser/v2 v2.5.34/go.mod h1:mFdHLGCio7OGX1fby9ZjTW6FN+qxgmbnBcRIeeScE5s=
+gitlab.com/unboundsoftware/eventsourced/eventsourced v1.23.0 h1:qcteJH9D7kHaOgLQ0fzlW9dv42hSa0Vluqt7p4kooWA=
+gitlab.com/unboundsoftware/eventsourced/eventsourced v1.23.0/go.mod h1:LrA7I7etRmhIC1PjO8c26BHm+gWsy2rC3eSMe5+XUWE=
 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/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
+go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU=
-go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
+go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.43.0 h1:w1K+pCJoPpQifuVpsKamUdn9U0zM3xUziVOqsGksUrY=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.44.0 h1:RuynHbfU8JUEw7DyONgkVYg2SVtsoF28y0LGIr69jgA=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.43.0/go.mod h1:HBy4BjzgVE8139ieRI75oXm3EcDN+6GhD88JT1Kjvxg=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.44.0/go.mod h1:qZF+/lBs71APw8mlnEZcqZHMzqrYrsFiJOv83lX1OGo=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 h1:88Y4s2C8oTui1LGM6bTWkw0ICGcOLCAI5l6zsD1j20k=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.44.0 h1:4YsVu3B8+3qtWYYrsUYgn0OG78pN0rnNPRGX4SbokQI=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0/go.mod h1:Vl1/iaggsuRlrHf/hfPJPvVag77kKyvrLeD10kpMl+A=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.44.0/go.mod h1:+wnlSn0mD1ADVMe3v9Z/WIaiz6q6gL2J/ejaAmdmv80=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 h1:3iZJKlCZufyRzPzlQhUIWVmfltrXuGyfjREgGP3UUjc=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.44.0 h1:lgh3PiVrRUWMLOVSkQicxzZll5NjF1r+AtsX1XRIHw0=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0/go.mod h1:/G+nUPfhq2e+qiXMGxMwumDrP5jtzU+mWN7/sjT2rak=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.44.0/go.mod h1:5Cnhth3m/AgOeTgE3ex12pPmiu/gGtZit03kSzx9X7s=
-go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.19.0 h1:GJkybS+crDMdExT/BUNCEgfrmfboztcS6PhvSo88HKM=
+go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.20.0 h1:aZfdmtI6QU/DAPD4b7YZ5zuJgewxO1EW9miOZklqleU=
-go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.19.0/go.mod h1:NuAyxRYIG2lKX3YQkB+83StTxM7s52PUUkRRiC0wnYI=
+go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.20.0/go.mod h1:isNl10/Om5CBWu9jj8WOb2+tJLbCVXDgqwzCaJMnJ6w=
-go.opentelemetry.io/otel/log v0.19.0 h1:KUZs/GOsw79TBBMfDWsXS+KZ4g2Ckzksd1ymzsIEbo4=
+go.opentelemetry.io/otel/log v0.20.0 h1:/5i0vuHxCLWUfChWG41K9wkM0jafruPw9NU1/RCJirs=
-go.opentelemetry.io/otel/log v0.19.0/go.mod h1:5DQYeGmxVIr4n0/BcJvF4upsraHjg6vudJJpnkL6Ipk=
+go.opentelemetry.io/otel/log v0.20.0/go.mod h1:wOcMcjsZpG8x7Bak7IhSi/lg8wscV2C1VdrKCLPlt0E=
-go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
+go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc=
-go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
+go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo=
-go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=
+go.opentelemetry.io/otel/metric/x v0.66.0 h1:YkCrx1zLOChi9ZcZ6euupOcsgzbVlec7D/xoEU1+cTA=
-go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=
+go.opentelemetry.io/otel/metric/x v0.66.0/go.mod h1:d1+BDj9t96do0/1LoU1ayfCv79ZgNE41qbhBvnMOBZk=
-go.opentelemetry.io/otel/sdk/log v0.19.0 h1:scYVLqT22D2gqXItnWiocLUKGH9yvkkeql5dBDiXyko=
+go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=
-go.opentelemetry.io/otel/sdk/log v0.19.0/go.mod h1:vFBowwXGLlW9AvpuF7bMgnNI95LiW10szrOdvzBHlAg=
+go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0=
-go.opentelemetry.io/otel/sdk/log/logtest v0.19.0 h1:BEbF7ZBB6qQloV/Ub1+3NQoOUnVtcGkU3XX4Ws3GQfk=
+go.opentelemetry.io/otel/sdk/log v0.20.0 h1:vM3xI7TQgKPiSghe6urZtAkyFY7SodrSpC83CffDFuY=
-go.opentelemetry.io/otel/sdk/log/logtest v0.19.0/go.mod h1:Lua81/3yM0wOmoHTokLj9y9ADeA02v1naRrVrkAZuKk=
+go.opentelemetry.io/otel/sdk/log v0.20.0/go.mod h1:Knej2nmsTUzN79T2eeXdRsjjPcoxoq2pUyUHz9TFyyU=
-go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=
+go.opentelemetry.io/otel/sdk/log/logtest v0.20.0 h1:OqdRZ1guyzamK3M6LlRsmGqRrjkHWw6WZOKKli5ELpg=
-go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=
+go.opentelemetry.io/otel/sdk/log/logtest v0.20.0/go.mod h1:PuMIlm7zAt7c3z8zfOI5ox4iT1Z87We+PF6YoINux/M=
-go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=
+go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI=
-go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
+go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA=
+go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk=
+go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE=
 go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g=
 go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
+golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
-golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
+golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
 golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
 golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
-golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
+golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
-golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
+golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
-golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
+golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
 gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
 gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
-google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA=
+google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8=
-google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:7QBABkRtR8z+TEnmXTqIqwJLlzrZKVfAUm7tY3yGv0M=
+google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 h1:m8qni9SQFH0tJc1X0vmnpw/0t+AImlSvp30sEupozUg=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
-google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM=
+google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ=
-google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4=
+google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I=
 google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
 google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

metrics.go

@@ -0,0 +1,123 @@
+package otelsetup
+
+import (
+	"context"
+	"errors"
+
+	"gitlab.com/unboundsoftware/eventsourced/eventsourced"
+	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/metric"
+)
+
+// eventsourcedMeterName is the instrumentation scope for the event-sourcing
+// metrics emitted by the adapter returned from NewEventsourcedMetrics.
+const eventsourcedMeterName = "gitea.unbound.se/shiny/otelsetup/eventsourced"
+
+// durationBucketsSeconds are explicit histogram boundaries tuned for
+// sub-second event-store and command latencies. The SDK default boundaries are
+// scaled for milliseconds, which would bucket nearly every second-valued
+// observation into the first bucket and make percentiles useless.
+var durationBucketsSeconds = []float64{0.001, 0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10}
+
+// eventsourcedMetrics implements eventsourced.MetricsRecorder by translating
+// the framework's Metric values into OpenTelemetry instruments registered on
+// the global MeterProvider configured by SetupOTelSDK.
+//
+// The OTel metric instruments are safe for concurrent use, and the struct is
+// immutable after construction, so Record may be called from multiple
+// goroutines as the framework requires.
+//
+// Operation counts are read off each duration histogram's generated _count
+// series rather than separate counters; the only standalone counters carry
+// information a histogram count cannot (events.loaded sums the number of events
+// per load, idempotency.checks counts lookups that have no duration).
+type eventsourcedMetrics struct {
+	commandDuration  metric.Float64Histogram
+	eventStoreDur    metric.Float64Histogram
+	eventsLoaded     metric.Int64Counter
+	eventLoadDur     metric.Float64Histogram
+	snapshotStoreDur metric.Float64Histogram
+	snapshotLoadDur  metric.Float64Histogram
+	idempotencyCheck metric.Int64Counter
+}
+
+// NewEventsourcedMetrics builds an eventsourced.MetricsRecorder that records to
+// the global OpenTelemetry MeterProvider. Pass the result to both
+// pg.WithMetrics (for event-store operations) and eventsourced.WithMetrics
+// (for command handling) so a single recorder covers store and handler
+// metrics.
+//
+// SetupOTelSDK must have run first so the global MeterProvider is configured;
+// when metrics are disabled the global provider is a no-op and recording is
+// effectively free.
+func NewEventsourcedMetrics() (eventsourced.MetricsRecorder, error) {
+	m := otel.Meter(eventsourcedMeterName)
+	var errs []error
+	hist := func(name, desc string) metric.Float64Histogram {
+		h, err := m.Float64Histogram(
+			name,
+			metric.WithDescription(desc),
+			metric.WithUnit("s"),
+			metric.WithExplicitBucketBoundaries(durationBucketsSeconds...),
+		)
+		errs = append(errs, err)
+		return h
+	}
+	counter := func(name, desc string) metric.Int64Counter {
+		c, err := m.Int64Counter(name, metric.WithDescription(desc))
+		errs = append(errs, err)
+		return c
+	}
+
+	r := &eventsourcedMetrics{
+		commandDuration:  hist("eventsourced.command.duration", "Wall-clock time to process a command in Handle."),
+		eventStoreDur:    hist("eventsourced.event.store.duration", "Time taken to persist a single event."),
+		eventsLoaded:     counter("eventsourced.events.loaded", "Number of events loaded when rehydrating aggregates."),
+		eventLoadDur:     hist("eventsourced.event.load.duration", "Time taken to load events for an aggregate."),
+		snapshotStoreDur: hist("eventsourced.snapshot.store.duration", "Time taken to persist a snapshot."),
+		snapshotLoadDur:  hist("eventsourced.snapshot.load.duration", "Time taken to load a snapshot."),
+		idempotencyCheck: counter("eventsourced.idempotency.checks", "Number of command idempotency lookups."),
+	}
+	if err := errors.Join(errs...); err != nil {
+		return nil, err
+	}
+	return r, nil
+}
+
+// Record implements eventsourced.MetricsRecorder. Metric types the adapter does
+// not recognise (for example pg outbox metrics when the outbox is not enabled)
+// are ignored.
+func (e *eventsourcedMetrics) Record(ctx context.Context, raw eventsourced.Metric) {
+	switch m := raw.(type) {
+	case eventsourced.CommandDuration:
+		e.commandDuration.Record(ctx, m.Duration.Seconds(), metric.WithAttributes(
+			attribute.String("command.type", m.CommandType),
+			attribute.Bool("success", m.Success),
+		))
+	case eventsourced.EventStored:
+		e.eventStoreDur.Record(ctx, m.Duration.Seconds(), metric.WithAttributes(
+			attribute.String("aggregate.type", m.AggregateType),
+			attribute.String("event.type", m.EventType),
+		))
+	case eventsourced.EventsLoaded:
+		attrs := metric.WithAttributes(attribute.String("aggregate.type", m.AggregateType))
+		e.eventsLoaded.Add(ctx, int64(m.EventCount), attrs)
+		e.eventLoadDur.Record(ctx, m.Duration.Seconds(), attrs)
+	case eventsourced.SnapshotStored:
+		e.snapshotStoreDur.Record(ctx, m.Duration.Seconds(), metric.WithAttributes(
+			attribute.String("aggregate.type", m.AggregateType),
+			attribute.Bool("success", m.Success),
+		))
+	case eventsourced.SnapshotLoaded:
+		e.snapshotLoadDur.Record(ctx, m.Duration.Seconds(), metric.WithAttributes(
+			attribute.String("aggregate.type", m.AggregateType),
+			attribute.Bool("found", m.Found),
+		))
+	case eventsourced.IdempotencyCheck:
+		e.idempotencyCheck.Add(ctx, 1, metric.WithAttributes(
+			attribute.String("aggregate.type", m.AggregateType),
+			attribute.Bool("hit", m.Hit),
+		))
+	}
+}

metrics_test.go

@@ -0,0 +1,75 @@
+package otelsetup
+
+import (
+	"context"
+	"sort"
+	"testing"
+	"time"
+
+	"gitlab.com/unboundsoftware/eventsourced/eventsourced"
+	"go.opentelemetry.io/otel"
+	sdkmetric "go.opentelemetry.io/otel/sdk/metric"
+	"go.opentelemetry.io/otel/sdk/metric/metricdata"
+)
+
+func TestNewEventsourcedMetrics_RecordsContract(t *testing.T) {
+	reader := sdkmetric.NewManualReader()
+	otel.SetMeterProvider(sdkmetric.NewMeterProvider(sdkmetric.WithReader(reader)))
+
+	r, err := NewEventsourcedMetrics()
+	if err != nil {
+		t.Fatalf("NewEventsourcedMetrics returned error: %v", err)
+	}
+	if r == nil {
+		t.Fatal("NewEventsourcedMetrics returned nil recorder")
+	}
+
+	// Recording every known metric type (and an unknown one) must not panic
+	// and must emit the expected instruments.
+	for _, m := range []eventsourced.Metric{
+		eventsourced.CommandDuration{CommandType: "AddEntry", Duration: time.Millisecond, Success: true},
+		eventsourced.EventStored{AggregateType: "Entry", EventType: "EntryAdded", Duration: time.Millisecond},
+		eventsourced.EventsLoaded{AggregateType: "Entry", EventCount: 3, Duration: time.Millisecond},
+		eventsourced.SnapshotStored{AggregateType: "Entry", Duration: time.Millisecond, Success: true},
+		eventsourced.SnapshotLoaded{AggregateType: "Entry", Found: false, Duration: time.Millisecond},
+		eventsourced.IdempotencyCheck{AggregateType: "Entry", Hit: true},
+		unknownMetric{},
+	} {
+		r.Record(context.Background(), m)
+	}
+
+	var rm metricdata.ResourceMetrics
+	if err := reader.Collect(context.Background(), &rm); err != nil {
+		t.Fatalf("collect: %v", err)
+	}
+
+	got := map[string]bool{}
+	for _, sm := range rm.ScopeMetrics {
+		for _, md := range sm.Metrics {
+			got[md.Name] = true
+		}
+	}
+	want := []string{
+		"eventsourced.command.duration",
+		"eventsourced.event.store.duration",
+		"eventsourced.events.loaded",
+		"eventsourced.event.load.duration",
+		"eventsourced.snapshot.store.duration",
+		"eventsourced.snapshot.load.duration",
+		"eventsourced.idempotency.checks",
+	}
+	var missing []string
+	for _, w := range want {
+		if !got[w] {
+			missing = append(missing, w)
+		}
+	}
+	if len(missing) > 0 {
+		sort.Strings(missing)
+		t.Errorf("missing expected metrics: %v", missing)
+	}
+}
+
+type unknownMetric struct{}
+
+func (unknownMetric) IsMetric() {}

otel.go

@@ -22,7 +22,17 @@ import (
 // SetupOTelSDK bootstraps the OpenTelemetry pipeline.
 func SetupOTelSDK(ctx context.Context, enabled bool, serviceName, buildVersion, environment string) (func(context.Context) error, error) {
 	if os.Getenv("OTEL_RESOURCE_ATTRIBUTES") == "" {
-		if err := os.Setenv("OTEL_RESOURCE_ATTRIBUTES", fmt.Sprintf("service.name=%s,service.version=%s,service.environment=%s", serviceName, buildVersion, environment)); err != nil {
+		// service.instance.id makes every pod a distinct telemetry resource. The
+		// OTLP→Prometheus exporter maps it to the `instance` label on metrics and
+		// target_info, which keeps multi-replica services from colliding on a
+		// single series and gives joins a unique (job, instance) key. Hostname is
+		// the pod name under Kubernetes; fall back to the service name if it is
+		// unavailable so the attribute is always present.
+		instanceID, err := os.Hostname()
+		if err != nil || instanceID == "" {
+			instanceID = serviceName
+		}
+		if err := os.Setenv("OTEL_RESOURCE_ATTRIBUTES", fmt.Sprintf("service.name=%s,service.version=%s,service.environment=%s,service.instance.id=%s", serviceName, buildVersion, environment, instanceID)); err != nil {
 			return func(context.Context) error {
 				return nil
 			}, err

subscription_metrics.go

@@ -0,0 +1,85 @@
+package otelsetup
+
+import (
+	"context"
+
+	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/metric"
+)
+
+// subscriptionMeterName is the instrumentation scope for the cross-service
+// subscription push metrics emitted by SubscriptionMetrics.
+const subscriptionMeterName = "gitea.unbound.se/shiny/otelsetup/subscriptions"
+
+// SubscriptionMetrics records cross-service subscription push outcomes (the
+// read-your-writes subscriptions described in ADR-0012) as OpenTelemetry
+// counters.
+//
+// Its method set (Pushed/PushSkipped/Dropped/ChannelFull) satisfies the
+// Observer interface of gitea.unbound.se/shiny/subscriptions *structurally* —
+// otelsetup does not import that library. A service constructs it and passes it
+// to the registry:
+//
+//	metrics, err := otelsetup.NewSubscriptionMetrics("availableCompanies")
+//	if err != nil { return err }
+//	reg := subscriptions.New[T](subscriptions.WithObserver(metrics))
+//
+// The WithObserver call type-checks the structural match, so a drift in the
+// Observer interface fails the service build. Add a
+// `var _ subscriptions.Observer = (*otelsetup.SubscriptionMetrics)(nil)` next to
+// it for an explicit guard.
+//
+// Outcomes are recorded against a low-cardinality (subscription, outcome) pair.
+// The subscriber key (company id / user email) the Observer methods receive is
+// deliberately NOT used as a metric attribute — that would be unbounded
+// cardinality; the key stays in the subscriptions library's logs for
+// correlation.
+type SubscriptionMetrics struct {
+	notifications metric.Int64Counter
+	subscription  attribute.KeyValue
+}
+
+// NewSubscriptionMetrics builds a SubscriptionMetrics that records to the global
+// OpenTelemetry MeterProvider. subscription is the low-cardinality name of the
+// subscription field (e.g. "availableCompanies", "entryBasesChanged"), recorded
+// as an attribute so one counter covers every subscription.
+//
+// SetupOTelSDK must have run first so the global MeterProvider is configured;
+// when metrics are disabled the global provider is a no-op and recording is
+// effectively free.
+func NewSubscriptionMetrics(subscription string) (*SubscriptionMetrics, error) {
+	c, err := otel.Meter(subscriptionMeterName).Int64Counter(
+		"subscription.notifications",
+		metric.WithDescription("Cross-service subscription push outcomes, by outcome (pushed/skipped/dropped/channel_full)."),
+	)
+	if err != nil {
+		return nil, err
+	}
+	return &SubscriptionMetrics{
+		notifications: c,
+		subscription:  attribute.String("subscription", subscription),
+	}, nil
+}
+
+func (s *SubscriptionMetrics) record(outcome string) {
+	s.notifications.Add(context.Background(), 1, metric.WithAttributes(
+		s.subscription,
+		attribute.String("outcome", outcome),
+	))
+}
+
+// Pushed records a change that was gated and delivered to the key's subscribers
+// — the denominator for a skip/drop rate.
+func (s *SubscriptionMetrics) Pushed(string) { s.record("pushed") }
+
+// PushSkipped records a push skipped because the read view never reflected the
+// change within the retry budget.
+func (s *SubscriptionMetrics) PushSkipped(string) { s.record("skipped") }
+
+// Dropped records a notification dropped because the worker queue was full.
+func (s *SubscriptionMetrics) Dropped(string) { s.record("dropped") }
+
+// ChannelFull records a notification dropped because a subscriber's buffer was
+// full.
+func (s *SubscriptionMetrics) ChannelFull(string) { s.record("channel_full") }

subscription_metrics_test.go

@@ -0,0 +1,108 @@
+package otelsetup
+
+import (
+	"context"
+	"testing"
+
+	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/metric/noop"
+	sdkmetric "go.opentelemetry.io/otel/sdk/metric"
+	"go.opentelemetry.io/otel/sdk/metric/metricdata"
+)
+
+// observerShape mirrors gitea.unbound.se/shiny/subscriptions.Observer. This
+// compile-time assertion guards that SubscriptionMetrics still satisfies that
+// interface structurally, without otelsetup importing the library.
+//
+// KEEP IN SYNC with subscriptions.Observer: this only proves SubscriptionMetrics
+// matches this local copy. The authoritative check that the local copy still
+// matches the real interface is the `subscriptions.WithObserver(...)` call site
+// in each consuming service — keep a `var _ subscriptions.Observer` guard there.
+type observerShape interface {
+	Pushed(string)
+	PushSkipped(string)
+	Dropped(string)
+	ChannelFull(string)
+}
+
+var _ observerShape = (*SubscriptionMetrics)(nil)
+
+// TestSubscriptionMetrics_DisabledProviderIsSafe proves the "recording is free
+// when metrics are disabled" claim: with the default global no-op provider, the
+// methods neither panic nor emit instruments.
+func TestSubscriptionMetrics_DisabledProviderIsSafe(t *testing.T) {
+	otel.SetMeterProvider(noop.NewMeterProvider())
+
+	m, err := NewSubscriptionMetrics("entryBasesChanged")
+	if err != nil {
+		t.Fatalf("NewSubscriptionMetrics returned error: %v", err)
+	}
+	// Must not panic on the no-op provider.
+	m.Pushed("c1")
+	m.PushSkipped("c1")
+	m.Dropped("c1")
+	m.ChannelFull("c1")
+}
+
+func TestNewSubscriptionMetrics_RecordsOutcomes(t *testing.T) {
+	reader := sdkmetric.NewManualReader()
+	otel.SetMeterProvider(sdkmetric.NewMeterProvider(sdkmetric.WithReader(reader)))
+
+	m, err := NewSubscriptionMetrics("availableCompanies")
+	if err != nil {
+		t.Fatalf("NewSubscriptionMetrics returned error: %v", err)
+	}
+
+	// The subscriber key is ignored for metrics; different keys must not create
+	// new series (cardinality guard is implicit — we only label by outcome).
+	m.Pushed("c1")
+	m.Pushed("c2")
+	m.PushSkipped("c1")
+	m.Dropped("c1")
+	m.ChannelFull("c1")
+
+	var rm metricdata.ResourceMetrics
+	if err := reader.Collect(context.Background(), &rm); err != nil {
+		t.Fatalf("collect: %v", err)
+	}
+
+	counts := map[string]int64{}
+	dataPoints := 0
+	found := false
+	for _, sm := range rm.ScopeMetrics {
+		for _, md := range sm.Metrics {
+			if md.Name != "subscription.notifications" {
+				continue
+			}
+			found = true
+			sum, ok := md.Data.(metricdata.Sum[int64])
+			if !ok {
+				t.Fatalf("expected Sum[int64], got %T", md.Data)
+			}
+			for _, dp := range sum.DataPoints {
+				dataPoints++
+				sub, _ := dp.Attributes.Value(attribute.Key("subscription"))
+				if sub.AsString() != "availableCompanies" {
+					t.Errorf("unexpected subscription attribute: %q", sub.AsString())
+				}
+				outcome, _ := dp.Attributes.Value(attribute.Key("outcome"))
+				counts[outcome.AsString()] += dp.Value
+			}
+		}
+	}
+
+	if !found {
+		t.Fatal("subscription.notifications counter not emitted")
+	}
+	// One series per outcome, keyed by outcome only (not by subscriber key).
+	if dataPoints != 4 {
+		t.Errorf("expected 4 data points (one per outcome), got %d", dataPoints)
+	}
+	want := map[string]int64{"pushed": 2, "skipped": 1, "dropped": 1, "channel_full": 1}
+	for k, v := range want {
+		if counts[k] != v {
+			t.Errorf("outcome %q: got %d, want %d", k, counts[k], v)
+		}
+	}
+}