From f67a8eec146012acd03db047bd4a1e5081608a37 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Sat, 23 Nov 2024 13:42:28 -0800
Subject: [PATCH] Update develocity configuration

---
 .github/renovate.json5                        |  4 --
 .github/workflows/build.yml                   |  7 +--
 buildSrc/build.gradle.kts                     |  1 -
 .../kotlin/otel.java-conventions.gradle.kts   |  7 ---
 settings.gradle.kts                           | 43 +++----------------
 5 files changed, 7 insertions(+), 55 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 2dea5f562..8e0a37d53 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -25,10 +25,6 @@
       "matchPackagePrefixes": ["io.micrometer:"],
       "groupName": "micrometer packages"
     },
-    {
-      "matchPackagePrefixes": ["com.gradle.enterprise"],
-      "groupName": "gradle enterprise packages"
-    },
     {
       // prevent 3.0.1u2 -> 3.0.1
       "matchPackageNames": ["com.google.code.findbugs:annotations"],
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4a3859fa3..2d0483a5f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,8 +30,6 @@ jobs:
           cache-read-only: ${{ github.event_name == 'pull_request' }}
       - name: Gradle build and test
         run: ./gradlew build -x test
-        env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
   test:
     name: test (${{ matrix.test-java-version }})
@@ -71,8 +69,6 @@ jobs:
           -PtestJavaVersion=${{ matrix.test-java-version }}
           -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }}
           -Porg.gradle.java.installations.auto-download=false
-        env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
   integration-test:
     runs-on: ubuntu-latest
@@ -89,10 +85,9 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
         with:
           cache-read-only: ${{ github.event_name == 'pull_request' }}
+
       - name: Integration test
         run: ./gradlew integrationTest
-        env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
       - name: Save integration test results
         uses: actions/upload-artifact@v4
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 2f8187e7b..05f8d8f32 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -15,7 +15,6 @@ dependencies {
   implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.1.0")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.1.0")
-  implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.18.2")
 }
 
 spotless {
diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
index 1098ba698..b29fe20a0 100644
--- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
@@ -71,13 +71,6 @@ tasks {
       showCauses = true
       showStackTraces = true
     }
-
-    develocity.testRetry {
-      // You can see tests that were retried by this mechanism in the collected test reports and build scans.
-      if (System.getenv().containsKey("CI") || rootProject.hasProperty("retryTests")) {
-        maxRetries.set(5)
-      }
-    }
   }
 
   withType<Javadoc>().configureEach {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index bcf713b79..91e74477c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,8 +1,8 @@
 pluginManagement {
   plugins {
     id("com.github.johnrengelman.shadow") version "8.1.1"
-    id("com.gradle.develocity") version "3.18.2"
     id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
+    id("com.gradle.develocity") version "3.18.2"
   }
 }
 
@@ -17,42 +17,11 @@ dependencyResolutionManagement {
   }
 }
 
-val gradleEnterpriseServer = "https://ge.opentelemetry.io"
-val isCI = System.getenv("CI") != null
-val develocityAccessKey = System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY") ?: ""
-
-// if GE access key is not given and we are in CI, then we publish to scans.gradle.com
-val useScansGradleCom = isCI && develocityAccessKey.isEmpty()
-
-if (useScansGradleCom) {
-  develocity {
-    buildScan {
-      termsOfUseUrl.set("https://gradle.com/terms-of-service")
-      termsOfUseAgree.set("yes")
-      uploadInBackground.set(!isCI)
-      publishing.onlyIf { true }
-
-      capture {
-        fileFingerprints.set(true)
-      }
-    }
-  }
-} else {
-  develocity {
-    server = gradleEnterpriseServer
-    buildScan {
-      uploadInBackground.set(!isCI)
-
-      publishing.onlyIf {
-        it.isAuthenticated
-      }
-      capture {
-        fileFingerprints.set(true)
-      }
-
-      gradle.startParameter.projectProperties["testJavaVersion"]?.let { tag(it) }
-      gradle.startParameter.projectProperties["testJavaVM"]?.let { tag(it) }
-    }
+develocity {
+  buildScan {
+    publishing.onlyIf { System.getenv("CI") != null }
+    termsOfUseUrl.set("https://gradle.com/help/legal-terms-of-use")
+    termsOfUseAgree.set("yes")
   }
 }