Skip to content

Commit dd63953

Browse files
iunanuabengl
iunanua
and
bengl
authored
upgrade upload-artifact version and fix vitest (#5118)
* Upgrade upload-artifact version * disable integration test for vitest v3 for now --------- Co-authored-by: Bryan English <[email protected]>
1 parent 803ac98 commit dd63953

10 files changed

Lines changed: 71 additions & 3 deletions

File tree

‎.github/actions/plugins/test-and-upstream/action.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@ runs:
1818
- uses: codecov/codecov-action@v3
1919
- if: always()
2020
uses: ./.github/actions/testagent/logs
21+
with:
22+
suffix: test-and-upstream-${{ github.job }}

‎.github/actions/plugins/test/action.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ runs:
1414
- uses: codecov/codecov-action@v3
1515
- if: always()
1616
uses: ./.github/actions/testagent/logs
17+
with:
18+
suffix: test-${{ github.job }}

‎.github/actions/plugins/upstream/action.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ runs:
1414
- uses: codecov/codecov-action@v3
1515
- if: always()
1616
uses: ./.github/actions/testagent/logs
17+
with:
18+
suffix: upstream-${{ github.job }}

‎.github/actions/testagent/logs/action.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ inputs:
44
container-id:
55
description: "ID of the Docker Container to get logs from (optional)"
66
required: false
7+
suffix:
8+
description: "suffix of the artifact file name"
9+
required: false
710
runs:
811
using: composite
912
steps:
@@ -34,7 +37,7 @@ runs:
3437
rm "$headers"
3538
shell: bash
3639
- name: Archive Test Agent Artifacts
37-
uses: actions/upload-artifact@v3
40+
uses: actions/upload-artifact@v4
3841
with:
39-
name: supported-integrations
42+
name: supported-integrations-${{inputs.suffix}}
4043
path: ./artifacts

‎.github/workflows/appsec.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,23 @@ jobs:
211211
- 18
212212
- latest
213213
range: ['>=10.2.0 <11', '>=11.0.0 <13', '11.1.4', '>=13.0.0 <14', '13.2.0', '>=14.0.0 <=14.2.6', '>=14.2.7 <15', '>=15.0.0']
214+
include:
215+
- range: '>=10.2.0 <11'
216+
range_clean: gte.10.2.0.and.lt.11
217+
- range: '>=11.0.0 <13'
218+
range_clean: gte.11.0.0.and.lt.13
219+
- range: '11.1.4'
220+
range_clean: 11.1.4
221+
- range: '>=13.0.0 <14'
222+
range_clean: gte.13.0.0.and.lt.14
223+
- range: '13.2.0'
224+
range_clean: 13.2.0
225+
- range: '>=14.0.0 <=14.2.6'
226+
range_clean: gte.14.0.0.and.lte.14.2.6
227+
- range: '>=14.2.7 <15'
228+
range_clean: gte.14.2.7.and.lt.15
229+
- range: '>=15.0.0'
230+
range_clean: gte.15.0.0
214231
runs-on: ubuntu-latest
215232
env:
216233
PLUGINS: next
@@ -226,6 +243,8 @@ jobs:
226243
- run: yarn test:appsec:plugins:ci
227244
- if: always()
228245
uses: ./.github/actions/testagent/logs
246+
with:
247+
suffix: appsec-${{ github.job }}-${{ matrix.version }}-${{ matrix.range_clean }}
229248
- uses: codecov/codecov-action@v3
230249

231250
lodash:

‎.github/workflows/debugger.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,6 @@ jobs:
3030
- run: yarn test:integration:debugger
3131
- if: always()
3232
uses: ./.github/actions/testagent/logs
33+
with:
34+
suffix: debugger
3335
- uses: codecov/codecov-action@v3

‎.github/workflows/lambda.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,6 @@ jobs:
2727
- run: yarn test:lambda:ci
2828
- if: always()
2929
uses: ./.github/actions/testagent/logs
30+
with:
31+
suffix: lambda
3032
- uses: codecov/codecov-action@v3

‎.github/workflows/llmobs.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ jobs:
2727
- run: yarn test:llmobs:sdk:ci
2828
- if: always()
2929
uses: ./.github/actions/testagent/logs
30+
with:
31+
suffix: llmobs-${{ github.job }}
3032
- uses: codecov/codecov-action@v3
3133

3234
openai:
@@ -47,6 +49,8 @@ jobs:
4749
- uses: codecov/codecov-action@v3
4850
- if: always()
4951
uses: ./.github/actions/testagent/logs
52+
with:
53+
suffix: llmobs-${{ github.job }}
5054

5155
langchain:
5256
runs-on: ubuntu-latest
@@ -66,3 +70,5 @@ jobs:
6670
- uses: codecov/codecov-action@v3
6771
- if: always()
6872
uses: ./.github/actions/testagent/logs
73+
with:
74+
suffix: llmobs-${{ github.job }}

‎.github/workflows/plugins.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ jobs:
6363
run: yarn test:plugins:ci
6464
- if: always()
6565
uses: ./.github/actions/testagent/logs
66+
with:
67+
suffix: plugins-${{ github.job }}-${{ matrix.node-version }}-${{ github.run_id }}
6668
- uses: codecov/codecov-action@v3
6769

6870
amqp10:
@@ -164,6 +166,8 @@ jobs:
164166
- run: yarn test:plugins:ci
165167
- if: always()
166168
uses: ./.github/actions/testagent/logs
169+
with:
170+
suffix: plugins-${{ github.job }}-${{ matrix.node-version }}
167171
- uses: codecov/codecov-action@v3
168172

169173
axios:
@@ -305,6 +309,8 @@ jobs:
305309
- run: yarn test:plugins:ci
306310
- if: always()
307311
uses: ./.github/actions/testagent/logs
312+
with:
313+
suffix: plugins-${{ github.job }}
308314
- uses: codecov/codecov-action@v3
309315

310316
dns:
@@ -324,6 +330,8 @@ jobs:
324330
- run: yarn test:plugins:ci
325331
- if: always()
326332
uses: ./.github/actions/testagent/logs
333+
with:
334+
suffix: plugins-${{ github.job }}
327335
- uses: codecov/codecov-action@v3
328336

329337
elasticsearch:
@@ -347,6 +355,8 @@ jobs:
347355
- run: yarn test:plugins:ci
348356
- if: always()
349357
uses: ./.github/actions/testagent/logs
358+
with:
359+
suffix: plugins-${{ github.job }}
350360
- uses: codecov/codecov-action@v3
351361

352362
express:
@@ -452,6 +462,8 @@ jobs:
452462
- run: yarn test:plugins:ci
453463
- if: always()
454464
uses: ./.github/actions/testagent/logs
465+
with:
466+
suffix: plugins-${{ github.job }}-${{ matrix.node-version }}
455467
- uses: codecov/codecov-action@v3
456468

457469
http2:
@@ -471,6 +483,8 @@ jobs:
471483
- run: yarn test:plugins:ci
472484
- if: always()
473485
uses: ./.github/actions/testagent/logs
486+
with:
487+
suffix: plugins-${{ github.job }}
474488
- uses: codecov/codecov-action@v3
475489

476490
# TODO: fix performance issues and test more Node versions
@@ -486,6 +500,8 @@ jobs:
486500
- run: yarn test:plugins:ci
487501
- if: always()
488502
uses: ./.github/actions/testagent/logs
503+
with:
504+
suffix: plugins-${{ github.job }}
489505
- uses: codecov/codecov-action@v3
490506

491507
kafkajs:
@@ -549,6 +565,8 @@ jobs:
549565
- uses: codecov/codecov-action@v3
550566
- if: always()
551567
uses: ./.github/actions/testagent/logs
568+
with:
569+
suffix: plugins-${{ github.job }}
552570

553571
limitd-client:
554572
runs-on: ubuntu-latest
@@ -718,6 +736,8 @@ jobs:
718736
- run: yarn test:plugins:ci
719737
- if: always()
720738
uses: ./.github/actions/testagent/logs
739+
with:
740+
suffix: plugins-${{ github.job }}
721741
- uses: codecov/codecov-action@v3
722742

723743
# TODO: fix performance issues and test more Node versions
@@ -741,6 +761,8 @@ jobs:
741761
- run: yarn test:plugins:ci
742762
- if: always()
743763
uses: ./.github/actions/testagent/logs
764+
with:
765+
suffix: plugins-${{ github.job }}-${{ matrix.version }}-${{ github.run_id }matrix.range}
744766
- uses: codecov/codecov-action@v3
745767

746768
openai:
@@ -831,6 +853,8 @@ jobs:
831853
- run: yarn test:plugins:ci
832854
- if: always()
833855
uses: ./.github/actions/testagent/logs
856+
with:
857+
suffix: plugins-${{ github.job }}
834858
- uses: codecov/codecov-action@v3
835859

836860
# TODO: re-enable upstream tests if it ever stops being flaky
@@ -850,6 +874,8 @@ jobs:
850874
# - run: yarn test:plugins:upstream
851875
- if: always()
852876
uses: ./.github/actions/testagent/logs
877+
with:
878+
suffix: plugins-${{ github.job }}
853879
- uses: codecov/codecov-action@v3
854880

855881
postgres:
@@ -963,6 +989,8 @@ jobs:
963989
- run: yarn test:plugins:ci
964990
- if: always()
965991
uses: ./.github/actions/testagent/logs
992+
with:
993+
suffix: plugins-${{ github.job }}
966994
- uses: codecov/codecov-action@v3
967995

968996
tedious:
@@ -989,6 +1017,8 @@ jobs:
9891017
- run: yarn test:plugins:upstream
9901018
- if: always()
9911019
uses: ./.github/actions/testagent/logs
1020+
with:
1021+
suffix: plugins-${{ github.job }}
9921022
- uses: codecov/codecov-action@v3
9931023

9941024
undici:

‎integration-tests/vitest/vitest.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const { DD_HOST_CPU_COUNT } = require('../../packages/dd-trace/src/plugins/util/
3535

3636
const NUM_RETRIES_EFD = 3
3737

38-
const versions = ['latest']
38+
const versions = ['2.1.8'] // was previously 'latest', but v3 breaks this test
3939

4040
const linePctMatchRegex = /Lines\s+:\s+([\d.]+)%/
4141

0 commit comments

Comments
 (0)