Skip to content

Commit e4cfac9

Browse files
paulojmdiasatoulme
andcommitted
[chore][ci] improve Build gotestsum for Windows (#43020)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> Seems the CI for `scoped-tests-matrix (windows-latest)` is failing due to the `Build gotestsum on Windows` error. ```sh Run make "$(${PWD} -replace '\\', '/')/.tools/gotestsum" make: *** No rule to make target 'D:/a/opentelemetry-collector-contrib/opentelemetry-collector-contrib/.tools/gotestsum'. Stop. Error: Process completed with exit code 1. ``` See https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/18048822328/job/51369899669?pr=43018 and https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/18050658515/job/51371803867?pr=43019 I think we can simplify the `Build gotestsum` task into a single one using the `working-directory` definition, and this should fix the issue. Found the issue in: - #43018 - #43019 Signed-off-by: Paulo Dias <[email protected]> Co-authored-by: Antoine Toulme <[email protected]>
1 parent c8000c3 commit e4cfac9

39 files changed

+2137
-1290
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ internal/common/ @open-telemetry
137137
internal/coreinternal/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
138138
internal/datadog/ @open-telemetry/collector-contrib-approvers @mx-psi @dineshg13 @liustanley @songy23 @mackjmr @ankitpatel96 @jade-guiton-dd @IbraheemA
139139
internal/docker/ @open-telemetry/collector-contrib-approvers @jamesmoessis @MovieStoreGuy
140+
internal/datadog/e2e/ @open-telemetry/collector-contrib-approvers @mx-psi @dineshg13 @liustanley @songy23 @mackjmr @ankitpatel96 @jade-guiton-dd @IbraheemA
140141
internal/exp/metrics/ @open-telemetry/collector-contrib-approvers @RichieSams @tombrk
141142
internal/filter/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
142143
internal/grpcutil/ @open-telemetry/collector-contrib-approvers @jmacd @moh-osman3 @lquerel

.github/ISSUE_TEMPLATE/beta_stability.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ body:
137137
- internal/common
138138
- internal/core
139139
- internal/datadog
140+
- internal/datadog/e2e
140141
- internal/docker
141142
- internal/exp/metrics
142143
- internal/filter

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ body:
140140
- internal/common
141141
- internal/core
142142
- internal/datadog
143+
- internal/datadog/e2e
143144
- internal/docker
144145
- internal/exp/metrics
145146
- internal/filter

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ body:
134134
- internal/common
135135
- internal/core
136136
- internal/datadog
137+
- internal/datadog/e2e
137138
- internal/docker
138139
- internal/exp/metrics
139140
- internal/filter

.github/ISSUE_TEMPLATE/other.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ body:
134134
- internal/common
135135
- internal/core
136136
- internal/datadog
137+
- internal/datadog/e2e
137138
- internal/docker
138139
- internal/exp/metrics
139140
- internal/filter

.github/ISSUE_TEMPLATE/unmaintained.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ body:
139139
- internal/common
140140
- internal/core
141141
- internal/datadog
142+
- internal/datadog/e2e
142143
- internal/docker
143144
- internal/exp/metrics
144145
- internal/filter

.github/component_labels.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ internal/common internal/common
118118
internal/coreinternal internal/core
119119
internal/datadog internal/datadog
120120
internal/docker internal/docker
121+
internal/datadog/e2e internal/datadog/e2e
121122
internal/exp/metrics internal/exp/metrics
122123
internal/filter internal/filter
123124
internal/grpcutil internal/grpcutil

.github/workflows/scoped-test.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,9 @@ jobs:
7878
if: steps.go-setup.outputs.cache-hit != 'true'
7979
run: make install-tools
8080

81-
- name: Build gotestsum on Windows
82-
if: runner.os == 'Windows'
83-
shell: pwsh # Explicitly set the shell to avoid actionlint treating this an attempt to escape single quote
84-
run: make "$(${PWD} -replace '\\', '/')/.tools/gotestsum"
85-
8681
- name: Build gotestsum
87-
if: runner.os != 'Windows'
88-
run: make "$PWD/.tools/gotestsum"
82+
working-directory: ${{ github.workspace }}
83+
run: make .tools/gotestsum
8984

9085
- name: Run changed tests
9186
if: needs.changedfiles.outputs.go_tests

connector/datadogconnector/go.mod

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -380,74 +380,34 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/metad
380380

381381
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => ../../internal/k8sconfig
382382

383-
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker => ../../internal/docker
384-
385-
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest => ../../pkg/xk8stest
386-
387383
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry => ../../pkg/resourcetotelemetry
388384

389385
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter => ../../internal/filter
390386

391-
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => ../../receiver/prometheusreceiver
392-
393-
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver => ../../receiver/hostmetricsreceiver
394-
395-
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter => ../../exporter/prometheusremotewriteexporter
396-
397-
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver => ../../receiver/filelogreceiver
398-
399-
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver => ../../receiver/dockerstatsreceiver
400-
401387
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil
402388

403389
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest
404390

405391
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden
406392

407-
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => ../../pkg/stanza
408-
409-
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor => ../../processor/resourcedetectionprocessor
410-
411393
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl => ../../pkg/ottl
412394

413395
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
414396

415397
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter => ../../exporter/datadogexporter
416398

417-
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => ../../pkg/translator/prometheus
418-
419-
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite => ../../pkg/translator/prometheusremotewrite
420-
421399
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor => ../../processor/probabilisticsamplerprocessor
422400

423401
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common
424402

425403
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil => ../../internal/aws/ecsutil
426404

427-
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor => ../../processor/k8sattributesprocessor
428-
429-
replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => ../../extension/storage
430-
431405
replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api v0.0.0-20180801171038-322a19404e37
432406

433-
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor => ../../processor/transformprocessor
434-
435407
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling => ../../pkg/sampling
436408

437-
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil => ../../internal/pdatautil
438-
439-
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata => ../../pkg/experimentalmetricmetadata
440-
441409
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog => ../../pkg/datadog
442410

443411
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils
444412

445413
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../internal/datadog
446-
447-
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters => ../../pkg/winperfcounters
448-
449-
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/gopsutilenv => ../../internal/gopsutilenv
450-
451-
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor => ../../processor/deltatocumulativeprocessor
452-
453-
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics => ../../internal/exp/metrics

0 commit comments

Comments
 (0)