Skip to content

Commit 6d9535d

Browse files
zeitlingerzeitlinger
committed
fix rebase
1 parent 0dede97 commit 6d9535d

File tree

13 files changed

+88
-28
lines changed

13 files changed

+88
-28
lines changed

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.google.errorprone.annotations.CanIgnoreReturnValue;
99
import io.opentelemetry.api.OpenTelemetry;
1010
import io.opentelemetry.context.propagation.TextMapGetter;
11-
import io.opentelemetry.instrumentation.api.incubator.config.internal.CoreCommonConfig;
11+
import io.opentelemetry.instrumentation.api.incubator.config.internal.CommonConfig;
1212
import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpExperimentalAttributesExtractor;
1313
import io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpServerExperimentalMetrics;
1414
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
@@ -211,8 +211,7 @@ public OpenTelemetry getOpenTelemetry() {
211211
}
212212

213213
@CanIgnoreReturnValue
214-
public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> configure(
215-
CoreCommonConfig config) {
214+
public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> configure(CommonConfig config) {
216215
set(config::getKnownHttpRequestMethods, this::setKnownMethods);
217216
set(config::getServerRequestHeaders, this::setCapturedRequestHeaders);
218217
set(config::getServerResponseHeaders, this::setCapturedResponseHeaders);

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/webflux/WebClientBeanPostProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ static SpringWebfluxTelemetry getWebfluxTelemetry(
3636
return InstrumentationConfigUtil.configureClientAndServerBuilder(
3737
config,
3838
SpringWebfluxTelemetry.builder(openTelemetry),
39-
SpringWebfluxUtil.GET_CLIENT_BUILDER,
40-
SpringWebfluxUtil.GET_SERVER_BUILDER)
39+
SpringWebfluxUtil.getClientBuilderExtractor(),
40+
SpringWebfluxUtil.getServerBuilderExtractor())
4141
.build();
4242
}
4343

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/webmvc/SpringWebMvc5InstrumentationAutoConfiguration.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ public class SpringWebMvc5InstrumentationAutoConfiguration {
2727
@Bean
2828
Filter otelWebMvcFilter(OpenTelemetry openTelemetry, ConfigProperties config) {
2929
return InstrumentationConfigUtil.configureServerBuilder(
30-
config, SpringWebMvcTelemetry.builder(openTelemetry), SpringMvcUtil.GET_BUILDER)
30+
config,
31+
SpringWebMvcTelemetry.builder(openTelemetry),
32+
SpringMvcUtil.getBuilderExtractor())
3133
.build()
3234
.createServletFilter();
3335
}

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/webmvc/SpringWebMvc6InstrumentationAutoConfiguration.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ public class SpringWebMvc6InstrumentationAutoConfiguration {
2727
@Bean
2828
Filter otelWebMvcFilter(OpenTelemetry openTelemetry, ConfigProperties config) {
2929
return InstrumentationConfigUtil.configureServerBuilder(
30-
config, SpringWebMvcTelemetry.builder(openTelemetry), SpringMvcUtil.GET_BUILDER)
30+
config,
31+
SpringWebMvcTelemetry.builder(openTelemetry),
32+
SpringMvcUtil.getBuilderExtractor())
3133
.build()
3234
.createServletFilter();
3335
}

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/properties/InstrumentationConfigUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ T configureClientAndServerBuilder(
2828
getClientBuilder,
2929
Function<T, DefaultHttpServerInstrumenterBuilder<SERVERREQUEST, SERVERRESPONSE>>
3030
getServerBuilder) {
31-
CoreCommonConfig commonConfig = getConfig(config);
31+
CommonConfig commonConfig = getConfig(config);
3232
getClientBuilder.apply(builder).configure(commonConfig);
3333
getServerBuilder.apply(builder).configure(commonConfig);
3434
return builder;
@@ -52,8 +52,8 @@ public static <T, REQUEST, RESPONSE> T configureServerBuilder(
5252
return builder;
5353
}
5454

55-
private static CoreCommonConfig getConfig(ConfigProperties config) {
56-
return new CoreCommonConfig(new ConfigPropertiesBridge(config));
55+
private static CommonConfig getConfig(ConfigProperties config) {
56+
return new CommonConfig(new ConfigPropertiesBridge(config));
5757
}
5858

5959
public static boolean isStatementSanitizationEnabled(ConfigProperties config, String key) {

‎instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxTelemetryBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public final class SpringWebfluxTelemetryBuilder {
3131
serverBuilder;
3232

3333
static {
34-
SpringWebfluxUtil.GET_CLIENT_BUILDER = SpringWebfluxTelemetryBuilder::getClientBuilder;
35-
SpringWebfluxUtil.GET_SERVER_BUILDER = SpringWebfluxTelemetryBuilder::getServerBuilder;
34+
SpringWebfluxUtil.setClientBuilderExtractor(SpringWebfluxTelemetryBuilder::getClientBuilder);
35+
SpringWebfluxUtil.setServerBuilderExtractor(SpringWebfluxTelemetryBuilder::getServerBuilder);
3636
}
3737

3838
SpringWebfluxTelemetryBuilder(OpenTelemetry openTelemetry) {

‎instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/internal/SpringWebfluxUtil.java

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,43 @@
2020
public class SpringWebfluxUtil {
2121
private SpringWebfluxUtil() {}
2222

23-
@SuppressWarnings("ConstantField")
24-
public static Function<
23+
private static Function<
2524
SpringWebfluxTelemetryBuilder,
2625
DefaultHttpClientInstrumenterBuilder<ClientRequest, ClientResponse>>
27-
GET_CLIENT_BUILDER;
26+
clientBuilderExtractor;
27+
28+
private static Function<
29+
SpringWebfluxTelemetryBuilder,
30+
DefaultHttpServerInstrumenterBuilder<ServerWebExchange, ServerWebExchange>>
31+
serverBuilderExtractor;
2832

29-
@SuppressWarnings("ConstantField")
3033
public static Function<
3134
SpringWebfluxTelemetryBuilder,
3235
DefaultHttpServerInstrumenterBuilder<ServerWebExchange, ServerWebExchange>>
33-
GET_SERVER_BUILDER;
36+
getServerBuilderExtractor() {
37+
return serverBuilderExtractor;
38+
}
39+
40+
public static void setServerBuilderExtractor(
41+
Function<
42+
SpringWebfluxTelemetryBuilder,
43+
DefaultHttpServerInstrumenterBuilder<ServerWebExchange, ServerWebExchange>>
44+
serverBuilderExtractor) {
45+
SpringWebfluxUtil.serverBuilderExtractor = serverBuilderExtractor;
46+
}
47+
48+
public static Function<
49+
SpringWebfluxTelemetryBuilder,
50+
DefaultHttpClientInstrumenterBuilder<ClientRequest, ClientResponse>>
51+
getClientBuilderExtractor() {
52+
return clientBuilderExtractor;
53+
}
54+
55+
public static void setClientBuilderExtractor(
56+
Function<
57+
SpringWebfluxTelemetryBuilder,
58+
DefaultHttpClientInstrumenterBuilder<ClientRequest, ClientResponse>>
59+
clientBuilderExtractor) {
60+
SpringWebfluxUtil.clientBuilderExtractor = clientBuilderExtractor;
61+
}
3462
}

‎instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcTelemetryBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public final class SpringWebMvcTelemetryBuilder {
2727
builder;
2828

2929
static {
30-
SpringMvcUtil.GET_BUILDER = SpringWebMvcTelemetryBuilder::getBuilder;
30+
SpringMvcUtil.setBuilderExtractor(SpringWebMvcTelemetryBuilder::getBuilder);
3131
}
3232

3333
SpringWebMvcTelemetryBuilder(OpenTelemetry openTelemetry) {

‎instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/internal/SpringMvcUtil.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,23 @@
1818
public class SpringMvcUtil {
1919
private SpringMvcUtil() {}
2020

21-
@SuppressWarnings("ConstantField")
21+
private static Function<
22+
SpringWebMvcTelemetryBuilder,
23+
DefaultHttpServerInstrumenterBuilder<HttpServletRequest, HttpServletResponse>>
24+
builderExtractor;
25+
2226
public static Function<
2327
SpringWebMvcTelemetryBuilder,
2428
DefaultHttpServerInstrumenterBuilder<HttpServletRequest, HttpServletResponse>>
25-
GET_BUILDER;
29+
getBuilderExtractor() {
30+
return builderExtractor;
31+
}
32+
33+
public static void setBuilderExtractor(
34+
Function<
35+
SpringWebMvcTelemetryBuilder,
36+
DefaultHttpServerInstrumenterBuilder<HttpServletRequest, HttpServletResponse>>
37+
builderExtractor) {
38+
SpringMvcUtil.builderExtractor = builderExtractor;
39+
}
2640
}

‎instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcTelemetryBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public final class SpringWebMvcTelemetryBuilder {
2626
builder;
2727

2828
static {
29-
SpringMvcUtil.GET_BUILDER = SpringWebMvcTelemetryBuilder::getBuilder;
29+
SpringMvcUtil.setBuilderExtractor(SpringWebMvcTelemetryBuilder::getBuilder);
3030
}
3131

3232
SpringWebMvcTelemetryBuilder(OpenTelemetry openTelemetry) {

‎instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/internal/SpringMvcUtil.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,23 @@
1818
public class SpringMvcUtil {
1919
private SpringMvcUtil() {}
2020

21-
@SuppressWarnings("ConstantField")
21+
private static Function<
22+
SpringWebMvcTelemetryBuilder,
23+
DefaultHttpServerInstrumenterBuilder<HttpServletRequest, HttpServletResponse>>
24+
builderExtractor;
25+
2226
public static Function<
2327
SpringWebMvcTelemetryBuilder,
2428
DefaultHttpServerInstrumenterBuilder<HttpServletRequest, HttpServletResponse>>
25-
GET_BUILDER;
29+
getBuilderExtractor() {
30+
return builderExtractor;
31+
}
32+
33+
public static void setBuilderExtractor(
34+
Function<
35+
SpringWebMvcTelemetryBuilder,
36+
DefaultHttpServerInstrumenterBuilder<HttpServletRequest, HttpServletResponse>>
37+
builderExtractor) {
38+
SpringMvcUtil.builderExtractor = builderExtractor;
39+
}
2640
}

‎smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,12 @@
2121
import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
2222
import io.opentelemetry.sdk.logs.data.LogRecordData;
2323
import io.opentelemetry.sdk.resources.Resource;
24-
import io.opentelemetry.sdk.testing.assertj.SpanDataAssert;
2524
import io.opentelemetry.semconv.ClientAttributes;
26-
import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
2725
import io.opentelemetry.semconv.HttpAttributes;
2826
import io.opentelemetry.semconv.ServerAttributes;
2927
import io.opentelemetry.semconv.UrlAttributes;
3028
import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes;
3129
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
32-
import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes;
3330
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
3431
import java.util.Collections;
3532
import java.util.List;

‎smoke-tests-otel-starter/spring-smoke-testing/src/main/java/io/opentelemetry/spring/smoketest/SpringTestUtil.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ public static void assertClientSpan(SpanDataAssert span, String path) {
2424
.hasAttributesSatisfying(
2525
satisfies(UrlAttributes.URL_FULL, a -> a.endsWith(path)),
2626
// this attribute is set by the experimental http instrumentation
27-
satisfies(HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE, AbstractLongAssert::isNotNegative));
27+
satisfies(
28+
HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE,
29+
AbstractLongAssert::isNotNegative));
2830
}
2931

3032
@CanIgnoreReturnValue
@@ -35,6 +37,8 @@ public static SpanDataAssert assertServerSpan(SpanDataAssert span, String route)
3537
.hasAttribute(HttpAttributes.HTTP_ROUTE, route)
3638
.hasAttributesSatisfying(
3739
// this attribute is set by the experimental http instrumentation
38-
satisfies(HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE, AbstractLongAssert::isNotNegative));
40+
satisfies(
41+
HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE,
42+
AbstractLongAssert::isNotNegative));
3943
}
4044
}

0 commit comments

Comments
 (0)