From fdf23bf098ba0f936e2db7daf769e0b698113ecc Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sun, 8 Dec 2024 17:28:15 -0800 Subject: [PATCH] Make package protected --- .../spring/webmvc/v5_3/SpringWebMvcTelemetryBuilder.java | 7 +------ .../spring/webmvc/v6_0/SpringWebMvcTelemetryBuilder.java | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcTelemetryBuilder.java b/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcTelemetryBuilder.java index 0c31ace56234..a24abdad8105 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcTelemetryBuilder.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcTelemetryBuilder.java @@ -27,7 +27,7 @@ public final class SpringWebMvcTelemetryBuilder { builder; static { - SpringMvcBuilderUtil.setBuilderExtractor(SpringWebMvcTelemetryBuilder::getBuilder); + SpringMvcBuilderUtil.setBuilderExtractor(builder -> builder.builder); } SpringWebMvcTelemetryBuilder(OpenTelemetry openTelemetry) { @@ -122,9 +122,4 @@ public SpringWebMvcTelemetryBuilder setEmitExperimentalHttpServerMetrics( public SpringWebMvcTelemetry build() { return new SpringWebMvcTelemetry(builder.build()); } - - public DefaultHttpServerInstrumenterBuilder - getBuilder() { - return builder; - } } diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcTelemetryBuilder.java b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcTelemetryBuilder.java index 1c34c847a3b2..7f768b057cbb 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcTelemetryBuilder.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcTelemetryBuilder.java @@ -26,7 +26,7 @@ public final class SpringWebMvcTelemetryBuilder { builder; static { - SpringMvcBuilderUtil.setBuilderExtractor(SpringWebMvcTelemetryBuilder::getBuilder); + SpringMvcBuilderUtil.setBuilderExtractor(builder -> builder.builder); } SpringWebMvcTelemetryBuilder(OpenTelemetry openTelemetry) { @@ -121,9 +121,4 @@ public SpringWebMvcTelemetryBuilder setEmitExperimentalHttpServerMetrics( public SpringWebMvcTelemetry build() { return new SpringWebMvcTelemetry(builder.build()); } - - public DefaultHttpServerInstrumenterBuilder - getBuilder() { - return builder; - } }