upgrade upstream (#586)

* upgrade upstream * upgrade upstream
grafana · Jul 4, 2024 · 1783a5d · 1783a5d
1 parent 5bb4827
commit 1783a5d
Show file tree

Hide file tree

Showing 25 changed files with 32 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
-## 2.4.0-beta.1 (2024-05-27)
+## 2.5.0-beta.1 (2024-07-04)
+
+- Update to [OpenTelemetry 2.5.0](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/CHANGELOG.md#version-250-2024-06-17)
 
 - Update to [OpenTelemetry 2.4.0](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/CHANGELOG.md#version-240-2024-05-18)
 

diff --git a/Dockerfile b/Dockerfile
@@ -54,7 +54,7 @@ ENV OTEL_SERVICE_NAME=<Service Name>
 #     - Click on "Application"
 # Note: It might take up to five minutes for data to appear.
 
-ARG version=2.4.0-beta.1
+ARG version=2.5.0-beta.1
 WORKDIR /app/
 
 # use a fixed version

diff --git a/Dockerfile.production b/Dockerfile.production
@@ -36,7 +36,7 @@ ENV OTEL_RESOURCE_ATTRIBUTES=deployment.environment=<Environment>,service.namesp
 #     - Click on "Application"
 # Note: It might take up to five minutes for data to appear.
 
-ARG version=2.4.0-beta.1
+ARG version=2.5.0-beta.1
 WORKDIR /app/
 
 # use a fixed version

diff --git a/build.gradle b/build.gradle
@@ -1,9 +1,9 @@
 group 'com.grafana'
-version '2.4.0-beta.1'
+version '2.5.0-beta.1'
 
 buildscript {
   ext {
-    otelInstrumentationVersion = "2.4.0"
+    otelInstrumentationVersion = "2.5.0"
   }
   repositories {
     maven {
@@ -26,7 +26,7 @@ subprojects {
   ext {
     versions = [
       // this line is managed by .github/scripts/update-sdk-version.sh
-      opentelemetrySdk           : "1.38.0",
+      opentelemetrySdk           : "1.39.0",
 
       // these lines are managed by .github/scripts/update-version.sh
       opentelemetryJavaagent     : otelInstrumentationVersion,

diff --git a/custom/src/main/java/com/grafana/extensions/resources/internal/DistributionVersion.java b/custom/src/main/java/com/grafana/extensions/resources/internal/DistributionVersion.java
@@ -9,5 +9,5 @@
 
 public class DistributionVersion {
 
-  public static final String VERSION = "2.4.0-beta.1";
+  public static final String VERSION = "2.5.0-beta.1";
 }
diff --git a/examples/jdbc/spring-boot-non-reactive-3/build.gradle b/examples/jdbc/spring-boot-non-reactive-3/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.3.0'
+  id 'org.springframework.boot' version '3.3.1'
   id 'io.spring.dependency-management' version '1.1.5'
 }
 

diff --git a/examples/jdbc/spring-boot-reactive-3/build.gradle b/examples/jdbc/spring-boot-reactive-3/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.3.0'
+  id 'org.springframework.boot' version '3.3.1'
   id 'io.spring.dependency-management' version '1.1.5'
 }
 

diff --git a/examples/jetty/spring-boot-non-reactive-3/build.gradle b/examples/jetty/spring-boot-non-reactive-3/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.3.0'
+  id 'org.springframework.boot' version '3.3.1'
   id 'io.spring.dependency-management' version '1.1.5'
 }
 

diff --git a/examples/jetty/spring-boot-reactive-3/build.gradle b/examples/jetty/spring-boot-reactive-3/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.3.0'
+  id 'org.springframework.boot' version '3.3.1'
   id 'io.spring.dependency-management' version '1.1.5'
 }
 

diff --git a/examples/jms/spring-boot-non-reactive-3/build.gradle b/examples/jms/spring-boot-non-reactive-3/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.3.0'
+  id 'org.springframework.boot' version '3.3.1'
   id 'io.spring.dependency-management' version '1.1.5'
 }
 

diff --git a/examples/jms/spring-boot-reactive-3/build.gradle b/examples/jms/spring-boot-reactive-3/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.3.0'
+  id 'org.springframework.boot' version '3.3.1'
   id 'io.spring.dependency-management' version '1.1.5'
 }
 

diff --git a/examples/kafka/spring-boot-non-reactive-3/build.gradle b/examples/kafka/spring-boot-non-reactive-3/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.3.0'
+  id 'org.springframework.boot' version '3.3.1'
   id 'io.spring.dependency-management' version '1.1.5'
 }
 

diff --git a/examples/kafka/spring-boot-reactive-3/build.gradle b/examples/kafka/spring-boot-reactive-3/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.3.0'
+  id 'org.springframework.boot' version '3.3.1'
   id 'io.spring.dependency-management' version '1.1.5'
 }
 

diff --git a/examples/log4j/spring-boot-non-reactive-3/build.gradle b/examples/log4j/spring-boot-non-reactive-3/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.3.0'
+  id 'org.springframework.boot' version '3.3.1'
   id 'io.spring.dependency-management' version '1.1.5'
 }
 

