chore: leverage fallback resolver for MSRV check (#2993)

gruebel · web-flow · commit 8c29ca7e21cf · 2025-05-22T08:39:53.000-07:00
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -0,0 +1,3 @@
+[resolver]
+# https://doc.rust-lang.org/cargo/reference/config.html#resolverincompatible-rust-versions
+incompatible-rust-versions = "fallback"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -85,7 +85,7 @@ jobs:
   external-types:
     strategy:
       matrix:
-        example: [opentelemetry, opentelemetry-sdk, opentelemetry-otlp, opentelemetry-zipkin]
+        member: [opentelemetry, opentelemetry-sdk, opentelemetry-otlp, opentelemetry-zipkin]
     runs-on: ubuntu-latest # TODO: Check if this could be covered for Windows. The step used currently fails on Windows.
     steps:
       - name: Harden the runner (Audit all outbound calls)
@@ -96,20 +96,20 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
         with:
-          toolchain: nightly-2024-06-30
+          # Rust version should be kept in sync with the one the release was tested with
+          # https://github.com/awslabs/cargo-check-external-types/releases
+          toolchain: nightly-2025-05-04
           components: rustfmt
-      - name: Patch dependencies versions
-        run: bash ./scripts/patch_dependencies.sh
+      - uses: taiki-e/install-action@33734a118689b0b418824fb78ea2bf18e970b43b # v2.50.4
+        with:
+          tool: cargo-check-external-types@0.2.0
       - name: external-type-check
-        run: |
-          cargo install cargo-check-external-types@0.1.13
-          cd ${{ matrix.example }}
-          cargo check-external-types --all-features --config allowed-external-types.toml
+        working-directory: ${{ matrix.member }}
+        run: cargo check-external-types --all-features --config allowed-external-types.toml
   msrv:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest]
-        rust: [1.75.0]
     runs-on: ${{ matrix.os }}
     continue-on-error: true
     steps:
@@ -121,14 +121,17 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: true
-      - name: Set up Rust ${{ matrix.rust }}
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
+      - uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
+        with:
+          toolchain: stable
+      - uses: taiki-e/install-action@33734a118689b0b418824fb78ea2bf18e970b43b # v2.50.4
         with:
-          toolchain: ${{ matrix.rust }}
-      - name: Patch dependencies versions
-        run: bash ./scripts/patch_dependencies.sh
+          tool: cargo-msrv
+      - uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Check MSRV for all crates
-        run: bash ./scripts/msrv.sh ${{ matrix.rust }}
+        run: bash ./scripts/msrv.sh
   cargo-deny:
     runs-on: ubuntu-latest # This uses the step `EmbarkStudios/cargo-deny-action@v1` which is only supported on Linux
     continue-on-error: true # Prevent sudden announcement of a new advisory from failing ci
diff --git a/examples/logs-basic/Cargo.toml b/examples/logs-basic/Cargo.toml
@@ -3,6 +3,7 @@ name = "logs-basic"
 version = "0.1.0"
 edition = "2021"
 license = "Apache-2.0"
+rust-version = "1.75.0"
 publish = false
 autobenches = false
 
diff --git a/examples/metrics-advanced/Cargo.toml b/examples/metrics-advanced/Cargo.toml
@@ -3,6 +3,7 @@ name = "metrics-advanced"
 version = "0.1.0"
 edition = "2021"
 license = "Apache-2.0"
+rust-version = "1.75.0"
 publish = false
 autobenches = false
 
diff --git a/examples/metrics-basic/Cargo.toml b/examples/metrics-basic/Cargo.toml
@@ -3,6 +3,7 @@ name = "metrics-basic"
 version = "0.1.0"
 edition = "2021"
 license = "Apache-2.0"
+rust-version = "1.75.0"
 publish = false
 autobenches = false
 
diff --git a/examples/tracing-grpc/Cargo.toml b/examples/tracing-grpc/Cargo.toml
@@ -3,6 +3,7 @@ name = "tracing-grpc"
 version = "0.1.0"
 edition = "2021"
 license = "Apache-2.0"
+rust-version = "1.75.0"
 publish = false
 autobenches = false
 
diff --git a/examples/tracing-http-propagator/Cargo.toml b/examples/tracing-http-propagator/Cargo.toml
@@ -3,6 +3,7 @@ name = "tracing-http-propagator"
 version = "0.1.0"
 edition = "2021"
 license = "Apache-2.0"
+rust-version = "1.75.0"
 publish = false
 autobenches = false
 
