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 some *InstrumenterBuilder classes to *InstrumenterFactory (#4391)

This commit is contained in:
Mateusz Rzeszutek 2021-10-15 13:47:32 +02:00 committed by GitHub
parent b0430f2b79
commit b2bc41453b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaSingletons.java
View File

@ -6,7 +6,7 @@
package io.opentelemetry.javaagent.instrumentation.kafkaclients; package io.opentelemetry.javaagent.instrumentation.kafkaclients;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.kafka.internal.KafkaInstrumenterBuilder; import io.opentelemetry.instrumentation.kafka.internal.KafkaInstrumenterFactory;
import io.opentelemetry.instrumentation.kafka.internal.ReceivedRecords; import io.opentelemetry.instrumentation.kafka.internal.ReceivedRecords;
import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.clients.producer.ProducerRecord;
@ -15,11 +15,11 @@ public final class KafkaSingletons {
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.kafka-clients-0.11"; private static final String INSTRUMENTATION_NAME = "io.opentelemetry.kafka-clients-0.11";
private static final Instrumenter<ProducerRecord<?, ?>, Void> PRODUCER_INSTRUMENTER = private static final Instrumenter<ProducerRecord<?, ?>, Void> PRODUCER_INSTRUMENTER =
KafkaInstrumenterBuilder.buildProducerInstrumenter(INSTRUMENTATION_NAME); KafkaInstrumenterFactory.createProducerInstrumenter(INSTRUMENTATION_NAME);
private static final Instrumenter<ReceivedRecords, Void> CONSUMER_RECEIVE_INSTRUMENTER = private static final Instrumenter<ReceivedRecords, Void> CONSUMER_RECEIVE_INSTRUMENTER =
KafkaInstrumenterBuilder.buildConsumerReceiveInstrumenter(INSTRUMENTATION_NAME); KafkaInstrumenterFactory.createConsumerReceiveInstrumenter(INSTRUMENTATION_NAME);
private static final Instrumenter<ConsumerRecord<?, ?>, Void> CONSUMER_PROCESS_INSTRUMENTER = private static final Instrumenter<ConsumerRecord<?, ?>, Void> CONSUMER_PROCESS_INSTRUMENTER =
KafkaInstrumenterBuilder.buildConsumerProcessInstrumenter(INSTRUMENTATION_NAME); KafkaInstrumenterFactory.createConsumerProcessInstrumenter(INSTRUMENTATION_NAME);
public static Instrumenter<ProducerRecord<?, ?>, Void> producerInstrumenter() { public static Instrumenter<ProducerRecord<?, ?>, Void> producerInstrumenter() {
return PRODUCER_INSTRUMENTER; return PRODUCER_INSTRUMENTER;

6
instrumentation/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/KafkaTracingBuilder.java
View File

@ -8,7 +8,7 @@ package io.opentelemetry.instrumentation.kafkaclients;
import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.messaging.MessageOperation; import io.opentelemetry.instrumentation.api.instrumenter.messaging.MessageOperation;
import io.opentelemetry.instrumentation.kafka.internal.KafkaInstrumenterBuilder; import io.opentelemetry.instrumentation.kafka.internal.KafkaInstrumenterFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@ -43,9 +43,9 @@ public final class KafkaTracingBuilder {
public KafkaTracing build() { public KafkaTracing build() {
return new KafkaTracing( return new KafkaTracing(
openTelemetry, openTelemetry,
KafkaInstrumenterBuilder.buildProducerInstrumenter( KafkaInstrumenterFactory.createProducerInstrumenter(
INSTRUMENTATION_NAME, openTelemetry, producerAttributesExtractors), INSTRUMENTATION_NAME, openTelemetry, producerAttributesExtractors),
KafkaInstrumenterBuilder.buildConsumerOperationInstrumenter( KafkaInstrumenterFactory.createConsumerOperationInstrumenter(
INSTRUMENTATION_NAME, INSTRUMENTATION_NAME,
openTelemetry, openTelemetry,
MessageOperation.RECEIVE, MessageOperation.RECEIVE,

22
instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaInstrumenterBuilder.java → instrumentation/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaInstrumenterFactory.java
View File

@ -20,15 +20,15 @@ import java.util.Collections;
import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.clients.producer.ProducerRecord;
public final class KafkaInstrumenterBuilder { public final class KafkaInstrumenterFactory {
public static Instrumenter<ProducerRecord<?, ?>, Void> buildProducerInstrumenter( public static Instrumenter<ProducerRecord<?, ?>, Void> createProducerInstrumenter(
String instrumentationName) { String instrumentationName) {
return buildProducerInstrumenter( return createProducerInstrumenter(
instrumentationName, GlobalOpenTelemetry.get(), Collections.emptyList()); instrumentationName, GlobalOpenTelemetry.get(), Collections.emptyList());
} }
public static Instrumenter<ProducerRecord<?, ?>, Void> buildProducerInstrumenter( public static Instrumenter<ProducerRecord<?, ?>, Void> createProducerInstrumenter(
String instrumentationName, String instrumentationName,
OpenTelemetry openTelemetry, OpenTelemetry openTelemetry,
Iterable<AttributesExtractor<ProducerRecord<?, ?>, Void>> extractors) { Iterable<AttributesExtractor<ProducerRecord<?, ?>, Void>> extractors) {
@ -44,13 +44,13 @@ public final class KafkaInstrumenterBuilder {
.newInstrumenter(SpanKindExtractor.alwaysProducer()); .newInstrumenter(SpanKindExtractor.alwaysProducer());
} }
public static Instrumenter<ReceivedRecords, Void> buildConsumerReceiveInstrumenter( public static Instrumenter<ReceivedRecords, Void> createConsumerReceiveInstrumenter(
String instrumentationName) { String instrumentationName) {
return buildConsumerReceiveInstrumenter( return createConsumerReceiveInstrumenter(
instrumentationName, GlobalOpenTelemetry.get(), Collections.emptyList()); instrumentationName, GlobalOpenTelemetry.get(), Collections.emptyList());
} }
public static Instrumenter<ReceivedRecords, Void> buildConsumerReceiveInstrumenter( public static Instrumenter<ReceivedRecords, Void> createConsumerReceiveInstrumenter(
String instrumentationName, String instrumentationName,
OpenTelemetry openTelemetry, OpenTelemetry openTelemetry,
Iterable<AttributesExtractor<ReceivedRecords, Void>> extractors) { Iterable<AttributesExtractor<ReceivedRecords, Void>> extractors) {
@ -67,16 +67,16 @@ public final class KafkaInstrumenterBuilder {
.newInstrumenter(SpanKindExtractor.alwaysConsumer()); .newInstrumenter(SpanKindExtractor.alwaysConsumer());
} }
public static Instrumenter<ConsumerRecord<?, ?>, Void> buildConsumerProcessInstrumenter( public static Instrumenter<ConsumerRecord<?, ?>, Void> createConsumerProcessInstrumenter(
String instrumentationName) { String instrumentationName) {
return buildConsumerOperationInstrumenter( return createConsumerOperationInstrumenter(
instrumentationName, instrumentationName,
GlobalOpenTelemetry.get(), GlobalOpenTelemetry.get(),
MessageOperation.PROCESS, MessageOperation.PROCESS,
Collections.emptyList()); Collections.emptyList());
} }
public static Instrumenter<ConsumerRecord<?, ?>, Void> buildConsumerOperationInstrumenter( public static Instrumenter<ConsumerRecord<?, ?>, Void> createConsumerOperationInstrumenter(
String instrumentationName, String instrumentationName,
OpenTelemetry openTelemetry, OpenTelemetry openTelemetry,
MessageOperation operation, MessageOperation operation,
@ -108,5 +108,5 @@ public final class KafkaInstrumenterBuilder {
} }
} }
private KafkaInstrumenterBuilder() {} private KafkaInstrumenterFactory() {}
} }

4
instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsSingletons.java
View File

@ -6,7 +6,7 @@
package io.opentelemetry.javaagent.instrumentation.kafkastreams; package io.opentelemetry.javaagent.instrumentation.kafkastreams;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.kafka.internal.KafkaInstrumenterBuilder; import io.opentelemetry.instrumentation.kafka.internal.KafkaInstrumenterFactory;
import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecord;
public final class KafkaStreamsSingletons { public final class KafkaStreamsSingletons {
@ -16,7 +16,7 @@ public final class KafkaStreamsSingletons {
private static final Instrumenter<ConsumerRecord<?, ?>, Void> INSTRUMENTER = buildInstrumenter(); private static final Instrumenter<ConsumerRecord<?, ?>, Void> INSTRUMENTER = buildInstrumenter();
private static Instrumenter<ConsumerRecord<?, ?>, Void> buildInstrumenter() { private static Instrumenter<ConsumerRecord<?, ?>, Void> buildInstrumenter() {
return KafkaInstrumenterBuilder.buildConsumerProcessInstrumenter(INSTRUMENTATION_NAME); return KafkaInstrumenterFactory.createConsumerProcessInstrumenter(INSTRUMENTATION_NAME);
} }
public static Instrumenter<ConsumerRecord<?, ?>, Void> instrumenter() { public static Instrumenter<ConsumerRecord<?, ?>, Void> instrumenter() {

4
instrumentation/tomcat/tomcat-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/Tomcat10Singletons.java
View File

@ -9,7 +9,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.Servlet5Accessor; import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.Servlet5Accessor;
import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.Servlet5Singletons; import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.Servlet5Singletons;
import io.opentelemetry.javaagent.instrumentation.tomcat.common.TomcatHelper; import io.opentelemetry.javaagent.instrumentation.tomcat.common.TomcatHelper;
import io.opentelemetry.javaagent.instrumentation.tomcat.common.TomcatInstrumenterBuilder; import io.opentelemetry.javaagent.instrumentation.tomcat.common.TomcatInstrumenterFactory;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.apache.coyote.Request; import org.apache.coyote.Request;
@ -18,7 +18,7 @@ import org.apache.coyote.Response;
public final class Tomcat10Singletons { public final class Tomcat10Singletons {
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.tomcat-10.0"; private static final String INSTRUMENTATION_NAME = "io.opentelemetry.tomcat-10.0";
private static final Instrumenter<Request, Response> INSTRUMENTER = private static final Instrumenter<Request, Response> INSTRUMENTER =
TomcatInstrumenterBuilder.newInstrumenter( TomcatInstrumenterFactory.create(
INSTRUMENTATION_NAME, Servlet5Accessor.INSTANCE, Tomcat10ServletEntityProvider.INSTANCE); INSTRUMENTATION_NAME, Servlet5Accessor.INSTANCE, Tomcat10ServletEntityProvider.INSTANCE);
private static final TomcatHelper<HttpServletRequest, HttpServletResponse> HELPER = private static final TomcatHelper<HttpServletRequest, HttpServletResponse> HELPER =
new TomcatHelper<>( new TomcatHelper<>(

4
instrumentation/tomcat/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/Tomcat7Singletons.java
View File

@ -9,7 +9,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Accessor; import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Accessor;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons; import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons;
import io.opentelemetry.javaagent.instrumentation.tomcat.common.TomcatHelper; import io.opentelemetry.javaagent.instrumentation.tomcat.common.TomcatHelper;
import io.opentelemetry.javaagent.instrumentation.tomcat.common.TomcatInstrumenterBuilder; import io.opentelemetry.javaagent.instrumentation.tomcat.common.TomcatInstrumenterFactory;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.coyote.Request; import org.apache.coyote.Request;
@ -18,7 +18,7 @@ import org.apache.coyote.Response;
public final class Tomcat7Singletons { public final class Tomcat7Singletons {
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.tomcat-7.0"; private static final String INSTRUMENTATION_NAME = "io.opentelemetry.tomcat-7.0";
private static final Instrumenter<Request, Response> INSTRUMENTER = private static final Instrumenter<Request, Response> INSTRUMENTER =
TomcatInstrumenterBuilder.newInstrumenter( TomcatInstrumenterFactory.create(
INSTRUMENTATION_NAME, Servlet3Accessor.INSTANCE, Tomcat7ServletEntityProvider.INSTANCE); INSTRUMENTATION_NAME, Servlet3Accessor.INSTANCE, Tomcat7ServletEntityProvider.INSTANCE);
private static final TomcatHelper<HttpServletRequest, HttpServletResponse> HELPER = private static final TomcatHelper<HttpServletRequest, HttpServletResponse> HELPER =
new TomcatHelper<>( new TomcatHelper<>(

6
instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatInstrumenterBuilder.java → instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatInstrumenterFactory.java
View File

@ -24,11 +24,11 @@ import io.opentelemetry.javaagent.instrumentation.servlet.ServletErrorCauseExtra
import org.apache.coyote.Request; import org.apache.coyote.Request;
import org.apache.coyote.Response; import org.apache.coyote.Response;
public final class TomcatInstrumenterBuilder { public final class TomcatInstrumenterFactory {
private TomcatInstrumenterBuilder() {} private TomcatInstrumenterFactory() {}
public static <REQUEST, RESPONSE> Instrumenter<Request, Response> newInstrumenter( public static <REQUEST, RESPONSE> Instrumenter<Request, Response> create(
String instrumentationName, String instrumentationName,
ServletAccessor<REQUEST, RESPONSE> accessor, ServletAccessor<REQUEST, RESPONSE> accessor,
TomcatServletEntityProvider<REQUEST, RESPONSE> servletEntityProvider) { TomcatServletEntityProvider<REQUEST, RESPONSE> servletEntityProvider) {