Skip to content

Commit 1f3d7b8

Browse files
scottgerringscottgerring
authored
Merge branch 'main' into chore/remove-redundant-test-logs
2 parents dba50a1 + 1d9bd25 commit 1f3d7b8

32 files changed

+147
-107
lines changed

‎.github/workflows/benchmark.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
BRANCH_NAME: ${{ github.event_name == 'pull_request' && github.base_ref || github.event.before }}
3737
steps:
3838
- name: Harden the runner (Audit all outbound calls)
39-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
39+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
4040
with:
4141
egress-policy: audit
4242

@@ -46,7 +46,7 @@ jobs:
4646
- uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
4747
with:
4848
repo-token: ${{ secrets.GITHUB_TOKEN }}
49-
- uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0
49+
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
5050
with:
5151
toolchain: stable
5252
- uses: boa-dev/criterion-compare-action@adfd3a94634fe2041ce5613eb7df09d247555b87 # v3.2.4

‎.github/workflows/ci.yml‎

Lines changed: 41 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
continue-on-error: ${{ matrix.rust == 'beta' }}
3333
steps:
3434
- name: Harden the runner (Audit all outbound calls)
35-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
35+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
3636
with:
3737
egress-policy: audit
3838

@@ -46,7 +46,7 @@ jobs:
4646
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4747
with:
4848
submodules: true
49-
- uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0
49+
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
5050
with:
5151
toolchain: ${{ matrix.rust }}
5252
components: rustfmt
@@ -61,18 +61,18 @@ jobs:
6161
runs-on: ubuntu-latest
6262
steps:
6363
- name: Harden the runner (Audit all outbound calls)
64-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
64+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
6565
with:
6666
egress-policy: audit
6767

6868
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6969
with:
7070
submodules: true
71-
- uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4
71+
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
7272
with:
7373
toolchain: stable
7474
components: rustfmt, clippy
75-
- uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc # v2.49.45
75+
- uses: taiki-e/install-action@33734a118689b0b418824fb78ea2bf18e970b43b # v2.50.4
7676
with:
7777
tool: cargo-hack
7878
- uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
@@ -89,12 +89,12 @@ jobs:
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)
92-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
92+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
9393
with:
9494
egress-policy: audit
9595

9696
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
97-
- uses: dtolnay/rust-toolchain@a02741459ec5e501b9843ed30b535ca0a0376ae4
97+
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
9898
with:
9999
toolchain: nightly-2024-06-30
100100
components: rustfmt
@@ -112,15 +112,15 @@ jobs:
112112
continue-on-error: true
113113
steps:
114114
- name: Harden the runner (Audit all outbound calls)
115-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
115+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
116116
with:
117117
egress-policy: audit
118118

119119
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
120120
with:
121121
submodules: true
122122
- name: Set up Rust ${{ matrix.rust }}
123-
uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0
123+
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
124124
with:
125125
toolchain: ${{ matrix.rust }}
126126
- name: Patch dependencies versions
@@ -132,7 +132,7 @@ jobs:
132132
continue-on-error: true # Prevent sudden announcement of a new advisory from failing ci
133133
steps:
134134
- name: Harden the runner (Audit all outbound calls)
135-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
135+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
136136
with:
137137
egress-policy: audit
138138

@@ -163,12 +163,12 @@ jobs:
163163
runs-on: ubuntu-latest
164164
steps:
165165
- name: Harden the runner (Audit all outbound calls)
166-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
166+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
167167
with:
168168
egress-policy: audit
169169

170170
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
171-
- uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4
171+
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
172172
with:
173173
toolchain: stable
174174
components: rustfmt
@@ -186,49 +186,69 @@ jobs:
186186
if: ${{ ! contains(github.event.pull_request.labels.*.name, 'dependencies') }}
187187
steps:
188188
- name: Harden the runner (Audit all outbound calls)
189-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
189+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
190190
with:
191191
egress-policy: audit
192192

