rename client builder to clientBuilder

Author: zeitlinger

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

@@ -20,10 +20,10 @@
 public final class ApacheHttpClientTelemetryBuilder {
 
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.apache-httpclient-4.3";
-  private final DefaultHttpClientInstrumenterBuilder<ApacheHttpClientRequest, HttpResponse> builder;
+  private final DefaultHttpClientInstrumenterBuilder<ApacheHttpClientRequest, HttpResponse> clientBuilder;
 
   ApacheHttpClientTelemetryBuilder(OpenTelemetry openTelemetry) {
-    builder =
+    clientBuilder =
         new DefaultHttpClientInstrumenterBuilder<>(
             INSTRUMENTATION_NAME, openTelemetry, ApacheHttpClientHttpAttributesGetter.INSTANCE);
   }
@@ -36,7 +36,7 @@ public final class ApacheHttpClientTelemetryBuilder {
   public ApacheHttpClientTelemetryBuilder addAttributeExtractor(
       AttributesExtractor<? super ApacheHttpClientRequest, ? super HttpResponse>
           attributesExtractor) {
-    builder.addAttributeExtractor(attributesExtractor);
+    clientBuilder.addAttributeExtractor(attributesExtractor);
     return this;
   }
 
@@ -47,7 +47,7 @@ public ApacheHttpClientTelemetryBuilder addAttributeExtractor(
    */
   @CanIgnoreReturnValue
   public ApacheHttpClientTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
-    builder.setCapturedRequestHeaders(requestHeaders);
+    clientBuilder.setCapturedRequestHeaders(requestHeaders);
     return this;
   }
 
@@ -58,7 +58,7 @@ public ApacheHttpClientTelemetryBuilder setCapturedRequestHeaders(List<String> r
    */
   @CanIgnoreReturnValue
   public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
-    builder.setCapturedResponseHeaders(responseHeaders);
+    clientBuilder.setCapturedResponseHeaders(responseHeaders);
     return this;
   }
 
@@ -77,7 +77,7 @@ public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders(List<String>
    */
   @CanIgnoreReturnValue
   public ApacheHttpClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
-    builder.setKnownMethods(knownMethods);
+    clientBuilder.setKnownMethods(knownMethods);
     return this;
   }
 
@@ -90,7 +90,7 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Set<String> knownMethods
   @CanIgnoreReturnValue
   public ApacheHttpClientTelemetryBuilder setEmitExperimentalHttpClientMetrics(
       boolean emitExperimentalHttpClientMetrics) {
-    builder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
+    clientBuilder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
     return this;
   }
 
@@ -101,7 +101,7 @@ public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
               SpanNameExtractor<ApacheHttpClientRequest>,
               ? extends SpanNameExtractor<? super ApacheHttpClientRequest>>
           spanNameExtractorTransformer) {
-    builder.setSpanNameExtractor(spanNameExtractorTransformer);
+    clientBuilder.setSpanNameExtractor(spanNameExtractorTransformer);
     return this;
   }
 
@@ -111,6 +111,6 @@ public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
    */
   public ApacheHttpClientTelemetry build() {
     return new ApacheHttpClientTelemetry(
-        builder.build(), builder.getOpenTelemetry().getPropagators());
+        clientBuilder.build(), clientBuilder.getOpenTelemetry().getPropagators());
   }
 }

instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClient5TelemetryBuilder.java

