merge main

Author: jaydeluca

.github/workflows/metadata-update.yml

@@ -0,0 +1,121 @@
+name: Metadata Update
+
+on:
+  workflow_dispatch:  # allow this to be manually triggered
+  schedule:
+    - cron: "00 1 * * *" # daily at 1:00 UTC
+
+permissions:
+  contents: read
+
+# Should only be one job running at a time to avoid conflicts with the metadata update branch
+concurrency:
+  group: metadata-update
+  cancel-in-progress: true
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write # for git push to PR branch
+      pull-requests: write # for adding label and assignee to PR
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Free disk space
+        run: .github/scripts/gha-free-disk-space.sh
+
+      - name: Set up JDK for running Gradle
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        with:
+          distribution: temurin
+          java-version-file: .java-version
+
+      - name: Set up gradle
+        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+
+      - name: Collect telemetry
+        run: ./instrumentation-docs/ci-collect.sh
+
+      - name: Run documentation analyzer
+        run: ./gradlew :instrumentation-docs:runAnalysis
+
+      - name: Check for diff
+        id: diffcheck
+        run: |
+          git add docs/instrumentation-list.yaml
+          if ! git diff --cached --quiet; then
+            echo "has_diff=true" >> $GITHUB_OUTPUT
+          else
+            echo "has_diff=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Use CLA approved github bot
+        if: steps.diffcheck.outputs.has_diff == 'true'
+        run: .github/scripts/use-cla-approved-bot.sh
+
+      - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+        if: steps.diffcheck.outputs.has_diff == 'true'
+        id: otelbot-token
+        with:
+          app-id: ${{ vars.OTELBOT_APP_ID }}
+          private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
+
+      - name: Find or create metadata update branch
+        if: steps.diffcheck.outputs.has_diff == 'true'
+        id: findbranch
+        env:
+          GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
+        run: |
+          BRANCH_NAME="metadata-update-main"
+          echo "branch=$BRANCH_NAME" >> $GITHUB_OUTPUT
+          if git ls-remote --exit-code --heads origin "$BRANCH_NAME"; then
+            git fetch origin "$BRANCH_NAME"
+            git checkout "$BRANCH_NAME"
+            git merge origin/main --no-edit
+          else
+            git checkout -b "$BRANCH_NAME" origin/main
+          fi
+
+      - name: Commit and push changes
+        if: steps.diffcheck.outputs.has_diff == 'true'
+        env:
+          GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
+        run: |
+          BRANCH_NAME="${{ steps.findbranch.outputs.branch }}"
+          git commit -m "chore: update instrumentation list [automated]" || echo "No changes to commit."
+          git push origin "$BRANCH_NAME"
+
+      - name: Create PR if needed
+        if: steps.diffcheck.outputs.has_diff == 'true'
+        id: createpr
+        env:
+          GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
+        run: |
+          BRANCH_NAME="${{ steps.findbranch.outputs.branch }}"
+          PR_EXISTS=$(gh pr list --state open --head "$BRANCH_NAME" --label automation --json url -q '.[0].url')
+          if [ -z "$PR_EXISTS" ]; then
+            gh pr create \
+              --title "chore: update instrumentation list [automated]" \
+              --body "This PR was created automatically by the metadata update workflow." \
+              --head "$BRANCH_NAME" \
+              --base main
+            echo "new_pr=true" >> $GITHUB_OUTPUT
+          else
+            echo "PR already exists: $PR_EXISTS"
+            echo "new_pr=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Add label to PR
+        if: steps.createpr.outputs.new_pr == 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          BRANCH_NAME="${{ steps.findbranch.outputs.branch }}"
+          PR_URL=$(gh pr list --state open --head "$BRANCH_NAME" --json url -q '.[0].url')
+          if [ -n "$PR_URL" ]; then
+            gh pr edit "$PR_URL" --add-label "automation" --add-assignee jaydeluca
+          else
+            echo "No open PR found for branch $BRANCH_NAME."
+          fi

benchmark-overhead/src/test/java/io/opentelemetry/agents/LatestAgentSnapshotResolver.java

@@ -13,6 +13,7 @@
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.util.Optional;
+import java.time.Duration;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -30,6 +31,11 @@ public class LatestAgentSnapshotResolver {
       "https://oss.sonatype.org/content/repositories/snapshots/io/opentelemetry/javaagent/opentelemetry-javaagent";
   static final String LATEST_SNAPSHOT_META = BASE_URL + "/maven-metadata.xml";
 
+  private static final OkHttpClient client = new OkHttpClient.Builder()
+      .connectTimeout(Duration.ofMinutes(1))
+      .readTimeout(Duration.ofMinutes(1))
+      .build();
+
   Optional<Path> resolve() throws IOException {
     String version = fetchLatestSnapshotVersion();
     logger.info("Latest snapshot version is {}", version);
@@ -81,11 +87,33 @@ private byte[] fetchBodyBytesFrom(String url) throws IOException {
     return fetchBodyFrom(url).bytes();
   }
 
+  // The sonatype repository can be very unreliable, so we retry a few times
   private ResponseBody fetchBodyFrom(String url) throws IOException {
     Request request = new Request.Builder().url(url).build();
-    OkHttpClient client = new OkHttpClient();
-    Response response = client.newCall(request).execute();
-    ResponseBody body = response.body();
-    return body;
+    IOException lastException = null;
+
+    for (int attempt = 0; attempt < 3; attempt++) {
+      try {
+        try (Response response = client.newCall(request).execute()) {
+          if (!response.isSuccessful()) {
+            throw new IOException("Unexpected HTTP code " + response.code() + " for " + url);
+          }
+          ResponseBody body = response.body();
+          if (body != null) {
+            byte[] data = body.bytes();
+            return ResponseBody.create(data, body.contentType());
+          } else {
+            throw new IOException("Response body is null");
+          }
+        }
+      } catch (IOException e) {
+        lastException = e;
+        if (attempt < 2) {
+          logger.warn("Attempt {} to fetch {} failed: {}. Retrying...", attempt + 1, url, e.getMessage());
+        }
+      }
+    }
+    throw lastException;
   }
 }
+

conventions/build.gradle.kts

@@ -57,7 +57,7 @@ dependencies {
   implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1")
   implementation("com.google.guava:guava:33.4.8-jre")
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
-  implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.8")
+  implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.9")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
   implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.1")
   implementation("org.owasp:dependency-check-gradle:12.1.3")

dependencyManagement/build.gradle.kts

@@ -28,7 +28,6 @@ val DEPENDENCY_BOMS = listOf(
   // even if they are only used by test dependencies, so not using junit bom since it is LGPL
 
   "com.fasterxml.jackson:jackson-bom:2.19.2",
-  "com.squareup.okio:okio-bom:3.15.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
   "com.google.guava:guava-bom:33.4.8-jre",
   "org.apache.groovy:groovy-bom:${groovyVersion}",
   "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",