Merge branch 'main' into disk-buffering-api-implementation

# Conflicts:
#	disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/exporters/SpanToDiskExporter.java
#	disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/exporter/ToDiskExporter.java
#	disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/exporters/SignalStorageExporter.java
#	disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/storage/StorageBuilder.java
#	disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/utils/DebugLogger.java
#	disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/storage/impl/FileStorageConfiguration.java

Author: LikeTheSalad

.github/copilot-instructions.md

@@ -0,0 +1,39 @@
+# Copilot Instructions for OpenTelemetry Java Contrib
+
+This repository provides observability instrumentation for Java applications.
+
+## Code Review Priorities
+
+### Style Guide Compliance
+
+**PRIORITY**: Verify that all code changes follow the [Style Guide](../docs/style-guide.md). Check:
+
+- Code formatting (auto-formatting, static imports, class organization)
+- Java language conventions (`final` usage, `@Nullable` annotations, `Optional` usage)
+- Performance constraints (hot path allocations)
+- Implementation patterns (SPI registration, configuration conventions)
+- Gradle conventions (Kotlin DSL, plugin usage, module naming)
+- Documentation standards (README files, deprecation processes)
+
+### Critical Areas
+
+- **Public APIs**: Changes affect downstream users and require careful review
+- **Performance**: Instrumentation must have minimal overhead
+- **Thread Safety**: Ensure safe concurrent access patterns
+- **Memory Management**: Prevent leaks and excessive allocations
+
+### Quality Standards
+
+- Proper error handling with appropriate logging levels
+- OpenTelemetry specification and semantic convention compliance
+- Resource cleanup and lifecycle management
+- Comprehensive unit tests for new functionality
+
+## Coding Agent Instructions
+
+When implementing changes or new features:
+
+1. Follow all [Style Guide](../docs/style-guide.md) conventions and the Code Review Priorities above
+2. Run tests to ensure they still pass (use `./gradlew test` and `./gradlew integrationTest` as needed)
+3. **Always run `./gradlew spotlessApply`** after making code changes to ensure proper formatting
+4. Run markdown lint to ensure it still passes: `npx [email protected] -c .github/config/markdownlint.yml **/*.md`

.github/renovate.json5

@@ -202,5 +202,15 @@
       depNameTemplate: 'java',
       extractVersionTemplate: '^(?<version>\\d+)',
     },
+    {
+      customType: 'regex',
+      datasourceTemplate: 'github-releases',
+      managerFilePatterns: [
+        '**/build.gradle.kts',
+      ],
+      matchStrings: [
+        '"https://github.com/(?<depName>[^/]+/[^/]+)/zipball/(?<currentValue>.+?)"',
+      ],
+    },
   ],
 }

.github/scripts/lychee-config.toml

@@ -6,11 +6,7 @@ max_concurrency = 4
 # Check link anchors
 include_fragments = true
 
-# excluding links to pull requests and issues is done for performance
-# sonatype snapshots are currrently unbrowseable
 exclude = [
+  # excluding links to pull requests and issues is done for performance
   "^https://github.com/open-telemetry/opentelemetry-java-contrib/(issues|pull)/\\d+$",
-  '^https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/io/opentelemetry/contrib/$',
 ]
-
-

.github/workflows/build-common.yml

@@ -18,6 +18,25 @@ permissions:
   contents: read
 
 jobs:
+  spotless:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+
+      - name: Set up JDK for running Gradle
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+        with:
+          cache-read-only: ${{ inputs.cache-read-only }}
+
+      - name: Spotless
+        run: ./gradlew spotlessCheck ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
+
   build:
     runs-on: ubuntu-latest
     steps:
@@ -29,13 +48,13 @@ jobs:
           distribution: temurin
           java-version: 17
 
-      - name: Set up gradle
+      - name: Set up Gradle
         uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
         with:
           cache-read-only: ${{ inputs.cache-read-only }}
 
-      - name: Gradle build and test
-        run: ./gradlew build -x test ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
+      - name: Build
+        run: ./gradlew build -x spotlessCheck -x test ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
 
   test:
     name: Test
@@ -44,8 +63,6 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-latest
-          - macos-13
           - ubuntu-latest
           - windows-latest
         test-java-version:
@@ -54,18 +71,6 @@ jobs:
           - 17
           - 21
           - 24 # renovate: datasource=java-version
-        # macos-latest drops support for java 8 temurin. Run java 8 on macos-13. Run java 11, 17, 21 on macos-latest.
-        exclude:
-          - os: macos-latest
-            test-java-version: 8
-          - os: macos-13
-            test-java-version: 11
-          - os: macos-13
-            test-java-version: 17
-          - os: macos-13
-            test-java-version: 21
-          - os: macos-13
-            test-java-version: 24 # renovate: datasource=java-version
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
@@ -83,12 +88,12 @@ jobs:
           distribution: temurin
           java-version: 17
 
-      - name: Set up gradle
+      - name: Set up Gradle
         uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
         with:
           cache-read-only: ${{ inputs.cache-read-only }}
 
-      - name: Gradle test
+      - name: Test
         run: >
           ./gradlew test
           "-PtestJavaVersion=${{ matrix.test-java-version }}"
@@ -97,6 +102,10 @@ jobs:
           "-PmaxTestRetries=${{ inputs.max-test-retries }}"
           ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
 
