simplify

Author: trask

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

@@ -24,17 +24,17 @@ public final class RatpackClientTelemetryBuilder {
 
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.ratpack-1.7";
 
-  private final DefaultHttpClientInstrumenterBuilder<RequestSpec, HttpResponse> clientBuilder;
+  private final DefaultHttpClientInstrumenterBuilder<RequestSpec, HttpResponse> builder;
 
   RatpackClientTelemetryBuilder(OpenTelemetry openTelemetry) {
-    clientBuilder =
+    builder =
         RatpackClientInstrumenterBuilderFactory.create(INSTRUMENTATION_NAME, openTelemetry);
   }
 
   @CanIgnoreReturnValue
   public RatpackClientTelemetryBuilder addAttributesExtractor(
       AttributesExtractor<? super RequestSpec, ? super HttpResponse> attributesExtractor) {
-    clientBuilder.addAttributeExtractor(attributesExtractor);
+    builder.addAttributeExtractor(attributesExtractor);
     return this;
   }
 
@@ -45,7 +45,7 @@ public RatpackClientTelemetryBuilder addAttributesExtractor(
    */
   @CanIgnoreReturnValue
   public RatpackClientTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
-    clientBuilder.setCapturedRequestHeaders(requestHeaders);
+    builder.setCapturedRequestHeaders(requestHeaders);
     return this;
   }
 
@@ -56,7 +56,7 @@ public RatpackClientTelemetryBuilder setCapturedRequestHeaders(List<String> requ
    */
   @CanIgnoreReturnValue
   public RatpackClientTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
-    clientBuilder.setCapturedResponseHeaders(responseHeaders);
+    builder.setCapturedResponseHeaders(responseHeaders);
     return this;
   }
 
@@ -75,7 +75,7 @@ public RatpackClientTelemetryBuilder setCapturedResponseHeaders(List<String> res
    */
   @CanIgnoreReturnValue
   public RatpackClientTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
-    clientBuilder.setKnownMethods(knownMethods);
+    builder.setKnownMethods(knownMethods);
     return this;
   }
 
@@ -86,7 +86,7 @@ public RatpackClientTelemetryBuilder setSpanNameExtractor(
               SpanNameExtractor<? super RequestSpec>,
               ? extends SpanNameExtractor<? super RequestSpec>>
           clientSpanNameExtractor) {
-    clientBuilder.setSpanNameExtractor(clientSpanNameExtractor);
+    builder.setSpanNameExtractor(clientSpanNameExtractor);
     return this;
   }
 
@@ -95,11 +95,11 @@ public RatpackClientTelemetryBuilder setSpanNameExtractor(
    * Experimental#setEmitExperimentalTelemetry(RatpackClientTelemetryBuilder, boolean)}.
    */
   void setEmitExperimentalHttpClientMetrics(boolean emitExperimentalHttpClientMetrics) {
-    clientBuilder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
+    builder.setEmitExperimentalHttpClientMetrics(emitExperimentalHttpClientMetrics);
   }
 
   /** Returns a new {@link RatpackClientTelemetry} with the configuration of this builder. */
   public RatpackClientTelemetry build() {
-    return new RatpackClientTelemetry(clientBuilder.build());
+    return new RatpackClientTelemetry(builder.build());
   }
 }

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

@@ -24,10 +24,10 @@ public final class RatpackServerTelemetryBuilder {
 
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.ratpack-1.7";
 
-  private final DefaultHttpServerInstrumenterBuilder<Request, Response> serverBuilder;
+  private final DefaultHttpServerInstrumenterBuilder<Request, Response> builder;
 
   RatpackServerTelemetryBuilder(OpenTelemetry openTelemetry) {
-    serverBuilder =
+    builder =
         RatpackServerInstrumenterBuilderFactory.create(INSTRUMENTATION_NAME, openTelemetry);
   }
 
@@ -38,7 +38,7 @@ public final class RatpackServerTelemetryBuilder {
   @CanIgnoreReturnValue
   public RatpackServerTelemetryBuilder addAttributesExtractor(
       AttributesExtractor<? super Request, ? super Response> attributesExtractor) {
-    serverBuilder.addAttributesExtractor(attributesExtractor);
+    builder.addAttributesExtractor(attributesExtractor);
     return this;
   }
 
@@ -49,7 +49,7 @@ public RatpackServerTelemetryBuilder addAttributesExtractor(
    */
   @CanIgnoreReturnValue
   public RatpackServerTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
-    serverBuilder.setCapturedRequestHeaders(requestHeaders);
+    builder.setCapturedRequestHeaders(requestHeaders);
     return this;
   }
 
@@ -60,7 +60,7 @@ public RatpackServerTelemetryBuilder setCapturedRequestHeaders(List<String> requ
    */
   @CanIgnoreReturnValue
   public RatpackServerTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
-    serverBuilder.setCapturedResponseHeaders(responseHeaders);
+    builder.setCapturedResponseHeaders(responseHeaders);
     return this;
   }
 
@@ -79,7 +79,7 @@ public RatpackServerTelemetryBuilder setCapturedResponseHeaders(List<String> res
    */
   @CanIgnoreReturnValue
   public RatpackServerTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
-    serverBuilder.setKnownMethods(knownMethods);
+    builder.setKnownMethods(knownMethods);
     return this;
   }
 
@@ -88,7 +88,7 @@ public RatpackServerTelemetryBuilder setKnownMethods(Set<String> knownMethods) {
   public RatpackServerTelemetryBuilder setSpanNameExtractor(
       Function<SpanNameExtractor<? super Request>, ? extends SpanNameExtractor<? super Request>>
           serverSpanNameExtractor) {
-    serverBuilder.setSpanNameExtractor(serverSpanNameExtractor);
+    builder.setSpanNameExtractor(serverSpanNameExtractor);
     return this;
   }
 
@@ -97,11 +97,11 @@ public RatpackServerTelemetryBuilder setSpanNameExtractor(
    * Experimental#setEmitExperimentalTelemetry(RatpackServerTelemetryBuilder, boolean)}.
    */
   void setEmitExperimentalHttpServerMetrics(boolean emitExperimentalHttpServerMetrics) {
-    serverBuilder.setEmitExperimentalHttpServerMetrics(emitExperimentalHttpServerMetrics);
+    builder.setEmitExperimentalHttpServerMetrics(emitExperimentalHttpServerMetrics);
   }
 
   /** Returns a new {@link RatpackServerTelemetry} with the configuration of this builder. */
   public RatpackServerTelemetry build() {
-    return new RatpackServerTelemetry(serverBuilder.build());
+    return new RatpackServerTelemetry(builder.build());
   }
 }