Merge branch 'main' into fix-log-unsupported-statsd-type

DataDog · Jan 14, 2025 · 2f19ba5 · 2f19ba5
2 parents 7b89a93 + b578133
commit 2f19ba5
Show file tree

Hide file tree

Showing 131 changed files with 6,220 additions and 1,931 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -24,7 +24,7 @@ jobs:
           swap-storage: true
       - uses: actions/checkout@v4
       - name: Install Rust
-        run: rustup install nightly-2024-10-21 && rustup default nightly-2024-10-21
+        run: rustup install nightly-2024-12-16 && rustup default nightly-2024-12-16
       - name: Install Protoc Binary
         shell: bash
         run: chmod +x ./scripts/install-protoc.sh && ./scripts/install-protoc.sh $HOME

diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
@@ -16,8 +16,8 @@ jobs:
       run: |
         set -e
         rustup set profile minimal
-        rustup toolchain install nightly-2024-10-21
-        rustup default nightly-2024-10-21
+        rustup toolchain install nightly-2024-12-16
+        rustup default nightly-2024-12-16
     - uses: taiki-e/install-action@v2
       with:
         tool: cargo-bolero

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -21,16 +21,16 @@ jobs:
         uses: actions/checkout@v4
       - name: Cache
         uses: ./.github/actions/cache
-      - name: Install nightly-2024-10-21 toolchain and rustfmt
-        run: rustup install nightly-2024-10-21 && rustup default nightly-2024-10-21 && rustup component add rustfmt
+      - name: Install nightly-2024-12-16 toolchain and rustfmt
+        run: rustup install nightly-2024-12-16 && rustup default nightly-2024-12-16 && rustup component add rustfmt
       - run: cargo fmt --all -- --check
   clippy:
     name: "clippy #${{ matrix.platform }} ${{ matrix.rust_version }}"
     runs-on: ${{ matrix.platform }}
     strategy:
       fail-fast: false
       matrix:
-        rust_version: ["1.76.0", "stable", "nightly-2024-10-21"]
+        rust_version: ["1.78.0", "stable", "nightly-2024-12-16"]
         platform: [windows-latest, ubuntu-latest]
     steps:
       - name: Checkout sources
@@ -48,7 +48,7 @@ jobs:
         shell: bash
         run: |
           # shellcheck disable=SC2046
-          cargo clippy --workspace --all-targets --all-features -- -D warnings $([ ${{ matrix.rust_version }} = 1.76.0 ] || [ ${{ matrix.rust_version }} = stable ] && echo -Aunknown-lints -Ainvalid_reference_casting -Aclippy::redundant-closure-call)
+          cargo clippy --workspace --all-targets --all-features -- -D warnings $([ ${{ matrix.rust_version }} = 1.78.0 ] || [ ${{ matrix.rust_version }} = stable ] && echo -Aunknown-lints -Ainvalid_reference_casting -Aclippy::redundant-closure-call)
   licensecheck:
     runs-on: ubuntu-latest
     name: "Presence of licence headers"

diff --git a/.github/workflows/miri.yml b/.github/workflows/miri.yml
@@ -14,8 +14,8 @@ jobs:
       run: |
         set -e
         rustup set profile minimal
-        rustup toolchain install nightly-2024-10-21 --component miri 
-        rustup default nightly-2024-10-21
+        rustup toolchain install nightly-2024-12-16 --component miri
+        rustup default nightly-2024-12-16
     - name: Install Protoc Binary
       shell: bash
       run: chmod +x ./scripts/install-protoc.sh && ./scripts/install-protoc.sh $HOME

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,7 +2,7 @@ name: Test
 on: [push]
 env:
   CARGO_TERM_COLOR: always
-  RUST_VERSION: 1.76.0
+  RUST_VERSION: 1.78.0
 
 jobs:
   test:

diff --git a/.github/workflows/verify-proto-files.yml b/.github/workflows/verify-proto-files.yml
@@ -5,7 +5,7 @@ on:
 
 env:
   DATADOG_AGENT_TAG: "7.55.0-rc.3"
-  rust_version: "1.76.0"
+  rust_version: "1.78.0"
 
 jobs:
   verify-proto-files:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -46,8 +46,15 @@ resolver = "2"
 # These are used by many packages, but not all. For instance, the sidecar and
 # serverless packages wanted to maintain their own version numbers. Some of
 # their depenencies also remain under their own versioning.
+#
+# When bumping the Rust version, make sure that the version is less than or
+# equal to latest Alpine Linux version, and also the latest RHEL 8.x and 9.x
+# releases (not stream):
+#  - https://rpms.remirepo.net/rpmphp/zoom.php?rpm=rust
+# The RHEL restrictions are for the dd-trace-php repository. Someone in the
+# community, Remi Collet, packages the extension for these systems.
 [workspace.package]
-rust-version = "1.76.0"
+rust-version = "1.78.0"
 edition = "2021"
 version = "14.3.1"
 license = "Apache-2.0"