diff --git a/opentelemetry-otlp/examples/basic-otlp-http/Cargo.toml b/opentelemetry-otlp/examples/basic-otlp-http/Cargo.toml
@@ -3,6 +3,7 @@ name = "basic-otlp-http"
 version = "0.1.0"
 edition = "2021"
 license = "Apache-2.0"
+rust-version = "1.75.0"
 publish = false
 autobenches = false
 
diff --git a/opentelemetry-otlp/examples/basic-otlp/Cargo.toml b/opentelemetry-otlp/examples/basic-otlp/Cargo.toml
@@ -3,6 +3,7 @@ name = "basic-otlp"
 version = "0.1.0"
 edition = "2021"
 license = "Apache-2.0"
+rust-version = "1.75.0"
 publish = false
 autobenches = false
 
diff --git a/opentelemetry-otlp/tests/integration_test/Cargo.toml b/opentelemetry-otlp/tests/integration_test/Cargo.toml
@@ -2,6 +2,8 @@
 name = "integration_test_runner"
 version = "0.1.0"
 edition = "2021"
+license = "Apache-2.0"
+rust-version = "1.75.0"
 publish = false
 autobenches = false
 
diff --git a/opentelemetry-proto/src/proto/opentelemetry-proto b/opentelemetry-proto/src/proto/opentelemetry-proto
@@ -1 +1 @@
-Subproject commit be5d58470429d0255ffdd49491f0815a3a63d6ef
+Subproject commit f7676e812035aa8a67478c6d740cb09f4c50f86a
diff --git a/scripts/msrv.sh b/scripts/msrv.sh
@@ -2,55 +2,12 @@
 
 set -eu
 
-# Check if a version is specified as parameter
-if [ $# -eq 0 ]; then
-  echo "No Rust version specified. Usage: $0 <rust-version>"
-  exit 1
-fi
-
-RUST_VERSION=$1
-
-# Determine the directory containing the script
-SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
-
-# Path to the configuration file
-CONFIG_FILE="$SCRIPT_DIR/msrv_config.json"
-
-# Change to the root directory of the repository
-cd "$SCRIPT_DIR/.."
-
-echo "Current working directory: $(pwd)"
-
-# function to check if specified toolchain is installed
-check_rust_toolchain_installed() {
-  local version=$1
-  if ! rustup toolchain list | grep -q "$version"; then
-    echo "Rust toolchain $version is not installed. Please install it using 'rustup toolchain install $version'."
-    exit 1
-  fi
-}
-
-# check if specified toolchain is installed
-check_rust_toolchain_installed "$RUST_VERSION"
-
-# Extract the exact installed rust version string
-installed_version=$(rustup toolchain list | grep "$RUST_VERSION" | awk '{print $1}')
-
-# Read the configuration file and get the packages for the specified version
-if [ -f "$CONFIG_FILE" ]; then
-  packages=$(jq -r --arg version "$RUST_VERSION" '.[$version] | .[]' "$CONFIG_FILE" | tr '\n' ' ')
-  if [ -z "$packages" ]; then
-    echo "No packages found for Rust version $RUST_VERSION in the configuration file."
-    exit 1
-  fi
-else
-  echo "Configuration file $CONFIG_FILE not found."
-  exit 1
-fi
-
-# Check MSRV for the packages
-for package in $packages; do
-  package=$(echo "$package" | tr -d '\r\n') # Remove any newline and carriage return characters
-  echo "Command: rustup run \"$installed_version\" cargo check --manifest-path=\"$package\" --all-features"
-  rustup run "$installed_version" cargo check --manifest-path=$package --all-features
+members=$(cargo metadata -q --no-deps --format-version 1 | jq -r '.packages[].manifest_path')
+
+for member in $members; do
+  # needed for windows CI run
+  clean_member=$(printf '%s' "$member" | tr -d '\r')
+  echo "Verifying MSRV version for $clean_member"
+  cargo msrv verify --manifest-path "$clean_member" --output-format json
+  echo "" # just for nicer separation between packages
 done
diff --git a/scripts/msrv_config.json b/scripts/msrv_config.json
diff --git a/scripts/patch_dependencies.sh b/scripts/patch_dependencies.sh
diff --git a/stress/Cargo.toml b/stress/Cargo.toml
@@ -2,6 +2,8 @@
 name = "stress"
 version = "0.1.0"
 edition = "2021"
+license = "Apache-2.0"
+rust-version = "1.75.0"
 publish = false
 autobenches = false
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[resolver]`
	`2`	`+# https://doc.rust-lang.org/cargo/reference/config.html#resolverincompatible-rust-versions`
	`3`	`+incompatible-rust-versions = "fallback"`