Merge remote-tracking branch 'upstream/main' into remove-cache-from-api

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.

instrumentation/http-url-connection/javaagent/src/test/groovy/HttpUrlConnectionTest.groovy

@@ -27,6 +27,9 @@ class HttpUrlConnectionTest extends HttpClientTest<HttpURLConnection> implements
 
   @Override
   int sendRequest(HttpURLConnection connection, String method, URI uri, Map<String, String> headers) {
+    if (uri.toString().contains("/read-timeout")) {
+      connection.readTimeout = READ_TIMEOUT_MS
+    }
     try {
       connection.setRequestMethod(method)
       headers.each { connection.setRequestProperty(it.key, it.value) }
@@ -65,6 +68,11 @@ class HttpUrlConnectionTest extends HttpClientTest<HttpURLConnection> implements
     return false
   }
 
+  @Override
+  boolean testReadTimeout() {
+    true
+  }
+
   @Unroll
   def "trace request (useCaches: #useCaches)"() {
     setup:

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()