Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -162,15 +162,15 @@ public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setKnownMethods(
}

/**
* 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;
}

Expand Down Expand Up @@ -229,7 +229,7 @@ public Instrumenter<REQUEST, RESPONSE> build() {
.addAttributesExtractor(httpAttributesExtractorBuilder.build())
.addAttributesExtractors(additionalExtractors)
.addOperationMetrics(HttpClientMetrics.get());
if (emitExperimentalHttpClientMetrics) {
if (emitExperimentalHttpClientTelemetry) {
builder
.addAttributesExtractor(HttpExperimentalAttributesExtractor.create(attributesGetter))
.addOperationMetrics(HttpClientExperimentalMetrics.get());
Expand Down Expand Up @@ -257,7 +257,7 @@ public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> configure(CommonC
set(config::getPeerServiceResolver, this::setPeerServiceResolver);
set(
config::shouldEmitExperimentalHttpClientTelemetry,
this::setEmitExperimentalHttpClientMetrics);
this::setEmitExperimentalHttpClientTelemetry);
set(config::redactQueryParameters, this::setRedactQueryParameters);
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -160,15 +160,15 @@ public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setKnownMethods(
}

/**
* 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;
}

Expand Down Expand Up @@ -210,7 +210,7 @@ public InstrumenterBuilder<REQUEST, RESPONSE> instrumenterBuilder() {
.addAttributesExtractors(additionalExtractors)
.addContextCustomizer(httpServerRouteBuilder.build())
.addOperationMetrics(HttpServerMetrics.get());
if (emitExperimentalHttpServerMetrics) {
if (emitExperimentalHttpServerTelemetry) {
builder
.addAttributesExtractor(HttpExperimentalAttributesExtractor.create(attributesGetter))
.addOperationMetrics(HttpServerExperimentalMetrics.get());
Expand All @@ -226,7 +226,7 @@ public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> configure(CommonC
set(config::getServerResponseHeaders, this::setCapturedResponseHeaders);
set(
config::shouldEmitExperimentalHttpServerTelemetry,
this::setEmitExperimentalHttpServerMetrics);
this::setEmitExperimentalHttpServerTelemetry);
return this;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public final class NettyClientTelemetryBuilder {
static {
Experimental.internalSetEmitExperimentalClientTelemetry(
(builder, emit) -> {
builder.builder.setEmitExperimentalHttpClientMetrics(emit);
builder.builder.setEmitExperimentalHttpClientTelemetry(emit);
builder.emitExperimentalHttpClientEvents = emit;
});
}
Expand Down Expand Up @@ -117,7 +117,7 @@ public NettyClientTelemetryBuilder setKnownMethods(Collection<String> knownMetho
@CanIgnoreReturnValue
public NettyClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
boolean emitExperimentalHttpClientMetrics) {
builder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
builder.setEmitExperimentalHttpClientTelemetry(emitExperimentalHttpClientMetrics);
return this;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
});
}
Expand Down Expand Up @@ -111,7 +111,7 @@ public NettyServerTelemetryBuilder setKnownMethods(Collection<String> knownMetho
@CanIgnoreReturnValue
public NettyServerTelemetryBuilder setEmitExperimentalHttpServerMetrics(
boolean emitExperimentalHttpServerMetrics) {
builder.setEmitExperimentalHttpServerMetrics(emitExperimentalHttpServerMetrics);
builder.setEmitExperimentalHttpServerTelemetry(emitExperimentalHttpServerMetrics);
return this;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -96,7 +96,7 @@ public RestletTelemetryBuilder setKnownMethods(Collection<String> knownMethods)
@CanIgnoreReturnValue
public RestletTelemetryBuilder setEmitExperimentalHttpServerMetrics(
boolean emitExperimentalHttpServerMetrics) {
builder.setEmitExperimentalHttpServerMetrics(emitExperimentalHttpServerMetrics);
builder.setEmitExperimentalHttpServerTelemetry(emitExperimentalHttpServerMetrics);
return this;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -96,7 +96,7 @@ public RestletTelemetryBuilder setKnownMethods(Collection<String> knownMethods)
@CanIgnoreReturnValue
public RestletTelemetryBuilder setEmitExperimentalHttpServerMetrics(
boolean emitExperimentalHttpServerMetrics) {
builder.setEmitExperimentalHttpServerMetrics(emitExperimentalHttpServerMetrics);
builder.setEmitExperimentalHttpServerTelemetry(emitExperimentalHttpServerMetrics);
return this;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -129,7 +129,7 @@ public SpringWebTelemetryBuilder setKnownMethods(Collection<String> knownMethods
@CanIgnoreReturnValue
public SpringWebTelemetryBuilder setEmitExperimentalHttpClientMetrics(
boolean emitExperimentalHttpClientMetrics) {
builder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
builder.setEmitExperimentalHttpClientTelemetry(emitExperimentalHttpClientMetrics);
return this;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -115,7 +115,7 @@ public SpringWebMvcTelemetryBuilder setKnownMethods(Collection<String> knownMeth
@CanIgnoreReturnValue
public SpringWebMvcTelemetryBuilder setEmitExperimentalHttpServerMetrics(
boolean emitExperimentalHttpServerMetrics) {
builder.setEmitExperimentalHttpServerMetrics(emitExperimentalHttpServerMetrics);
builder.setEmitExperimentalHttpServerTelemetry(emitExperimentalHttpServerMetrics);
return this;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -114,7 +114,7 @@ public SpringWebMvcTelemetryBuilder setKnownMethods(Collection<String> knownMeth
@CanIgnoreReturnValue
public SpringWebMvcTelemetryBuilder setEmitExperimentalHttpServerMetrics(
boolean emitExperimentalHttpServerMetrics) {
builder.setEmitExperimentalHttpServerMetrics(emitExperimentalHttpServerMetrics);
builder.setEmitExperimentalHttpServerTelemetry(emitExperimentalHttpServerMetrics);
return this;
}

Expand Down
Loading