Revert "Update develocity config (open-telemetry#12835)"

This reverts commit 80ccda1.

Author: trask

.github/repository-settings.md

@@ -10,6 +10,10 @@ private admin repo.
 
 - `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
 - `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
+- `GRADLE_ENTERPRISE_ACCESS_KEY` - owned by [@trask](https://github.com/trask)
+  - Generated at https://ge.opentelemetry.io > My settings > Access keys
+  - Format of env var is `ge.opentelemetry.io=<access key>`,
+    see [docs](https://docs.gradle.com/enterprise/gradle-plugin/#via_environment_variable)
 - `GRADLE_PUBLISH_KEY`
 - `GRADLE_PUBLISH_SECRET`
 - `NVD_API_KEY` - stored in OpenTelemetry-Java 1Password

.github/workflows/build-common.yml

@@ -16,6 +16,8 @@ on:
         type: boolean
         required: false
     secrets:
+      GRADLE_ENTERPRISE_ACCESS_KEY:
+        required: false
       FLAKY_TEST_REPORTER_ACCESS_KEY:
         required: false
 
@@ -43,6 +45,8 @@ jobs:
           cache-read-only: ${{ inputs.cache-read-only }}
 
       - name: Spotless
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
         run: ./gradlew spotlessCheck ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
 
   license-check:
@@ -65,6 +69,8 @@ jobs:
           cache-read-only: ${{ inputs.cache-read-only }}
 
       - name: Generate license report
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
         # with the build cache enabled occasionally produces outdated results
         run: ./gradlew generateLicenseReport --no-build-cache
 
@@ -192,6 +198,8 @@ jobs:
           cache-read-only: ${{ inputs.cache-read-only }}
 
       - name: Build
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
         run: ./gradlew check javadoc sourcesJar spdxSbom -x spotlessCheck -PskipTests=true ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
 
       - name: Check for jApiCmp diffs
@@ -296,6 +304,8 @@ jobs:
           cache-read-only: ${{ inputs.cache-read-only || matrix.test-java-version != 11 || matrix.vm != 'hotspot' }}
 
       - name: List tests
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
         # "check" is needed to activate all tests for listing purposes
         # listTestsInPartition writes test tasks that apply to the given partition to a file named
         # "test-tasks.txt" and then disables all tasks (including tests) after it runs
@@ -310,6 +320,8 @@ jobs:
           echo "test-tasks=$(cat test-tasks.txt | xargs echo | sed 's/\n/ /g')" >> $GITHUB_ENV
 
       - name: Test
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
         # spotless is checked separately since it's a common source of failure
         run: >
           ./gradlew
@@ -432,11 +444,15 @@ jobs:
           cache-read-only: ${{ inputs.cache-read-only || matrix.smoke-test-suite != 'tomcat' }}
 
       - name: Build
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
         # running suite "none" compiles everything needed by smoke tests without executing any tests
         # --no-daemon is used to free up the memory from the build step before running the test step below
         run: ./gradlew :smoke-tests:test -PsmokeTestSuite=none --no-daemon ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
 
       - name: Test
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
         run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }} ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
 
       - name: Build scan

.github/workflows/build-daily-no-build-cache.yml

@@ -15,13 +15,15 @@ jobs:
     with:
       no-build-cache: true
     secrets:
+      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
 
   test-latest-deps:
     uses: ./.github/workflows/reusable-test-latest-deps.yml
     with:
       no-build-cache: true
     secrets:
+      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
 
   # muzzle is not included here because it doesn't use gradle cache anyway and so is already covered

.github/workflows/build-daily.yml

@@ -13,11 +13,13 @@ jobs:
   common:
     uses: ./.github/workflows/build-common.yml
     secrets:
+      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
 
   test-latest-deps:
     uses: ./.github/workflows/reusable-test-latest-deps.yml
     secrets:
+      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
 
   muzzle:

.github/workflows/build.yml

