Skip to content

Commit 78c1cca

Browse files
committed
Merge remote-tracking branch 'origin/main' into quenting/process-metrics
2 parents 13b3a36 + 4a32ccc commit 78c1cca

File tree

73 files changed

+4320
-3239
lines changed

Some content is hidden

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

73 files changed

+4320
-3239
lines changed

.github/workflows/build.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
chmod -R u=rwX,go=rX assets-dist/
8585
8686
- name: Upload assets
87-
uses: actions/upload-artifact@v5.0.0
87+
uses: actions/upload-artifact@v6.0.0
8888
with:
8989
name: assets
9090
path: assets-dist
@@ -143,7 +143,7 @@ jobs:
143143
-p mas-cli
144144
145145
- name: Upload binary artifact
146-
uses: actions/upload-artifact@v5.0.0
146+
uses: actions/upload-artifact@v6.0.0
147147
with:
148148
name: binary-${{ matrix.target }}
149149
path: target/${{ matrix.target }}/release/mas-cli
@@ -162,19 +162,19 @@ jobs:
162162

163163
steps:
164164
- name: Download assets
165-
uses: actions/download-artifact@v6
165+
uses: actions/download-artifact@v7
166166
with:
167167
name: assets
168168
path: assets-dist
169169

170170
- name: Download binary x86_64
171-
uses: actions/download-artifact@v6
171+
uses: actions/download-artifact@v7
172172
with:
173173
name: binary-x86_64-unknown-linux-gnu
174174
path: binary-x86_64
175175

176176
- name: Download binary aarch64
177-
uses: actions/download-artifact@v6
177+
uses: actions/download-artifact@v7
178178
with:
179179
name: binary-aarch64-unknown-linux-gnu
180180
path: binary-aarch64
@@ -192,13 +192,13 @@ jobs:
192192
done
193193
194194
- name: Upload aarch64 archive
195-
uses: actions/upload-artifact@v5.0.0
195+
uses: actions/upload-artifact@v6.0.0
196196
with:
197197
name: mas-cli-aarch64-linux
198198
path: mas-cli-aarch64-linux.tar.gz
199199

200200
- name: Upload x86_64 archive
201-
uses: actions/upload-artifact@v5.0.0
201+
uses: actions/upload-artifact@v6.0.0
202202
with:
203203
name: mas-cli-x86_64-linux
204204
path: mas-cli-x86_64-linux.tar.gz
@@ -320,7 +320,7 @@ jobs:
320320
- build-image
321321
steps:
322322
- name: Download the artifacts from the previous job
323-
uses: actions/download-artifact@v6
323+
uses: actions/download-artifact@v7
324324
with:
325325
pattern: mas-cli-*
326326
path: artifacts
@@ -382,7 +382,7 @@ jobs:
382382
.github/scripts
383383
384384
- name: Download the artifacts from the previous job
385-
uses: actions/download-artifact@v6
385+
uses: actions/download-artifact@v7
386386
with:
387387
pattern: mas-cli-*
388388
path: artifacts

.github/workflows/ci.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
uses: actions/checkout@v6
6565

6666
- name: Install Node
67-
uses: actions/setup-node@v6.0.0
67+
uses: actions/setup-node@v6.1.0
6868
with:
6969
node-version: 24
7070

@@ -88,7 +88,7 @@ jobs:
8888
uses: actions/checkout@v6
8989

9090
- name: Install Node
91-
uses: actions/setup-node@v6.0.0
91+
uses: actions/setup-node@v6.1.0
9292
with:
9393
node-version: 24
9494

@@ -112,7 +112,7 @@ jobs:
112112
uses: actions/checkout@v6
113113

114114
- name: Install Node
115-
uses: actions/setup-node@v6.0.0
115+
uses: actions/setup-node@v6.1.0
116116
with:
117117
node-version: 24
118118

@@ -257,7 +257,7 @@ jobs:
257257
SQLX_OFFLINE: "1"
258258

