From 561b0f32a0e7c8a94d7fd98cfcbda782d4ba71eb Mon Sep 17 00:00:00 2001 From: Code and Solder Date: Sun, 27 Sep 2026 07:05:18 +0200 Subject: [PATCH 01/11] chore(deps): coordinate telemetry and OpenAPI upgrades --- Cargo.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c1a8803..47e46ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,14 +50,14 @@ stylance = "0.8" leptos-use = "0.19" leptos-struct-table = "0.19" lepticons = "0.13" -utoipa = "5" -utoipa-axum = "0.2" +utoipa = "6" +utoipa-axum = "0.3" # `axum` enables the SwaggerUi router builder; `vendored` bundles Swagger UI assets so Docker builds don't need network. -utoipa-swagger-ui = { version = "9", features = ["axum", "vendored"] } -opentelemetry = "0.32" -opentelemetry_sdk = { version = "0.32", features = ["rt-tokio"] } -opentelemetry-otlp = { version = "0.32", features = ["reqwest-client", "http-proto", "reqwest-rustls"] } -tracing-opentelemetry = "0.33" +utoipa-swagger-ui = { version = "10", features = ["axum", "vendored"] } +opentelemetry = "0.33" +opentelemetry_sdk = { version = "0.33", features = ["rt-tokio"] } +opentelemetry-otlp = { version = "0.33", features = ["reqwest-client", "http-proto", "reqwest-rustls"] } +tracing-opentelemetry = "0.34" axum-tracing-opentelemetry = "0.39" # 0.5 aligns with this workspace's SQLx 0.9, OpenTelemetry 0.32 and Rust 1.94. # Only tracing is enabled here; sqlx-otel runtime features are for its optional From b21c85f6a1c3cf031c8087f77dd9d838773f437a Mon Sep 17 00:00:00 2001 From: Code and Solder Date: Sun, 27 Sep 2026 07:05:29 +0200 Subject: [PATCH 02/11] ci: resolve coordinated dependency lockfile --- .../workflows/resolve-coordinated-lock.yml | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/resolve-coordinated-lock.yml diff --git a/.github/workflows/resolve-coordinated-lock.yml b/.github/workflows/resolve-coordinated-lock.yml new file mode 100644 index 0000000..744a5e0 --- /dev/null +++ b/.github/workflows/resolve-coordinated-lock.yml @@ -0,0 +1,32 @@ +name: Resolve coordinated lockfile + +on: + push: + branches: + - maintenance/telemetry-openapi-20260927 + paths: + - Cargo.toml + - .github/workflows/resolve-coordinated-lock.yml + workflow_dispatch: + +permissions: + contents: read + +jobs: + resolve: + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v7 + - name: Install Rust 1.98.1 + run: rustup toolchain install 1.98.1 --profile minimal + - name: Resolve only the manifest-required lockfile changes + run: | + cargo +1.98.1 metadata --format-version 1 >/dev/null + git diff -- Cargo.lock + - name: Upload resolved lockfile + uses: actions/upload-artifact@v7 + with: + name: coordinated-cargo-lock + path: Cargo.lock + if-no-files-found: error + retention-days: 1 From f1fe3feca849c0ab2e5196305b708cca564db11e Mon Sep 17 00:00:00 2001 From: Code and Solder Date: Sun, 27 Sep 2026 07:09:15 +0200 Subject: [PATCH 03/11] ci: commit resolved coordinated lockfile --- .../workflows/resolve-coordinated-lock.yml | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/resolve-coordinated-lock.yml b/.github/workflows/resolve-coordinated-lock.yml index 744a5e0..03165d5 100644 --- a/.github/workflows/resolve-coordinated-lock.yml +++ b/.github/workflows/resolve-coordinated-lock.yml @@ -10,23 +10,27 @@ on: workflow_dispatch: permissions: - contents: read + contents: write jobs: resolve: runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v7 + with: + ref: maintenance/telemetry-openapi-20260927 - name: Install Rust 1.98.1 run: rustup toolchain install 1.98.1 --profile minimal - - name: Resolve only the manifest-required lockfile changes + - name: Resolve only manifest-required lockfile changes + run: cargo +1.98.1 metadata --format-version 1 >/dev/null + - name: Commit resolved lockfile run: | - cargo +1.98.1 metadata --format-version 1 >/dev/null - git diff -- Cargo.lock - - name: Upload resolved lockfile - uses: actions/upload-artifact@v7 - with: - name: coordinated-cargo-lock - path: Cargo.lock - if-no-files-found: error - retention-days: 1 + if git diff --quiet -- Cargo.lock; then + echo "Cargo.lock already current" + exit 0 + fi + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + git add Cargo.lock + git commit -m "chore(deps): refresh coordinated lockfile" + git push origin HEAD:maintenance/telemetry-openapi-20260927 From a2c9a75d5dc48b3495c406a36a0a5e9e55b512d2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 27 Sep 2026 05:13:10 +0000 Subject: [PATCH 04/11] chore(deps): refresh coordinated lockfile --- Cargo.lock | 169 +++++++++++++++++++++++++++-------------------------- 1 file changed, 85 insertions(+), 84 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 872928f..fe89165 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -337,12 +337,12 @@ dependencies = [ "futures-core", "futures-util", "http", - "opentelemetry", + "opentelemetry 0.32.0", "opentelemetry-semantic-conventions", "pin-project-lite", "tower", "tracing", - "tracing-opentelemetry", + "tracing-opentelemetry 0.33.0", "tracing-opentelemetry-instrumentation-sdk", ] @@ -828,12 +828,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "const-oid" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" - [[package]] name = "const-str" version = "1.1.0" @@ -1333,7 +1327,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ "block-buffer 0.12.1", - "const-oid", "crypto-common 0.2.2", "ctutils", ] @@ -1399,7 +1392,7 @@ dependencies = [ "leptos-utils", "leptos_axum", "live-search", - "opentelemetry", + "opentelemetry 0.33.0", "opentelemetry_sdk", "proptest", "reqwest", @@ -1412,7 +1405,7 @@ dependencies = [ "tokio-util", "tower-http 0.7.1", "tracing", - "tracing-opentelemetry", + "tracing-opentelemetry 0.34.0", "tracing-subscriber", "uuid", ] @@ -1771,7 +1764,7 @@ dependencies = [ "criterion", "futures", "jsonwebtoken", - "opentelemetry", + "opentelemetry 0.33.0", "opentelemetry-otlp", "opentelemetry_sdk", "reqwest", @@ -1790,7 +1783,7 @@ dependencies = [ "tower-sessions", "tower_governor", "tracing", - "tracing-opentelemetry", + "tracing-opentelemetry 0.34.0", "tracing-subscriber", "utoipa", "utoipa-axum", @@ -3637,7 +3630,7 @@ dependencies = [ "leptos_meta", "leptos_router", "moka", - "opentelemetry", + "opentelemetry 0.33.0", "opentelemetry-otlp", "opentelemetry_sdk", "rwf-config", @@ -3653,7 +3646,7 @@ dependencies = [ "tokio-util", "tower-http 0.7.1", "tracing", - "tracing-opentelemetry", + "tracing-opentelemetry 0.34.0", "tracing-subscriber", "uuid", "wasm-bindgen", @@ -4071,42 +4064,58 @@ dependencies = [ "tracing", ] +[[package]] +name = "opentelemetry" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cdb0b1b267eb9db3331b434ed9ddab10d50e280a9adf9d13e5233e2002b61b5" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "pin-project-lite", + "thiserror 2.0.21", + "tracing", +] + [[package]] name = "opentelemetry-http" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5683015d09e2df236ef005b17f6f196f0d5f6313c4fa43a7b6a53b52776e4331" +checksum = "ee2c3625b8aa04209f7e01e513bc8044da9687fa38a9eacf59628ca5f3b87300" dependencies = [ "async-trait", "bytes", "http", - "opentelemetry", + "opentelemetry 0.33.0", "reqwest", ] [[package]] name = "opentelemetry-otlp" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9966929966d17620d7c316c643ba62631826e10021409357772d5eea84f62c35" +checksum = "699a67345e21962a231955b9059a157e428b219fa5df8efe11f08346fb23a344" dependencies = [ "http", - "opentelemetry", + "httpdate", + "opentelemetry 0.33.0", "opentelemetry-http", "opentelemetry-proto", "opentelemetry_sdk", "prost", "reqwest", "thiserror 2.0.21", + "tokio", ] [[package]] name = "opentelemetry-proto" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d658ba1faf63f7b9c492cfbe6e0ec365440a16132d3270c1065f7b33f1b638" +checksum = "25da1ac11a0aeccf38d7f77ee0348715adaf8340f65ad46c94a02c6b20e2f65d" dependencies = [ - "opentelemetry", + "opentelemetry 0.33.0", "opentelemetry_sdk", "prost", ] @@ -4119,14 +4128,14 @@ checksum = "c913ac17a6c451661ee255f4625d143e51647ae78ebd969b75e41c4442f4fe47" [[package]] name = "opentelemetry_sdk" -version = "0.32.1" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b59f80e1ac4d5ff7a2db8fb6c80badb7f0f3f858211fba08dd9aaec750894f9" +checksum = "cb39533d9d1c912123efd7d41d7e0c29d16917b60ce15b4c8d87cb1af7f67520" dependencies = [ "futures-channel", "futures-executor", "futures-util", - "opentelemetry", + "opentelemetry 0.33.0", "percent-encoding", "portable-atomic", "rand 0.9.5", @@ -4226,6 +4235,12 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +[[package]] +name = "pastey" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ee67f1008b1ba2321834326597b8e186293b049a023cdef258527550b9935b4" + [[package]] name = "pathdiff" version = "0.2.3" @@ -4927,41 +4942,6 @@ dependencies = [ "thiserror 2.0.21", ] -[[package]] -name = "rust-embed" -version = "8.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e7760e252aaba7b09f4be00e36476cf585bdb68a53552ac954cdf504ab4bc9" -dependencies = [ - "rust-embed-impl", - "rust-embed-utils", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "8.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcfc4d6f53af43755f7a723e4b6b8794fcce052a178dd8c6c1dadc5f5343097" -dependencies = [ - "mime_guess", - "proc-macro2", - "quote", - "rust-embed-utils", - "syn 2.0.119", - "walkdir", -] - -[[package]] -name = "rust-embed-utils" -version = "8.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ffa149f6aa81b58a5b3011d01a857c4ed12c7a732d2c51947a4c7c692185f0" -dependencies = [ - "sha2 0.11.0", - "walkdir", -] - [[package]] name = "rustc-hash" version = "2.1.3" @@ -5759,7 +5739,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a231242dc2b2d3e3c799e62c68fb3a01481e049811c43b788bb1f3155d2031a4" dependencies = [ "futures", - "opentelemetry", + "opentelemetry 0.32.0", "opentelemetry-semantic-conventions", "sqlx", "sqlx-core", @@ -6616,7 +6596,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adbc64cba7137545b8044cb1fe9814f7aacf3c6b5f9b45be8bb5db538befdb26" dependencies = [ "js-sys", - "opentelemetry", + "opentelemetry 0.32.0", + "smallvec", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", + "web-time", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a904802a1b902f43638b677ff2a650847e3b4404101b6c586d648e8c1e3e8fe" +dependencies = [ + "js-sys", + "opentelemetry 0.33.0", "smallvec", "tracing", "tracing-core", @@ -6632,10 +6628,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8884891560864c229e82653b02641a808711111fc34ce8555c0c47fec947b549" dependencies = [ "http", - "opentelemetry", + "opentelemetry 0.32.0", "opentelemetry-semantic-conventions", "tracing", - "tracing-opentelemetry", + "tracing-opentelemetry 0.33.0", ] [[package]] @@ -6721,6 +6717,12 @@ dependencies = [ "syn 2.0.119", ] +[[package]] +name = "typed-path" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e28f89b80c87b8fb0cf04ab448d5dd0dd0ade2f8891bae878de66a75a28600e" + [[package]] name = "typeid" version = "1.0.3" @@ -6900,9 +6902,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "utoipa" -version = "5.5.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bde15df68e80b16c7d16b9616e80770ad158988daa56a27dccd1e55558b0160" +checksum = "8765fe27aeff71012a3f90fa474cf1df863a7d0dd81ed25de4e63fff2544994f" dependencies = [ "indexmap 2.14.2", "serde", @@ -6912,12 +6914,12 @@ dependencies = [ [[package]] name = "utoipa-axum" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c25bae5bccc842449ec0c5ddc5cbb6a3a1eaeac4503895dc105a1138f8234a0" +checksum = "865319162dc3d0032e1e40ed11bd49d5b78e8ef576740589fd6823e2e9977423" dependencies = [ "axum", - "paste", + "pastey", "tower-layer", "tower-service", "utoipa", @@ -6925,39 +6927,38 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "5.5.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba0b99ee52df3028635d93840c797102da61f8a7bb3cf751032455895b52ef8" +checksum = "d935f1c83fdf8b88f09bbe050d0cea78ea4afee6d7b0317403228c1200b2c8ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.6", ] [[package]] name = "utoipa-swagger-ui" -version = "9.0.2" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d047458f1b5b65237c2f6dc6db136945667f40a7668627b3490b9513a3d43a55" +checksum = "3f5ec9d7816e4ce8ccb7e0bd7276e090cad0fcb1def4f3540e5b0f7485d7583e" dependencies = [ "axum", - "base64 0.22.1", + "base64 0.23.1", "mime_guess", "regex", - "rust-embed", "serde", "serde_json", "url", "utoipa", "utoipa-swagger-ui-vendored", - "zip 3.0.0", + "zip 8.6.0", ] [[package]] name = "utoipa-swagger-ui-vendored" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2eebbbfe4093922c2b6734d7c679ebfebd704a0d7e56dfcb0d05818ce28977d" +checksum = "552a64d6a0d251ae28bc021838800943cce60c9ec2e60ff331f54e79f696268f" [[package]] name = "uuid" @@ -7683,15 +7684,15 @@ dependencies = [ [[package]] name = "zip" -version = "3.0.0" +version = "8.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12598812502ed0105f607f941c386f43d441e00148fce9dec3ca5ffb0bde9308" +checksum = "2d04a6b5381502aa6087c94c669499eb1602eb9c5e8198e534de571f7154809b" dependencies = [ - "arbitrary", "crc32fast", "flate2", "indexmap 2.14.2", "memchr", + "typed-path", "zopfli", ] From 6ffe3d66d01a4833077b9bd7206ceeb619ef830a Mon Sep 17 00:00:00 2001 From: Code and Solder Date: Sun, 27 Sep 2026 07:14:50 +0200 Subject: [PATCH 05/11] ci: remove temporary lockfile resolver --- .../workflows/resolve-coordinated-lock.yml | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 .github/workflows/resolve-coordinated-lock.yml diff --git a/.github/workflows/resolve-coordinated-lock.yml b/.github/workflows/resolve-coordinated-lock.yml deleted file mode 100644 index 03165d5..0000000 --- a/.github/workflows/resolve-coordinated-lock.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Resolve coordinated lockfile - -on: - push: - branches: - - maintenance/telemetry-openapi-20260927 - paths: - - Cargo.toml - - .github/workflows/resolve-coordinated-lock.yml - workflow_dispatch: - -permissions: - contents: write - -jobs: - resolve: - runs-on: ubuntu-24.04 - steps: - - uses: actions/checkout@v7 - with: - ref: maintenance/telemetry-openapi-20260927 - - name: Install Rust 1.98.1 - run: rustup toolchain install 1.98.1 --profile minimal - - name: Resolve only manifest-required lockfile changes - run: cargo +1.98.1 metadata --format-version 1 >/dev/null - - name: Commit resolved lockfile - run: | - if git diff --quiet -- Cargo.lock; then - echo "Cargo.lock already current" - exit 0 - fi - git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - git add Cargo.lock - git commit -m "chore(deps): refresh coordinated lockfile" - git push origin HEAD:maintenance/telemetry-openapi-20260927 From e61dda53729d73079be5c44591bb00fd089a81e2 Mon Sep 17 00:00:00 2001 From: Code and Solder Date: Sun, 27 Sep 2026 09:04:05 +0200 Subject: [PATCH 06/11] chore(deps): keep OpenTelemetry aligned with sqlx-otel --- Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 47e46ae..3dd4b76 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,10 +54,10 @@ utoipa = "6" utoipa-axum = "0.3" # `axum` enables the SwaggerUi router builder; `vendored` bundles Swagger UI assets so Docker builds don't need network. utoipa-swagger-ui = { version = "10", features = ["axum", "vendored"] } -opentelemetry = "0.33" -opentelemetry_sdk = { version = "0.33", features = ["rt-tokio"] } -opentelemetry-otlp = { version = "0.33", features = ["reqwest-client", "http-proto", "reqwest-rustls"] } -tracing-opentelemetry = "0.34" +opentelemetry = "0.32" +opentelemetry_sdk = { version = "0.32", features = ["rt-tokio"] } +opentelemetry-otlp = { version = "0.32", features = ["reqwest-client", "http-proto", "reqwest-rustls"] } +tracing-opentelemetry = "0.33" axum-tracing-opentelemetry = "0.39" # 0.5 aligns with this workspace's SQLx 0.9, OpenTelemetry 0.32 and Rust 1.94. # Only tracing is enabled here; sqlx-otel runtime features are for its optional From 6b830d733520748431a59bb8251f3cf96bd07179 Mon Sep 17 00:00:00 2001 From: Code and Solder Date: Sun, 27 Sep 2026 09:04:08 +0200 Subject: [PATCH 07/11] renovate: cap telemetry until sqlx-otel catches up --- renovate.json | 50 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/renovate.json b/renovate.json index e3afa7e..21e301d 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,8 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["config:recommended"], + "extends": [ + "config:recommended" + ], "dependencyDashboard": true, "minimumReleaseAge": "3 days", "minimumReleaseAgeBehaviour": "timestamp-required", @@ -11,21 +13,53 @@ "rebaseWhen": "behind-base-branch", "lockFileMaintenance": { "enabled": true, - "schedule": ["before 3am"], + "schedule": [ + "before 3am" + ], "automerge": true, "automergeType": "pr" }, "packageRules": [ + { + "description": "Keep tracing-opentelemetry paired with OpenTelemetry 0.32", + "matchManagers": [ + "cargo" + ], + "matchPackageNames": [ + "tracing-opentelemetry" + ], + "allowedVersions": "<0.34" + }, + { + "description": "Keep OpenTelemetry on 0.32 until sqlx-otel supports 0.33", + "matchManagers": [ + "cargo" + ], + "matchPackageNames": [ + "opentelemetry", + "opentelemetry_sdk", + "opentelemetry-otlp" + ], + "allowedVersions": "<0.33" + }, { "description": "Automerge ordinary compatible updates after CI", - "matchUpdateTypes": ["minor", "patch", "pin", "pinDigest", "digest"], + "matchUpdateTypes": [ + "minor", + "patch", + "pin", + "pinDigest", + "digest" + ], "matchCurrentVersion": "!/^0/", "automerge": true, "automergeType": "pr" }, { "description": "Cargo lockfile maintenance is age-gated by repository CI", - "matchUpdateTypes": ["lockFileMaintenance"], + "matchUpdateTypes": [ + "lockFileMaintenance" + ], "minimumReleaseAge": null, "automerge": true, "automergeType": "pr" @@ -37,12 +71,16 @@ }, { "description": "Major updates are always attempted but stay open for the maintenance agent", - "matchUpdateTypes": ["major"], + "matchUpdateTypes": [ + "major" + ], "automerge": false }, { "description": "Package replacements stay open for the maintenance agent", - "matchUpdateTypes": ["replacement"], + "matchUpdateTypes": [ + "replacement" + ], "minimumReleaseAge": null, "automerge": false } From 5bb1ec2a3b48dfaf1712da650f351d8edc53dcd8 Mon Sep 17 00:00:00 2001 From: Code and Solder Date: Sun, 27 Sep 2026 09:04:21 +0200 Subject: [PATCH 08/11] ci: refresh coordinated dependency lockfile --- .../workflows/refresh-coordinated-lock.yml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/refresh-coordinated-lock.yml diff --git a/.github/workflows/refresh-coordinated-lock.yml b/.github/workflows/refresh-coordinated-lock.yml new file mode 100644 index 0000000..ab10218 --- /dev/null +++ b/.github/workflows/refresh-coordinated-lock.yml @@ -0,0 +1,36 @@ +name: Refresh coordinated lockfile + +on: + push: + branches: + - maintenance/telemetry-openapi-20260927 + paths: + - Cargo.toml + - .github/workflows/refresh-coordinated-lock.yml + workflow_dispatch: + +permissions: + contents: write + +jobs: + refresh: + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v7 + with: + ref: maintenance/telemetry-openapi-20260927 + - name: Install Rust 1.98.1 + run: rustup toolchain install 1.98.1 --profile minimal + - name: Refresh lockfile + run: cargo +1.98.1 metadata --format-version 1 >/dev/null + - name: Commit lockfile + run: | + if git diff --quiet -- Cargo.lock; then + echo "Cargo.lock already current" + exit 0 + fi + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + git add Cargo.lock + git commit -m "chore(deps): refresh coordinated lockfile" + git push origin HEAD:maintenance/telemetry-openapi-20260927 From 1010a54772da7bc756d031610a61407ba314697f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 27 Sep 2026 07:04:58 +0000 Subject: [PATCH 09/11] chore(deps): refresh coordinated lockfile --- Cargo.lock | 80 ++++++++++++++++-------------------------------------- 1 file changed, 24 insertions(+), 56 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fe89165..c2910cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -337,12 +337,12 @@ dependencies = [ "futures-core", "futures-util", "http", - "opentelemetry 0.32.0", + "opentelemetry", "opentelemetry-semantic-conventions", "pin-project-lite", "tower", "tracing", - "tracing-opentelemetry 0.33.0", + "tracing-opentelemetry", "tracing-opentelemetry-instrumentation-sdk", ] @@ -1392,7 +1392,7 @@ dependencies = [ "leptos-utils", "leptos_axum", "live-search", - "opentelemetry 0.33.0", + "opentelemetry", "opentelemetry_sdk", "proptest", "reqwest", @@ -1405,7 +1405,7 @@ dependencies = [ "tokio-util", "tower-http 0.7.1", "tracing", - "tracing-opentelemetry 0.34.0", + "tracing-opentelemetry", "tracing-subscriber", "uuid", ] @@ -1764,7 +1764,7 @@ dependencies = [ "criterion", "futures", "jsonwebtoken", - "opentelemetry 0.33.0", + "opentelemetry", "opentelemetry-otlp", "opentelemetry_sdk", "reqwest", @@ -1783,7 +1783,7 @@ dependencies = [ "tower-sessions", "tower_governor", "tracing", - "tracing-opentelemetry 0.34.0", + "tracing-opentelemetry", "tracing-subscriber", "utoipa", "utoipa-axum", @@ -3630,7 +3630,7 @@ dependencies = [ "leptos_meta", "leptos_router", "moka", - "opentelemetry 0.33.0", + "opentelemetry", "opentelemetry-otlp", "opentelemetry_sdk", "rwf-config", @@ -3646,7 +3646,7 @@ dependencies = [ "tokio-util", "tower-http 0.7.1", "tracing", - "tracing-opentelemetry 0.34.0", + "tracing-opentelemetry", "tracing-subscriber", "uuid", "wasm-bindgen", @@ -4064,58 +4064,42 @@ dependencies = [ "tracing", ] -[[package]] -name = "opentelemetry" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cdb0b1b267eb9db3331b434ed9ddab10d50e280a9adf9d13e5233e2002b61b5" -dependencies = [ - "futures-core", - "futures-sink", - "js-sys", - "pin-project-lite", - "thiserror 2.0.21", - "tracing", -] - [[package]] name = "opentelemetry-http" -version = "0.33.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2c3625b8aa04209f7e01e513bc8044da9687fa38a9eacf59628ca5f3b87300" +checksum = "5683015d09e2df236ef005b17f6f196f0d5f6313c4fa43a7b6a53b52776e4331" dependencies = [ "async-trait", "bytes", "http", - "opentelemetry 0.33.0", + "opentelemetry", "reqwest", ] [[package]] name = "opentelemetry-otlp" -version = "0.33.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "699a67345e21962a231955b9059a157e428b219fa5df8efe11f08346fb23a344" +checksum = "9966929966d17620d7c316c643ba62631826e10021409357772d5eea84f62c35" dependencies = [ "http", - "httpdate", - "opentelemetry 0.33.0", + "opentelemetry", "opentelemetry-http", "opentelemetry-proto", "opentelemetry_sdk", "prost", "reqwest", "thiserror 2.0.21", - "tokio", ] [[package]] name = "opentelemetry-proto" -version = "0.33.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25da1ac11a0aeccf38d7f77ee0348715adaf8340f65ad46c94a02c6b20e2f65d" +checksum = "56d658ba1faf63f7b9c492cfbe6e0ec365440a16132d3270c1065f7b33f1b638" dependencies = [ - "opentelemetry 0.33.0", + "opentelemetry", "opentelemetry_sdk", "prost", ] @@ -4128,14 +4112,14 @@ checksum = "c913ac17a6c451661ee255f4625d143e51647ae78ebd969b75e41c4442f4fe47" [[package]] name = "opentelemetry_sdk" -version = "0.33.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb39533d9d1c912123efd7d41d7e0c29d16917b60ce15b4c8d87cb1af7f67520" +checksum = "9b59f80e1ac4d5ff7a2db8fb6c80badb7f0f3f858211fba08dd9aaec750894f9" dependencies = [ "futures-channel", "futures-executor", "futures-util", - "opentelemetry 0.33.0", + "opentelemetry", "percent-encoding", "portable-atomic", "rand 0.9.5", @@ -5739,7 +5723,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a231242dc2b2d3e3c799e62c68fb3a01481e049811c43b788bb1f3155d2031a4" dependencies = [ "futures", - "opentelemetry 0.32.0", + "opentelemetry", "opentelemetry-semantic-conventions", "sqlx", "sqlx-core", @@ -6596,23 +6580,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adbc64cba7137545b8044cb1fe9814f7aacf3c6b5f9b45be8bb5db538befdb26" dependencies = [ "js-sys", - "opentelemetry 0.32.0", - "smallvec", - "tracing", - "tracing-core", - "tracing-log", - "tracing-subscriber", - "web-time", -] - -[[package]] -name = "tracing-opentelemetry" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a904802a1b902f43638b677ff2a650847e3b4404101b6c586d648e8c1e3e8fe" -dependencies = [ - "js-sys", - "opentelemetry 0.33.0", + "opentelemetry", "smallvec", "tracing", "tracing-core", @@ -6628,10 +6596,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8884891560864c229e82653b02641a808711111fc34ce8555c0c47fec947b549" dependencies = [ "http", - "opentelemetry 0.32.0", + "opentelemetry", "opentelemetry-semantic-conventions", "tracing", - "tracing-opentelemetry 0.33.0", + "tracing-opentelemetry", ] [[package]] From bf0146694b6f73da682c4412767b92badc21c0d7 Mon Sep 17 00:00:00 2001 From: Code and Solder Date: Sun, 27 Sep 2026 09:08:42 +0200 Subject: [PATCH 10/11] ci: remove temporary lockfile refresher --- .../workflows/refresh-coordinated-lock.yml | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 .github/workflows/refresh-coordinated-lock.yml diff --git a/.github/workflows/refresh-coordinated-lock.yml b/.github/workflows/refresh-coordinated-lock.yml deleted file mode 100644 index ab10218..0000000 --- a/.github/workflows/refresh-coordinated-lock.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Refresh coordinated lockfile - -on: - push: - branches: - - maintenance/telemetry-openapi-20260927 - paths: - - Cargo.toml - - .github/workflows/refresh-coordinated-lock.yml - workflow_dispatch: - -permissions: - contents: write - -jobs: - refresh: - runs-on: ubuntu-24.04 - steps: - - uses: actions/checkout@v7 - with: - ref: maintenance/telemetry-openapi-20260927 - - name: Install Rust 1.98.1 - run: rustup toolchain install 1.98.1 --profile minimal - - name: Refresh lockfile - run: cargo +1.98.1 metadata --format-version 1 >/dev/null - - name: Commit lockfile - run: | - if git diff --quiet -- Cargo.lock; then - echo "Cargo.lock already current" - exit 0 - fi - git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - git add Cargo.lock - git commit -m "chore(deps): refresh coordinated lockfile" - git push origin HEAD:maintenance/telemetry-openapi-20260927 From a49e8ca93e075373bd7fdce9a00b8796eddd575c Mon Sep 17 00:00:00 2001 From: Code and Solder Date: Sun, 27 Sep 2026 09:09:08 +0200 Subject: [PATCH 11/11] style: keep Renovate compatibility cap diff minimal --- renovate.json | 54 +++++++++++++-------------------------------------- 1 file changed, 14 insertions(+), 40 deletions(-) diff --git a/renovate.json b/renovate.json index 21e301d..a5b1462 100644 --- a/renovate.json +++ b/renovate.json @@ -1,8 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:recommended" - ], + "extends": ["config:recommended"], "dependencyDashboard": true, "minimumReleaseAge": "3 days", "minimumReleaseAgeBehaviour": "timestamp-required", @@ -13,53 +11,33 @@ "rebaseWhen": "behind-base-branch", "lockFileMaintenance": { "enabled": true, - "schedule": [ - "before 3am" - ], + "schedule": ["before 3am"], "automerge": true, "automergeType": "pr" }, "packageRules": [ - { - "description": "Keep tracing-opentelemetry paired with OpenTelemetry 0.32", - "matchManagers": [ - "cargo" - ], - "matchPackageNames": [ - "tracing-opentelemetry" - ], - "allowedVersions": "<0.34" - }, { "description": "Keep OpenTelemetry on 0.32 until sqlx-otel supports 0.33", - "matchManagers": [ - "cargo" - ], - "matchPackageNames": [ - "opentelemetry", - "opentelemetry_sdk", - "opentelemetry-otlp" - ], + "matchManagers": ["cargo"], + "matchPackageNames": ["opentelemetry", "opentelemetry_sdk", "opentelemetry-otlp"], "allowedVersions": "<0.33" }, + { + "description": "Keep tracing-opentelemetry paired with OpenTelemetry 0.32", + "matchManagers": ["cargo"], + "matchPackageNames": ["tracing-opentelemetry"], + "allowedVersions": "<0.34" + }, { "description": "Automerge ordinary compatible updates after CI", - "matchUpdateTypes": [ - "minor", - "patch", - "pin", - "pinDigest", - "digest" - ], + "matchUpdateTypes": ["minor", "patch", "pin", "pinDigest", "digest"], "matchCurrentVersion": "!/^0/", "automerge": true, "automergeType": "pr" }, { "description": "Cargo lockfile maintenance is age-gated by repository CI", - "matchUpdateTypes": [ - "lockFileMaintenance" - ], + "matchUpdateTypes": ["lockFileMaintenance"], "minimumReleaseAge": null, "automerge": true, "automergeType": "pr" @@ -71,16 +49,12 @@ }, { "description": "Major updates are always attempted but stay open for the maintenance agent", - "matchUpdateTypes": [ - "major" - ], + "matchUpdateTypes": ["major"], "automerge": false }, { "description": "Package replacements stay open for the maintenance agent", - "matchUpdateTypes": [ - "replacement" - ], + "matchUpdateTypes": ["replacement"], "minimumReleaseAge": null, "automerge": false }