Merge branch 'main' into dependabot/npm_and_yarn/nodejs/opentelemetry-deps-nodejs-ab25c0e567

Author: serkan-ozal

java/README.md

@@ -41,7 +41,7 @@ For more information about the idea behind this optimization, you can check the
 
 ### Wrapper
 
-[OpenTelemetry Lambda Instrumentation](https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/main/instrumentation/aws-lambda-1.0/library)
+[OpenTelemetry Lambda Instrumentation](https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/main/instrumentation/aws-lambda)
 and [OpenTelemetry SDK](https://github.com/open-telemetry/opentelemetry-java) are bundled into the
 `java/lib` directory to be available on the classpath of the Lambda function. No code change is
 needed to instrument the execution of your function, but you will need to set the `AWS_LAMBDA_EXEC_WRAPPER`

java/dependencyManagement/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 data class DependencySet(val group: String, val version: String, val modules: List<String>)
 
 val DEPENDENCY_BOMS = listOf(
-    "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha",
+    "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.14.0-alpha",
     "org.apache.logging.log4j:log4j-bom:2.24.3",
     "software.amazon.awssdk:bom:2.31.16"
 )
@@ -18,9 +18,9 @@ val DEPENDENCIES = listOf(
     "com.amazonaws:aws-lambda-java-core:1.2.3",
     "com.amazonaws:aws-lambda-java-events:3.15.0",
     "com.squareup.okhttp3:okhttp:4.12.0",
-    "io.opentelemetry.javaagent:opentelemetry-javaagent:2.12.0",
+    "io.opentelemetry.javaagent:opentelemetry-javaagent:2.14.0",
     "io.opentelemetry:opentelemetry-sdk-extension-aws:1.19.0",
-    "io.opentelemetry.contrib:opentelemetry-aws-resources:1.43.0-alpha",
+    "io.opentelemetry.contrib:opentelemetry-aws-resources:1.45.0-alpha",
 )
 
 javaPlatform {

java/sample-apps/okhttp/src/main/java/io/opentelemetry/lambda/sampleapps/okhttp/OkHttpRequestHandler.java

@@ -8,6 +8,7 @@
 import io.opentelemetry.instrumentation.okhttp.v3_0.OkHttpTelemetry;
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import okhttp3.Call;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -24,15 +25,14 @@ public APIGatewayProxyResponseEvent handleRequest(
       APIGatewayProxyRequestEvent input, Context context) {
     logger.info("Serving lambda request.");
 
-    OkHttpClient client =
-        new OkHttpClient.Builder()
-            .addInterceptor(OkHttpTelemetry.create(GlobalOpenTelemetry.get()).newInterceptor())
-            .build();
+    OkHttpClient baseClient = new OkHttpClient();
+    Call.Factory callFactory =
+        OkHttpTelemetry.create(GlobalOpenTelemetry.get()).newCallFactory(baseClient);
 
     APIGatewayProxyResponseEvent response = new APIGatewayProxyResponseEvent();
 
     Request request = new Request.Builder().url("https://aws.amazon.com/").build();
-    try (Response okhttpResponse = client.newCall(request).execute()) {
+    try (Response okhttpResponse = callFactory.newCall(request).execute()) {
       response.setBody(
           "Hello lambda - fetched " + okhttpResponse.body().string().length() + " bytes.");
     } catch (IOException e) {