Skip to content

Commit 587a388

Browse files
Update Java To OTel 1.7 (#202)
Co-authored-by: Nathaniel Ruiz Nowell <[email protected]> Co-authored-by: Nathaniel Ruiz Nowell <[email protected]>
1 parent 8e77f5b commit 587a388

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

Diff for: java/awssdk-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/autoconfigure/AutoconfiguredTracingExecutionInterceptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class AutoconfiguredTracingExecutionInterceptor implements ExecutionInter
4343

4444
public AutoconfiguredTracingExecutionInterceptor() {
4545
delegate =
46-
AwsSdkTracing.newBuilder(GlobalOpenTelemetry.get())
46+
AwsSdkTracing.builder(GlobalOpenTelemetry.get())
4747
// TODO(anuraaga): Replace this by adding ability to configure default property values
4848
// via sdk-extension-autoconfigure.
4949
.setCaptureExperimentalSpanAttributes(

Diff for: java/dependencyManagement/build.gradle.kts

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ plugins {
99
data class DependencySet(val group: String, val version: String, val modules: List<String>)
1010

1111
val DEPENDENCY_BOMS = listOf(
12-
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.7.0-alpha",
13-
"io.grpc:grpc-bom:1.41.0",
14-
"org.apache.logging.log4j:log4j-bom:2.14.1",
15-
"software.amazon.awssdk:bom:2.17.63"
12+
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.10.0-alpha",
13+
"io.grpc:grpc-bom:1.42.1",
14+
"org.apache.logging.log4j:log4j-bom:2.17.1",
15+
"software.amazon.awssdk:bom:2.17.112"
1616
)
1717

1818
val DEPENDENCIES = listOf(
1919
"com.amazonaws:aws-lambda-java-core:1.2.1",
20-
"com.amazonaws:aws-lambda-java-events:3.10.0",
21-
"com.squareup.okhttp3:okhttp:4.9.2",
22-
"io.opentelemetry.javaagent:opentelemetry-javaagent:1.7.0"
20+
"com.amazonaws:aws-lambda-java-events:3.11.0",
21+
"com.squareup.okhttp3:okhttp:4.9.3",
22+
"io.opentelemetry.javaagent:opentelemetry-javaagent:1.10.0"
2323
)
2424

2525
javaPlatform {

Diff for: java/sample-apps/aws-sdk/build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ plugins {
55

66
dependencies {
77
implementation("io.opentelemetry:opentelemetry-api")
8-
implementation("io.opentelemetry:opentelemetry-api-metrics")
98
implementation("com.amazonaws:aws-lambda-java-core")
109
implementation("com.amazonaws:aws-lambda-java-events")
1110
implementation("org.apache.logging.log4j:log4j-core")

Diff for: java/sample-apps/aws-sdk/src/main/java/io/opentelemetry/lambda/sampleapps/awssdk/AwsSdkRequestHandler.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import com.amazonaws.services.lambda.runtime.RequestHandler;
55
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
66
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
7+
import io.opentelemetry.api.GlobalOpenTelemetry;
78
import io.opentelemetry.api.common.AttributeKey;
89
import io.opentelemetry.api.common.Attributes;
9-
import io.opentelemetry.api.metrics.GlobalMeterProvider;
1010
import io.opentelemetry.api.metrics.LongUpDownCounter;
1111
import io.opentelemetry.api.metrics.Meter;
1212
import org.apache.logging.log4j.LogManager;
@@ -18,7 +18,11 @@ public class AwsSdkRequestHandler
1818
implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
1919

2020
private static final Logger logger = LogManager.getLogger(AwsSdkRequestHandler.class);
21-
private static final Meter sampleMeter = GlobalMeterProvider.get().get("aws-otel", "1.0", null);
21+
private static final Meter sampleMeter =
22+
GlobalOpenTelemetry.getMeterProvider()
23+
.meterBuilder("aws-otel")
24+
.setInstrumentationVersion("1.0")
25+
.build();
2226
private static final LongUpDownCounter queueSizeCounter =
2327
sampleMeter
2428
.upDownCounterBuilder("queueSizeChange")

0 commit comments

Comments
 (0)