From 1a2fa2a28e0fde20749b38a29bd576f283fdb21c Mon Sep 17 00:00:00 2001 From: thugrock7 Date: Thu, 29 Oct 2026 20:53:46 +0530 Subject: [PATCH 1/3] debug-smoke --- .github/workflows/smoke-test.yml | 21 ++++++++++++++++++++- smoke-tests/build.gradle.kts | 9 +++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml index 64046e9a..64b318e9 100644 --- a/.github/workflows/smoke-test.yml +++ b/.github/workflows/smoke-test.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: suite: [ "glassfish", "jetty", "liberty", "tomcat", "tomee", "wildfly"] - fail-fast: true + fail-fast: false steps: # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation - name: Check out code @@ -49,3 +49,22 @@ jobs: env: JVM_OPTS: -Xmx1g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED TERM: dumb + + - name: print smoke test results + if: failure() + run: | + for f in smoke-tests/build/test-results/test/*.xml; do + echo "::group::$f" + cat "$f" + echo "::endgroup::" + done + + - name: upload smoke test reports + if: always() + uses: actions/upload-artifact@v4 + with: + name: smoke-test-reports-${{ matrix.suite }} + path: | + smoke-tests/build/reports/tests/test/ + smoke-tests/build/test-results/test/ + if-no-files-found: ignore diff --git a/smoke-tests/build.gradle.kts b/smoke-tests/build.gradle.kts index f9cb2963..91596620 100644 --- a/smoke-tests/build.gradle.kts +++ b/smoke-tests/build.gradle.kts @@ -35,6 +35,15 @@ tasks.test { junitXml.isOutputPerTestCase = true } + testLogging { + events("started", "passed", "skipped", "failed", "standard_out", "standard_error") + showStandardStreams = true + showExceptions = true + showCauses = true + showStackTraces = true + exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL + } + maxParallelForks = 2 var suites : HashMap From 333ddb99bbf7e34a09dd1af67d1d6541850705ed Mon Sep 17 00:00:00 2001 From: thugrock7 Date: Thu, 29 Oct 2026 21:05:04 +0530 Subject: [PATCH 2/3] upgrade testcontainers --- otel-extensions/build.gradle.kts | 2 +- smoke-tests/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/otel-extensions/build.gradle.kts b/otel-extensions/build.gradle.kts index 3cdc84d0..7a3f6845 100644 --- a/otel-extensions/build.gradle.kts +++ b/otel-extensions/build.gradle.kts @@ -9,7 +9,7 @@ plugins { sourceSets { main { proto { - srcDir("src/main/proto") + setSrcDirs(listOf("src/main/proto/proto")) exclude("gen/go/**") } } diff --git a/smoke-tests/build.gradle.kts b/smoke-tests/build.gradle.kts index 91596620..1e7d75c2 100644 --- a/smoke-tests/build.gradle.kts +++ b/smoke-tests/build.gradle.kts @@ -12,7 +12,7 @@ val versions: Map by extra dependencies{ testImplementation(project(":testing-common")) testImplementation(project(":javaagent-core")) - testImplementation("org.testcontainers:testcontainers:1.15.2") + testImplementation("org.testcontainers:testcontainers:1.21.4") testImplementation("com.squareup.okhttp3:okhttp:4.9.0") testImplementation("org.awaitility:awaitility:4.0.3") testImplementation("io.opentelemetry.proto:opentelemetry-proto:${versions["opentelemetry_proto"]}") From 173449465c8c8563ab17d52d979a6b2194df0827 Mon Sep 17 00:00:00 2001 From: thugrock7 Date: Thu, 29 Oct 2026 21:16:25 +0530 Subject: [PATCH 3/3] remove debug --- .github/workflows/smoke-test.yml | 21 +-------------------- smoke-tests/build.gradle.kts | 9 --------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml index 64b318e9..64046e9a 100644 --- a/.github/workflows/smoke-test.yml +++ b/.github/workflows/smoke-test.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: suite: [ "glassfish", "jetty", "liberty", "tomcat", "tomee", "wildfly"] - fail-fast: false + fail-fast: true steps: # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation - name: Check out code @@ -49,22 +49,3 @@ jobs: env: JVM_OPTS: -Xmx1g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED TERM: dumb - - - name: print smoke test results - if: failure() - run: | - for f in smoke-tests/build/test-results/test/*.xml; do - echo "::group::$f" - cat "$f" - echo "::endgroup::" - done - - - name: upload smoke test reports - if: always() - uses: actions/upload-artifact@v4 - with: - name: smoke-test-reports-${{ matrix.suite }} - path: | - smoke-tests/build/reports/tests/test/ - smoke-tests/build/test-results/test/ - if-no-files-found: ignore diff --git a/smoke-tests/build.gradle.kts b/smoke-tests/build.gradle.kts index 1e7d75c2..727b26c9 100644 --- a/smoke-tests/build.gradle.kts +++ b/smoke-tests/build.gradle.kts @@ -35,15 +35,6 @@ tasks.test { junitXml.isOutputPerTestCase = true } - testLogging { - events("started", "passed", "skipped", "failed", "standard_out", "standard_error") - showStandardStreams = true - showExceptions = true - showCauses = true - showStackTraces = true - exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL - } - maxParallelForks = 2 var suites : HashMap