From 172e98249873f04a8104017245b937b327fd089b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Feb 2025 14:51:53 +0000 Subject: [PATCH] Bump github.com/riandyrn/otelchi from 0.11.0 to 0.12.0 Bumps [github.com/riandyrn/otelchi](https://github.com/riandyrn/otelchi) from 0.11.0 to 0.12.0. - [Release notes](https://github.com/riandyrn/otelchi/releases) - [Changelog](https://github.com/riandyrn/otelchi/blob/master/CHANGELOG.md) - [Commits](https://github.com/riandyrn/otelchi/compare/v0.11.0...v0.12.0) --- updated-dependencies: - dependency-name: github.com/riandyrn/otelchi dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 8 ++++---- vendor/github.com/riandyrn/otelchi/CHANGELOG.md | 15 +++++++++++++-- vendor/github.com/riandyrn/otelchi/RELEASING.md | 2 +- vendor/github.com/riandyrn/otelchi/middleware.go | 3 ++- .../riandyrn/otelchi/{ => version}/version.go | 4 ++-- vendor/modules.txt | 3 ++- 7 files changed, 25 insertions(+), 12 deletions(-) rename vendor/github.com/riandyrn/otelchi/{ => version}/version.go (72%) diff --git a/go.mod b/go.mod index 9802d3fad5..b30ea72c47 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,7 @@ require ( github.com/pkg/xattr v0.4.10 github.com/prometheus/client_golang v1.20.5 github.com/r3labs/sse/v2 v2.10.0 - github.com/riandyrn/otelchi v0.11.0 + github.com/riandyrn/otelchi v0.12.0 github.com/rogpeppe/go-internal v1.13.1 github.com/rs/cors v1.11.1 github.com/rs/zerolog v1.33.0 diff --git a/go.sum b/go.sum index cb0fafa321..937b7794b5 100644 --- a/go.sum +++ b/go.sum @@ -965,8 +965,8 @@ github.com/rainycape/memcache v0.0.0-20150622160815-1031fa0ce2f2/go.mod h1:7tZKc github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo5oJ0jf870itWm3D0Sjh7+Za9gazKc5LQ= github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/riandyrn/otelchi v0.11.0 h1:x9MFoTgHcwCC2DdWkTEEZ2ZQFkbl6z7GXLQtTANN6Gk= -github.com/riandyrn/otelchi v0.11.0/go.mod h1:FlBYmG9fBQu0jFRvZZrATP4mDvLX2H5gwELfpZvNlxY= +github.com/riandyrn/otelchi v0.12.0 h1:7aXphKyzut8849DDb/0LWyCPq4mfnikpggEmmW3b38U= +github.com/riandyrn/otelchi v0.12.0/go.mod h1:weZZeUJURvtCcbWsdb7Y6F8KFZGedJlSrgUjq9VirV8= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= @@ -1175,8 +1175,8 @@ go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE= 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.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU= -go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ= +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.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k= go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE= go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4= diff --git a/vendor/github.com/riandyrn/otelchi/CHANGELOG.md b/vendor/github.com/riandyrn/otelchi/CHANGELOG.md index 8a3bd602ed..dc1efee74b 100644 --- a/vendor/github.com/riandyrn/otelchi/CHANGELOG.md +++ b/vendor/github.com/riandyrn/otelchi/CHANGELOG.md @@ -8,11 +8,19 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +## [0.12.0] - 2025-01-18 + +### Changed + +- Upgrade `go.opentelemetry.io/otel`, `go.opentelemetry.io/otel/sdk`, & `go.opentelemetry.io/otel/trace` to `v1.34.0`. ([#87]) +- Upgrade `go.opentelemetry.io/otel/metric` to `v1.34.0`. ([#87]) +- Set the metric version to be the same as middleware version which is `v0.12.0` to make it easy for maintainer of this repo to maintain the versioning. ([#88]) + ## [0.11.0] - 2024-11-27 ### Added -- Add metric package as middleware `go-chi/chi`, support `request_duration_millis`, `requests_inflight`, and `response_size_bytes` metric. ([#69]) +- Add metric package as middleware `go-chi/chi`, support `request_duration_millis`, `requests_inflight`, and `response_size_bytes` metric. Using `go.opentelemetry.io/otel/metric` which the version is `v1.32.0`. ([#69]) ### Changed @@ -214,6 +222,8 @@ It contains instrumentation for trace and depends on: - Example code for a basic usage. - Apache-2.0 license. +[#88]: https://github.com/riandyrn/otelchi/pull/88 +[#87]: https://github.com/riandyrn/otelchi/pull/87 [#74]: https://github.com/riandyrn/otelchi/pull/74 [#70]: https://github.com/riandyrn/otelchi/pull/70 [#69]: https://github.com/riandyrn/otelchi/pull/69 @@ -243,7 +253,8 @@ It contains instrumentation for trace and depends on: [#2]: https://github.com/riandyrn/otelchi/pull/2 [#1]: https://github.com/riandyrn/otelchi/pull/1 -[Unreleased]: https://github.com/riandyrn/otelchi/compare/v0.11.0...HEAD +[Unreleased]: https://github.com/riandyrn/otelchi/compare/v0.12.0...HEAD +[0.12.0]: https://github.com/riandyrn/otelchi/releases/tag/v0.12.0 [0.11.0]: https://github.com/riandyrn/otelchi/releases/tag/v0.11.0 [0.10.1]: https://github.com/riandyrn/otelchi/releases/tag/v0.10.1 [0.10.0]: https://github.com/riandyrn/otelchi/releases/tag/v0.10.0 diff --git a/vendor/github.com/riandyrn/otelchi/RELEASING.md b/vendor/github.com/riandyrn/otelchi/RELEASING.md index 5262d42317..6f665f22fb 100644 --- a/vendor/github.com/riandyrn/otelchi/RELEASING.md +++ b/vendor/github.com/riandyrn/otelchi/RELEASING.md @@ -14,7 +14,7 @@ This procedure is used when we want to create new release from the latest develo The steps for this procedure are the following: 1. Create a new branch from the `master` branch with the following name format: `pre_release/v{MAJOR}.{MINOR}.{BUILD}`. For example, if we want to release for version `0.6.0`, we will first create a new branch from the `master` called `pre_release/v0.6.0`. -2. Update method `Version()` in `version.go` to return the target version. +2. Update method `version.Version()` to return the target version. 3. Update the `CHANGELOG.md` to include all the notable changes. 4. Create a new PR from this branch to `master` with the title: `Release v{MAJOR}.{MINOR}.{BUILD}` (e.g `Release v0.6.0`). 5. At least one maintainer should approve the PR. However if the PR is created by the repo owner, it doesn't need to get approval from other maintainers. diff --git a/vendor/github.com/riandyrn/otelchi/middleware.go b/vendor/github.com/riandyrn/otelchi/middleware.go index ab2050b2fe..0cc9ca9bb8 100644 --- a/vendor/github.com/riandyrn/otelchi/middleware.go +++ b/vendor/github.com/riandyrn/otelchi/middleware.go @@ -8,6 +8,7 @@ import ( "github.com/felixge/httpsnoop" "github.com/go-chi/chi/v5" + "github.com/riandyrn/otelchi/version" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" @@ -35,7 +36,7 @@ func Middleware(serverName string, opts ...Option) func(next http.Handler) http. } tracer := cfg.tracerProvider.Tracer( tracerName, - oteltrace.WithInstrumentationVersion(Version()), + oteltrace.WithInstrumentationVersion(version.Version()), ) if cfg.propagators == nil { cfg.propagators = otel.GetTextMapPropagator() diff --git a/vendor/github.com/riandyrn/otelchi/version.go b/vendor/github.com/riandyrn/otelchi/version/version.go similarity index 72% rename from vendor/github.com/riandyrn/otelchi/version.go rename to vendor/github.com/riandyrn/otelchi/version/version.go index 8d862701db..e7a0e5f210 100644 --- a/vendor/github.com/riandyrn/otelchi/version.go +++ b/vendor/github.com/riandyrn/otelchi/version/version.go @@ -1,6 +1,6 @@ -package otelchi +package version // Version is the current release version of otelchi in use. func Version() string { - return "0.11.0" + return "0.12.0" } diff --git a/vendor/modules.txt b/vendor/modules.txt index 21c8a2debd..529f45703a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1660,9 +1660,10 @@ github.com/r3labs/sse/v2 # github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 ## explicit github.com/rcrowley/go-metrics -# github.com/riandyrn/otelchi v0.11.0 +# github.com/riandyrn/otelchi v0.12.0 ## explicit; go 1.22.0 github.com/riandyrn/otelchi +github.com/riandyrn/otelchi/version # github.com/rivo/uniseg v0.4.7 ## explicit; go 1.18 github.com/rivo/uniseg