Skip to content

Commit 1bb0d5c

Browse files
TommyCppTommyCpp
authored
Merge branch 'main' into steved/tracing-appender-valuable-main
2 parents 1cd7694 + 34d6d50 commit 1bb0d5c

File tree

23 files changed

+96
-65
lines changed

23 files changed

+96
-65
lines changed

‎.cspell.json‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"ignoreWords": [
1313
"otel",
1414
"rustdoc",
15-
"rustfilt"
15+
"rustfilt",
16+
"webkpi"
1617
],
1718
// these are words that are always considered incorrect.
1819
"flagWords": [
@@ -34,47 +35,61 @@
3435
"Bhasin",
3536
"Björn",
3637
"BLRP",
38+
"chrono",
3739
"Cijo",
3840
"clippy",
3941
"clonable",
4042
"codecov",
43+
"dashmap",
4144
"datapoint",
4245
"deque",
4346
"Dirkjan",
4447
"docsrs",
4548
"Dwarnings",
49+
"eprintln",
4650
"EPYC",
4751
"flamegraph",
4852
"Gerring",
53+
"grpcio",
4954
"Grübel",
5055
"hasher",
56+
"impls",
57+
"isahc",
5158
"Isobel",
5259
"jaegertracing",
5360
"Kühle",
5461
"Kumar",
5562
"Lalit",
5663
"LIBCLANG",
64+
"logrecord",
5765
"MILLIS",
66+
"mpsc",
5867
"msrv",
5968
"mykey",
69+
"myunit",
6070
"myvalue",
6171
"nocapture",
6272
"Ochtman",
6373
"opentelemetry",
74+
"openzipkin",
75+
"otcorrelations",
6476
"OTELCOL",
6577
"OTLP",
6678
"periodicreader",
6779
"Pillai",
6880
"pprof",
81+
"protos",
6982
"prost",
7083
"protoc",
7184
"quantile",
85+
"quantiles",
7286
"Redelmeier",
7387
"reqwest",
7488
"rstest",
7589
"runtimes",
7690
"rustc",
7791
"rustls",
92+
"schemars",
7893
"semconv",
7994
"serde",
8095
"shoppingcart",
@@ -83,10 +98,18 @@
8398
"testcontainers",
8499
"testresults",
85100
"thiserror",
101+
"traceparent",
102+
"Traceparent",
86103
"tracerprovider",
104+
"tracestate",
105+
"UCUM",
87106
"Umesan",
107+
"unsampled",
88108
"updown",
109+
"urlencoding",
110+
"usize",
89111
"Utkarsh",
112+
"webpki",
90113
"Zhongyang",
91114
"zipkin"
92115
],

‎.github/workflows/benchmark.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
3535
steps:
3636
- name: Harden the runner (Audit all outbound calls)
37-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
37+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
3838
with:
3939
egress-policy: audit
4040

‎.github/workflows/ci.yml‎

Lines changed: 17 additions & 17 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@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
35+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
3636
with:
3737
egress-policy: audit
3838

@@ -61,7 +61,7 @@ jobs:
6161
runs-on: ubuntu-latest
6262
steps:
6363
- name: Harden the runner (Audit all outbound calls)
64-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
64+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
6565
with:
6666
egress-policy: audit
6767

@@ -72,7 +72,7 @@ jobs:
7272
with:
7373
toolchain: stable
7474
components: rustfmt, clippy
75-
- uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
75+
- uses: taiki-e/install-action@0eee80d37f55e834144deec670972c19e81a85b0 # v2.56.0
7676
with:
7777
tool: cargo-hack
7878
- uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
@@ -89,7 +89,7 @@ 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@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
92+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
9393
with:
9494
egress-policy: audit
9595

@@ -100,7 +100,7 @@ jobs:
100100
# https://github.com/awslabs/cargo-check-external-types/releases
101101
toolchain: nightly-2025-05-04
102102
components: rustfmt
103-
- uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
103+
- uses: taiki-e/install-action@0eee80d37f55e834144deec670972c19e81a85b0 # v2.56.0
104104
with:
105105
tool: [email protected]
106106
- name: external-type-check
@@ -114,7 +114,7 @@ jobs:
114114
continue-on-error: true
115115
steps:
116116
- name: Harden the runner (Audit all outbound calls)
117-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
117+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
118118
with:
119119
egress-policy: audit
120120

