Simplify tests

Author: trask

.github/workflows/build-common.yml

@@ -111,7 +111,7 @@ jobs:
 
       - name: Test
         run: >
-          ./gradlew test
+          ./gradlew check -x spotlessCheck
           "-PtestJavaVersion=${{ matrix.test-java-version }}"
           "-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }}"
           "-Porg.gradle.java.installations.auto-download=false"
@@ -122,36 +122,6 @@ jobs:
         if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}
         run: cat build-scan.txt
 
-  integration-test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-
-      - name: Set up JDK for running Gradle
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
-        with:
-          distribution: temurin
-          java-version: 17
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
-        with:
-          cache-read-only: ${{ inputs.cache-read-only }}
-
-      - name: Integration test
-        run: ./gradlew integrationTest "-PmaxTestRetries=${{ inputs.max-test-retries }}" ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
-
-      - name: Build scan
-        if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}
-        run: cat build-scan.txt
-
-      - name: Save integration test results
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        if: always()
-        with:
-          name: integration-test-results
-          path: jmx-metrics/build/reports/tests/integrationTest
-
   markdown-lint-check:
     uses: ./.github/workflows/reusable-markdown-lint.yml
 

CONTRIBUTING.md

@@ -31,12 +31,6 @@ To run the tests:
 ./gradlew test
 ```
 
-Some modules include integration tests that can be run with:
-
-```bash
-./gradlew integrationTest
-```
-
 ## Snapshot Builds
 
 Snapshot builds of the `main` branch are available from the Sonatype snapshot repository at:

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -173,6 +173,12 @@ testing {
   }
 }
 
+tasks {
+  check {
+    dependsOn(testing.suites)
+  }
+}
+
 fun isJavaVersionAllowed(version: JavaVersion): Boolean {
   if (otelJava.minJavaVersionSupported.get() > version) {
     return false

runtime-attach/runtime-attach/build.gradle.kts

@@ -59,9 +59,4 @@ tasks {
       excludeTestsMatching("AgentDisabledBySystemPropertyTest")
     }
   }
-
-  check {
-    dependsOn(testAgentDisabledByEnvironmentVariable)
-    dependsOn(testAgentDisabledBySystemProperty)
-  }
 }