Merge branch 'main' into auto-opentelemetry-builder-hold-mutex

Author: fandreuz

.github/renovate.json5

@@ -1,59 +1,78 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:best-practices",
-    "helpers:pinGitHubActionDigestsToSemver"
+  $schema: 'https://docs.renovatebot.com/renovate-schema.json',
+  extends: [
+    'config:best-practices',
+    'helpers:pinGitHubActionDigestsToSemver',
   ],
-  "packageRules": [
+  packageRules: [
     {
       // this is to reduce the number of renovate PRs
-      "matchManagers": [
-        "github-actions",
-        "dockerfile"
+      matchManagers: [
+        'github-actions',
+        'dockerfile',
       ],
-      "extends": ["schedule:weekly"],
-      "groupName": "weekly update"
+      extends: [
+        'schedule:weekly',
+      ],
+      groupName: 'weekly update',
     },
     {
-      "matchPackageNames": [
-        "io.opentelemetry.contrib:opentelemetry-aws-xray-propagator",
-        "io.opentelemetry.proto:opentelemetry-proto",
-        "io.opentelemetry.semconv:opentelemetry-semconv-incubating"
+      matchPackageNames: [
+        'io.opentelemetry.contrib:opentelemetry-aws-xray-propagator',
+        'io.opentelemetry.proto:opentelemetry-proto',
+        'io.opentelemetry.semconv:opentelemetry-semconv-incubating',
       ],
       // Renovate's default behavior is only to update from unstable -> unstable if it's for the
       // major.minor.patch, under the assumption that you would want to update to the stable version
       // of that release instead of the unstable version for a future release
       // (TODO remove once the artifacts above release stable versions)
-      "ignoreUnstable": false,
-      "allowedVersions": "!/\\-SNAPSHOT$/"
+      ignoreUnstable: false,
+      allowedVersions: '!/\\-SNAPSHOT$/',
     },
     {
       // junit-pioneer 2+ requires Java 11+
-      "matchPackageNames": ["org.junit-pioneer:junit-pioneer"],
-      "matchUpdateTypes": ["major"],
-      "enabled": false
+      matchPackageNames: [
+        'org.junit-pioneer:junit-pioneer',
+      ],
+      matchUpdateTypes: [
+        'major',
+      ],
+      enabled: false,
     },
     {
       // mockito 5+ requires Java 11+
-      "matchPackagePrefixes": ["org.mockito:"],
-      "matchUpdateTypes": ["major"],
-      "enabled": false
+      matchUpdateTypes: [
+        'major',
+      ],
+      enabled: false,
+      matchPackageNames: [
+        'org.mockito:{/,}**',
+      ],
     },
     {
       // jqf-fuzz version 1.8+ requires Java 11+
-      "matchPackageNames": ["edu.berkeley.cs.jqf:jqf-fuzz"],
-      "matchUpdateTypes": ["major", "minor"],
-      "enabled": false
+      matchPackageNames: [
+        'edu.berkeley.cs.jqf:jqf-fuzz',
+      ],
+      matchUpdateTypes: [
+        'major',
+        'minor',
+      ],
+      enabled: false,
     },
     {
       // pinned version for compatibility
-      "matchPackageNames": ["org.jetbrains.kotlinx:kotlinx-coroutines-core"],
-      "matchCurrentVersion": "1.5.2",
-      "enabled": false
+      matchPackageNames: [
+        'org.jetbrains.kotlinx:kotlinx-coroutines-core',
+      ],
+      matchCurrentVersion: '1.5.2',
+      enabled: false,
     },
     {
-      "matchPackagePrefixes": ["com.diffplug.spotless"],
-      "groupName": "spotless packages"
-    }
-  ]
+      groupName: 'spotless packages',
+      matchPackageNames: [
+        'com.diffplug.spotless{/,}**',
+      ],
+    },
+  ],
 }

.github/repository-settings.md

@@ -1,98 +1,8 @@
 # Repository settings
 