@@ -124,7 +124,7 @@ jobs:
124124
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
125125
with:
126126
toolchain: stable
127-
- uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
127+
- uses: taiki-e/install-action@0eee80d37f55e834144deec670972c19e81a85b0 # v2.56.0
128128
with:
129129
tool: cargo-msrv
130130
- uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
@@ -137,29 +137,29 @@ jobs:
137137
continue-on-error: true # Prevent sudden announcement of a new advisory from failing ci
138138
steps:
139139
- name: Harden the runner (Audit all outbound calls)
140-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
140+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
141141
with:
142142
egress-policy: audit
143143

144144
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
145145

146146
- name: Check advisories
147-
uses: EmbarkStudios/cargo-deny-action@34899fc7ba81ca6268d5947a7a16b4649013fea1 # v2.0.11
147+
uses: EmbarkStudios/cargo-deny-action@30f817c6f72275c6d54dc744fbca09ebc958599f # v2.0.12
148148
with:
149149
command: check advisories
150150

151151
- name: Check licenses
152-
uses: EmbarkStudios/cargo-deny-action@34899fc7ba81ca6268d5947a7a16b4649013fea1 # v2.0.11
152+
uses: EmbarkStudios/cargo-deny-action@30f817c6f72275c6d54dc744fbca09ebc958599f # v2.0.12
153153
with:
154154
command: check licenses
155155

156156
- name: Check bans
157-
uses: EmbarkStudios/cargo-deny-action@34899fc7ba81ca6268d5947a7a16b4649013fea1 # v2.0.11
157+
uses: EmbarkStudios/cargo-deny-action@30f817c6f72275c6d54dc744fbca09ebc958599f # v2.0.12
158158
with:
159159
command: check bans
160160

161161
- name: Check sources
162-
uses: EmbarkStudios/cargo-deny-action@34899fc7ba81ca6268d5947a7a16b4649013fea1 # v2.0.11
162+
uses: EmbarkStudios/cargo-deny-action@30f817c6f72275c6d54dc744fbca09ebc958599f # v2.0.12
163163
with:
164164
command: check sources
165165

@@ -168,7 +168,7 @@ jobs:
168168
runs-on: ubuntu-latest
169169
steps:
170170
- name: Harden the runner (Audit all outbound calls)
171-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
171+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
172172
with:
173173
egress-policy: audit
174174

@@ -191,7 +191,7 @@ jobs:
191191
if: ${{ ! contains(github.event.pull_request.labels.*.name, 'dependencies') }}
192192
steps:
193193
- name: Harden the runner (Audit all outbound calls)
194-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
194+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
195195
with:
196196
egress-policy: audit
197197

@@ -206,7 +206,7 @@ jobs:
206206
with:
207207
repo-token: ${{ secrets.GITHUB_TOKEN }}
208208
- name: Install cargo-llvm-cov
209-
uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
209+
uses: taiki-e/install-action@0eee80d37f55e834144deec670972c19e81a85b0 # v2.56.0
210210
with:
211211
tool: cargo-llvm-cov
212212
- name: cargo generate-lockfile
@@ -244,7 +244,7 @@ jobs:
244244
runs-on: ubuntu-latest
245245
steps:
246246
- name: Harden the runner (Audit all outbound calls)
247-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
247+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
248248
with:
249249
egress-policy: audit
250250

@@ -254,7 +254,7 @@ jobs:
254254
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
255255
with:
256256
toolchain: stable
257-
- uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
257+
- uses: taiki-e/install-action@0eee80d37f55e834144deec670972c19e81a85b0 # v2.56.0
258258
with:
259259
tool: cargo-machete
260260
- 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@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
27+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
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@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
37+
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
3838
with:
3939
languages: rust
4040

4141
- name: Autobuild
42-
uses: github/codeql-action/autobuild@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
42+
uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
4343

4444
- name: Perform CodeQL Analysis
45-
uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
45+
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2

‎.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@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
16+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
1717
with:
1818
egress-policy: audit
1919

‎.github/workflows/integration_tests.yml‎

Lines changed: 1 addition & 1 deletion
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@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
17+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
1818
with:
1919
egress-policy: audit
2020

‎.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@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
19+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
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@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
24+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
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@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
51+
uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
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@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
15+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
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,7 +13,7 @@ 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@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
16+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
1717
with:
1818
egress-policy: audit
1919

@@ -26,4 +26,4 @@ jobs:
2626
toolchain: stable
2727
components: rustfmt
2828
- name: cargo-semver-checks
29-
uses: obi1kenobi/cargo-semver-checks-action@7272cc2caa468d3e009a2b0a9cc366839348237b # v2.6
29+
uses: obi1kenobi/cargo-semver-checks-action@5b298c9520f7096a4683c0bd981a7ac5a7e249ae # v2.8

0 commit comments

Comments
 (0)