Skip to content

Commit acecf7e

Browse files
committed
diag iter2: full module test + heap-pressure cells
1 parent e58d8aa commit acecf7e

2 files changed

Lines changed: 22 additions & 15 deletions

File tree

.github/workflows/diag-consistent-sampling.yml

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,35 @@ permissions:
1717

1818
jobs:
1919
diag:
20-
name: ${{ matrix.os }} ${{ matrix.distribution }}-${{ matrix.test-java-version }}
20+
name: ${{ matrix.os }} ${{ matrix.distribution }}-${{ matrix.test-java-version }} ${{ matrix.label }}
2121
runs-on: ${{ matrix.os }}
2222
timeout-minutes: 120
2323
strategy:
2424
fail-fast: false
2525
matrix:
2626
include:
27-
# CI's exact failing config (build-common uses zulu)
27+
# reproduce the build scan's standalone `:consistent-sampling:test` (all classes)
2828
- os: windows-latest
2929
distribution: zulu
3030
test-java-version: 26
31-
# vendor hypothesis: temurin 26 runs fast locally on Windows
32-
- os: windows-latest
33-
distribution: temurin
31+
label: full
32+
tests: ""
33+
extra: ""
34+
- os: ubuntu-latest
35+
distribution: zulu
3436
test-java-version: 26
35-
# version baseline: zulu 25 runs fast
37+
label: full
38+
tests: ""
39+
extra: ""
40+
# heap-pressure hypothesis: constrain heap and run only the two slow classes
3641
- os: windows-latest
37-
distribution: zulu
38-
test-java-version: 25
39-
# OS dimension: zulu 26 on linux
40-
- os: ubuntu-latest
4142
distribution: zulu
4243
test-java-version: 26
44+
label: lowheap
45+
tests: >-
46+
--tests "*.consistent.ConsistentProbabilityBasedSamplerTest"
47+
--tests "*.consistent.ConsistentRateLimitingSamplerTest"
48+
extra: "-PdiagMaxHeap=256m"
4349
steps:
4450
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4551
with:
@@ -62,22 +68,21 @@ jobs:
6268
- name: Set up Gradle
6369
uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
6470

65-
- name: Run slow consistent-sampling tests with profiling
71+
- name: Run consistent-sampling tests with profiling
6672
run: >
67-
./gradlew :consistent-sampling:test -PdiagProfiling
73+
./gradlew :consistent-sampling:test -PdiagProfiling ${{ matrix.extra }}
6874
"-PtestJavaVersion=${{ matrix.test-java-version }}"
6975
"-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }}"
7076
"-Porg.gradle.java.installations.auto-download=false"
71-
--tests "*.consistent.ConsistentProbabilityBasedSamplerTest"
72-
--tests "*.consistent.ConsistentRateLimitingSamplerTest"
77+
${{ matrix.tests }}
7378
env:
7479
GITHUB_TOKEN: ${{ github.token }}
7580

7681
- name: Upload diagnostics
7782
if: ${{ !cancelled() }}
7883
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
7984
with:
80-
name: diag-${{ matrix.os }}-${{ matrix.distribution }}${{ matrix.test-java-version }}
85+
name: diag-${{ matrix.os }}-${{ matrix.distribution }}${{ matrix.test-java-version }}-${{ matrix.label }}
8186
path: |
8287
consistent-sampling/build/diag/**
8388
consistent-sampling/build/reports/tests/**

consistent-sampling/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ tasks {
3737
"settings=profile,dumponexit=true,maxsize=250m",
3838
"-Xlog:gc*:file=build/diag/gc.log",
3939
)
40+
// Optional heap-pressure experiment: -PdiagMaxHeap=256m
41+
(project.findProperty("diagMaxHeap") as String?)?.let { maxHeapSize = it }
4042
}
4143
}
4244
}

0 commit comments

Comments
 (0)