From 64187e843c57f35b01b94b05536106607ac22e6c Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Sun, 21 Nov 2021 15:00:14 -0800
Subject: [PATCH 1/2] Remove gradle scan publishing from CI

---
 settings.gradle.kts | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index af2adfa92bcf..af41e186964a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -28,19 +28,9 @@ dependencyResolutionManagement {
 
 val gradleEnterpriseServer = "https://ge.opentelemetry.io"
 val isCI = System.getenv("CI") != null
-val geAccessKey = 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
 gradleEnterprise {
-  if (geAccessKey.isNotEmpty()) {
-    server = gradleEnterpriseServer
-  }
+  server = gradleEnterpriseServer
   buildScan {
-    // TODO remove this until legal approves
-    if (geAccessKey.isEmpty() && isCI) {
-      termsOfServiceUrl = "https://gradle.com/terms-of-service"
-      termsOfServiceAgree = "yes"
-    }
     publishAlways()
     this as com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
     publishIfAuthenticated()

From 4b2e6b42bf3eef2dee90421efc02babe1a090ca5 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Mon, 22 Nov 2021 11:09:52 -0800
Subject: [PATCH 2/2] Remove doc too

---
 CONTRIBUTING.md | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8b7148227e56..17ea063ff05e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -65,16 +65,3 @@ See [Debugging](docs/contributing/debugging.md)
 ### Understanding Muzzle
 
 See [Understanding Muzzle](docs/contributing/muzzle.md)
-
-### Troubleshooting PR build failures
-
-The build logs are very long and there is a lot of parallelization, so the logs can be hard to
-decipher, but if you scroll to the bottom you should see something like:
-
-```
-Publishing build scan...
-https://gradle.com/s/ila4qwp5lcf5s
-```
-
-Opening the build scan link can sometimes take several seconds (it's a large build), but it
-typically makes it a lot clearer what's failing.