@@ -14,6 +14,7 @@ jobs:
   common:
     uses: ./.github/workflows/build-common.yml
     secrets:
+      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
 
   test-latest-deps:
@@ -23,6 +24,7 @@ jobs:
     if: "!startsWith(github.ref_name, 'release/')"
     uses: ./.github/workflows/reusable-test-latest-deps.yml
     secrets:
+      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
 
   muzzle:
@@ -80,6 +82,7 @@ jobs:
 
       - name: Build and publish artifact snapshots
         env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
           SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
           SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
@@ -88,6 +91,7 @@ jobs:
 
       - name: Build and publish gradle plugin snapshots
         env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
           SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
           SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}

.github/workflows/reusable-test-indy.yml

@@ -0,0 +1,91 @@
+name: Reusable - Test latest deps
+
+on:
+  workflow_call:
+    inputs:
+      cache-read-only:
+        type: boolean
+        required: false
+      no-build-cache:
+        type: boolean
+        required: false
+    secrets:
+      GRADLE_ENTERPRISE_ACCESS_KEY:
+        required: false
+
+permissions:
+  contents: read
+
+jobs:
+  test-indy:
+    name: testIndy${{ matrix.test-partition }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        test-partition:
+          - 0
+          - 1
+          - 2
+          - 3
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Free disk space
+        run: .github/scripts/gha-free-disk-space.sh
+
+      - name: Set up JDK for running Gradle
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
+        with:
+          distribution: temurin
+          java-version-file: .java-version
+
+      - name: Increase gradle daemon heap size
+        run: |
+          sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
+
+      # vaadin 14 tests fail with node 18
+      - name: Set up Node
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+        with:
+          node-version: 16
+
+      # vaadin tests use pnpm
+      - name: Cache pnpm modules
+        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
+        with:
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-test-latest-cache-pnpm-modules
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
+        with:
+          cache-read-only: ${{ inputs.cache-read-only }}
+          # gradle enterprise is used for the build cache
+          gradle-home-cache-excludes: caches/build-cache-1
+
+      - name: List tests
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+        run: >
+          ./gradlew
+          check -x spotlessCheck
+          listTestsInPartition
+          -PtestPartition=${{ matrix.test-partition }}
+
+      - name: Set test tasks
+        run: |
+          echo "test-tasks=$(cat test-tasks.txt | xargs echo | sed 's/\n/ /g')" >> $GITHUB_ENV
+
+      - name: Test
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+        run: >
+          ./gradlew
+          ${{ env.test-tasks }}
+          -PtestIndy=true
+          ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
+
+      - name: Build scan
+        if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}
+        run: cat build-scan.txt

.github/workflows/reusable-test-latest-deps.yml

@@ -10,6 +10,8 @@ on:
         type: boolean
         required: false
     secrets:
+      GRADLE_ENTERPRISE_ACCESS_KEY:
+        required: false
       FLAKY_TEST_REPORTER_ACCESS_KEY:
         required: false
 
@@ -60,6 +62,8 @@ jobs:
           cache-read-only: ${{ inputs.cache-read-only }}
 
       - name: List tests
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
         run: >
           ./gradlew
           check -x spotlessCheck
@@ -72,6 +76,8 @@ jobs:
           echo "test-tasks=$(cat test-tasks.txt | xargs echo | sed 's/\n/ /g')" >> $GITHUB_ENV
 
       - name: Test
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
         run: >
           ./gradlew
           ${{ env.test-tasks }}

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

