Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java-docs into update-snippets-1.44.0

Author: jack-berg

build.gradle.kts

@@ -14,13 +14,11 @@ subprojects {
 
     repositories {
         mavenCentral()
-        maven("https://oss.sonatype.org/content/repositories/snapshots")
     }
 
     dependencies {
         // using the bom ensures that all of your opentelemetry dependency versions are aligned
-        implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha"))
-        implementation(platform("io.opentelemetry:opentelemetry-bom-alpha:1.44.0-alpha-SNAPSHOT"))
+        implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.10.0-alpha"))
     }
 
     spotless {

doc-snippets/exporters/build.gradle.kts

@@ -9,7 +9,7 @@ val moduleName by extra { "io.opentelemetry.examples.docs.exporters" }
 
 dependencies {
     implementation(platform(SpringBootPlugin.BOM_COORDINATES))
-    implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0"))
+    implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.10.0"))
 
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("io.opentelemetry:opentelemetry-exporter-otlp")

doc-snippets/getting-started/build.gradle.kts

@@ -9,7 +9,7 @@ val moduleName by extra { "io.opentelemetry.examples.docs.getting-started" }
 
 dependencies {
     implementation(platform(SpringBootPlugin.BOM_COORDINATES))
-    implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0"))
+    implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.10.0"))
 
     implementation("org.springframework.boot:spring-boot-starter-web")
 }

doc-snippets/spring-starter/build.gradle.kts

@@ -9,7 +9,7 @@ val moduleName by extra { "io.opentelemetry.examples.docs.spring-starter" }
 
 dependencies {
     implementation(platform(SpringBootPlugin.BOM_COORDINATES))
-    implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0"))
+    implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.10.0"))
 
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-webflux")

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

javaagent/Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11-jre
+FROM eclipse-temurin:17-jre
 
 ADD build/libs/app.jar /app.jar
 ADD build/agent/opentelemetry-javaagent.jar /opentelemetry-javaagent.jar

javaagent/build.gradle.kts

@@ -9,6 +9,12 @@ plugins {
 description = "OpenTelemetry Example for Java Agent"
 val moduleName by extra { "io.opentelemetry.examples.javagent" }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
 val agent = configurations.create("agent")
 val extension = configurations.create("extension")
 
@@ -20,7 +26,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-actuator")
 
-    agent("io.opentelemetry.javaagent:opentelemetry-javaagent:2.9.0")
+    agent("io.opentelemetry.javaagent:opentelemetry-javaagent:2.10.0")
     extension("io.opentelemetry.contrib:opentelemetry-samplers:1.40.0-alpha") {
         isTransitive = false
     }

settings.gradle.kts

@@ -3,7 +3,7 @@ pluginManagement {
         id("com.diffplug.spotless") version "6.25.0"
         id("com.github.johnrengelman.shadow") version "8.1.1"
         id("com.google.protobuf") version "0.9.4"
-        id("com.gradle.develocity") version "3.18.1"
+        id("com.gradle.develocity") version "3.18.2"
         id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
         id("com.google.cloud.tools.jib") version "3.4.4"
     }

spring-native/build.gradle.kts

@@ -11,7 +11,7 @@ val moduleName by extra { "io.opentelemetry.examples.native" }
 
 dependencies {
     implementation(platform(SpringBootPlugin.BOM_COORDINATES))
-    implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0"))
+    implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.10.0"))
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-data-jdbc")

telemetry-testing/build.gradle.kts

@@ -23,7 +23,7 @@ val bootJar = tasks.named<BootJar>("bootJar") {
 dependencies {
     implementation(platform(SpringBootPlugin.BOM_COORDINATES))
     implementation("io.opentelemetry:opentelemetry-api")
-    implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.9.0")
+    implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.10.0")
     //spring modules
     implementation("org.springframework.boot:spring-boot-starter-web")
     testImplementation("org.springframework.boot:spring-boot-starter-test")
@@ -36,7 +36,7 @@ dependencies {
     testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.3.2-alpha")
     testImplementation("org.assertj:assertj-core:3.26.3")
 
-    agent("io.opentelemetry.javaagent:opentelemetry-javaagent:2.9.0")
+    agent("io.opentelemetry.javaagent:opentelemetry-javaagent:2.10.0")
 }
 
 tasks.test {