Skip to content

Commit e2edadb

Browse files
committed
Merge branch 'main' into paullgdc/sdk/span_processor_api_refactor
2 parents 48a3edf + 8882c31 commit e2edadb

File tree

85 files changed

+4067
-1273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+4067
-1273
lines changed

.cargo/config.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff 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"

.github/workflows/ci.yml

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
external-types:
8686
strategy:
8787
matrix:
88-
example: [opentelemetry, opentelemetry-sdk, opentelemetry-otlp, opentelemetry-zipkin]
88+
member: [opentelemetry, opentelemetry-sdk, opentelemetry-otlp, opentelemetry-zipkin]
8989
runs-on: ubuntu-latest # TODO: Check if this could be covered for Windows. The step used currently fails on Windows.
9090
steps:
9191
- name: Harden the runner (Audit all outbound calls)
@@ -96,20 +96,20 @@ jobs:
9696
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
9797
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
9898
with:
99-
toolchain: nightly-2024-06-30
99+
# Rust version should be kept in sync with the one the release was tested with
100+
# https://github.com/awslabs/cargo-check-external-types/releases
101+
toolchain: nightly-2025-05-04
100102
components: rustfmt
101-
- name: Patch dependencies versions
102-
run: bash ./scripts/patch_dependencies.sh
103+
- uses: taiki-e/install-action@33734a118689b0b418824fb78ea2bf18e970b43b # v2.50.4
104+
with:
105+
103106
- name: external-type-check
104-
run: |
105-
cargo install [email protected]
106-
cd ${{ matrix.example }}
107-
cargo check-external-types --all-features --config allowed-external-types.toml
107+
working-directory: ${{ matrix.member }}
108+
run: cargo check-external-types --all-features --config allowed-external-types.toml
108109
msrv:
109110
strategy:
110111
matrix:
111112
os: [windows-latest, ubuntu-latest]
112-
rust: [1.75.0]
113113
runs-on: ${{ matrix.os }}
114114
continue-on-error: true
115115
steps:
@@ -121,14 +121,17 @@ jobs:
121121
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
122122
with:
123123
submodules: true
124-
- name: Set up Rust ${{ matrix.rust }}
125-
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
124+
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
125+
with:
126+
toolchain: stable
127+
- uses: taiki-e/install-action@33734a118689b0b418824fb78ea2bf18e970b43b # v2.50.4
128+
with:
129+
tool: cargo-msrv
130+
- uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
126131
with:
127-
toolchain: ${{ matrix.rust }}
128-
- name: Patch dependencies versions
129-
run: bash ./scripts/patch_dependencies.sh
132+
repo-token: ${{ secrets.GITHUB_TOKEN }}
130133
- name: Check MSRV for all crates
131-
run: bash ./scripts/msrv.sh ${{ matrix.rust }}
134+
run: bash ./scripts/msrv.sh
132135
cargo-deny:
133136
runs-on: ubuntu-latest # This uses the step `EmbarkStudios/cargo-deny-action@v1` which is only supported on Linux
134137
continue-on-error: true # Prevent sudden announcement of a new advisory from failing ci
@@ -220,11 +223,11 @@ jobs:
220223
build-examples:
221224
runs-on: ubuntu-latest
222225
steps:
223-
- uses: actions/checkout@v4
224-
- uses: dtolnay/rust-toolchain@stable
226+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
227+
- uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable
225228
with:
226229
components: rustfmt
227-
- uses: arduino/setup-protoc@v3
230+
- uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
228231
with:
229232
repo-token: ${{ secrets.GITHUB_TOKEN }}
230233
- name: Build examples

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ documentation.
3535
| Baggage | RC |
3636
| Propagators | Beta |
3737
| Logs-API | Stable* |
38-
| Logs-SDK | Stable |
38+
| Logs-SDK | Stable |
3939
| Logs-OTLP Exporter | RC |
4040
| Logs-Appender-Tracing | Stable |
4141
| Metrics-API | Stable |
42-
| Metrics-SDK | RC |
42+
| Metrics-SDK | Stable |
4343
| Metrics-OTLP Exporter | RC |
4444
| Traces-API | Beta |
4545
| Traces-SDK | Beta |

0 commit comments

Comments
 (0)