From 3e1a3f75bde9820a20b2bbd73060b1008264c9a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 14:07:22 +0000 Subject: [PATCH 1/2] build(deps): bump the opentelemetry-deps-java group across 1 directory with 3 updates Bumps the opentelemetry-deps-java group with 3 updates in the /java directory: [io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha](https://github.com/open-telemetry/opentelemetry-java-instrumentation), [io.opentelemetry.javaagent:opentelemetry-javaagent](https://github.com/open-telemetry/opentelemetry-java-instrumentation) and [io.opentelemetry.contrib:opentelemetry-aws-resources](https://github.com/open-telemetry/opentelemetry-java-contrib). Updates `io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha` from 2.12.0-alpha to 2.14.0-alpha - [Release notes](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java-instrumentation/commits) Updates `io.opentelemetry.javaagent:opentelemetry-javaagent` from 2.12.0 to 2.14.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java-instrumentation/compare/v2.12.0...v2.14.0) Updates `io.opentelemetry.contrib:opentelemetry-aws-resources` from 1.43.0-alpha to 1.45.0-alpha - [Release notes](https://github.com/open-telemetry/opentelemetry-java-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java-contrib/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java-contrib/commits) --- updated-dependencies: - dependency-name: io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-deps-java - dependency-name: io.opentelemetry.javaagent:opentelemetry-javaagent dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-deps-java - dependency-name: io.opentelemetry.contrib:opentelemetry-aws-resources dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-deps-java ... Signed-off-by: dependabot[bot] --- java/dependencyManagement/build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/dependencyManagement/build.gradle.kts b/java/dependencyManagement/build.gradle.kts index 2a7c85a16b..7845aae13b 100644 --- a/java/dependencyManagement/build.gradle.kts +++ b/java/dependencyManagement/build.gradle.kts @@ -9,7 +9,7 @@ plugins { data class DependencySet(val group: String, val version: String, val modules: List) 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.30.36" ) @@ -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 { From 912a553df59f94bce75044f44502e833053ccd46 Mon Sep 17 00:00:00 2001 From: Tyler Benson <734411+tylerbenson@users.noreply.github.com> Date: Wed, 9 Apr 2025 16:12:13 -0400 Subject: [PATCH 2/2] fix build --- .../lambda/sampleapps/okhttp/OkHttpRequestHandler.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/java/sample-apps/okhttp/src/main/java/io/opentelemetry/lambda/sampleapps/okhttp/OkHttpRequestHandler.java b/java/sample-apps/okhttp/src/main/java/io/opentelemetry/lambda/sampleapps/okhttp/OkHttpRequestHandler.java index 965ab522e8..6c9a82baf1 100644 --- a/java/sample-apps/okhttp/src/main/java/io/opentelemetry/lambda/sampleapps/okhttp/OkHttpRequestHandler.java +++ b/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) {