Merge branch 'main' of github.com:robsunday/splunk-otel-java into fbc-snapshot-span-processor

Author: robsunday

.github/workflows/ci.yaml

@@ -15,7 +15,7 @@ jobs:
   check-links:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
 
       - name: Check all links in *.md files
         id: lychee
@@ -30,7 +30,7 @@ jobs:
   build:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
 
       - name: Set up JDK 17 for running Gradle
         uses: actions/setup-java@v5.0.0
@@ -57,7 +57,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5.0.1
+        uses: actions/checkout@v6.0.0
 
       - name: Set up JDK 17 for running Gradle
         uses: actions/setup-java@v5.0.0
@@ -82,7 +82,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5.0.1
+        uses: actions/checkout@v6.0.0
 
       - name: Set up JDK 17 for running Gradle
         uses: actions/setup-java@v5.0.0
@@ -120,7 +120,7 @@ jobs:
             suite: profiler
       fail-fast: false
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
 
       - name: Free disk space
         run: .github/scripts/gha-free-disk-space.sh
@@ -159,7 +159,7 @@ jobs:
   shellcheck:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
 
       - name: Install shell check
         run: wget -qO- "https://github.com/koalaman/shellcheck/releases/download/v0.8.0/shellcheck-v0.8.0.linux.x86_64.tar.xz" | tar -xJv

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

@@ -12,6 +12,6 @@ jobs:
   validation:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
 
       - uses: gradle/actions/wrapper-validation@v5.0.0

.github/workflows/nightly.yaml

@@ -9,7 +9,7 @@ jobs:
   check-links:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
 
       - name: Check all links in *.md files
         id: lychee
@@ -24,7 +24,7 @@ jobs:
   build:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
 
       - name: Set up JDK 17 for running Gradle
         uses: actions/setup-java@v5.0.0
@@ -51,7 +51,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5.0.1
+        uses: actions/checkout@v6.0.0
 
       - name: Set up JDK 17 for running Gradle
         uses: actions/setup-java@v5.0.0
@@ -76,7 +76,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5.0.1
+        uses: actions/checkout@v6.0.0
 
       - name: Set up JDK 17 for running Gradle
         uses: actions/setup-java@v5.0.0
@@ -114,7 +114,7 @@ jobs:
             suite: profiler
       fail-fast: false
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
 
       - name: Free disk space
         run: .github/scripts/gha-free-disk-space.sh
@@ -162,7 +162,7 @@ jobs:
       # You can get conclusion by env (env.WORKFLOW_CONCLUSION)
       - uses: technote-space/workflow-conclusion-action@v3.0.3
 
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
 
       - name: Create issue
         if: env.WORKFLOW_CONCLUSION == 'failure' # notify only if failure
@@ -185,7 +185,7 @@ jobs:
   shellcheck:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
 
       - name: Install shell check
         run: wget -qO- "https://github.com/koalaman/shellcheck/releases/download/v0.8.0/shellcheck-v0.8.0.linux.x86_64.tar.xz" | tar -xJv

.github/workflows/pr.yaml

@@ -11,7 +11,7 @@ jobs:
   check-links:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
 
       - name: Check all links in *.md files
         id: lychee
@@ -25,7 +25,7 @@ jobs:
   build:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
 
       - name: Set up JDK 17 for running Gradle
         uses: actions/setup-java@v5.0.0
@@ -52,7 +52,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5.0.1
+        uses: actions/checkout@v6.0.0
 
       - name: Set up JDK 17 for running Gradle
         uses: actions/setup-java@v5.0.0
@@ -77,7 +77,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5.0.1
+        uses: actions/checkout@v6.0.0
 
       - name: Set up JDK 17 for running Gradle
         uses: actions/setup-java@v5.0.0
@@ -116,7 +116,7 @@ jobs:
             suite: profiler
       fail-fast: false
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
 
       - name: Free disk space
         run: .github/scripts/gha-free-disk-space.sh
@@ -157,7 +157,7 @@ jobs:
   shellcheck:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
 
       - name: Install shell check
         run: wget -qO- "https://github.com/koalaman/shellcheck/releases/download/v0.8.0/shellcheck-v0.8.0.linux.x86_64.tar.xz" | tar -xJv
@@ -168,7 +168,7 @@ jobs:
   license-check:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
 
       - name: Set up JDK 17 for running Gradle
         uses: actions/setup-java@v5.0.0