diff --git a/examples/logback/spring-boot-non-reactive-3/build.gradle b/examples/logback/spring-boot-non-reactive-3/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.3.0'
+  id 'org.springframework.boot' version '3.3.1'
   id 'io.spring.dependency-management' version '1.1.5'
 }
 

diff --git a/examples/manual/spring-boot-non-reactive-2/build.gradle b/examples/manual/spring-boot-non-reactive-2/build.gradle
@@ -15,8 +15,8 @@ repositories {
 
 dependencies {
   implementation 'org.springframework.boot:spring-boot-starter-web'
-  implementation('io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.4.0')
-  implementation('io.opentelemetry:opentelemetry-api:1.38.0')
+  implementation('io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.5.0')
+  implementation('io.opentelemetry:opentelemetry-api:1.39.0')
 }
 
 bootRun {

diff --git a/examples/manual/spring-boot-non-reactive-3/build.gradle b/examples/manual/spring-boot-non-reactive-3/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.3.0'
+  id 'org.springframework.boot' version '3.3.1'
   id 'io.spring.dependency-management' version '1.1.5'
 }
 
@@ -17,8 +17,8 @@ repositories {
 
 dependencies {
   implementation 'org.springframework.boot:spring-boot-starter-web'
-  implementation('io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.4.0')
-  implementation('io.opentelemetry:opentelemetry-api:1.38.0')
+  implementation('io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.5.0')
+  implementation('io.opentelemetry:opentelemetry-api:1.39.0')
 }
 
 bootRun {

diff --git a/examples/mongodb/spring-boot-non-reactive-3/build.gradle b/examples/mongodb/spring-boot-non-reactive-3/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.3.0'
+  id 'org.springframework.boot' version '3.3.1'
   id 'io.spring.dependency-management' version '1.1.5'
 }
 

diff --git a/examples/mongodb/spring-boot-reactive-3/build.gradle b/examples/mongodb/spring-boot-reactive-3/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.3.0'
+  id 'org.springframework.boot' version '3.3.1'
   id 'io.spring.dependency-management' version '1.1.5'
 }
 

diff --git a/examples/redis/spring-boot-non-reactive-3/build.gradle b/examples/redis/spring-boot-non-reactive-3/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.3.0'
+  id 'org.springframework.boot' version '3.3.1'
   id 'io.spring.dependency-management' version '1.1.5'
 }
 

diff --git a/examples/redis/spring-boot-reactive-3/build.gradle b/examples/redis/spring-boot-reactive-3/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.3.0'
+  id 'org.springframework.boot' version '3.3.1'
   id 'io.spring.dependency-management' version '1.1.5'
 }
 

diff --git a/examples/run-example.sh b/examples/run-example.sh
@@ -33,7 +33,7 @@ done
 
 "$scriptDir"/start-grafana-agent.sh
 
-agentVersion=2.4.0-beta.1
+agentVersion=2.5.0-beta.1
 agent="grafana-opentelemetry-java-$agentVersion.jar"
 agentPath="$scriptDir/$agent"
 

diff --git a/examples/undertow/spring-boot-non-reactive-3/build.gradle b/examples/undertow/spring-boot-non-reactive-3/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.3.0'
+  id 'org.springframework.boot' version '3.3.1'
   id 'io.spring.dependency-management' version '1.1.5'
 }
 

diff --git a/examples/undertow/spring-boot-reactive-3/build.gradle b/examples/undertow/spring-boot-reactive-3/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.3.0'
+  id 'org.springframework.boot' version '3.3.1'
   id 'io.spring.dependency-management' version '1.1.5'
 }
 

diff --git a/smoke-tests/build.gradle b/smoke-tests/build.gradle
@@ -6,7 +6,7 @@ dependencies {
   testImplementation(project(":custom"))
   testImplementation("org.testcontainers:testcontainers:1.19.8")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.17.1")
-  testImplementation("com.google.protobuf:protobuf-java-util:4.27.2")
+  testImplementation("com.google.protobuf:protobuf-java-util:3.25.3")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.3.1-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api")