193193
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
194194
with:
195195
submodules: true
196-
- uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4
196+
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
197197
with:
198198
toolchain: stable
199199
components: rustfmt,llvm-tools-preview
200200
- uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
201201
with:
202-
repo-token: ${{ secrets.GITHUB_TOKEN }}
203-
- name: cargo install cargo-llvm-cov
204-
uses: taiki-e/install-action@5075451c95db43b063f20f0c8fef04c04d5bf0ba # cargo-llvm-cov
202+
repo-token: ${{ secrets.GITHUB_TOKEN }}
203+
- name: Install cargo-llvm-cov
204+
uses: taiki-e/install-action@33734a118689b0b418824fb78ea2bf18e970b43b # v2.50.4
205+
with:
206+
tool: cargo-llvm-cov
205207
- name: cargo generate-lockfile
206208
if: hashFiles('Cargo.lock') == ''
207209
run: cargo generate-lockfile
208210
- name: cargo llvm-cov
209211
run: cargo llvm-cov --locked --all-features --workspace --lcov --lib --output-path lcov.info
210212
- name: Upload to codecov.io
211-
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
213+
uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
212214
env:
213215
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
214216
with:
215217
fail_ci_if_error: true
218+
build-examples:
219+
runs-on: ubuntu-latest
220+
steps:
221+
- uses: actions/checkout@v4
222+
- uses: dtolnay/rust-toolchain@stable
223+
with:
224+
components: rustfmt
225+
- uses: arduino/setup-protoc@v3
226+
with:
227+
repo-token: ${{ secrets.GITHUB_TOKEN }}
228+
- name: Build examples
229+
run: |
230+
for example in examples/*; do
231+
if [ -d "$example" ]; then
232+
echo "Building $example"
233+
cargo build
234+
fi
235+
done
216236
cargo-machete:
217237
continue-on-error: true
218238
runs-on: ubuntu-latest
219239
steps:
220240
- name: Harden the runner (Audit all outbound calls)
221-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
241+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
222242
with:
223243
egress-policy: audit
224244

225245
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
226246
with:
227247
submodules: true
228-
- uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0
248+
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
229249
with:
230250
toolchain: stable
231-
- uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc # v2.49.45
251+
- uses: taiki-e/install-action@33734a118689b0b418824fb78ea2bf18e970b43b # v2.50.4
232252
with:
233253
tool: cargo-machete
234254
- name: cargo machete

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Harden the runner (Audit all outbound calls)
27-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
27+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
2828
with:
2929
egress-policy: audit
3030

@@ -34,12 +34,12 @@ jobs:
3434
submodules: true
3535

3636
- name: Initialize CodeQL
37-
uses: github/codeql-action/init@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
37+
uses: github/codeql-action/init@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
3838
with:
3939
languages: rust
4040

4141
- name: Autobuild
42-
uses: github/codeql-action/autobuild@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
42+
uses: github/codeql-action/autobuild@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
4343

4444
- name: Perform CodeQL Analysis
45-
uses: github/codeql-action/analyze@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
45+
uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16

‎.github/workflows/fossa.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Harden the runner (Audit all outbound calls)
16-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
16+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
1717
with:
1818
egress-policy: audit
1919

‎.github/workflows/integration_tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
timeout-minutes: 10
1515
steps:
1616
- name: Harden the runner (Audit all outbound calls)
17-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
17+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
1818
with:
1919
egress-policy: audit
2020

@@ -27,7 +27,7 @@ jobs:
2727
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2828
with:
2929
submodules: true
30-
- uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4
30+
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
3131
with:
3232
toolchain: stable
3333
components: rustfmt

‎.github/workflows/markdown-link-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Harden the runner (Audit all outbound calls)
19-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
19+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
2020
with:
2121
egress-policy: audit
2222

‎.github/workflows/ossf-scorecard.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
id-token: write
2222
steps:
2323
- name: Harden the runner (Audit all outbound calls)
24-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
24+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
2525
with:
2626
egress-policy: audit
2727

@@ -48,6 +48,6 @@ jobs:
4848
# Upload the results to GitHub's code scanning dashboard (optional).
4949
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
5050
- name: "Upload to code-scanning"
51-
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
51+
uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
5252
with:
5353
sarif_file: results.sarif

‎.github/workflows/pr_naming.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Harden the runner (Audit all outbound calls)
15-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
15+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
1616
with:
1717
egress-policy: audit
1818

‎.github/workflows/semver.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
if: ${{ github.event.label.name == 'semver-check' || contains(github.event.pull_request.labels.*.name, 'semver-check') }}
1414
steps:
1515
- name: Harden the runner (Audit all outbound calls)
16-
uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
16+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
1717
with:
1818
egress-policy: audit
1919

2020
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2121
with:
2222
submodules: true
2323
- name: Install stable
24-
uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4
24+
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
2525
with:
2626
toolchain: stable
2727
components: rustfmt

‎examples/tracing-http-propagator/src/server.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,6 @@ impl LogProcessor for EnrichWithBaggageLogProcessor {
120120
fn force_flush(&self) -> OTelSdkResult {
121121
Ok(())
122122
}
123-
124-
fn shutdown(&self) -> OTelSdkResult {
125-
Ok(())
126-
}
127123
}
128124

129125
/// A custom span processor that enriches spans with baggage attributes. Baggage

0 commit comments

Comments
 (0)