-Repository settings in addition to what's documented already at
-<https://github.com/open-telemetry/community/blob/main/docs/how-to-configure-new-repository.md>.
-
-## General > Pull Requests
-
-- Allow squash merging > Default to pull request title
-
-- Allow auto-merge
-
-## Actions > General
-
-- Fork pull request workflows from outside collaborators:
-  "Require approval for first-time contributors who are new to GitHub"
-
-  (To reduce friction for new contributors,
-  as the default is "Require approval for first-time contributors")
-
-- Workflow permissions
-  - Default permissions granted to the `GITHUB_TOKEN` when running workflows in this repository:
-    Read repository contents and packages permissions
-  - Allow GitHub Actions to create and approve pull requests: UNCHECKED
-
-## Rules > Rulesets
-
-### `main` and release branches
-
-- Targeted branches:
-  - `main`
-  - `release/*`
-- Branch rules
-  - Restrict deletions: CHECKED
-  - Require linear history: CHECKED
-  - Require a pull request before merging: CHECKED
-    - Required approvals: 1
-    - Require review from Code Owners: CHECKED
-    - Allowed merge methods: Squash
-  - Require status checks to pass
-    - Do not require status checks on creation: CHECKED
-    - Status checks that are required
-      - EasyCLA
-      - `required-status-check`
-      - `gradle-wrapper-validation`
-  - Block force pushes: CHECKED
-  - Require code scanning results: CHECKED
-    - CodeQL
-      - Security alerts: High or higher
-      - Alerts: Errors
-
-### `benchmarks` branch
-
-- Targeted branches:
-  - `benchmarks`
-- Branch rules
-  - Restrict deletions: CHECKED
-  - Require linear history: CHECKED
-  - Block force pushes: CHECKED
-
-### Old-style release branches
-
-- Targeted branches:
-  - `v0.*`
-  - `v1.*`
-- Branch rules
-  - Restrict creations: CHECKED
-  - Restrict updates: CHECKED
-  - Restrict deletions: CHECKED
-
-### Restrict branch creation
-
-- Targeted branches
-  - Exclude:
-    - `release/*`
-    - `renovate/**/*`
-    - `otelbot/**/*`
-    - `revert-*/**/*` (these are created when using the GitHub UI to revert a PR)
-- Restrict creations: CHECKED
-
-### Restrict updating tags
-
-- Targeted tags
-  - All tags
-- Restrict updates: CHECKED
-- Restrict deletions: CHECKED
-
-## Branch protections
-
-### `main`, `release/*`
-
-- Restrict who can push to matching branches: CHECKED
-
-## Code security and analysis
-
-- Secret scanning: Enabled
+This document describes any changes that have been made to the
+settings in this repository outside the settings tracked in the
+private admin repo.
 
 ## Secrets and variables > Actions
 

.github/scripts/update-version.sh

@@ -1,7 +1,8 @@
 #!/bin/bash -e
 
 version=$1
+versionWithSnapshot="$version-SNAPSHOT"
 
 sed -Ei "s/[0-9]+\.[0-9]+\.[0-9]+/$version/" version.gradle.kts
 
-sed -Ei "1 s/(Comparing source compatibility of [a-z-]+)-[0-9]+\.[0-9]+\.[0-9]+(-SNAPSHOT)?.jar/\1-$version.jar/" docs/apidiffs/current_vs_latest/*.txt
+sed -Ei "1 s/(Comparing source compatibility of [a-z-]+)-[0-9]+\.[0-9]+\.[0-9]+(-SNAPSHOT)?.jar/\1-$versionWithSnapshot.jar/" docs/apidiffs/current_vs_latest/*.txt

.github/workflows/benchmark-tags.yml

@@ -11,7 +11,7 @@ jobs:
     permissions:
       contents: write # for git push to benchmarks branch
     name: Benchmark SDK
-    runs-on: self-hosted
+    runs-on: equinix-bare-metal
     timeout-minutes: 10
     strategy:
       fail-fast: false
@@ -56,7 +56,7 @@ jobs:
           java-version: 17
 
       - name: Set up gradle
-        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
+        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
       - name: Run jmh
         run: ./gradlew jmhJar
 

.github/workflows/benchmark.yml

@@ -13,7 +13,7 @@ jobs:
     permissions:
       contents: write # for git push to benchmarks branch
     name: Benchmark SDK
-    runs-on: self-hosted
+    runs-on: equinix-bare-metal
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -26,7 +26,7 @@ jobs:
           java-version: 17
 
       - name: Set up gradle
-        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
+        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
       - name: Run jmh
         run: ./gradlew jmhJar
 

.github/workflows/build-tracecontext-testsuite.yml

@@ -29,7 +29,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
         with:
           context: integration-tests/tracecontext/docker
           push: true

.github/workflows/build.yml

@@ -69,7 +69,7 @@ jobs:
           java-version: 17
 
       - name: Set up gradle
-        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
+        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
       - name: Build
         run: >
             ./gradlew build
@@ -145,7 +145,7 @@ jobs:
           java-version: 17
 
       - name: Set up gradle
-        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
+        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
         # skipping release branches because the versions in those branches are not snapshots
         # (also this skips pull requests)
         if: ${{ github.ref_name == 'main' && github.repository == 'open-telemetry/opentelemetry-java' }}

.github/workflows/codeql.yml

@@ -34,10 +34,10 @@ jobs:
           java-version: 17
 
       - name: Set up gradle
-        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
+        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
+        uses: github/codeql-action/init@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
         with:
           languages: java, actions
           # using "latest" helps to keep up with the latest Kotlin support
@@ -51,4 +51,4 @@ jobs:
         run: ./gradlew assemble --no-build-cache --no-daemon
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
+        uses: github/codeql-action/analyze@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19

.github/workflows/gradle-wrapper-validation.yml

@@ -13,4 +13,4 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: gradle/actions/wrapper-validation@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
+      - uses: gradle/actions/wrapper-validation@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0

.github/workflows/issue-management-feedback-label.yml

@@ -12,6 +12,7 @@ jobs:
     permissions:
       contents: read
       issues: write
+      pull-requests: write
     if: >
       contains(github.event.issue.labels.*.name, 'needs author feedback') &&
       github.event.comment.user.login == github.event.issue.user.login