259259
- name: Upload archive to workflow
260-
uses: actions/upload-artifact@v5.0.0
260+
uses: actions/upload-artifact@v6.0.0
261261
with:
262262
name: nextest-archive
263263
path: nextest-archive.tar.zst
@@ -305,7 +305,7 @@ jobs:
305305
- uses: ./.github/actions/build-policies
306306

307307
- name: Download archive
308-
uses: actions/download-artifact@v6
308+
uses: actions/download-artifact@v7
309309
with:
310310
name: nextest-archive
311311

.github/workflows/coverage.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
run: make coverage
3939

4040
- name: Upload to codecov.io
41-
uses: codecov/[email protected].1
41+
uses: codecov/[email protected].2
4242
with:
4343
token: ${{ secrets.CODECOV_TOKEN }}
4444
files: policies/coverage.json
@@ -65,7 +65,7 @@ jobs:
6565
run: npm run coverage
6666

6767
- name: Upload to codecov.io
68-
uses: codecov/[email protected].1
68+
uses: codecov/[email protected].2
6969
with:
7070
token: ${{ secrets.CODECOV_TOKEN }}
7171
directory: frontend/coverage/
@@ -132,7 +132,7 @@ jobs:
132132
grcov . --binary-path ./target/debug/deps/ -s . -t lcov --branch --ignore-not-existing --ignore '../*' --ignore "/*" -o target/coverage/tests.lcov
133133
134134
- name: Upload to codecov.io
135-
uses: codecov/[email protected].1
135+
uses: codecov/[email protected].2
136136
with:
137137
token: ${{ secrets.CODECOV_TOKEN }}
138138
files: target/coverage/*.lcov

.github/workflows/docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
tool: mdbook
4040

4141
- name: Install Node
42-
uses: actions/setup-node@v6.0.0
42+
uses: actions/setup-node@v6.1.0
4343
with:
4444
node-version: 24
4545

.github/workflows/release-branch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
uses: actions/checkout@v6
6565

6666
- name: Install Node
67-
uses: actions/setup-node@v6.0.0
67+
uses: actions/setup-node@v6.1.0
6868
with:
6969
node-version: 24
7070

.github/workflows/translations-download.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/checkout@v6
2323

2424
- name: Install Node
25-
uses: actions/setup-node@v6.0.0
25+
uses: actions/setup-node@v6.1.0
2626
with:
2727
node-version: 24
2828

@@ -42,7 +42,7 @@ jobs:
4242

4343
- name: Create Pull Request
4444
id: cpr
45-
uses: peter-evans/create-pull-request@v7.0.9
45+
uses: peter-evans/create-pull-request@v8.0.0
4646
with:
4747
sign-commits: true
4848
token: ${{ secrets.BOT_GITHUB_TOKEN }}

.github/workflows/translations-upload.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/checkout@v6
2222

2323
- name: Install Node
24-
uses: actions/setup-node@v6.0.0
24+
uses: actions/setup-node@v6.1.0
2525
with:
2626
node-version: 24
2727

Cargo.lock

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,8 @@ version = "0.31.0"
403403
features = ["reqwest"]
404404
[workspace.dependencies.opentelemetry-instrumentation-process]
405405
version = "0.1.2"
406+
[workspace.dependencies.opentelemetry-instrumentation-tokio]
407+
version = "0.1.2"
406408
[workspace.dependencies.opentelemetry-jaeger-propagator]
407409
version = "0.31.0"
408410
[workspace.dependencies.opentelemetry-otlp]

crates/cli/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ tracing-opentelemetry.workspace = true
5858
opentelemetry.workspace = true
5959
opentelemetry-http.workspace = true
6060
opentelemetry-instrumentation-process.workspace = true
61+
opentelemetry-instrumentation-tokio.workspace = true
6162
opentelemetry-jaeger-propagator.workspace = true
6263
opentelemetry-otlp.workspace = true
6364
opentelemetry-prometheus-text-exporter.workspace = true

0 commit comments

Comments
 (0)