Apply to *Telemetry classes

Author: trask

docs/contributing/style-guide.md

@@ -75,8 +75,9 @@ immediately after the field to keep initialization logic co-located, even when t
 the general method ordering above.
 
 **Static factory entry points**: When a class exposes public static factory methods as its primary
-creation API (for example `create*(...)` or `builder(...)`), those methods should be placed below
-fields and above constructors.
+creation API (for example `create*(...)` or `builder(...)`), place those methods below fields and
+immediately above constructors. Treat static factory methods and constructors as a single
+construction section.
 
 **Static utility classes**: Place the private constructor (used to prevent instantiation) after all
 methods.

instrumentation/alibaba-druid-1.0/library/src/main/java/io/opentelemetry/instrumentation/alibabadruid/v1_0/DruidTelemetry.java

@@ -9,13 +9,12 @@
 import io.opentelemetry.api.OpenTelemetry;
 
 public final class DruidTelemetry {
+  private final OpenTelemetry openTelemetry;
 
   public static DruidTelemetry create(OpenTelemetry openTelemetry) {
     return new DruidTelemetry(openTelemetry);
   }
 
-  private final OpenTelemetry openTelemetry;
-
   private DruidTelemetry(OpenTelemetry openTelemetry) {
     this.openTelemetry = openTelemetry;
   }

instrumentation/apache-dbcp-2.0/library/src/main/java/io/opentelemetry/instrumentation/apachedbcp/v2_0/ApacheDbcpTelemetry.java

@@ -10,14 +10,13 @@
 
 /** Entrypoint for instrumenting Apache DBCP database connection pools. */
 public final class ApacheDbcpTelemetry {
+  private final OpenTelemetry openTelemetry;
 
   /** Returns a new {@link ApacheDbcpTelemetry} configured with the given {@link OpenTelemetry}. */
   public static ApacheDbcpTelemetry create(OpenTelemetry openTelemetry) {
     return new ApacheDbcpTelemetry(openTelemetry);
   }
 
-  private final OpenTelemetry openTelemetry;
-
   private ApacheDbcpTelemetry(OpenTelemetry openTelemetry) {
     this.openTelemetry = openTelemetry;
   }

instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetry.java

@@ -12,7 +12,6 @@
 
 /** Entrypoint for instrumenting Apache Dubbo servers and clients. */
 public final class DubboTelemetry {
-
   private final Instrumenter<DubboRequest, Result> serverInstrumenter;
   private final Instrumenter<DubboRequest, Result> clientInstrumenter;
 

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

@@ -14,6 +14,8 @@
 
 /** Entrypoint for instrumenting Apache HTTP Client. */
 public final class ApacheHttpClientTelemetry {
+  private final Instrumenter<ApacheHttpClientRequest, HttpResponse> instrumenter;
+  private final ContextPropagators propagators;
 
   /** Returns a new instance configured with the given {@link OpenTelemetry} instance. */
   public static ApacheHttpClientTelemetry create(OpenTelemetry openTelemetry) {
@@ -25,9 +27,6 @@ public static ApacheHttpClientTelemetryBuilder builder(OpenTelemetry openTelemet
     return new ApacheHttpClientTelemetryBuilder(openTelemetry);
   }
 
-  private final Instrumenter<ApacheHttpClientRequest, HttpResponse> instrumenter;
-  private final ContextPropagators propagators;
-
   ApacheHttpClientTelemetry(
       Instrumenter<ApacheHttpClientRequest, HttpResponse> instrumenter,
       ContextPropagators propagators) {

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

@@ -15,6 +15,8 @@
 
 /** Entrypoint for instrumenting Apache HTTP Client. */
 public final class ApacheHttpClientTelemetry {
+  private final Instrumenter<ApacheHttpClientRequest, HttpResponse> instrumenter;
+  private final ContextPropagators propagators;
 
   /** Returns a new instance configured with the given {@link OpenTelemetry} instance. */
   public static ApacheHttpClientTelemetry create(OpenTelemetry openTelemetry) {
@@ -26,9 +28,6 @@ public static ApacheHttpClientTelemetryBuilder builder(OpenTelemetry openTelemet
     return new ApacheHttpClientTelemetryBuilder(openTelemetry);
   }
 
-  private final Instrumenter<ApacheHttpClientRequest, HttpResponse> instrumenter;
-  private final ContextPropagators propagators;
-
   ApacheHttpClientTelemetry(
       Instrumenter<ApacheHttpClientRequest, HttpResponse> instrumenter,
       ContextPropagators propagators) {

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

@@ -14,6 +14,7 @@
 
 /** Entrypoint for instrumenting Armeria clients. */
 public final class ArmeriaClientTelemetry {
+  private final Instrumenter<ClientRequestContext, RequestLog> instrumenter;
 
   /** Returns a new instance configured with the given {@link OpenTelemetry} instance. */
   public static ArmeriaClientTelemetry create(OpenTelemetry openTelemetry) {
@@ -25,8 +26,6 @@ public static ArmeriaClientTelemetryBuilder builder(OpenTelemetry openTelemetry)
     return new ArmeriaClientTelemetryBuilder(openTelemetry);
   }
 
-  private final Instrumenter<ClientRequestContext, RequestLog> instrumenter;
-
   ArmeriaClientTelemetry(Instrumenter<ClientRequestContext, RequestLog> instrumenter) {
     this.instrumenter = instrumenter;
   }

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

@@ -14,6 +14,7 @@
 
 /** Entrypoint for instrumenting Armeria services. */
 public final class ArmeriaServerTelemetry {
+  private final Instrumenter<ServiceRequestContext, RequestLog> instrumenter;
 
   /** Returns a new instance configured with the given {@link OpenTelemetry} instance. */
   public static ArmeriaServerTelemetry create(OpenTelemetry openTelemetry) {
@@ -25,8 +26,6 @@ public static ArmeriaServerTelemetryBuilder builder(OpenTelemetry openTelemetry)
     return new ArmeriaServerTelemetryBuilder(openTelemetry);
   }
 
-  private final Instrumenter<ServiceRequestContext, RequestLog> instrumenter;
-
   ArmeriaServerTelemetry(Instrumenter<ServiceRequestContext, RequestLog> instrumenter) {
     this.instrumenter = instrumenter;
   }

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkTelemetry.java

@@ -23,15 +23,11 @@
  * witness broken traces.
  */
 public class AwsSdkTelemetry {
-
-  /**
-   * Returns the OpenTelemetry {@link Context} stored in the {@link Request}, or {@code null} if
-   * there is no {@link Context}. This is generally not needed unless you are implementing your own
-   * instrumentation that delegates to this one.
-   */
-  public static Context getOpenTelemetryContext(Request<?> request) {
-    return request.getHandlerContext(TracingRequestHandler.CONTEXT);
-  }
+  private final Instrumenter<Request<?>, Response<?>> requestInstrumenter;
+  private final Instrumenter<SqsReceiveRequest, Response<?>> consumerReceiveInstrumenter;
+  private final Instrumenter<SqsProcessRequest, Response<?>> consumerProcessInstrumenter;
+  private final Instrumenter<Request<?>, Response<?>> producerInstrumenter;
+  private final Instrumenter<Request<?>, Response<?>> dynamoDbInstrumenter;
 
   /** Returns a new {@link AwsSdkTelemetry} configured with the given {@link OpenTelemetry}. */
   public static AwsSdkTelemetry create(OpenTelemetry openTelemetry) {
@@ -45,12 +41,6 @@ public static AwsSdkTelemetryBuilder builder(OpenTelemetry openTelemetry) {
     return new AwsSdkTelemetryBuilder(openTelemetry);
   }
 
-  private final Instrumenter<Request<?>, Response<?>> requestInstrumenter;
-  private final Instrumenter<SqsReceiveRequest, Response<?>> consumerReceiveInstrumenter;
-  private final Instrumenter<SqsProcessRequest, Response<?>> consumerProcessInstrumenter;
-  private final Instrumenter<Request<?>, Response<?>> producerInstrumenter;
-  private final Instrumenter<Request<?>, Response<?>> dynamoDbInstrumenter;
-
   AwsSdkTelemetry(
       OpenTelemetry openTelemetry,
       List<String> capturedHeaders,
@@ -81,4 +71,13 @@ public RequestHandler2 createRequestHandler() {
         producerInstrumenter,
         dynamoDbInstrumenter);
   }
+
+  /**
+   * Returns the OpenTelemetry {@link Context} stored in the {@link Request}, or {@code null} if
+   * there is no {@link Context}. This is generally not needed unless you are implementing your own
+   * instrumentation that delegates to this one.
+   */
+  public static Context getOpenTelemetryContext(Request<?> request) {
+    return request.getHandlerContext(TracingRequestHandler.CONTEXT);
+  }
 }

instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkTelemetry.java

@@ -48,19 +48,6 @@
  * }</pre>
  */
 public class AwsSdkTelemetry {
-
-  /** Returns a new {@link AwsSdkTelemetry} configured with the given {@link OpenTelemetry}. */
-  public static AwsSdkTelemetry create(OpenTelemetry openTelemetry) {
-    return builder(openTelemetry).build();
-  }
-
-  /**
-   * Returns a new {@link AwsSdkTelemetryBuilder} configured with the given {@link OpenTelemetry}.
-   */
-  public static AwsSdkTelemetryBuilder builder(OpenTelemetry openTelemetry) {
-    return new AwsSdkTelemetryBuilder(openTelemetry);
-  }
-
   private final Instrumenter<ExecutionAttributes, Response> requestInstrumenter;
   private final Instrumenter<SqsReceiveRequest, Response> consumerReceiveInstrumenter;
   private final Instrumenter<SqsProcessRequest, Response> consumerProcessInstrumenter;
@@ -74,6 +61,18 @@ public static AwsSdkTelemetryBuilder builder(OpenTelemetry openTelemetry) {
   private final boolean recordIndividualHttpError;
   private final boolean genAiCaptureMessageContent;
 
+  /** Returns a new {@link AwsSdkTelemetry} configured with the given {@link OpenTelemetry}. */
+  public static AwsSdkTelemetry create(OpenTelemetry openTelemetry) {
+    return builder(openTelemetry).build();
+  }
+
+  /**
+   * Returns a new {@link AwsSdkTelemetryBuilder} configured with the given {@link OpenTelemetry}.
+   */
+  public static AwsSdkTelemetryBuilder builder(OpenTelemetry openTelemetry) {
+    return new AwsSdkTelemetryBuilder(openTelemetry);
+  }
+
   AwsSdkTelemetry(
       OpenTelemetry openTelemetry,
       List<String> capturedHeaders,