Fix spotless: use static imports for SemconvStability methods

Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>

Author: zeitlinger

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcAttributesGetter.java

@@ -74,8 +74,8 @@ default String getRpcMethod(REQUEST request) {
    *
    * <p>This method should return {@code null} if there was no error.
    *
-   * <p>If this method returns {@code null}, the exception class name
-   * will be used as error type if one was thrown.
+   * <p>If this method returns {@code null}, the exception class name will be used as error type if
+   * one was thrown.
    *
    * <p>The cardinality of the error type should be low. The instrumentations implementing this
    * method are recommended to document the custom values they support.

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcCommonAttributesExtractor.java

@@ -5,13 +5,14 @@
 
 package io.opentelemetry.instrumentation.api.incubator.semconv.rpc;
 
+import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitOldRpcSemconv;
+import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableRpcSemconv;
 import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
-import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import javax.annotation.Nullable;
 
 abstract class RpcCommonAttributesExtractor<REQUEST, RESPONSE>
@@ -38,15 +39,15 @@ abstract class RpcCommonAttributesExtractor<REQUEST, RESPONSE>
   @Override
   public final void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
 
-    if (SemconvStability.emitStableRpcSemconv()) {
+    if (emitStableRpcSemconv()) {
       attributes.put(RPC_SYSTEM_NAME, getter.getRpcSystemName(request));
       attributes.put(RPC_METHOD, getter.getRpcMethod(request));
     }
 
-    if (SemconvStability.emitOldRpcSemconv()) {
+    if (emitOldRpcSemconv()) {
       attributes.put(RPC_SYSTEM, getter.getSystem(request));
       attributes.put(RPC_SERVICE, getter.getService(request));
-      if (!SemconvStability.emitStableRpcSemconv()) {
+      if (!emitStableRpcSemconv()) {
         // only set old rpc.method on spans when there's no clash with stable rpc.method
         attributes.put(RPC_METHOD, getter.getMethod(request));
       }
@@ -60,7 +61,7 @@ public final void onEnd(
       REQUEST request,
       @Nullable RESPONSE response,
       @Nullable Throwable error) {
-    if (SemconvStability.emitStableRpcSemconv()) {
+    if (emitStableRpcSemconv()) {
       String errorType = getter.getErrorType(request, response, error);
       // fall back to exception class name
       if (errorType == null && error != null) {

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcSpanNameExtractor.java

@@ -5,8 +5,9 @@
 
 package io.opentelemetry.instrumentation.api.incubator.semconv.rpc;
 
+import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableRpcSemconv;
+
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
-import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 
 /** A {@link SpanNameExtractor} for RPC requests. */
 public final class RpcSpanNameExtractor<REQUEST> implements SpanNameExtractor<REQUEST> {
@@ -29,7 +30,7 @@ private RpcSpanNameExtractor(RpcAttributesGetter<REQUEST, ?> getter) {
   @SuppressWarnings("deprecation") // for getMethod()
   @Override
   public String extract(REQUEST request) {
-    if (SemconvStability.emitStableRpcSemconv()) {
+    if (emitStableRpcSemconv()) {
       String method = getter.getRpcMethod(request);
       if (method != null) {
         return method;

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcAttributesExtractorTest.java

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.instrumentation.api.incubator.semconv.rpc;
 
+import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitOldRpcSemconv;
+import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableRpcSemconv;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
 import static org.assertj.core.api.Assertions.entry;
@@ -14,7 +16,6 @@
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
-import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -102,15 +103,15 @@ private static void testExtractor(AttributesExtractor<Map<String, String>, Void>
     // Build expected entries list based on semconv mode
     List<Map.Entry<? extends AttributeKey<?>, ?>> expectedEntries = new ArrayList<>();
 
-    if (SemconvStability.emitStableRpcSemconv()) {
+    if (emitStableRpcSemconv()) {
       expectedEntries.add(entry(RPC_SYSTEM_NAME, "test"));
       expectedEntries.add(entry(RPC_METHOD, "my.Service/Method"));
     }
 
-    if (SemconvStability.emitOldRpcSemconv()) {
+    if (emitOldRpcSemconv()) {
       expectedEntries.add(entry(RPC_SYSTEM, "test"));
       expectedEntries.add(entry(RPC_SERVICE, "my.Service"));
-      if (!SemconvStability.emitStableRpcSemconv()) {
+      if (!emitStableRpcSemconv()) {
         expectedEntries.add(entry(RPC_METHOD, "Method"));
       }
     }
@@ -140,7 +141,7 @@ void shouldExtractErrorType_getter() {
     extractor.onStart(attributes, context, request);
     extractor.onEnd(attributes, context, request, null, null);
 
-    if (SemconvStability.emitStableRpcSemconv()) {
+    if (emitStableRpcSemconv()) {
       assertThat(attributes.build()).containsEntry(ERROR_TYPE, "CANCELLED");
     }
   }
@@ -159,7 +160,7 @@ void shouldExtractErrorType_exceptionClassName() {
     extractor.onStart(attributes, context, request);
     extractor.onEnd(attributes, context, request, null, new IllegalArgumentException());
 
-    if (SemconvStability.emitStableRpcSemconv()) {
+    if (emitStableRpcSemconv()) {
       assertThat(attributes.build())
           .containsEntry(ERROR_TYPE, "java.lang.IllegalArgumentException");
     }
@@ -179,7 +180,7 @@ void shouldNotExtractErrorType_noError() {
     extractor.onStart(attributes, context, request);
     extractor.onEnd(attributes, context, request, null, null);
 
-    if (SemconvStability.emitStableRpcSemconv()) {
+    if (emitStableRpcSemconv()) {
       assertThat(attributes.build()).doesNotContainKey(ERROR_TYPE);
     }
   }

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcSpanNameExtractorTest.java

@@ -5,13 +5,13 @@
 
 package io.opentelemetry.instrumentation.api.incubator.semconv.rpc;
 
+import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableRpcSemconv;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
-import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -38,7 +38,7 @@ void normal() {
   @Test
   @SuppressWarnings("deprecation") // testing deprecated method
   void serviceNull() {
-    assumeTrue(!SemconvStability.emitStableRpcSemconv());
+    assumeTrue(!emitStableRpcSemconv());
 
     RpcRequest request = new RpcRequest();
 
@@ -50,7 +50,7 @@ void serviceNull() {
 
   @Test
   void methodNull() {
-    assumeTrue(!SemconvStability.emitStableRpcSemconv());
+    assumeTrue(!emitStableRpcSemconv());
 
     RpcRequest request = new RpcRequest();
 
@@ -62,7 +62,7 @@ void methodNull() {
 
   @Test
   void rpcMethodNull_fallsBackToSystemName() {
-    assumeTrue(SemconvStability.emitStableRpcSemconv());
+    assumeTrue(emitStableRpcSemconv());
 
     RpcRequest request = new RpcRequest();
 
@@ -74,7 +74,7 @@ void rpcMethodNull_fallsBackToSystemName() {
 
   @Test
   void rpcMethodAndSystemNameNull() {
-    assumeTrue(SemconvStability.emitStableRpcSemconv());
+    assumeTrue(emitStableRpcSemconv());
 
     RpcRequest request = new RpcRequest();