@@ -373,12 +373,11 @@ tasks.withType<Test>().configureEach {
   // This value is quite big because with lower values (3 mins) we were experiencing large number of false positives
   timeout.set(Duration.ofMinutes(15))
 
-  val defaultMaxRetries = if (System.getenv().containsKey("CI")) 5 else 0
-  val maxTestRetries = gradle.startParameter.projectProperties["maxTestRetries"]?.toInt() ?: defaultMaxRetries
-
   develocity.testRetry {
     // You can see tests that were retried by this mechanism in the collected test reports and build scans.
-    maxRetries.set(maxTestRetries);
+    if (System.getenv().containsKey("CI") || rootProject.hasProperty("retryTests")) {
+      maxRetries.set(5)
+    }
   }
 
   reports {

settings.gradle.kts

@@ -14,6 +14,7 @@ pluginManagement {
 }
 
 plugins {
+  id("com.gradle.develocity") version "4.2"
   id("com.gradle.common-custom-user-data-gradle-plugin") version "2.4.0"
   id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
   // this can't live in pluginManagement currently due to
@@ -22,7 +23,6 @@ plugins {
   // ./gradlew :smoke-tests:images:servlet:buildLinuxTestImages pushMatrix -PsmokeTestServer=jetty
   // ./gradlew :smoke-tests:images:servlet:buildWindowsTestImages pushMatrix -PsmokeTestServer=jetty
   id("com.bmuschko.docker-remote-api") version "9.4.0" apply false
-  id("com.gradle.develocity") version "4.2.2"
 }
 
 dependencyResolutionManagement {
@@ -47,21 +47,67 @@ dependencyResolutionManagement {
   }
 }
 
-develocity {
-  buildScan {
-    publishing.onlyIf { System.getenv("CI") != null }
-    termsOfUseUrl.set("https://gradle.com/help/legal-terms-of-use")
-    termsOfUseAgree.set("yes")
+val gradleEnterpriseServer = "https://ge.opentelemetry.io"
+val isCI = System.getenv("CI") != null
+val geAccessKey = System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY") ?: ""
 
-    if (!gradle.startParameter.taskNames.contains("listTestsInPartition") &&
-      !gradle.startParameter.taskNames.contains(":test-report:reportFlakyTests")) {
-      buildScanPublished {
-        File("build-scan.txt").printWriter().use { writer ->
-          writer.println(buildScanUri)
+// if GE access key is not given and we are in CI, then we publish to scans.gradle.com
+val useScansGradleCom = isCI && geAccessKey.isEmpty()
+
+if (useScansGradleCom) {
+  develocity {
+    buildScan {
+      termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use"
+      termsOfUseAgree = "yes"
+      uploadInBackground = !isCI
+
+      capture {
+        fileFingerprints = true
+      }
+
+      if (!gradle.startParameter.taskNames.contains("listTestsInPartition") &&
+        !gradle.startParameter.taskNames.contains(":test-report:reportFlakyTests")) {
+        buildScanPublished {
+          File("build-scan.txt").printWriter().use { writer ->
+            writer.println(buildScanUri)
+          }
+        }
+      }
+    }
+  }
+} else {
+  develocity {
+    server = gradleEnterpriseServer
+    buildScan {
+      uploadInBackground = !isCI
+      publishing.onlyIf { it.isAuthenticated }
+
+      capture {
+        fileFingerprints = true
+      }
+
+      gradle.startParameter.projectProperties["testJavaVersion"]?.let { tag(it) }
+      gradle.startParameter.projectProperties["testJavaVM"]?.let { tag(it) }
+      gradle.startParameter.projectProperties["smokeTestSuite"]?.let {
+        value("Smoke test suite", it)
+      }
+
+      if (!gradle.startParameter.taskNames.contains("listTestsInPartition") &&
+        !gradle.startParameter.taskNames.contains(":test-report:reportFlakyTests")) {
+        buildScanPublished {
+          File("build-scan.txt").printWriter().use { writer ->
+            writer.println(buildScanUri)
+          }
         }
       }
     }
   }
+
+  buildCache {
+    remote(develocity.buildCache) {
+      isPush = isCI && geAccessKey.isNotEmpty()
+    }
+  }
 }
 
 rootProject.name = "opentelemetry-java-instrumentation"