@@ -205,7 +205,7 @@ jobs:
   generate-metadata:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
 
       - name: Set up JDK 17 for running Gradle
         uses: actions/setup-java@v5.0.0

.github/workflows/publish-docker-image-ghcr.yml

@@ -12,7 +12,7 @@ jobs:
       packages: write
       contents: read
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
         with:
           fetch-depth: 0
 

.github/workflows/publish-profiling-petclinic-base.yml

@@ -12,7 +12,7 @@ jobs:
       contents: read
     steps:
       - name: check out the repo
-        uses: actions/checkout@v5.0.1
+        uses: actions/checkout@v6.0.0
       - uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3.6.0
@@ -44,7 +44,7 @@ jobs:
       - name: Support longpaths
         run: git config --system core.longpaths true
       - name: check out the repo
-        uses: actions/checkout@v5.0.1
+        uses: actions/checkout@v6.0.0
       - name: Login to GitHub Container Registry
         uses: azure/docker-login@v2
         with:

custom/src/main/java/com/splunk/opentelemetry/appd/AppdBonusPropagatorComponentProvider.java

@@ -21,9 +21,8 @@
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 
-@SuppressWarnings("rawtypes")
 @AutoService(ComponentProvider.class)
-public class AppdBonusPropagatorComponentProvider implements ComponentProvider<TextMapPropagator> {
+public class AppdBonusPropagatorComponentProvider implements ComponentProvider {
   @Override
   public Class<TextMapPropagator> getType() {
     return TextMapPropagator.class;

custom/src/main/java/com/splunk/opentelemetry/appd/AppdBonusSpanProcessorComponentProvider.java

@@ -22,9 +22,8 @@
 import io.opentelemetry.sdk.extension.incubator.trace.OnStartSpanProcessor;
 import io.opentelemetry.sdk.trace.SpanProcessor;
 
-@SuppressWarnings("rawtypes")
 @AutoService(ComponentProvider.class)
-public class AppdBonusSpanProcessorComponentProvider implements ComponentProvider<SpanProcessor> {
+public class AppdBonusSpanProcessorComponentProvider implements ComponentProvider {
   static final String NAME = "appd-bonus";
 
   @Override

custom/src/main/java/com/splunk/opentelemetry/opamp/OpampActivator.java

@@ -22,8 +22,8 @@
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.AgentListener;
-import io.opentelemetry.opamp.client.internal.OpampClient;
-import io.opentelemetry.opamp.client.internal.OpampClientBuilder;
+import io.opentelemetry.opamp.client.OpampClient;
+import io.opentelemetry.opamp.client.OpampClientBuilder;
 import io.opentelemetry.opamp.client.internal.connectivity.http.OkHttpSender;
 import io.opentelemetry.opamp.client.internal.request.service.HttpRequestService;
 import io.opentelemetry.opamp.client.internal.response.MessageData;
@@ -58,20 +58,21 @@ public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetr
         serviceName,
         new OpampClient.Callbacks() {
           @Override
-          public void onConnect() {}
+          public void onConnect(OpampClient opampClient) {}
 
           @Override
-          public void onConnectFailed(@Nullable Throwable throwable) {
+          public void onConnectFailed(OpampClient opampClient, @Nullable Throwable throwable) {
             logger.log(WARNING, "Connection to OpAMP server failed", throwable);
           }
 
           @Override
-          public void onErrorResponse(ServerErrorResponse errorResponse) {
-            logger.log(WARNING, "OpAMP server returned error " + errorResponse);
+          public void onErrorResponse(
+              OpampClient opampClient, ServerErrorResponse serverErrorResponse) {
+            logger.log(WARNING, "OpAMP server returned error " + serverErrorResponse);
           }
 
           @Override
-          public void onMessage(MessageData messageData) {}
+          public void onMessage(OpampClient opampClient, MessageData messageData) {}
         });
   }
 

custom/src/main/java/com/splunk/opentelemetry/resource/SplunkDistroVersionResourceDetector.java

@@ -23,9 +23,8 @@
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 import io.opentelemetry.sdk.resources.Resource;
 
-@SuppressWarnings("rawtypes")
 @AutoService(ComponentProvider.class)
-public class SplunkDistroVersionResourceDetector implements ComponentProvider<Resource> {
+public class SplunkDistroVersionResourceDetector implements ComponentProvider {
   private static final Resource DISTRO_VERSION_RESOURCE = createResource();
 
   @Override