Merge branch 'newrelic:main' into main

newrelic · Oct 5, 2023 · 3a153b0 · 3a153b0
2 parents 70d96c4 + d0bd4a2
commit 3a153b0
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -8,9 +8,9 @@ jobs:
   build-java:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3.12.0
+        uses: actions/setup-java@v3.13.0
         with:
           distribution: temurin
           java-version: 17

diff --git a/.github/workflows/repolinter.yml b/.github/workflows/repolinter.yml
@@ -22,7 +22,7 @@ jobs:
             return data.data && data.data.default_branch === context.ref.split('/').slice(-1)[0]
       - name: Checkout Self
         if: ${{ steps.default-branch.outputs.result == 'true' }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run Repolinter
         if: ${{ steps.default-branch.outputs.result == 'true' }}
         uses: newrelic/repolinter-action@v1

diff --git a/getting-started-guides/java/instrumented/build.gradle b/getting-started-guides/java/instrumented/build.gradle
@@ -19,15 +19,15 @@ dependencies {
   implementation 'org.springframework.boot:spring-boot-starter-log4j2'
 
   // OpenTelemetry core
-  implementation platform('io.opentelemetry:opentelemetry-bom:1.29.0')
-  implementation platform('io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha')
+  implementation platform('io.opentelemetry:opentelemetry-bom:1.30.1')
+  implementation platform('io.opentelemetry:opentelemetry-bom-alpha:1.30.1-alpha')
   implementation 'io.opentelemetry:opentelemetry-api'
   implementation 'io.opentelemetry:opentelemetry-sdk'
   implementation 'io.opentelemetry:opentelemetry-exporter-otlp'
   implementation 'io.opentelemetry:opentelemetry-sdk-extension-autoconfigure'
 
   // OpenTelemetry instrumentation
-  implementation platform('io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha')
+  implementation platform('io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha')
   implementation 'io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8'
   implementation 'io.opentelemetry.instrumentation:opentelemetry-log4j-appender-2.17'
   implementation 'io.opentelemetry.instrumentation:opentelemetry-spring-webmvc-6.0'

diff --git a/getting-started-guides/java/settings.gradle b/getting-started-guides/java/settings.gradle
@@ -1,7 +1,7 @@
 pluginManagement {
   plugins {
-    id 'com.diffplug.spotless' version '6.21.0'
-    id 'org.springframework.boot' version '3.1.3'
+    id 'com.diffplug.spotless' version '6.22.0'
+    id 'org.springframework.boot' version '3.1.4'
     id 'de.undercouch.download' version '5.5.0'
   }
 }

diff --git a/other-examples/java/agent-nr-config/config-extension/build.gradle b/other-examples/java/agent-nr-config/config-extension/build.gradle
@@ -20,5 +20,5 @@ dependencies {
   compileOnly 'io.opentelemetry:opentelemetry-sdk-extension-autoconfigure'
   compileOnly 'io.opentelemetry:opentelemetry-semconv'
 
-  implementation "io.opentelemetry.contrib:opentelemetry-samplers:1.29.0-alpha"
+  implementation "io.opentelemetry.contrib:opentelemetry-samplers:1.30.0-alpha"
 }
diff --git a/other-examples/java/build.gradle b/other-examples/java/build.gradle
@@ -30,8 +30,8 @@ subprojects {
 
     dependencies {
       implementation platform("io.opentelemetry:opentelemetry-bom:1.29.0")
-      implementation platform("io.opentelemetry:opentelemetry-bom-alpha:1.29.0-alpha")
-      implementation platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.29.0-alpha")
+      implementation platform("io.opentelemetry:opentelemetry-bom-alpha:1.30.1-alpha")
+      implementation platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha")
     }
   }
 }
diff --git a/other-examples/java/settings.gradle b/other-examples/java/settings.gradle
@@ -1,7 +1,7 @@
 pluginManagement {
   plugins {
-    id 'com.diffplug.spotless' version '6.21.0'
-    id 'org.springframework.boot' version '3.1.3'
+    id 'com.diffplug.spotless' version '6.22.0'
+    id 'org.springframework.boot' version '3.1.4'
     id 'de.undercouch.download' version '5.5.0'
     id 'com.github.johnrengelman.shadow' version '8.1.1'
   }