@@ -21,10 +21,10 @@ public final class ApacheHttpClient5TelemetryBuilder {
 
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.apache-httpclient-5.2";
   private final DefaultHttpClientInstrumenterBuilder<ApacheHttpClient5Request, HttpResponse>
-      builder;
+      clientBuilder;
 
   ApacheHttpClient5TelemetryBuilder(OpenTelemetry openTelemetry) {
-    builder =
+    clientBuilder =
         new DefaultHttpClientInstrumenterBuilder<>(
             INSTRUMENTATION_NAME, openTelemetry, ApacheHttpClient5HttpAttributesGetter.INSTANCE);
   }
@@ -37,7 +37,7 @@ public final class ApacheHttpClient5TelemetryBuilder {
   public ApacheHttpClient5TelemetryBuilder addAttributeExtractor(
       AttributesExtractor<? super ApacheHttpClient5Request, ? super HttpResponse>
           attributesExtractor) {
-    builder.addAttributeExtractor(attributesExtractor);
+    clientBuilder.addAttributeExtractor(attributesExtractor);
     return this;
   }
 
@@ -48,7 +48,7 @@ public ApacheHttpClient5TelemetryBuilder addAttributeExtractor(
    */
   @CanIgnoreReturnValue
   public ApacheHttpClient5TelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
-    builder.setCapturedRequestHeaders(requestHeaders);
+    clientBuilder.setCapturedRequestHeaders(requestHeaders);
     return this;
   }
 
@@ -60,7 +60,7 @@ public ApacheHttpClient5TelemetryBuilder setCapturedRequestHeaders(List<String>
   @CanIgnoreReturnValue
   public ApacheHttpClient5TelemetryBuilder setCapturedResponseHeaders(
       List<String> responseHeaders) {
-    builder.setCapturedResponseHeaders(responseHeaders);
+    clientBuilder.setCapturedResponseHeaders(responseHeaders);
     return this;
   }
 
@@ -79,7 +79,7 @@ public ApacheHttpClient5TelemetryBuilder setCapturedResponseHeaders(
    */
   @CanIgnoreReturnValue
   public ApacheHttpClient5TelemetryBuilder setKnownMethods(Set<String> knownMethods) {
-    builder.setKnownMethods(knownMethods);
+    clientBuilder.setKnownMethods(knownMethods);
     return this;
   }
 
@@ -92,7 +92,7 @@ public ApacheHttpClient5TelemetryBuilder setKnownMethods(Set<String> knownMethod
   @CanIgnoreReturnValue
   public ApacheHttpClient5TelemetryBuilder setEmitExperimentalHttpClientMetrics(
       boolean emitExperimentalHttpClientMetrics) {
-    builder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
+    clientBuilder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
     return this;
   }
 
@@ -103,7 +103,7 @@ public ApacheHttpClient5TelemetryBuilder setSpanNameExtractor(
               SpanNameExtractor<ApacheHttpClient5Request>,
               ? extends SpanNameExtractor<? super ApacheHttpClient5Request>>
           spanNameExtractorTransformer) {
-    builder.setSpanNameExtractor(spanNameExtractorTransformer);
+    clientBuilder.setSpanNameExtractor(spanNameExtractorTransformer);
     return this;
   }
 
@@ -113,6 +113,6 @@ public ApacheHttpClient5TelemetryBuilder setSpanNameExtractor(
    */
   public ApacheHttpClient5Telemetry build() {
     return new ApacheHttpClient5Telemetry(
-        builder.build(), builder.getOpenTelemetry().getPropagators());
+        clientBuilder.build(), clientBuilder.getOpenTelemetry().getPropagators());
   }
 }

instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java

@@ -35,12 +35,12 @@ public final class ArmeriaTelemetryBuilder {
   private static final AttributeKey<String> PEER_SERVICE = AttributeKey.stringKey("peer.service");
 
   @Nullable private String peerService;
-  private final DefaultHttpClientTelemetryBuilder<ClientRequestContext, RequestLog> builder;
+  private final DefaultHttpClientTelemetryBuilder<ClientRequestContext, RequestLog> clientBuilder;
   private final DefaultHttpServerTelemetryBuilder<ServiceRequestContext, RequestLog> serverBuilder;
 
   @SuppressWarnings({"rawtypes", "unchecked"})
   ArmeriaTelemetryBuilder(OpenTelemetry openTelemetry) {
-    builder = new DefaultHttpClientTelemetryBuilder<>(INSTRUMENTATION_NAME,
+    clientBuilder = new DefaultHttpClientTelemetryBuilder<>(INSTRUMENTATION_NAME,
         openTelemetry,
         (HttpClientAttributesGetter)ArmeriaHttpClientAttributesGetter.INSTANCE,
         Optional.of(ClientRequestContextSetter.INSTANCE));
@@ -55,7 +55,7 @@ public ArmeriaTelemetryBuilder setStatusExtractor(
               SpanStatusExtractor<RequestContext, RequestLog>,
               ? extends SpanStatusExtractor<? super RequestContext, ? super RequestLog>>
           statusExtractor) {
-    builder.setStatusExtractor((Function)statusExtractor);
+    clientBuilder.setStatusExtractor((Function)statusExtractor);
     serverBuilder.setStatusExtractor((Function)statusExtractor);
     return this;
   }
@@ -68,7 +68,7 @@ public ArmeriaTelemetryBuilder setStatusExtractor(
   @CanIgnoreReturnValue
   public ArmeriaTelemetryBuilder addAttributeExtractor(
       AttributesExtractor<? super RequestContext, ? super RequestLog> attributesExtractor) {
-    builder.addAttributeExtractor(attributesExtractor);
+    clientBuilder.addAttributeExtractor(attributesExtractor);
     serverBuilder.addAttributesExtractor((AttributesExtractor)attributesExtractor);
     return this;
   }
@@ -81,7 +81,7 @@ public ArmeriaTelemetryBuilder addAttributeExtractor(
   @CanIgnoreReturnValue
   public ArmeriaTelemetryBuilder addClientAttributeExtractor(
       AttributesExtractor<? super ClientRequestContext, ? super RequestLog> attributesExtractor) {
-    builder.addAttributeExtractor(attributesExtractor);
+    clientBuilder.addAttributeExtractor(attributesExtractor);
     return this;
   }
 
@@ -99,7 +99,7 @@ public ArmeriaTelemetryBuilder setPeerService(String peerService) {
    */
   @CanIgnoreReturnValue
   public ArmeriaTelemetryBuilder setCapturedClientRequestHeaders(List<String> requestHeaders) {
-    builder.setCapturedRequestHeaders(requestHeaders);
+    clientBuilder.setCapturedRequestHeaders(requestHeaders);
     return this;
   }
 
@@ -110,7 +110,7 @@ public ArmeriaTelemetryBuilder setCapturedClientRequestHeaders(List<String> requ
    */
   @CanIgnoreReturnValue
   public ArmeriaTelemetryBuilder setCapturedClientResponseHeaders(List<String> responseHeaders) {
-    builder.setCapturedResponseHeaders(responseHeaders);
+    clientBuilder.setCapturedResponseHeaders(responseHeaders);
     return this;
   }
 
@@ -152,7 +152,7 @@ public ArmeriaTelemetryBuilder setCapturedServerResponseHeaders(List<String> res
    */
   @CanIgnoreReturnValue
   public ArmeriaTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
-    builder.setKnownMethods(knownMethods);
+    clientBuilder.setKnownMethods(knownMethods);
     serverBuilder.setKnownMethods(knownMethods);
     return this;
   }
@@ -166,7 +166,7 @@ public ArmeriaTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
   @CanIgnoreReturnValue
   public ArmeriaTelemetryBuilder setEmitExperimentalHttpClientMetrics(
       boolean emitExperimentalHttpClientMetrics) {
-    builder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
+    clientBuilder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
     serverBuilder.setEmitExperimentalHttpServerMetrics(emitExperimentalHttpClientMetrics);
     return this;
   }
@@ -180,7 +180,7 @@ public ArmeriaTelemetryBuilder setEmitExperimentalHttpClientMetrics(
   @CanIgnoreReturnValue
   public ArmeriaTelemetryBuilder setEmitExperimentalHttpServerMetrics(
       boolean emitExperimentalHttpServerMetrics) {
-    builder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpServerMetrics);
+    clientBuilder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpServerMetrics);
     serverBuilder.setEmitExperimentalHttpServerMetrics(emitExperimentalHttpServerMetrics);
     return this;
   }
@@ -193,7 +193,7 @@ public ArmeriaTelemetryBuilder setClientSpanNameExtractor(
               SpanNameExtractor<RequestContext>,
               ? extends SpanNameExtractor<? super RequestContext>>
           clientSpanNameExtractor) {
-    builder.setSpanNameExtractor((Function)clientSpanNameExtractor);
+    clientBuilder.setSpanNameExtractor((Function)clientSpanNameExtractor);
     return this;
   }
 
@@ -211,7 +211,7 @@ public ArmeriaTelemetryBuilder setServerSpanNameExtractor(
 
   public ArmeriaTelemetry build() {
     return new ArmeriaTelemetry(
-        builder.instrumenter(clientInstrumenterBuilder -> {
+        clientBuilder.instrumenter(clientInstrumenterBuilder -> {
           if (peerService != null) {
                clientInstrumenterBuilder.addAttributesExtractor(
                    AttributesExtractor.constant(PEER_SERVICE, peerService));

instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorClientTracingBuilder.kt

@@ -18,10 +18,10 @@ import java.util.*
 
 class KtorClientTracingBuilder {
 
-  private lateinit var builder: DefaultHttpClientTelemetryBuilder<HttpRequestData, HttpResponse>
+  private lateinit var clientBuilder: DefaultHttpClientTelemetryBuilder<HttpRequestData, HttpResponse>
 
   fun setOpenTelemetry(openTelemetry: OpenTelemetry) {
-    this.builder = DefaultHttpClientTelemetryBuilder(
+    this.clientBuilder = DefaultHttpClientTelemetryBuilder(
       INSTRUMENTATION_NAME,
       openTelemetry,
       KtorHttpClientAttributesGetter,
@@ -44,7 +44,7 @@ class KtorClientTracingBuilder {
   fun capturedRequestHeaders(vararg headers: String) = capturedRequestHeaders(headers.asIterable())
 
   fun capturedRequestHeaders(headers: Iterable<String>) {
-    builder.setCapturedRequestHeaders(headers.toList())
+    clientBuilder.setCapturedRequestHeaders(headers.toList())
   }
 
   @Deprecated(
@@ -62,7 +62,7 @@ class KtorClientTracingBuilder {
   fun capturedResponseHeaders(vararg headers: String) = capturedResponseHeaders(headers.asIterable())
 
   fun capturedResponseHeaders(headers: Iterable<String>) {
-    builder.setCapturedResponseHeaders(headers.toList())
+    clientBuilder.setCapturedResponseHeaders(headers.toList())
   }
 
   @Deprecated(
@@ -79,7 +79,7 @@ class KtorClientTracingBuilder {
   fun knownMethods(methods: Iterable<HttpMethod>) = knownMethods(methods.map { it.value })
 
   fun knownMethods(methods: Iterable<String>) {
-    builder.setKnownMethods(methods.toSet())
+    clientBuilder.setKnownMethods(methods.toSet())
   }
 
   @Deprecated("Please use method `attributeExtractor`")
@@ -97,7 +97,7 @@ class KtorClientTracingBuilder {
 
   fun attributeExtractor(extractorBuilder: ExtractorBuilder.() -> Unit = {}) {
     val builder = ExtractorBuilder().apply(extractorBuilder).build()
-    this.builder.addAttributeExtractor(
+    this.clientBuilder.addAttributeExtractor(
       object : AttributesExtractor<HttpRequestData, HttpResponse> {
         override fun onStart(attributes: AttributesBuilder, parentContext: Context, request: HttpRequestData) {
           builder.onStart(OnStartData(attributes, parentContext, request))
@@ -156,11 +156,11 @@ class KtorClientTracingBuilder {
   }
 
   fun emitExperimentalHttpClientMetrics() {
-    builder.setEmitExperimentalHttpClientMetrics(true)
+    clientBuilder.setEmitExperimentalHttpClientMetrics(true)
   }
 
   internal fun build(): KtorClientTracing = KtorClientTracing(
-    instrumenter = builder.instrumenter(),
-    propagators = builder.openTelemetry.propagators,
+    instrumenter = clientBuilder.instrumenter(),
+    propagators = clientBuilder.openTelemetry.propagators,
   )
 }