Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] add more Windows versions for testing #37025

Merged
merged 6 commits into from
Jan 9, 2025
Merged

[chore] add more Windows versions for testing #37025

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c855d73
[chore] add more Windows versions for testing
CodePrometheus Jan 5, 2025
9d2111a
[fix] adjust version and try to fix ci
CodePrometheus Jan 8, 2025
909d90e
Merge branch 'main' into add-more-archs-for-windows
CodePrometheus Jan 8, 2025
2ca8aa6
[fix] change assert to require
CodePrometheus Jan 8, 2025
094749e
Merge remote-tracking branch 'upstream/main' into add-more-archs-for-…
CodePrometheus Jan 9, 2025
6e3438d
[fix] skip Test_PushMetricsConcurrent when win25 and merge upstream/main
CodePrometheus Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/build-and-test-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ jobs:
- cmd-0
- cmd-1
- other
runs-on: windows-latest
os: [windows-2022, windows-2025]
runs-on: ${{ matrix.os }}
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run Windows') || github.event_name == 'push' || github.event_name == 'merge_group') }}
env:
# Limit memory usage via GC environment variables to avoid OOM on GH runners, especially for `cmd/otelcontribcol`,
Expand Down
18 changes: 15 additions & 3 deletions .github/workflows/e2e-tests-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ jobs:
- run: echo $(./.github/workflows/scripts/is_changed_file_windows.sh ${{ github.event.pull_request.base.sha }} ${{ github.sha }} )

collector-build:
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
os: [windows-2022, windows-2025]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually this one is fine to use windows-latest since it is building the binary, we should be fine with windows-latest - it also breaks because it tries to upload two artifacts with the same name.

runs-on: ${{ matrix.os }}
needs: [windows-file-changed]
if: ${{ github.actor != 'dependabot[bot]' && ((contains(github.event.pull_request.labels.*.name, 'Run Windows') || github.event_name == 'push' || github.event_name == 'merge_group') || needs.windows-file-changed.outputs.changed == 'true') }}
steps:
Expand Down Expand Up @@ -65,7 +69,11 @@ jobs:
path: ./bin/*

supervisor-test:
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
os: [windows-2022, windows-2025]
runs-on: ${{ matrix.os }}
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run Windows') || github.event_name == 'push' || github.event_name == 'merge_group') }}
needs: [collector-build]
steps:
Expand Down Expand Up @@ -97,7 +105,11 @@ jobs:
go test -v --tags=e2e

windows-supervisor-service-test:
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
os: [windows-2022, windows-2025]
runs-on: ${{ matrix.os }}
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run Windows') || github.event_name == 'push' || github.event_name == 'merge_group') }}
needs: [collector-build]
steps:
Expand Down
10 changes: 10 additions & 0 deletions exporter/prometheusremotewriteexporter/exporter_concurrency_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ func Test_PushMetricsConcurrent(t *testing.T) {
t.Fatal(err)
}
assert.NotNil(t, body)
if len(body) == 0 {
// No content, nothing to do. The request is just checking that the server is up.
return
}
// Receives the http requests and unzip, unmarshalls, and extracts TimeSeries
assert.Equal(t, "0.1.0", r.Header.Get("X-Prometheus-Remote-Write-Version"))
assert.Equal(t, "snappy", r.Header.Get("Content-Encoding"))
Expand Down Expand Up @@ -124,6 +128,12 @@ func Test_PushMetricsConcurrent(t *testing.T) {
require.NoError(t, prwe.Shutdown(ctx))
}()

// Ensure that the test server is up before making the requests
assert.EventuallyWithT(t, func(c *assert.CollectT) {
_, checkRequestErr := http.Get(server.URL)
assert.NoError(c, checkRequestErr)
}, 5*time.Second, 100*time.Millisecond)

var wg sync.WaitGroup
wg.Add(n)
for _, m := range ms {
Expand Down
Loading