open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename method, use Telemetry instead of Metrics (#13574)

This commit is contained in:
Lauri Tulmin 2025-03-25 11:03:32 +02:00 committed by GitHub
parent e8ed4e2075
commit e207579370
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
23 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java
View File

@ -61,7 +61,7 @@ public final class DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> {
@Nullable private final TextMapSetter<REQUEST> headerSetter;
private Function<SpanNameExtractor<REQUEST>, ? extends SpanNameExtractor<REQUEST>>
spanNameExtractorTransformer = Function.identity();
private boolean emitExperimentalHttpClientMetrics = false;
private boolean emitExperimentalHttpClientTelemetry = false;
private Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> builderCustomizer = b -> {};
private DefaultHttpClientInstrumenterBuilder(
@ -162,15 +162,15 @@ public final class DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> {
}
/**
* Configures the instrumentation to emit experimental HTTP client metrics.
* Configures the instrumentation to emit experimental HTTP client telemetry.
*
* @param emitExperimentalHttpClientMetrics {@code true} if the experimental HTTP client metrics
* are to be emitted.
* @param emitExperimentalHttpClientTelemetry {@code true} if the experimental HTTP client
* telemetry is to be emitted.
*/
@CanIgnoreReturnValue
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE>
setEmitExperimentalHttpClientMetrics(boolean emitExperimentalHttpClientMetrics) {
this.emitExperimentalHttpClientMetrics = emitExperimentalHttpClientMetrics;
setEmitExperimentalHttpClientTelemetry(boolean emitExperimentalHttpClientTelemetry) {
this.emitExperimentalHttpClientTelemetry = emitExperimentalHttpClientTelemetry;
return this;
}
@ -229,7 +229,7 @@ public final class DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> {
.addAttributesExtractor(httpAttributesExtractorBuilder.build())
.addAttributesExtractors(additionalExtractors)
.addOperationMetrics(HttpClientMetrics.get());
if (emitExperimentalHttpClientMetrics) {
if (emitExperimentalHttpClientTelemetry) {
builder
.addAttributesExtractor(HttpExperimentalAttributesExtractor.create(attributesGetter))
.addOperationMetrics(HttpClientExperimentalMetrics.get());
@ -257,7 +257,7 @@ public final class DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> {
set(config::getPeerServiceResolver, this::setPeerServiceResolver);
set(
config::shouldEmitExperimentalHttpClientTelemetry,
this::setEmitExperimentalHttpClientMetrics);
this::setEmitExperimentalHttpClientTelemetry);
set(config::redactQueryParameters, this::setRedactQueryParameters);
return this;
}

16
instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java
View File

@ -57,7 +57,7 @@ public final class DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> {
spanNameExtractorTransformer = Function.identity();
private final HttpServerRouteBuilder<REQUEST> httpServerRouteBuilder;
private final HttpServerAttributesGetter<REQUEST, RESPONSE> attributesGetter;
private boolean emitExperimentalHttpServerMetrics = false;
private boolean emitExperimentalHttpServerTelemetry = false;
private Consumer<InstrumenterBuilder<REQUEST, RESPONSE>> builderCustomizer = b -> {};
private DefaultHttpServerInstrumenterBuilder(
@ -160,15 +160,15 @@ public final class DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> {
}
/**
* Configures the instrumentation to emit experimental HTTP server metrics.
* Configures the instrumentation to emit experimental HTTP server telemetry.
*
* @param emitExperimentalHttpServerMetrics {@code true} if the experimental HTTP server metrics
* are to be emitted.
* @param emitExperimentalHttpServerTelemetry {@code true} if the experimental HTTP server
* telemetry is to be emitted.
*/
@CanIgnoreReturnValue
public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE>
setEmitExperimentalHttpServerMetrics(boolean emitExperimentalHttpServerMetrics) {
this.emitExperimentalHttpServerMetrics = emitExperimentalHttpServerMetrics;
setEmitExperimentalHttpServerTelemetry(boolean emitExperimentalHttpServerTelemetry) {
this.emitExperimentalHttpServerTelemetry = emitExperimentalHttpServerTelemetry;
return this;
}
@ -210,7 +210,7 @@ public final class DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> {
.addAttributesExtractors(additionalExtractors)
.addContextCustomizer(httpServerRouteBuilder.build())
.addOperationMetrics(HttpServerMetrics.get());
if (emitExperimentalHttpServerMetrics) {
if (emitExperimentalHttpServerTelemetry) {
builder
.addAttributesExtractor(HttpExperimentalAttributesExtractor.create(attributesGetter))
.addOperationMetrics(HttpServerExperimentalMetrics.get());
@ -226,7 +226,7 @@ public final class DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> {
set(config::getServerResponseHeaders, this::setCapturedResponseHeaders);
set(
config::shouldEmitExperimentalHttpServerTelemetry,
this::setEmitExperimentalHttpServerMetrics);
this::setEmitExperimentalHttpServerTelemetry);
return this;
}

2
instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java
View File

@ -25,7 +25,7 @@ public final class ApacheHttpClientTelemetryBuilder {
static {
Experimental.internalSetEmitExperimentalTelemetry(
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientMetrics(emit));
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientTelemetry(emit));
}
ApacheHttpClientTelemetryBuilder(OpenTelemetry openTelemetry) {

2
instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClientTelemetryBuilder.java
View File

@ -25,7 +25,7 @@ public final class ApacheHttpClientTelemetryBuilder {
static {
Experimental.internalSetEmitExperimentalTelemetry(
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientMetrics(emit));
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientTelemetry(emit));
}
ApacheHttpClientTelemetryBuilder(OpenTelemetry openTelemetry) {

2
instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaClientTelemetryBuilder.java
View File

@ -27,7 +27,7 @@ public final class ArmeriaClientTelemetryBuilder {
static {
ArmeriaInstrumenterBuilderUtil.setClientBuilderExtractor(builder -> builder.builder);
Experimental.internalSetEmitExperimentalClientTelemetry(
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientMetrics(emit));
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientTelemetry(emit));
Experimental.internalSetClientPeerService(
(builder, peerService) -> builder.builder.setPeerService(peerService));
}

2
instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaServerTelemetryBuilder.java
View File

@ -27,7 +27,7 @@ public final class ArmeriaServerTelemetryBuilder {
static {
ArmeriaInstrumenterBuilderUtil.setServerBuilderExtractor(builder -> builder.builder);
Experimental.internalSetEmitExperimentalServerTelemetry(
(builder, emit) -> builder.builder.setEmitExperimentalHttpServerMetrics(emit));
(builder, emit) -> builder.builder.setEmitExperimentalHttpServerTelemetry(emit));
}
ArmeriaServerTelemetryBuilder(OpenTelemetry openTelemetry) {

2
instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/javahttpclient/JavaHttpClientTelemetryBuilder.java
View File

@ -26,7 +26,7 @@ public final class JavaHttpClientTelemetryBuilder {
static {
Experimental.internalSetEmitExperimentalTelemetry(
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientMetrics(emit));
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientTelemetry(emit));
}
JavaHttpClientTelemetryBuilder(OpenTelemetry openTelemetry) {

2
instrumentation/java-http-server/library/src/main/java/io/opentelemetry/instrumentation/javahttpserver/JavaHttpServerTelemetryBuilder.java
View File

@ -27,7 +27,7 @@ public final class JavaHttpServerTelemetryBuilder {
static {
JavaHttpServerInstrumenterBuilderUtil.setServerBuilderExtractor(builder -> builder.builder);
Experimental.internalSetEmitExperimentalTelemetry(
(builder, emit) -> builder.builder.setEmitExperimentalHttpServerMetrics(emit));
(builder, emit) -> builder.builder.setEmitExperimentalHttpServerTelemetry(emit));
}
JavaHttpServerTelemetryBuilder(OpenTelemetry openTelemetry) {

2
instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/JettyClientTelemetryBuilder.java
View File

@ -28,7 +28,7 @@ public final class JettyClientTelemetryBuilder {
static {
Experimental.internalSetEmitExperimentalTelemetry(
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientMetrics(emit));
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientTelemetry(emit));
}
JettyClientTelemetryBuilder(OpenTelemetry openTelemetry) {

2
instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyClientTelemetryBuilder.java
View File

@ -29,7 +29,7 @@ public final class JettyClientTelemetryBuilder {
static {
Experimental.internalSetEmitExperimentalTelemetry(
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientMetrics(emit));
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientTelemetry(emit));
}
JettyClientTelemetryBuilder(OpenTelemetry openTelemetry) {

4
instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/internal/Experimental.kt
View File

@ -12,11 +12,11 @@ class Experimental private constructor() {
companion object {
fun emitExperimentalTelemetry(builder: AbstractKtorClientTelemetryBuilder) {
builder.builder().setEmitExperimentalHttpClientMetrics(true)
builder.builder().setEmitExperimentalHttpClientTelemetry(true)
}
fun emitExperimentalTelemetry(builder: AbstractKtorServerTelemetryBuilder) {
builder.builder.setEmitExperimentalHttpServerMetrics(true)
builder.builder.setEmitExperimentalHttpServerTelemetry(true)
}
}
}

4
instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java
View File

@ -29,7 +29,7 @@ public final class NettyClientTelemetryBuilder {
static {
Experimental.internalSetEmitExperimentalClientTelemetry(
(builder, emit) -> {
builder.builder.setEmitExperimentalHttpClientMetrics(emit);
builder.builder.setEmitExperimentalHttpClientTelemetry(emit);
builder.emitExperimentalHttpClientEvents = emit;
});
}
@ -117,7 +117,7 @@ public final class NettyClientTelemetryBuilder {
@CanIgnoreReturnValue
public NettyClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
boolean emitExperimentalHttpClientMetrics) {
builder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
builder.setEmitExperimentalHttpClientTelemetry(emitExperimentalHttpClientMetrics);
return this;
}

4
instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetryBuilder.java
View File

@ -30,7 +30,7 @@ public final class NettyServerTelemetryBuilder {
nettyServerTelemetryBuilder -> nettyServerTelemetryBuilder.builder);
Experimental.internalSetEmitExperimentalServerTelemetry(
(builder, emit) -> {
builder.builder.setEmitExperimentalHttpServerMetrics(emit);
builder.builder.setEmitExperimentalHttpServerTelemetry(emit);
builder.emitExperimentalHttpServerEvents = emit;
});
}
@ -111,7 +111,7 @@ public final class NettyServerTelemetryBuilder {
@CanIgnoreReturnValue
public NettyServerTelemetryBuilder setEmitExperimentalHttpServerMetrics(
boolean emitExperimentalHttpServerMetrics) {
builder.setEmitExperimentalHttpServerMetrics(emitExperimentalHttpServerMetrics);
builder.setEmitExperimentalHttpServerTelemetry(emitExperimentalHttpServerMetrics);
return this;
}

2
instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpTelemetryBuilder.java
View File

@ -26,7 +26,7 @@ public final class OkHttpTelemetryBuilder {
static {
Experimental.internalSetEmitExperimentalTelemetry(
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientMetrics(emit));
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientTelemetry(emit));
}
OkHttpTelemetryBuilder(OpenTelemetry openTelemetry) {

2
instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackClientTelemetryBuilder.java
View File

@ -27,7 +27,7 @@ public final class RatpackClientTelemetryBuilder {
static {
Experimental.internalSetEmitExperimentalClientTelemetry(
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientMetrics(emit));
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientTelemetry(emit));
}
RatpackClientTelemetryBuilder(OpenTelemetry openTelemetry) {

2
instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackServerTelemetryBuilder.java
View File

@ -27,7 +27,7 @@ public final class RatpackServerTelemetryBuilder {
static {
Experimental.internalSetEmitExperimentalServerTelemetry(
(builder, emit) -> builder.builder.setEmitExperimentalHttpServerMetrics(emit));
(builder, emit) -> builder.builder.setEmitExperimentalHttpServerTelemetry(emit));
}
RatpackServerTelemetryBuilder(OpenTelemetry openTelemetry) {

4
instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletTelemetryBuilder.java
View File

@ -25,7 +25,7 @@ public final class RestletTelemetryBuilder {
static {
Experimental.internalSetEmitExperimentalTelemetry(
(builder, emit) -> builder.builder.setEmitExperimentalHttpServerMetrics(emit));
(builder, emit) -> builder.builder.setEmitExperimentalHttpServerTelemetry(emit));
}
RestletTelemetryBuilder(OpenTelemetry openTelemetry) {
@ -96,7 +96,7 @@ public final class RestletTelemetryBuilder {
@CanIgnoreReturnValue
public RestletTelemetryBuilder setEmitExperimentalHttpServerMetrics(
boolean emitExperimentalHttpServerMetrics) {
builder.setEmitExperimentalHttpServerMetrics(emitExperimentalHttpServerMetrics);
builder.setEmitExperimentalHttpServerTelemetry(emitExperimentalHttpServerMetrics);
return this;
}

4
instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletTelemetryBuilder.java
View File

@ -25,7 +25,7 @@ public final class RestletTelemetryBuilder {
static {
Experimental.internalSetEmitExperimentalTelemetry(
(builder, emit) -> builder.builder.setEmitExperimentalHttpServerMetrics(emit));
(builder, emit) -> builder.builder.setEmitExperimentalHttpServerTelemetry(emit));
}
RestletTelemetryBuilder(OpenTelemetry openTelemetry) {
@ -96,7 +96,7 @@ public final class RestletTelemetryBuilder {
@CanIgnoreReturnValue
public RestletTelemetryBuilder setEmitExperimentalHttpServerMetrics(
boolean emitExperimentalHttpServerMetrics) {
builder.setEmitExperimentalHttpServerMetrics(emitExperimentalHttpServerMetrics);
builder.setEmitExperimentalHttpServerTelemetry(emitExperimentalHttpServerMetrics);
return this;
}

4
instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebTelemetryBuilder.java
View File

@ -26,7 +26,7 @@ public final class SpringWebTelemetryBuilder {
static {
WebTelemetryUtil.setBuilderExtractor(SpringWebTelemetryBuilder::getBuilder);
Experimental.internalSetEmitExperimentalTelemetry(
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientMetrics(emit));
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientTelemetry(emit));
}
SpringWebTelemetryBuilder(OpenTelemetry openTelemetry) {
@ -129,7 +129,7 @@ public final class SpringWebTelemetryBuilder {
@CanIgnoreReturnValue
public SpringWebTelemetryBuilder setEmitExperimentalHttpClientMetrics(
boolean emitExperimentalHttpClientMetrics) {
builder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
builder.setEmitExperimentalHttpClientTelemetry(emitExperimentalHttpClientMetrics);
return this;
}

2
instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxClientTelemetryBuilder.java
View File

@ -29,7 +29,7 @@ public final class SpringWebfluxClientTelemetryBuilder {
static {
SpringWebfluxBuilderUtil.setClientBuilderExtractor(builder -> builder.builder);
Experimental.internalSetEmitExperimentalClientTelemetry(
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientMetrics(emit));
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientTelemetry(emit));
}
SpringWebfluxClientTelemetryBuilder(OpenTelemetry openTelemetry) {

2
instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxServerTelemetryBuilder.java
View File

@ -26,7 +26,7 @@ public final class SpringWebfluxServerTelemetryBuilder {
static {
SpringWebfluxBuilderUtil.setServerBuilderExtractor(builder -> builder.builder);
Experimental.internalSetEmitExperimentalServerTelemetry(
(builder, emit) -> builder.builder.setEmitExperimentalHttpServerMetrics(emit));
(builder, emit) -> builder.builder.setEmitExperimentalHttpServerTelemetry(emit));
}
SpringWebfluxServerTelemetryBuilder(OpenTelemetry openTelemetry) {

4
instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcTelemetryBuilder.java
View File

@ -29,7 +29,7 @@ public final class SpringWebMvcTelemetryBuilder {
static {
SpringMvcBuilderUtil.setBuilderExtractor(builder -> builder.builder);
Experimental.internalSetEmitExperimentalTelemetry(
(builder, emit) -> builder.builder.setEmitExperimentalHttpServerMetrics(emit));
(builder, emit) -> builder.builder.setEmitExperimentalHttpServerTelemetry(emit));
}
SpringWebMvcTelemetryBuilder(OpenTelemetry openTelemetry) {
@ -115,7 +115,7 @@ public final class SpringWebMvcTelemetryBuilder {
@CanIgnoreReturnValue
public SpringWebMvcTelemetryBuilder setEmitExperimentalHttpServerMetrics(
boolean emitExperimentalHttpServerMetrics) {
builder.setEmitExperimentalHttpServerMetrics(emitExperimentalHttpServerMetrics);
builder.setEmitExperimentalHttpServerTelemetry(emitExperimentalHttpServerMetrics);
return this;
}

4
instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcTelemetryBuilder.java
View File

@ -28,7 +28,7 @@ public final class SpringWebMvcTelemetryBuilder {
static {
SpringMvcBuilderUtil.setBuilderExtractor(builder -> builder.builder);
Experimental.internalSetEmitExperimentalTelemetry(
(builder, emit) -> builder.builder.setEmitExperimentalHttpServerMetrics(emit));
(builder, emit) -> builder.builder.setEmitExperimentalHttpServerTelemetry(emit));
}
SpringWebMvcTelemetryBuilder(OpenTelemetry openTelemetry) {
@ -114,7 +114,7 @@ public final class SpringWebMvcTelemetryBuilder {
@CanIgnoreReturnValue
public SpringWebMvcTelemetryBuilder setEmitExperimentalHttpServerMetrics(
boolean emitExperimentalHttpServerMetrics) {
builder.setEmitExperimentalHttpServerMetrics(emitExperimentalHttpServerMetrics);
builder.setEmitExperimentalHttpServerTelemetry(emitExperimentalHttpServerMetrics);
return this;
}