From 4de1ae8bf09cf98393c7b0e89c931680469d3c56 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Mon, 8 Dec 2025 20:30:29 -0800
Subject: [PATCH 1/2] Use public build scans when Develocity access key is not
 set

---
 settings.gradle.kts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index f3a564f2f16a..2ee7e861c61a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -52,11 +52,8 @@ val develocityServer = "https://develocity.opentelemetry.io"
 val isCI = System.getenv("CI") != null
 val develocityAccessKey = System.getenv("DEVELOCITY_ACCESS_KEY") ?: ""
 
-// if develocity access key is not given and we are in CI, then we publish to scans.gradle.com
-val useScansGradleCom = isCI && develocityAccessKey.isEmpty()
-
 develocity {
-  if (useScansGradleCom) {
+  if (develocityAccessKey.isEmpty()) {
     buildScan {
       termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use"
       termsOfUseAgree = "yes"
@@ -93,7 +90,7 @@ develocity {
   }
 }
 
-if (!useScansGradleCom) {
+if (develocityAccessKey.isNotEmpty()) {
   buildCache {
     remote(develocity.buildCache) {
       isPush = isCI && develocityAccessKey.isNotEmpty()

From b1805868b655e44fc1ffe32a663a9c4092aa5d0d Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Tue, 9 Dec 2025 09:45:22 -0800
Subject: [PATCH 2/2] better

---
 .gitignore          |  3 +--
 settings.gradle.kts | 30 +++++++++++++-----------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9b3f30e67a10..964fa2c0bd2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,5 +61,4 @@ replay_pid*
 .telemetry*
 .lycheecache
 
-!java-agent/benchmark/releases/*.jar
-
+build-scan.txt
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2ee7e861c61a..0eca56d1785d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -53,26 +53,23 @@ val isCI = System.getenv("CI") != null
 val develocityAccessKey = System.getenv("DEVELOCITY_ACCESS_KEY") ?: ""
 
 develocity {
-  if (develocityAccessKey.isEmpty()) {
-    buildScan {
-      termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use"
-      termsOfUseAgree = "yes"
-    }
-  } else {
+  if (develocityAccessKey.isNotEmpty()) {
     server = develocityServer
-    buildScan {
-      publishing.onlyIf { it.isAuthenticated }
+  }
 
+  buildScan {
+    if (develocityAccessKey.isNotEmpty()) {
       gradle.startParameter.projectProperties["testJavaVersion"]?.let { tag(it) }
       gradle.startParameter.projectProperties["testJavaVM"]?.let { tag(it) }
       gradle.startParameter.projectProperties["smokeTestSuite"]?.let {
         value("Smoke test suite", it)
       }
+    } else if (isCI) {
+      termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use"
+      termsOfUseAgree = "yes"
+    } else {
+      publishing.onlyIf { false }
     }
-  }
-
-  buildScan {
-    uploadInBackground = !isCI
 
     capture {
       fileFingerprints = true
@@ -90,11 +87,10 @@ develocity {
   }
 }
 
-if (develocityAccessKey.isNotEmpty()) {
-  buildCache {
-    remote(develocity.buildCache) {
-      isPush = isCI && develocityAccessKey.isNotEmpty()
-    }
+buildCache {
+  remote(HttpBuildCache::class) {
+    url = uri("$develocityServer/cache/")
+    isPush = isCI && develocityAccessKey.isNotEmpty()
   }
 }