diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b631f7418..2ae9e0d14 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -27,11 +27,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up JDK 17 for running Gradle
+      - name: Set up JDK for running Gradle
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
@@ -50,11 +50,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up JDK 17 for running Gradle
+      - name: Set up JDK for running Gradle
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
@@ -76,11 +76,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up JDK 17 for running Gradle
+      - name: Set up JDK for running Gradle
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
@@ -100,11 +100,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up JDK 17 for running Gradle
+      - name: Set up JDK for running Gradle
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
@@ -148,11 +148,11 @@ jobs:
             Start-Service -Name "docker"
           }
 
-      - name: Set up JDK 17 for running Gradle
+      - name: Set up JDK for running Gradle
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index e466062f8..a300ab52f 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -21,11 +21,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up JDK 17 for running Gradle
+      - name: Set up JDK for running Gradle
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
@@ -44,11 +44,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up JDK 17 for running Gradle
+      - name: Set up JDK for running Gradle
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
@@ -70,11 +70,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up JDK 17 for running Gradle
+      - name: Set up JDK for running Gradle
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
@@ -94,11 +94,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up JDK 17 for running Gradle
+      - name: Set up JDK for running Gradle
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
@@ -142,11 +142,11 @@ jobs:
             Start-Service -Name "docker"
           }
 
-      - name: Set up JDK 17 for running Gradle
+      - name: Set up JDK for running Gradle
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index f45b8cd85..6cca510e1 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -29,11 +29,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up JDK 17 for running Gradle
+      - name: Set up JDK for running Gradle
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
@@ -61,11 +61,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up JDK 17 for running Gradle
+      - name: Set up JDK for running Gradle
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
@@ -89,11 +89,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up JDK 17 for running Gradle
+      - name: Set up JDK for running Gradle
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
@@ -115,11 +115,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up JDK 17 for running Gradle
+      - name: Set up JDK for running Gradle
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
@@ -166,11 +166,11 @@ jobs:
             Start-Service -Name "docker"
           }
 
-      - name: Set up JDK 17 for running Gradle
+      - name: Set up JDK for running Gradle
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
@@ -222,11 +222,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up JDK 17 for running Gradle
+      - name: Set up JDK for running Gradle
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
@@ -276,11 +276,11 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
-      - name: Set up JDK 17 for running Gradle
+      - name: Set up JDK for running Gradle
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
@@ -330,11 +330,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up JDK 17 for running Gradle
+      - name: Set up JDK for running Gradle
         uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
diff --git a/profiler/src/main/java/com/splunk/opentelemetry/profiler/context/SpanContextualizer.java b/profiler/src/main/java/com/splunk/opentelemetry/profiler/context/SpanContextualizer.java
index 70e4aa772..71d18b358 100644
--- a/profiler/src/main/java/com/splunk/opentelemetry/profiler/context/SpanContextualizer.java
+++ b/profiler/src/main/java/com/splunk/opentelemetry/profiler/context/SpanContextualizer.java
@@ -52,7 +52,7 @@ public SpanContextualizer(EventReader eventReader) {
    * ContextAttached events.
    */
   public void updateContext(IItem event) {
-    // jdk 17 doesn't report thread for events that happened on a thread that has terminated by now
+    // JFR doesn't report thread for events that happened on a thread that has terminated by now
     IMCThread eventThread = eventReader.getThread(event);
     if (eventThread == null) {
       return;