From 4ca115b97d13631f97ec78b2b94a1bdf6029f43f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 16 Jul 2025 20:05:07 +0000
Subject: [PATCH 01/19] Initial plan


From 846b766b175906971e105f44f151e78a25e359d9 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 16 Jul 2025 20:17:24 +0000
Subject: [PATCH 02/19] Add dev container configuration to speed up builds

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 .devcontainer/Dockerfile        | 45 +++++++++++++++++++++++++++++++++
 .devcontainer/README.md         | 45 +++++++++++++++++++++++++++++++++
 .devcontainer/devcontainer.json | 26 +++++++++++++++++++
 .devcontainer/post-create.sh    | 24 ++++++++++++++++++
 build.gradle.kts                | 19 ++++++++++++++
 5 files changed, 159 insertions(+)
 create mode 100644 .devcontainer/Dockerfile
 create mode 100644 .devcontainer/README.md
 create mode 100644 .devcontainer/devcontainer.json
 create mode 100755 .devcontainer/post-create.sh

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 000000000000..a7dbca2d3b35
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,45 @@
+# Use the official OpenJDK image as base
+FROM mcr.microsoft.com/devcontainers/java:1-21-bookworm
+
+# Install additional tools
+RUN apt-get update && apt-get install -y \
+    git \
+    curl \
+    wget \
+    unzip \
+    && rm -rf /var/lib/apt/lists/*
+
+# Set up Node.js (needed for vaadin tests)
+RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
+    && apt-get install -y nodejs
+
+# Install pnpm (needed for vaadin tests)
+RUN npm install -g pnpm
+
+# Set up gradle cache directory
+RUN mkdir -p /home/vscode/.gradle
+RUN chown -R vscode:vscode /home/vscode/.gradle
+
+# Switch to vscode user
+USER vscode
+
+# Set JAVA_HOME for vscode user
+ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-current
+
+# Pre-configure git (optional, helps with development)
+RUN git config --global init.defaultBranch main
+
+# Pre-configure gradle with optimized settings
+RUN mkdir -p ~/.gradle && \
+    echo "org.gradle.daemon=true" > ~/.gradle/gradle.properties && \
+    echo "org.gradle.parallel=true" >> ~/.gradle/gradle.properties && \
+    echo "org.gradle.caching=true" >> ~/.gradle/gradle.properties && \
+    echo "org.gradle.configureondemand=true" >> ~/.gradle/gradle.properties && \
+    echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m" >> ~/.gradle/gradle.properties && \
+    echo "org.gradle.priority=low" >> ~/.gradle/gradle.properties
+
+# Set up pnpm store
+RUN mkdir -p ~/.pnpm-store
+
+# Final workspace setup
+WORKDIR /workspace
\ No newline at end of file
diff --git a/.devcontainer/README.md b/.devcontainer/README.md
new file mode 100644
index 000000000000..0c2214817b6c
--- /dev/null
+++ b/.devcontainer/README.md
@@ -0,0 +1,45 @@
+# Development Container Configuration
+
+This directory contains the development container configuration for the OpenTelemetry Java Instrumentation project. The dev container is designed to address the issue where Copilot agents timeout due to long build times (>5 minutes) by preinstalling dependencies and optimizing the build environment.
+
+## What this solves
+
+- **Faster builds**: Pre-downloads Gradle dependencies and sets up optimized build configurations
+- **Consistent environment**: Ensures all developers and Copilot agents use the same Java/Gradle versions
+- **Reduced timeouts**: Eliminates the need to download dependencies during each build
+
+## Files
+
+- `devcontainer.json`: Main configuration file defining the development container
+- `Dockerfile`: Custom container image with pre-installed dependencies
+- `post-create.sh`: Script that runs after container creation to optimize the environment
+- `README.md`: This documentation file
+
+## How it works
+
+1. **Base Image**: Uses Microsoft's Java dev container with OpenJDK 21
+2. **Pre-installation**: Downloads Gradle dependencies during container build
+3. **Optimization**: Sets up Gradle daemon with optimized JVM settings
+4. **Node.js**: Installs Node.js 16 and pnpm for Vaadin tests
+5. **Post-setup**: Runs additional optimization after container creation
+
+## Usage
+
+The dev container will automatically be used by:
+- GitHub Copilot agents
+- VS Code with Dev Containers extension
+- Any tool that supports dev containers
+
+## Build time improvements
+
+Expected improvements:
+- Initial dependency download: ~2-3 minutes → ~10-30 seconds
+- Subsequent builds: ~1-2 minutes → ~30-60 seconds
+- Overall development experience: Much faster iteration cycles
+
+## Maintenance
+
+The configuration may need updates when:
+- Java version changes (update `.java-version` and `devcontainer.json`)
+- New major dependencies are added
+- Gradle version changes significantly
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 000000000000..6985de584fd3
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,26 @@
+{
+  "name": "OpenTelemetry Java Instrumentation Dev Environment",
+  "build": {
+    "dockerfile": "Dockerfile",
+    "context": ".."
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "vscjava.vscode-java-pack",
+        "vscjava.vscode-gradle"
+      ]
+    }
+  },
+  "features": {
+    "ghcr.io/devcontainers/features/java:1": {
+      "version": "21",
+      "installGradle": "true"
+    },
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "16"
+    }
+  },
+  "postCreateCommand": ".devcontainer/post-create.sh",
+  "remoteUser": "vscode"
+}
\ No newline at end of file
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
new file mode 100755
index 000000000000..afec8463d183
--- /dev/null
+++ b/.devcontainer/post-create.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# This script runs after the dev container is created
+# It performs additional dependency pre-loading to speed up builds
+
+echo "Setting up OpenTelemetry Java Instrumentation development environment..."
+
+# Ensure we're in the right directory
+cd /workspace
+
+# Download Gradle wrapper and basic dependencies
+echo "Downloading Gradle and basic dependencies..."
+./gradlew --version
+
+# Pre-download dependencies by running a lightweight task
+echo "Pre-downloading project dependencies..."
+./gradlew resolveDependencies --no-daemon --parallel || true
+
+# Try to compile basic components without running tests
+echo "Pre-compiling basic components..."
+./gradlew compileJava -x test -x check -x spotlessCheck -PskipTests=true --parallel || true
+
+echo "Development environment setup complete!"
+echo "Build times should now be significantly faster."
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index d31dbfc326db..33572ccc9984 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -123,6 +123,25 @@ if (gradle.startParameter.taskNames.contains("listTestsInPartition")) {
 tasks {
   val stableVersion = version.toString().replace("-alpha", "")
 
+  val resolveDependencies by registering {
+    group = "Help"
+    description = "Resolve and download all dependencies for faster builds"
+    
+    doLast {
+      allprojects {
+        configurations.configureEach {
+          if (isCanBeResolved) {
+            try {
+              resolve()
+            } catch (e: Exception) {
+              logger.warn("Could not resolve configuration $name: ${e.message}")
+            }
+          }
+        }
+      }
+    }
+  }
+
   val generateFossaConfiguration by registering {
     group = "Help"
     description = "Generate .fossa.yml configuration file"

From b1d0c5d6a2c474624751bed04fa810853b2a9f1e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 16 Jul 2025 20:20:38 +0000
Subject: [PATCH 03/19] Complete dev container setup with validation and
 documentation

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 .devcontainer/IMPLEMENTATION.md               | 58 +++++++++++++++
 .devcontainer/devcontainer.json               | 13 +++-
 .devcontainer/post-create.sh                  | 21 +++---
 .devcontainer/validate-setup.sh               | 71 +++++++++++++++++++
 ...otlin-compiler-15676992713606780862.salive |  0
 ...kotlin-compiler-5560425784788503470.salive |  0
 6 files changed, 152 insertions(+), 11 deletions(-)
 create mode 100644 .devcontainer/IMPLEMENTATION.md
 create mode 100755 .devcontainer/validate-setup.sh
 create mode 100644 conventions/.kotlin/sessions/kotlin-compiler-15676992713606780862.salive
 create mode 100644 gradle-plugins/.kotlin/sessions/kotlin-compiler-5560425784788503470.salive

diff --git a/.devcontainer/IMPLEMENTATION.md b/.devcontainer/IMPLEMENTATION.md
new file mode 100644
index 000000000000..bbf8cc2619fc
--- /dev/null
+++ b/.devcontainer/IMPLEMENTATION.md
@@ -0,0 +1,58 @@
+# Dev Container Setup for OpenTelemetry Java Instrumentation
+
+## Problem Addressed
+GitHub Copilot agents were timing out when building the OpenTelemetry Java Instrumentation project because builds were taking over 5 minutes, primarily due to:
+- Large dependency downloads
+- Gradle daemon startup time
+- Complex multi-module project structure
+
+## Solution Implemented
+A comprehensive dev container configuration that pre-optimizes the build environment:
+
+### 1. Container Configuration (`devcontainer.json`)
+- **Base**: Microsoft's Java 21 dev container image
+- **Volume Mount**: Persistent Gradle cache across container rebuilds
+- **Environment**: Pre-configured Gradle and Java options for optimal performance
+- **Extensions**: Java and Gradle VS Code extensions for better development experience
+
+### 2. Custom Dockerfile
+- **Java 21**: Matches the project's required Java version
+- **Node.js 16**: Required for Vaadin tests
+- **pnpm**: Package manager for frontend dependencies
+- **Optimized Gradle settings**: Pre-configured for parallel builds and caching
+
+### 3. Post-Creation Script (`post-create.sh`)
+- **Gradle Daemon**: Starts the daemon to avoid cold starts
+- **Dependency Pre-loading**: Attempts to resolve and cache dependencies
+- **Timeout Protection**: Uses timeouts to prevent hanging
+
+### 4. Enhanced Build Configuration
+- **New Gradle Task**: `resolveDependencies` task added to `build.gradle.kts`
+- **Dependency Resolution**: Systematically resolves all project configurations
+- **Error Handling**: Graceful handling of resolution failures
+
+## Expected Performance Improvements
+
+### Before Dev Container:
+- Cold build time: ~5-8 minutes
+- Gradle daemon startup: ~30-60 seconds
+- Dependency download: ~2-3 minutes per clean build
+
+### After Dev Container:
+- Cold build time: ~2-3 minutes
+- Gradle daemon startup: ~5-10 seconds (already warm)
+- Dependency download: ~10-30 seconds (mostly cached)
+
+## Key Benefits for Copilot Agents
+1. **Reduced Timeout Risk**: Builds should complete well under 5 minutes
+2. **Consistent Environment**: Same configuration across all development environments
+3. **Cached Dependencies**: Persistent cache reduces repeated downloads
+4. **Optimized JVM Settings**: Better memory management and parallel processing
+
+## Implementation Details
+- **Gradle Cache**: Mounted as persistent volume for cross-session reuse
+- **Parallel Processing**: Enabled for faster multi-module builds
+- **Memory Optimization**: 4GB heap with optimized metaspace
+- **Fallback Strategy**: Graceful degradation if dependency resolution fails
+
+This configuration implements the GitHub Copilot agent optimization strategy described in the official documentation for preinstalling tools and dependencies in the development environment.
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 6985de584fd3..38427ce4b32c 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -8,7 +8,8 @@
     "vscode": {
       "extensions": [
         "vscjava.vscode-java-pack",
-        "vscjava.vscode-gradle"
+        "vscjava.vscode-gradle",
+        "ms-vscode.gradle"
       ]
     }
   },
@@ -22,5 +23,13 @@
     }
   },
   "postCreateCommand": ".devcontainer/post-create.sh",
-  "remoteUser": "vscode"
+  "remoteUser": "vscode",
+  "containerEnv": {
+    "GRADLE_USER_HOME": "/home/vscode/.gradle",
+    "GRADLE_OPTS": "-Dorg.gradle.daemon=true -Dorg.gradle.parallel=true -Dorg.gradle.caching=true",
+    "JAVA_TOOL_OPTIONS": "-Xmx4g -XX:MaxMetaspaceSize=512m"
+  },
+  "mounts": [
+    "source=opentelemetry-gradle-cache,target=/home/vscode/.gradle,type=volume"
+  ]
 }
\ No newline at end of file
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
index afec8463d183..4a8f2ec7c1f0 100755
--- a/.devcontainer/post-create.sh
+++ b/.devcontainer/post-create.sh
@@ -8,17 +8,20 @@ echo "Setting up OpenTelemetry Java Instrumentation development environment..."
 # Ensure we're in the right directory
 cd /workspace
 
-# Download Gradle wrapper and basic dependencies
-echo "Downloading Gradle and basic dependencies..."
+# Set up environment variables for faster builds
+export GRADLE_OPTS="-Dorg.gradle.daemon=true -Dorg.gradle.parallel=true -Dorg.gradle.caching=true"
+
+# Download Gradle wrapper and start daemon
+echo "Starting Gradle daemon..."
 ./gradlew --version
 
-# Pre-download dependencies by running a lightweight task
-echo "Pre-downloading project dependencies..."
-./gradlew resolveDependencies --no-daemon --parallel || true
+# Try to run the custom resolveDependencies task with timeout
+echo "Pre-downloading some dependencies..."
+timeout 180 ./gradlew resolveDependencies --no-daemon --parallel || echo "Dependency resolution completed or timed out"
 
-# Try to compile basic components without running tests
-echo "Pre-compiling basic components..."
-./gradlew compileJava -x test -x check -x spotlessCheck -PskipTests=true --parallel || true
+# As a fallback, try to just compile the basic Gradle plugins
+echo "Pre-compiling build scripts..."
+timeout 120 ./gradlew help --no-daemon || echo "Help task completed or timed out"
 
 echo "Development environment setup complete!"
-echo "Build times should now be significantly faster."
\ No newline at end of file
+echo "The Gradle daemon is now warmed up and build times should be faster."
\ No newline at end of file
diff --git a/.devcontainer/validate-setup.sh b/.devcontainer/validate-setup.sh
new file mode 100755
index 000000000000..b4d3339bc8ee
--- /dev/null
+++ b/.devcontainer/validate-setup.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# Validation script to check if the dev container setup is working correctly
+
+echo "=== Dev Container Configuration Validation ==="
+echo
+
+# Check if we're in the right directory
+if [ ! -f "build.gradle.kts" ]; then
+    echo "❌ ERROR: Not in the root directory of the OpenTelemetry Java Instrumentation project"
+    exit 1
+fi
+
+# Check if devcontainer files exist
+echo "📁 Checking dev container files..."
+if [ ! -f ".devcontainer/devcontainer.json" ]; then
+    echo "❌ ERROR: devcontainer.json not found"
+    exit 1
+fi
+
+if [ ! -f ".devcontainer/Dockerfile" ]; then
+    echo "❌ ERROR: Dockerfile not found"
+    exit 1
+fi
+
+if [ ! -f ".devcontainer/post-create.sh" ]; then
+    echo "❌ ERROR: post-create.sh not found"
+    exit 1
+fi
+
+echo "✅ All dev container files present"
+
+# Check if the custom Gradle task exists
+echo "🔧 Checking custom Gradle task..."
+if grep -q "resolveDependencies" build.gradle.kts; then
+    echo "✅ resolveDependencies task found in build.gradle.kts"
+else
+    echo "❌ ERROR: resolveDependencies task not found in build.gradle.kts"
+    exit 1
+fi
+
+# Check JSON syntax
+echo "🔍 Validating JSON syntax..."
+if python3 -m json.tool .devcontainer/devcontainer.json > /dev/null 2>&1; then
+    echo "✅ devcontainer.json has valid JSON syntax"
+else
+    echo "❌ ERROR: devcontainer.json has invalid JSON syntax"
+    exit 1
+fi
+
+# Check if Java version matches
+echo "☕ Checking Java version..."
+if [ -f ".java-version" ]; then
+    EXPECTED_VERSION=$(cat .java-version)
+    if grep -q "java:1\":" .devcontainer/devcontainer.json && grep -q "\"version\": \"21\"" .devcontainer/devcontainer.json; then
+        echo "✅ Java version in devcontainer.json matches .java-version file"
+    else
+        echo "⚠️  WARNING: Java version in devcontainer.json might not match .java-version file"
+    fi
+else
+    echo "⚠️  WARNING: .java-version file not found"
+fi
+
+echo
+echo "=== Validation Complete ==="
+echo "🎉 Dev container configuration appears to be set up correctly!"
+echo
+echo "Next steps:"
+echo "1. Commit these changes to your repository"
+echo "2. GitHub Copilot agents will automatically use this configuration"
+echo "3. Build times should be significantly improved"
\ No newline at end of file
diff --git a/conventions/.kotlin/sessions/kotlin-compiler-15676992713606780862.salive b/conventions/.kotlin/sessions/kotlin-compiler-15676992713606780862.salive
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/gradle-plugins/.kotlin/sessions/kotlin-compiler-5560425784788503470.salive b/gradle-plugins/.kotlin/sessions/kotlin-compiler-5560425784788503470.salive
new file mode 100644
index 000000000000..e69de29bb2d1

From a1685bb85944f7b3f09b728e86f4e3af35ae1250 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 16 Jul 2025 20:21:22 +0000
Subject: [PATCH 04/19] Clean up Kotlin session files and update gitignore

---
 .gitignore                                                      | 2 ++
 .../sessions/kotlin-compiler-15676992713606780862.salive        | 0
 .../.kotlin/sessions/kotlin-compiler-5560425784788503470.salive | 0
 3 files changed, 2 insertions(+)
 delete mode 100644 conventions/.kotlin/sessions/kotlin-compiler-15676992713606780862.salive
 delete mode 100644 gradle-plugins/.kotlin/sessions/kotlin-compiler-5560425784788503470.salive

diff --git a/.gitignore b/.gitignore
index 308ea9e1651f..209a07462a18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,5 @@ replay_pid*
 
 !java-agent/benchmark/releases/*.jar
 
+*.salive
+.kotlin/
diff --git a/conventions/.kotlin/sessions/kotlin-compiler-15676992713606780862.salive b/conventions/.kotlin/sessions/kotlin-compiler-15676992713606780862.salive
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/gradle-plugins/.kotlin/sessions/kotlin-compiler-5560425784788503470.salive b/gradle-plugins/.kotlin/sessions/kotlin-compiler-5560425784788503470.salive
deleted file mode 100644
index e69de29bb2d1..000000000000

From 1fe445e1bc1621b154bf518f8648eb3af9ad559e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 16 Jul 2025 21:21:07 +0000
Subject: [PATCH 05/19] Clean up dev container config based on code review
 feedback

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 .devcontainer/Dockerfile        | 10 +---------
 .devcontainer/devcontainer.json |  6 ++----
 .devcontainer/post-create.sh    |  3 ---
 .gitignore                      |  2 --
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index a7dbca2d3b35..f0878ee90c8b 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -26,20 +26,12 @@ USER vscode
 # Set JAVA_HOME for vscode user
 ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-current
 
-# Pre-configure git (optional, helps with development)
-RUN git config --global init.defaultBranch main
-
 # Pre-configure gradle with optimized settings
 RUN mkdir -p ~/.gradle && \
     echo "org.gradle.daemon=true" > ~/.gradle/gradle.properties && \
     echo "org.gradle.parallel=true" >> ~/.gradle/gradle.properties && \
     echo "org.gradle.caching=true" >> ~/.gradle/gradle.properties && \
-    echo "org.gradle.configureondemand=true" >> ~/.gradle/gradle.properties && \
-    echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m" >> ~/.gradle/gradle.properties && \
-    echo "org.gradle.priority=low" >> ~/.gradle/gradle.properties
-
-# Set up pnpm store
-RUN mkdir -p ~/.pnpm-store
+    echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m" >> ~/.gradle/gradle.properties
 
 # Final workspace setup
 WORKDIR /workspace
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 38427ce4b32c..28ff688c6778 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -15,8 +15,7 @@
   },
   "features": {
     "ghcr.io/devcontainers/features/java:1": {
-      "version": "21",
-      "installGradle": "true"
+      "version": "21"
     },
     "ghcr.io/devcontainers/features/node:1": {
       "version": "16"
@@ -26,8 +25,7 @@
   "remoteUser": "vscode",
   "containerEnv": {
     "GRADLE_USER_HOME": "/home/vscode/.gradle",
-    "GRADLE_OPTS": "-Dorg.gradle.daemon=true -Dorg.gradle.parallel=true -Dorg.gradle.caching=true",
-    "JAVA_TOOL_OPTIONS": "-Xmx4g -XX:MaxMetaspaceSize=512m"
+    "GRADLE_OPTS": "-Dorg.gradle.daemon=true -Dorg.gradle.parallel=true -Dorg.gradle.caching=true -Xmx4g -XX:MaxMetaspaceSize=512m"
   },
   "mounts": [
     "source=opentelemetry-gradle-cache,target=/home/vscode/.gradle,type=volume"
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
index 4a8f2ec7c1f0..d2baa79406e0 100755
--- a/.devcontainer/post-create.sh
+++ b/.devcontainer/post-create.sh
@@ -8,9 +8,6 @@ echo "Setting up OpenTelemetry Java Instrumentation development environment..."
 # Ensure we're in the right directory
 cd /workspace
 
-# Set up environment variables for faster builds
-export GRADLE_OPTS="-Dorg.gradle.daemon=true -Dorg.gradle.parallel=true -Dorg.gradle.caching=true"
-
 # Download Gradle wrapper and start daemon
 echo "Starting Gradle daemon..."
 ./gradlew --version
diff --git a/.gitignore b/.gitignore
index 209a07462a18..308ea9e1651f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,5 +62,3 @@ replay_pid*
 
 !java-agent/benchmark/releases/*.jar
 
-*.salive
-.kotlin/

From 14e2a9bcbe3a8f07bdeabc0ac8a68ea00b63f43d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 16 Jul 2025 21:34:28 +0000
Subject: [PATCH 06/19] Remove redundant Gradle properties and fix
 documentation

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 .devcontainer/Dockerfile        |  5 +--
 .devcontainer/IMPLEMENTATION.md | 58 ---------------------------------
 .devcontainer/README.md         |  4 +--
 3 files changed, 3 insertions(+), 64 deletions(-)
 delete mode 100644 .devcontainer/IMPLEMENTATION.md

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index f0878ee90c8b..218e1ca6a687 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -28,10 +28,7 @@ ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-current
 
 # Pre-configure gradle with optimized settings
 RUN mkdir -p ~/.gradle && \
-    echo "org.gradle.daemon=true" > ~/.gradle/gradle.properties && \
-    echo "org.gradle.parallel=true" >> ~/.gradle/gradle.properties && \
-    echo "org.gradle.caching=true" >> ~/.gradle/gradle.properties && \
-    echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m" >> ~/.gradle/gradle.properties
+    echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m" > ~/.gradle/gradle.properties
 
 # Final workspace setup
 WORKDIR /workspace
\ No newline at end of file
diff --git a/.devcontainer/IMPLEMENTATION.md b/.devcontainer/IMPLEMENTATION.md
deleted file mode 100644
index bbf8cc2619fc..000000000000
--- a/.devcontainer/IMPLEMENTATION.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# Dev Container Setup for OpenTelemetry Java Instrumentation
-
-## Problem Addressed
-GitHub Copilot agents were timing out when building the OpenTelemetry Java Instrumentation project because builds were taking over 5 minutes, primarily due to:
-- Large dependency downloads
-- Gradle daemon startup time
-- Complex multi-module project structure
-
-## Solution Implemented
-A comprehensive dev container configuration that pre-optimizes the build environment:
-
-### 1. Container Configuration (`devcontainer.json`)
-- **Base**: Microsoft's Java 21 dev container image
-- **Volume Mount**: Persistent Gradle cache across container rebuilds
-- **Environment**: Pre-configured Gradle and Java options for optimal performance
-- **Extensions**: Java and Gradle VS Code extensions for better development experience
-
-### 2. Custom Dockerfile
-- **Java 21**: Matches the project's required Java version
-- **Node.js 16**: Required for Vaadin tests
-- **pnpm**: Package manager for frontend dependencies
-- **Optimized Gradle settings**: Pre-configured for parallel builds and caching
-
-### 3. Post-Creation Script (`post-create.sh`)
-- **Gradle Daemon**: Starts the daemon to avoid cold starts
-- **Dependency Pre-loading**: Attempts to resolve and cache dependencies
-- **Timeout Protection**: Uses timeouts to prevent hanging
-
-### 4. Enhanced Build Configuration
-- **New Gradle Task**: `resolveDependencies` task added to `build.gradle.kts`
-- **Dependency Resolution**: Systematically resolves all project configurations
-- **Error Handling**: Graceful handling of resolution failures
-
-## Expected Performance Improvements
-
-### Before Dev Container:
-- Cold build time: ~5-8 minutes
-- Gradle daemon startup: ~30-60 seconds
-- Dependency download: ~2-3 minutes per clean build
-
-### After Dev Container:
-- Cold build time: ~2-3 minutes
-- Gradle daemon startup: ~5-10 seconds (already warm)
-- Dependency download: ~10-30 seconds (mostly cached)
-
-## Key Benefits for Copilot Agents
-1. **Reduced Timeout Risk**: Builds should complete well under 5 minutes
-2. **Consistent Environment**: Same configuration across all development environments
-3. **Cached Dependencies**: Persistent cache reduces repeated downloads
-4. **Optimized JVM Settings**: Better memory management and parallel processing
-
-## Implementation Details
-- **Gradle Cache**: Mounted as persistent volume for cross-session reuse
-- **Parallel Processing**: Enabled for faster multi-module builds
-- **Memory Optimization**: 4GB heap with optimized metaspace
-- **Fallback Strategy**: Graceful degradation if dependency resolution fails
-
-This configuration implements the GitHub Copilot agent optimization strategy described in the official documentation for preinstalling tools and dependencies in the development environment.
\ No newline at end of file
diff --git a/.devcontainer/README.md b/.devcontainer/README.md
index 0c2214817b6c..ee9c76413c56 100644
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -18,10 +18,10 @@ This directory contains the development container configuration for the OpenTele
 ## How it works
 
 1. **Base Image**: Uses Microsoft's Java dev container with OpenJDK 21
-2. **Pre-installation**: Downloads Gradle dependencies during container build
+2. **Post-creation Setup**: Downloads Gradle dependencies during container startup
 3. **Optimization**: Sets up Gradle daemon with optimized JVM settings
 4. **Node.js**: Installs Node.js 16 and pnpm for Vaadin tests
-5. **Post-setup**: Runs additional optimization after container creation
+5. **Dependency Caching**: Attempts to resolve and cache dependencies after container creation
 
 ## Usage
 

From a23105b832f693e513b31b31e96d0190ee0d3d59 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 16 Jul 2025 21:59:15 +0000
Subject: [PATCH 07/19] Address code review feedback: simplify dev container
 config

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 .devcontainer/Dockerfile        |  9 +--------
 .devcontainer/README.md         | 11 +----------
 .devcontainer/devcontainer.json |  2 +-
 .devcontainer/post-create.sh    |  4 ++++
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 218e1ca6a687..93a1778fe086 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -9,13 +9,6 @@ RUN apt-get update && apt-get install -y \
     unzip \
     && rm -rf /var/lib/apt/lists/*
 
-# Set up Node.js (needed for vaadin tests)
-RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
-    && apt-get install -y nodejs
-
-# Install pnpm (needed for vaadin tests)
-RUN npm install -g pnpm
-
 # Set up gradle cache directory
 RUN mkdir -p /home/vscode/.gradle
 RUN chown -R vscode:vscode /home/vscode/.gradle
@@ -28,7 +21,7 @@ ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-current
 
 # Pre-configure gradle with optimized settings
 RUN mkdir -p ~/.gradle && \
-    echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m" > ~/.gradle/gradle.properties
+    echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m" > ~/.gradle/gradle.properties
 
 # Final workspace setup
 WORKDIR /workspace
\ No newline at end of file
diff --git a/.devcontainer/README.md b/.devcontainer/README.md
index ee9c76413c56..2685e19974f4 100644
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -30,16 +30,7 @@ The dev container will automatically be used by:
 - VS Code with Dev Containers extension
 - Any tool that supports dev containers
 
-## Build time improvements
-
-Expected improvements:
-- Initial dependency download: ~2-3 minutes → ~10-30 seconds
-- Subsequent builds: ~1-2 minutes → ~30-60 seconds
-- Overall development experience: Much faster iteration cycles
-
 ## Maintenance
 
 The configuration may need updates when:
-- Java version changes (update `.java-version` and `devcontainer.json`)
-- New major dependencies are added
-- Gradle version changes significantly
\ No newline at end of file
+- Java version changes (update `.java-version` and `devcontainer.json`)
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 28ff688c6778..c9082f31d5ec 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -25,7 +25,7 @@
   "remoteUser": "vscode",
   "containerEnv": {
     "GRADLE_USER_HOME": "/home/vscode/.gradle",
-    "GRADLE_OPTS": "-Dorg.gradle.daemon=true -Dorg.gradle.parallel=true -Dorg.gradle.caching=true -Xmx4g -XX:MaxMetaspaceSize=512m"
+    "GRADLE_OPTS": "-Xmx2g -XX:MaxMetaspaceSize=512m"
   },
   "mounts": [
     "source=opentelemetry-gradle-cache,target=/home/vscode/.gradle,type=volume"
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
index d2baa79406e0..ea500b33d338 100755
--- a/.devcontainer/post-create.sh
+++ b/.devcontainer/post-create.sh
@@ -8,6 +8,10 @@ echo "Setting up OpenTelemetry Java Instrumentation development environment..."
 # Ensure we're in the right directory
 cd /workspace
 
+# Install pnpm for vaadin tests (Node.js installed via devcontainer features)
+echo "Installing pnpm..."
+npm install -g pnpm
+
 # Download Gradle wrapper and start daemon
 echo "Starting Gradle daemon..."
 ./gradlew --version

From 2ef31d46d08a9dda1970caa622abf3dbee17a85c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 16 Jul 2025 22:11:24 +0000
Subject: [PATCH 08/19] Remove unnecessary JVM memory settings from Dockerfile
 and clean up README

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 .devcontainer/Dockerfile | 5 ++---
 .devcontainer/README.md  | 7 +------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 93a1778fe086..8d305ca85c28 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -19,9 +19,8 @@ USER vscode
 # Set JAVA_HOME for vscode user
 ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-current
 
-# Pre-configure gradle with optimized settings
-RUN mkdir -p ~/.gradle && \
-    echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m" > ~/.gradle/gradle.properties
+# Create gradle cache directory
+RUN mkdir -p ~/.gradle
 
 # Final workspace setup
 WORKDIR /workspace
\ No newline at end of file
diff --git a/.devcontainer/README.md b/.devcontainer/README.md
index 2685e19974f4..afe986f2acef 100644
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -28,9 +28,4 @@ This directory contains the development container configuration for the OpenTele
 The dev container will automatically be used by:
 - GitHub Copilot agents
 - VS Code with Dev Containers extension
-- Any tool that supports dev containers
-
-## Maintenance
-
-The configuration may need updates when:
-- Java version changes (update `.java-version` and `devcontainer.json`)
\ No newline at end of file
+- Any tool that supports dev containers
\ No newline at end of file

From 68523109b7ce2007a2c04eefed5b9aaaefef6638 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 16 Jul 2025 22:42:41 +0000
Subject: [PATCH 09/19] Remove GRADLE_OPTS environment variable and let JVM
 decide on memory settings

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 .devcontainer/devcontainer.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c9082f31d5ec..9dd0ecbee8b5 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -24,8 +24,7 @@
   "postCreateCommand": ".devcontainer/post-create.sh",
   "remoteUser": "vscode",
   "containerEnv": {
-    "GRADLE_USER_HOME": "/home/vscode/.gradle",
-    "GRADLE_OPTS": "-Xmx2g -XX:MaxMetaspaceSize=512m"
+    "GRADLE_USER_HOME": "/home/vscode/.gradle"
   },
   "mounts": [
     "source=opentelemetry-gradle-cache,target=/home/vscode/.gradle,type=volume"

From 1a8ac0b5fcad3f7104be1cf3bf6acb6a8a2a683f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 16 Jul 2025 22:44:01 +0000
Subject: [PATCH 10/19] Use generic base image with Java feature instead of
 Java-specific base image

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 .devcontainer/Dockerfile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 8d305ca85c28..6c6eeae9aede 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
-# Use the official OpenJDK image as base
-FROM mcr.microsoft.com/devcontainers/java:1-21-bookworm
+# Use the official dev container base image
+FROM mcr.microsoft.com/devcontainers/base:bookworm
 
 # Install additional tools
 RUN apt-get update && apt-get install -y \
@@ -16,9 +16,6 @@ RUN chown -R vscode:vscode /home/vscode/.gradle
 # Switch to vscode user
 USER vscode
 
-# Set JAVA_HOME for vscode user
-ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-current
-
 # Create gradle cache directory
 RUN mkdir -p ~/.gradle
 

From 115133d66ca1ccadcc258b33387827815a116649 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 16 Jul 2025 22:59:56 +0000
Subject: [PATCH 11/19] Address code review feedback: remove redundant tools,
 update documentation, remove validation script

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 .devcontainer/Dockerfile        |  8 ----
 .devcontainer/README.md         |  4 +-
 .devcontainer/validate-setup.sh | 71 ---------------------------------
 3 files changed, 2 insertions(+), 81 deletions(-)
 delete mode 100755 .devcontainer/validate-setup.sh

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 6c6eeae9aede..fc50cc051553 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,14 +1,6 @@
 # Use the official dev container base image
 FROM mcr.microsoft.com/devcontainers/base:bookworm
 
-# Install additional tools
-RUN apt-get update && apt-get install -y \
-    git \
-    curl \
-    wget \
-    unzip \
-    && rm -rf /var/lib/apt/lists/*
-
 # Set up gradle cache directory
 RUN mkdir -p /home/vscode/.gradle
 RUN chown -R vscode:vscode /home/vscode/.gradle
diff --git a/.devcontainer/README.md b/.devcontainer/README.md
index afe986f2acef..ac74637cd307 100644
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -17,10 +17,10 @@ This directory contains the development container configuration for the OpenTele
 
 ## How it works
 
-1. **Base Image**: Uses Microsoft's Java dev container with OpenJDK 21
+1. **Base Image**: Uses Microsoft's generic dev container base with Java 21 via dev container features
 2. **Post-creation Setup**: Downloads Gradle dependencies during container startup
 3. **Optimization**: Sets up Gradle daemon with optimized JVM settings
-4. **Node.js**: Installs Node.js 16 and pnpm for Vaadin tests
+4. **Node.js**: Installs Node.js 16 via dev container features for Vaadin tests
 5. **Dependency Caching**: Attempts to resolve and cache dependencies after container creation
 
 ## Usage
diff --git a/.devcontainer/validate-setup.sh b/.devcontainer/validate-setup.sh
deleted file mode 100755
index b4d3339bc8ee..000000000000
--- a/.devcontainer/validate-setup.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-# Validation script to check if the dev container setup is working correctly
-
-echo "=== Dev Container Configuration Validation ==="
-echo
-
-# Check if we're in the right directory
-if [ ! -f "build.gradle.kts" ]; then
-    echo "❌ ERROR: Not in the root directory of the OpenTelemetry Java Instrumentation project"
-    exit 1
-fi
-
-# Check if devcontainer files exist
-echo "📁 Checking dev container files..."
-if [ ! -f ".devcontainer/devcontainer.json" ]; then
-    echo "❌ ERROR: devcontainer.json not found"
-    exit 1
-fi
-
-if [ ! -f ".devcontainer/Dockerfile" ]; then
-    echo "❌ ERROR: Dockerfile not found"
-    exit 1
-fi
-
-if [ ! -f ".devcontainer/post-create.sh" ]; then
-    echo "❌ ERROR: post-create.sh not found"
-    exit 1
-fi
-
-echo "✅ All dev container files present"
-
-# Check if the custom Gradle task exists
-echo "🔧 Checking custom Gradle task..."
-if grep -q "resolveDependencies" build.gradle.kts; then
-    echo "✅ resolveDependencies task found in build.gradle.kts"
-else
-    echo "❌ ERROR: resolveDependencies task not found in build.gradle.kts"
-    exit 1
-fi
-
-# Check JSON syntax
-echo "🔍 Validating JSON syntax..."
-if python3 -m json.tool .devcontainer/devcontainer.json > /dev/null 2>&1; then
-    echo "✅ devcontainer.json has valid JSON syntax"
-else
-    echo "❌ ERROR: devcontainer.json has invalid JSON syntax"
-    exit 1
-fi
-
-# Check if Java version matches
-echo "☕ Checking Java version..."
-if [ -f ".java-version" ]; then
-    EXPECTED_VERSION=$(cat .java-version)
-    if grep -q "java:1\":" .devcontainer/devcontainer.json && grep -q "\"version\": \"21\"" .devcontainer/devcontainer.json; then
-        echo "✅ Java version in devcontainer.json matches .java-version file"
-    else
-        echo "⚠️  WARNING: Java version in devcontainer.json might not match .java-version file"
-    fi
-else
-    echo "⚠️  WARNING: .java-version file not found"
-fi
-
-echo
-echo "=== Validation Complete ==="
-echo "🎉 Dev container configuration appears to be set up correctly!"
-echo
-echo "Next steps:"
-echo "1. Commit these changes to your repository"
-echo "2. GitHub Copilot agents will automatically use this configuration"
-echo "3. Build times should be significantly improved"
\ No newline at end of file

From a01a1d6635e1bed11e0eb7b6ee6b3ab822a908ab Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 17 Jul 2025 02:51:23 +0000
Subject: [PATCH 12/19] Initial plan


From a80aa1b0c5e956e9c1a9f29b59535a79c94423b9 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 17 Jul 2025 03:21:40 +0000
Subject: [PATCH 13/19] Add S3 build cache configuration with Oracle OCI Object
 Storage

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 build-scan.txt      |  1 +
 settings.gradle.kts | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 build-scan.txt

diff --git a/build-scan.txt b/build-scan.txt
new file mode 100644
index 000000000000..e930102f9b53
--- /dev/null
+++ b/build-scan.txt
@@ -0,0 +1 @@
+https://gradle.com/s/rbsfwoytagkki
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3ee0dd86e302..51e38d18653a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -8,6 +8,7 @@ pluginManagement {
     id("org.xbib.gradle.plugin.jflex") version "3.0.2"
     id("org.unbroken-dome.xjc") version "2.0.0"
     id("org.graalvm.buildtools.native") version "0.10.6"
+    id("com.github.burrunan.s3-build-cache") version "1.8.2"
   }
 }
 
@@ -21,6 +22,7 @@ plugins {
   // ./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.1"
+  id("com.github.burrunan.s3-build-cache") version "1.8.2"
 }
 
 dependencyResolutionManagement {
@@ -64,6 +66,38 @@ develocity {
   }
 }
 
+buildCache {
+  local {
+    // Local cache is enabled by default, but we might want to disable it in CI
+    // when using remote cache to avoid unnecessary storage
+    isEnabled = System.getenv("CI").isNullOrEmpty()
+  }
+  
+  remote<com.github.burrunan.s3cache.AwsS3BuildCache> {
+    region = "us-phoenix-1"
+    bucket = "opentelemetry-java-instrumentation-build-cache"
+    endpoint = "https://objectstorage.us-phoenix-1.oraclecloud.com"
+    
+    // Configure credentials for write access (only on main branch)
+    val accessKeyId = System.getenv("S3_BUILD_CACHE_ACCESS_KEY_ID")
+    val secretAccessKey = System.getenv("S3_BUILD_CACHE_SECRET_ACCESS_KEY")
+    
+    if (!accessKeyId.isNullOrEmpty() && !secretAccessKey.isNullOrEmpty()) {
+      awsAccessKeyId = accessKeyId
+      awsSecretKey = secretAccessKey
+      
+      // Enable push only for main branch builds
+      isPush = System.getenv("GITHUB_REF") == "refs/heads/main"
+    } else {
+      // Read-only mode for pull requests and local development
+      isPush = false
+    }
+    
+    // Enable the remote cache
+    isEnabled = true
+  }
+}
+
 rootProject.name = "opentelemetry-java-instrumentation"
 
 includeBuild("conventions")

From a9684922934aa2b3422e7a29e239c64a3806fb23 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 17 Jul 2025 03:27:17 +0000
Subject: [PATCH 14/19] Complete S3 build cache implementation with GitHub
 Actions integration

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 .github/workflows/build-common.yml            | 37 ++++++++
 .../workflows/build-daily-no-build-cache.yml  |  2 +
 .github/workflows/build-daily.yml             |  2 +
 .github/workflows/build-pull-request.yml      |  3 +
 .github/workflows/build.yml                   |  6 ++
 .github/workflows/release.yml                 |  3 +
 build-scan.txt                                |  2 +-
 docs/gradle-build-cache.md                    | 88 +++++++++++++++++++
 8 files changed, 142 insertions(+), 1 deletion(-)
 create mode 100644 docs/gradle-build-cache.md

diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml
index b23ff7e5ee35..3414c1747bf4 100644
--- a/.github/workflows/build-common.yml
+++ b/.github/workflows/build-common.yml
@@ -21,6 +21,10 @@ on:
     secrets:
       FLAKY_TEST_REPORTER_ACCESS_KEY:
         required: false
+      S3_BUILD_CACHE_ACCESS_KEY_ID:
+        required: false
+      S3_BUILD_CACHE_SECRET_ACCESS_KEY:
+        required: false
 
 permissions:
   contents: read
@@ -195,6 +199,9 @@ jobs:
 
       - name: Build
         # javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
+        env:
+          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+          S3_BUILD_CACHE_SECRET_ACCESS_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_ACCESS_KEY }}
         run: ./gradlew check spdxSbom -x javadoc -x spotlessCheck -PskipTests=true ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
 
       - name: Check for jApiCmp diffs
@@ -322,6 +329,9 @@ jobs:
 
       - name: Test
         # spotless is checked separately since it's a common source of failure
+        env:
+          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+          S3_BUILD_CACHE_SECRET_ACCESS_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_ACCESS_KEY }}
         run: >
           ./gradlew
           ${{ env.test-tasks }}
@@ -440,9 +450,15 @@ jobs:
       - name: Build
         # 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
+        env:
+          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+          S3_BUILD_CACHE_SECRET_ACCESS_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_ACCESS_KEY }}
         run: ./gradlew :smoke-tests:test -PsmokeTestSuite=none --no-daemon ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
 
       - name: Test
+        env:
+          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+          S3_BUILD_CACHE_SECRET_ACCESS_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_ACCESS_KEY }}
         run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }} ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
 
       - name: Build scan
@@ -489,6 +505,9 @@ jobs:
           cache-read-only: ${{ inputs.cache-read-only }}
 
       - name: Build
+        env:
+          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+          S3_BUILD_CACHE_SECRET_ACCESS_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_ACCESS_KEY }}
         run: ./gradlew build ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
         working-directory: gradle-plugins
 
@@ -513,25 +532,43 @@ jobs:
 
       - name: Local publish of artifacts
         # javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
+        env:
+          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+          S3_BUILD_CACHE_SECRET_ACCESS_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_ACCESS_KEY }}
         run: ./gradlew publishToMavenLocal -x javadoc
 
       - name: Local publish of gradle plugins
         # javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
+        env:
+          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+          S3_BUILD_CACHE_SECRET_ACCESS_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_ACCESS_KEY }}
         run: ./gradlew publishToMavenLocal -x javadoc
         working-directory: gradle-plugins
 
       - name: Build distro
+        env:
+          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+          S3_BUILD_CACHE_SECRET_ACCESS_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_ACCESS_KEY }}
         run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
         working-directory: examples/distro
 
       - name: Build extension
+        env:
+          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+          S3_BUILD_CACHE_SECRET_ACCESS_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_ACCESS_KEY }}
         run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
         working-directory: examples/extension
 
       - name: Build benchmark-overhead
+        env:
+          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+          S3_BUILD_CACHE_SECRET_ACCESS_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_ACCESS_KEY }}
         run: ./gradlew assemble ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
         working-directory: benchmark-overhead
 
       - name: Run muzzle check against extension
+        env:
+          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+          S3_BUILD_CACHE_SECRET_ACCESS_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_ACCESS_KEY }}
         run: ./gradlew muzzle --init-script ../../.github/scripts/local.init.gradle.kts
         working-directory: examples/extension
diff --git a/.github/workflows/build-daily-no-build-cache.yml b/.github/workflows/build-daily-no-build-cache.yml
index 652df1d810b6..9854a9d29d96 100644
--- a/.github/workflows/build-daily-no-build-cache.yml
+++ b/.github/workflows/build-daily-no-build-cache.yml
@@ -16,6 +16,8 @@ jobs:
       no-build-cache: true
     secrets:
       FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
+      S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+      S3_BUILD_CACHE_SECRET_ACCESS_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_ACCESS_KEY }}
 
   test-latest-deps:
     uses: ./.github/workflows/reusable-test-latest-deps.yml
diff --git a/.github/workflows/build-daily.yml b/.github/workflows/build-daily.yml
index 7d76d7c02f8e..06163a1138dc 100644
--- a/.github/workflows/build-daily.yml
+++ b/.github/workflows/build-daily.yml
@@ -14,6 +14,8 @@ jobs:
     uses: ./.github/workflows/build-common.yml
     secrets:
       FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
+      S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+      S3_BUILD_CACHE_SECRET_ACCESS_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_ACCESS_KEY }}
 
   test-latest-deps:
     uses: ./.github/workflows/reusable-test-latest-deps.yml
diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml
index 121405d721a0..b12f15aff411 100644
--- a/.github/workflows/build-pull-request.yml
+++ b/.github/workflows/build-pull-request.yml
@@ -23,6 +23,9 @@ jobs:
       skip-openj9-tests: ${{ !contains(github.event.pull_request.labels.*.name, 'test openj9') }}
       skip-windows-smoke-tests: ${{ !contains(github.event.pull_request.labels.*.name, 'test windows') }}
       cache-read-only: true
+    secrets:
+      S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+      S3_BUILD_CACHE_SECRET_ACCESS_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_ACCESS_KEY }}
 
   test-latest-deps:
     uses: ./.github/workflows/reusable-test-latest-deps.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c99f34412c79..1e401d872a84 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,6 +15,8 @@ jobs:
     uses: ./.github/workflows/build-common.yml
     secrets:
       FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
+      S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+      S3_BUILD_CACHE_SECRET_ACCESS_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_ACCESS_KEY }}
 
   test-latest-deps:
     # release branches are excluded
@@ -84,6 +86,8 @@ jobs:
           SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
           GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
+          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+          S3_BUILD_CACHE_SECRET_ACCESS_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_ACCESS_KEY }}
         run: ./gradlew assemble spdxSbom publishToSonatype
 
       - name: Build and publish gradle plugin snapshots
@@ -92,5 +96,7 @@ jobs:
           SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
           GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
+          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+          S3_BUILD_CACHE_SECRET_ACCESS_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_ACCESS_KEY }}
         run: ./gradlew build publishToSonatype
         working-directory: gradle-plugins
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 876e9792a663..fa9fa7abf666 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,6 +8,9 @@ permissions:
 jobs:
   common:
     uses: ./.github/workflows/build-common.yml
+    secrets:
+      S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+      S3_BUILD_CACHE_SECRET_ACCESS_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_ACCESS_KEY }}
 
   # test-latest-deps is intentionally not included in the release workflows
   # because any time a new library version is released to maven central
diff --git a/build-scan.txt b/build-scan.txt
index e930102f9b53..172664102de6 100644
--- a/build-scan.txt
+++ b/build-scan.txt
@@ -1 +1 @@
-https://gradle.com/s/rbsfwoytagkki
+https://gradle.com/s/hjhlmvdbaumf4
diff --git a/docs/gradle-build-cache.md b/docs/gradle-build-cache.md
new file mode 100644
index 000000000000..afbf3fbcf585
--- /dev/null
+++ b/docs/gradle-build-cache.md
@@ -0,0 +1,88 @@
+# Gradle Build Cache with Oracle OCI Object Storage
+
+This repository is configured to use a remote build cache backed by Oracle OCI Object Storage (S3-compatible) to speed up builds significantly.
+
+## How it works
+
+The build cache is implemented using the [gradle-s3-build-cache](https://github.com/burrunan/gradle-s3-build-cache) plugin, which provides S3-compatible storage for Gradle's build cache and configuration cache.
+
+### Configuration
+
+The build cache is configured in `settings.gradle.kts`:
+- **Remote cache**: Oracle OCI Object Storage (S3-compatible endpoint)
+- **Region**: us-phoenix-1
+- **Bucket**: opentelemetry-java-instrumentation-build-cache
+- **Access**: Read access for everyone, write access only for main branch builds
+
+### Access Control
+
+#### Read Access (Pull from cache)
+- Available to everyone: CI builds, pull requests, and local development
+- No authentication required
+- Always enabled (`isPull = true`)
+
+#### Write Access (Push to cache)
+- Only available on main branch builds (`GITHUB_REF == "refs/heads/main"`)
+- Requires authentication via GitHub secrets:
+  - `S3_BUILD_CACHE_ACCESS_KEY_ID`
+  - `S3_BUILD_CACHE_SECRET_ACCESS_KEY`
+- Disabled for pull requests and local development
+
+### Local Development
+
+For local development, the cache will:
+- Use the local build cache when not in CI
+- Read from the remote cache (no authentication needed)
+- Not write to the remote cache (no credentials available)
+
+To use the build cache locally:
+```bash
+./gradlew build --build-cache
+```
+
+To also enable configuration cache:
+```bash
+./gradlew build --build-cache --configuration-cache
+```
+
+### GitHub Actions
+
+The cache is automatically configured in GitHub Actions workflows:
+- All workflows have access to read from the cache
+- Only main branch builds have write access via secrets
+- Both build cache and configuration cache are enabled
+
+### Benefits
+
+1. **Faster builds**: Reuse compilation results and test outputs
+2. **Reduced CI costs**: Less compute time needed
+3. **Better developer experience**: Faster local builds
+4. **Consistency**: Same artifacts across different environments
+
+### Monitoring
+
+Build cache effectiveness can be monitored through:
+- Gradle build scans (automatically published for CI builds)
+- Build times in GitHub Actions
+- Cache hit rates in build logs
+
+### Troubleshooting
+
+If you encounter issues with the build cache:
+
+1. **Disable build cache temporarily**:
+   ```bash
+   ./gradlew build --no-build-cache
+   ```
+
+2. **Clear local cache**:
+   ```bash
+   rm -rf ~/.gradle/caches/
+   ```
+
+3. **Check cache configuration**:
+   ```bash
+   ./gradlew help --build-cache
+   ```
+
+The cache is designed to be transparent - builds should work the same way with or without the cache, just faster when enabled.
\ No newline at end of file

From e9098a05b6a82c71b87112a3b52380b1570b8a7b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 17 Jul 2025 03:28:06 +0000
Subject: [PATCH 15/19] Add build-scan.txt to .gitignore and remove temporary
 file

---
 .gitignore     | 1 +
 build-scan.txt | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 build-scan.txt

diff --git a/.gitignore b/.gitignore
index 308ea9e1651f..4d15c3839954 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,6 +59,7 @@ replay_pid*
 .attach_pid*
 .telemetry*
 .lycheecache
+build-scan.txt
 
 !java-agent/benchmark/releases/*.jar
 
diff --git a/build-scan.txt b/build-scan.txt
deleted file mode 100644
index 172664102de6..000000000000
--- a/build-scan.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://gradle.com/s/hjhlmvdbaumf4

From 47ed5f6ca74ccc0d41dc3e5c66c4dd206cfa589f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 17 Jul 2025 04:04:10 +0000
Subject: [PATCH 16/19] Initial analysis of PR comments and plan

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 .../.kotlin/sessions/kotlin-compiler-5312110592152672777.salive   | 0
 .../.kotlin/sessions/kotlin-compiler-1911870946709896392.salive   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 conventions/.kotlin/sessions/kotlin-compiler-5312110592152672777.salive
 create mode 100644 gradle-plugins/.kotlin/sessions/kotlin-compiler-1911870946709896392.salive

diff --git a/conventions/.kotlin/sessions/kotlin-compiler-5312110592152672777.salive b/conventions/.kotlin/sessions/kotlin-compiler-5312110592152672777.salive
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/gradle-plugins/.kotlin/sessions/kotlin-compiler-1911870946709896392.salive b/gradle-plugins/.kotlin/sessions/kotlin-compiler-1911870946709896392.salive
new file mode 100644
index 000000000000..e69de29bb2d1

From 9f684139a12bbaf6bd2c45ca5930812263208578 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 17 Jul 2025 04:06:18 +0000
Subject: [PATCH 17/19] Address PR review comments: fix documentation, clarify
 comments, and adjust push settings

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 .gitignore                                         |  3 +++
 .../kotlin-compiler-5312110592152672777.salive     |  0
 docs/gradle-build-cache.md                         | 14 +++++++-------
 .../kotlin-compiler-1911870946709896392.salive     |  0
 settings.gradle.kts                                | 13 +++++--------
 5 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 conventions/.kotlin/sessions/kotlin-compiler-5312110592152672777.salive
 delete mode 100644 gradle-plugins/.kotlin/sessions/kotlin-compiler-1911870946709896392.salive

diff --git a/.gitignore b/.gitignore
index 4d15c3839954..7478ab0507d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,5 +61,8 @@ replay_pid*
 .lycheecache
 build-scan.txt
 
+# Kotlin compiler sessions
+**/.kotlin/sessions/
+
 !java-agent/benchmark/releases/*.jar
 
diff --git a/conventions/.kotlin/sessions/kotlin-compiler-5312110592152672777.salive b/conventions/.kotlin/sessions/kotlin-compiler-5312110592152672777.salive
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/docs/gradle-build-cache.md b/docs/gradle-build-cache.md
index afbf3fbcf585..3a6c319b6a41 100644
--- a/docs/gradle-build-cache.md
+++ b/docs/gradle-build-cache.md
@@ -22,11 +22,11 @@ The build cache is configured in `settings.gradle.kts`:
 - Always enabled (`isPull = true`)
 
 #### Write Access (Push to cache)
-- Only available on main branch builds (`GITHUB_REF == "refs/heads/main"`)
+- Available when authentication credentials are provided
 - Requires authentication via GitHub secrets:
   - `S3_BUILD_CACHE_ACCESS_KEY_ID`
   - `S3_BUILD_CACHE_SECRET_ACCESS_KEY`
-- Disabled for pull requests and local development
+- Disabled for pull requests and local development (no credentials available)
 
 ### Local Development
 
@@ -35,21 +35,21 @@ For local development, the cache will:
 - Read from the remote cache (no authentication needed)
 - Not write to the remote cache (no credentials available)
 
-To use the build cache locally:
+The build cache is enabled by default via `org.gradle.caching=true` in `gradle.properties`, so you can simply run:
 ```bash
-./gradlew build --build-cache
+./gradlew build
 ```
 
-To also enable configuration cache:
+To also enable configuration cache (which provides additional speedup):
 ```bash
-./gradlew build --build-cache --configuration-cache
+./gradlew build --configuration-cache
 ```
 
 ### GitHub Actions
 
 The cache is automatically configured in GitHub Actions workflows:
 - All workflows have access to read from the cache
-- Only main branch builds have write access via secrets
+- Workflows with access to the S3 secrets have write access
 - Both build cache and configuration cache are enabled
 
 ### Benefits
diff --git a/gradle-plugins/.kotlin/sessions/kotlin-compiler-1911870946709896392.salive b/gradle-plugins/.kotlin/sessions/kotlin-compiler-1911870946709896392.salive
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 51e38d18653a..88c8c4ffa942 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -68,8 +68,8 @@ develocity {
 
 buildCache {
   local {
-    // Local cache is enabled by default, but we might want to disable it in CI
-    // when using remote cache to avoid unnecessary storage
+    // Local cache is enabled by default for local development, but disabled in CI
+    // to save CI storage space since CI can use the remote cache directly
     isEnabled = System.getenv("CI").isNullOrEmpty()
   }
   
@@ -78,7 +78,7 @@ buildCache {
     bucket = "opentelemetry-java-instrumentation-build-cache"
     endpoint = "https://objectstorage.us-phoenix-1.oraclecloud.com"
     
-    // Configure credentials for write access (only on main branch)
+    // Configure credentials for write access
     val accessKeyId = System.getenv("S3_BUILD_CACHE_ACCESS_KEY_ID")
     val secretAccessKey = System.getenv("S3_BUILD_CACHE_SECRET_ACCESS_KEY")
     
@@ -86,15 +86,12 @@ buildCache {
       awsAccessKeyId = accessKeyId
       awsSecretKey = secretAccessKey
       
-      // Enable push only for main branch builds
-      isPush = System.getenv("GITHUB_REF") == "refs/heads/main"
+      // Enable push whenever secrets are available
+      isPush = true
     } else {
       // Read-only mode for pull requests and local development
       isPush = false
     }
-    
-    // Enable the remote cache
-    isEnabled = true
   }
 }
 

From 7962a444c71f204d6ae9834451fa1ef68bde51bc Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 17 Jul 2025 04:17:30 +0000
Subject: [PATCH 18/19] Remove redundant local cache config and comments as
 requested

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 settings.gradle.kts | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 88c8c4ffa942..59591a82451a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -67,12 +67,6 @@ develocity {
 }
 
 buildCache {
-  local {
-    // Local cache is enabled by default for local development, but disabled in CI
-    // to save CI storage space since CI can use the remote cache directly
-    isEnabled = System.getenv("CI").isNullOrEmpty()
-  }
-  
   remote<com.github.burrunan.s3cache.AwsS3BuildCache> {
     region = "us-phoenix-1"
     bucket = "opentelemetry-java-instrumentation-build-cache"
@@ -85,11 +79,8 @@ buildCache {
     if (!accessKeyId.isNullOrEmpty() && !secretAccessKey.isNullOrEmpty()) {
       awsAccessKeyId = accessKeyId
       awsSecretKey = secretAccessKey
-      
-      // Enable push whenever secrets are available
       isPush = true
     } else {
-      // Read-only mode for pull requests and local development
       isPush = false
     }
   }

From 8418d5404aa33ef62510081d98456b8130675010 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 17 Jul 2025 04:22:38 +0000
Subject: [PATCH 19/19] Delete gradle-build-cache.md documentation file

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 docs/gradle-build-cache.md | 88 --------------------------------------
 1 file changed, 88 deletions(-)
 delete mode 100644 docs/gradle-build-cache.md

diff --git a/docs/gradle-build-cache.md b/docs/gradle-build-cache.md
deleted file mode 100644
index 3a6c319b6a41..000000000000
--- a/docs/gradle-build-cache.md
+++ /dev/null
@@ -1,88 +0,0 @@
-# Gradle Build Cache with Oracle OCI Object Storage
-
-This repository is configured to use a remote build cache backed by Oracle OCI Object Storage (S3-compatible) to speed up builds significantly.
-
-## How it works
-
-The build cache is implemented using the [gradle-s3-build-cache](https://github.com/burrunan/gradle-s3-build-cache) plugin, which provides S3-compatible storage for Gradle's build cache and configuration cache.
-
-### Configuration
-
-The build cache is configured in `settings.gradle.kts`:
-- **Remote cache**: Oracle OCI Object Storage (S3-compatible endpoint)
-- **Region**: us-phoenix-1
-- **Bucket**: opentelemetry-java-instrumentation-build-cache
-- **Access**: Read access for everyone, write access only for main branch builds
-
-### Access Control
-
-#### Read Access (Pull from cache)
-- Available to everyone: CI builds, pull requests, and local development
-- No authentication required
-- Always enabled (`isPull = true`)
-
-#### Write Access (Push to cache)
-- Available when authentication credentials are provided
-- Requires authentication via GitHub secrets:
-  - `S3_BUILD_CACHE_ACCESS_KEY_ID`
-  - `S3_BUILD_CACHE_SECRET_ACCESS_KEY`
-- Disabled for pull requests and local development (no credentials available)
-
-### Local Development
-
-For local development, the cache will:
-- Use the local build cache when not in CI
-- Read from the remote cache (no authentication needed)
-- Not write to the remote cache (no credentials available)
-
-The build cache is enabled by default via `org.gradle.caching=true` in `gradle.properties`, so you can simply run:
-```bash
-./gradlew build
-```
-
-To also enable configuration cache (which provides additional speedup):
-```bash
-./gradlew build --configuration-cache
-```
-
-### GitHub Actions
-
-The cache is automatically configured in GitHub Actions workflows:
-- All workflows have access to read from the cache
-- Workflows with access to the S3 secrets have write access
-- Both build cache and configuration cache are enabled
-
-### Benefits
-
-1. **Faster builds**: Reuse compilation results and test outputs
-2. **Reduced CI costs**: Less compute time needed
-3. **Better developer experience**: Faster local builds
-4. **Consistency**: Same artifacts across different environments
-
-### Monitoring
-
-Build cache effectiveness can be monitored through:
-- Gradle build scans (automatically published for CI builds)
-- Build times in GitHub Actions
-- Cache hit rates in build logs
-
-### Troubleshooting
-
-If you encounter issues with the build cache:
-
-1. **Disable build cache temporarily**:
-   ```bash
-   ./gradlew build --no-build-cache
-   ```
-
-2. **Clear local cache**:
-   ```bash
-   rm -rf ~/.gradle/caches/
-   ```
-
-3. **Check cache configuration**:
-   ```bash
-   ./gradlew help --build-cache
-   ```
-
-The cache is designed to be transparent - builds should work the same way with or without the cache, just faster when enabled.
\ No newline at end of file