+      - name: Build scan
+        if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}
+        run: cat build-scan.txt
+
   integration-test:
     runs-on: ubuntu-latest
     steps:
@@ -108,14 +117,18 @@ jobs:
           distribution: temurin
           java-version: 17
 
-      - name: Set up gradle
+      - name: Set up Gradle
         uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
         with:
           cache-read-only: ${{ inputs.cache-read-only }}
 
       - name: Integration test
         run: ./gradlew integrationTest "-PmaxTestRetries=${{ inputs.max-test-retries }}" ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
 
+      - name: Build scan
+        if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}
+        run: cat build-scan.txt
+
       - name: Save integration test results
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: always()

.github/workflows/build.yml

@@ -21,6 +21,8 @@ jobs:
     needs:
       - common
     runs-on: ubuntu-latest
+    # skipping release branches because the versions in those branches are not snapshots
+    if: github.ref_name == 'main' && github.repository == 'open-telemetry/opentelemetry-java-contrib'
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 

.github/workflows/codeql.yml

@@ -1,10 +1,6 @@
 name: CodeQL
 
 on:
-  push:
-    branches:
-      - main
-      - release/*
   pull_request:
     branches:
       - main
@@ -15,6 +11,10 @@ on:
   # - https://github.com/github/codeql-action/issues/1537
   # - https://github.com/github/codeql-action/issues/2691
   # merge_group:
+  push:
+    branches:
+      - main
+      - release/*
   schedule:
     - cron: "29 13 * * 2"  # weekly at 13:29 UTC on Tuesday
 

.github/workflows/copilot-setup-steps.yml

@@ -0,0 +1,34 @@
+# Custom setup steps for GitHub Copilot coding agent to speed up Copilot's work on coding tasks
+name: "Copilot Setup Steps"
+
+on:
+  pull_request:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+  push:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  copilot-setup-steps: # Job name required by GitHub Copilot coding agent
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+
+      - name: Set up JDK for running Gradle
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Set up gradle
+        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+
+      - name: Build project and download dependencies
+        run: ./gradlew build -x test

.github/workflows/release.yml

@@ -11,59 +11,15 @@ permissions:
   contents: read
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-
-      - name: Set up JDK for running Gradle
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
-        with:
-          distribution: temurin
-          java-version: 17
-
-      - name: Set up gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
-      - name: Gradle build
-        run: ./gradlew build
-
-      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        name: Save unit test results
-        if: always()
-        with:
-          name: test-results
-          path: jmx-metrics/build/reports/tests/test
-
-  integration-test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-
-      - name: Set up JDK for running Gradle
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
-        with:
-          distribution: temurin
-          java-version: 17
-
-      - name: Set up gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
-      - name: Integration test
-        run: ./gradlew integrationTest
-
-      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        name: Save integration test results
-        if: always()
-        with:
-          name: integration-test-results
-          path: jmx-metrics/build/reports/tests/integrationTest
+  common:
+    uses: ./.github/workflows/build-common.yml
 
   release:
     permissions:
       contents: write # for creating the release
     runs-on: ubuntu-latest
     needs:
-      - build
-      - integration-test
+      - common
     outputs:
       version: ${{ steps.create-github-release.outputs.version }}
     steps:

.github/workflows/reusable-link-check.yml

@@ -26,20 +26,34 @@ jobs:
         run: |
           merge_base=$(git merge-base origin/${{ github.base_ref }} HEAD)
           # Using lychee's default extension filter here to match when it runs against all files
-          modified_files=$(git diff --name-only $merge_base...${{ github.event.pull_request.head.sha }} \
+          # Note: --diff-filter=d filters out deleted files
+          modified_files=$(git diff --name-only --diff-filter=d $merge_base...${{ github.event.pull_request.head.sha }} \
                             | grep -E '\.(md|mkd|mdx|mdown|mdwn|mkdn|mkdown|markdown|html|htm|txt)$' \
                             | tr '\n' ' ' || true)
           echo "files=$modified_files" >> $GITHUB_OUTPUT
           echo "Modified files: $modified_files"
 
+      - name: Check if lychee config was modified
+        if: github.event_name == 'pull_request'
+        id: config-check
+        run: |
+          merge_base=$(git merge-base origin/${{ github.base_ref }} HEAD)
+          config_modified=$(git diff --name-only $merge_base...${{ github.event.pull_request.head.sha }} \
+                            | grep -E '\.github/scripts/(lychee-config\.toml|link-check\.sh|dependencies\.Dockerfile)$' || true)
+          if [ -n "$config_modified" ]; then
+            echo "modified=true" >> $GITHUB_OUTPUT
+          else
+            echo "modified=false" >> $GITHUB_OUTPUT
+          fi
+
       - name: Link check - all links (modified files only)
         if: github.event_name == 'pull_request' && steps.modified-files.outputs.files != ''
         env:
           GITHUB_TOKEN: ${{ github.token }}
         run: ./.github/scripts/link-check.sh ${{ steps.modified-files.outputs.files }}
 
       - name: Link check - all links (all files)
-        if: github.event_name != 'pull_request'
+        if: github.event_name != 'pull_request' || steps.config-check.outputs.modified == 'true'
         env:
           GITHUB_TOKEN: ${{ github.token }}
         run: ./.github/scripts/link-check.sh