add suppress method that takes span kind

Author: zeitlinger

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/Instrumenter.java

@@ -327,8 +327,15 @@ public <REQUEST, RESPONSE> Context suppressSpan(
               Instrumenter<REQUEST, RESPONSE> instrumenter,
               Context parentContext,
               REQUEST request) {
-            SpanKind spanKind = instrumenter.spanKindExtractor.extract(request);
+            return suppressSpan(
+                instrumenter, parentContext, instrumenter.spanKindExtractor.extract(request));
+          }
 
+          @Override
+          public <REQUEST, RESPONSE> Context suppressSpan(
+              Instrumenter<REQUEST, RESPONSE> instrumenter,
+              Context parentContext,
+              SpanKind spanKind) {
             return instrumenter.spanSuppressor.storeInContext(
                 parentContext, spanKind, Span.getInvalid());
           }

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InstrumenterAccess.java

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.instrumentation.api.internal;
 
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import java.time.Instant;
@@ -27,4 +28,7 @@ <REQUEST, RESPONSE> Context startAndEnd(
 
   <REQUEST, RESPONSE> Context suppressSpan(
       Instrumenter<REQUEST, RESPONSE> instrumenter, Context parentContext, REQUEST request);
+
+  <REQUEST, RESPONSE> Context suppressSpan(
+      Instrumenter<REQUEST, RESPONSE> instrumenter, Context parentContext, SpanKind spanKind);
 }

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InstrumenterUtil.java

@@ -6,6 +6,7 @@
 package io.opentelemetry.instrumentation.api.internal;
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.context.propagation.TextMapSetter;
@@ -53,6 +54,11 @@ public static <REQUEST, RESPONSE> Context suppressSpan(
     return instrumenterAccess.suppressSpan(instrumenter, parentContext, request);
   }
 
+  public static <REQUEST, RESPONSE> Context suppressSpan(
+      Instrumenter<REQUEST, RESPONSE> instrumenter, Context parentContext, SpanKind spanKind) {
+    return instrumenterAccess.suppressSpan(instrumenter, parentContext, spanKind);
+  }
+
   public static <REQUEST, RESPONSE> Instrumenter<REQUEST, RESPONSE> buildUpstreamInstrumenter(
       InstrumenterBuilder<REQUEST, RESPONSE> builder,
       TextMapGetter<REQUEST> getter,

instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v2_0/JmsDestinationAccessorInstrumentation.java

@@ -10,6 +10,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.internal.InstrumenterUtil;
@@ -44,10 +45,9 @@ public static Scope onEnter() {
         return null;
       }
       // suppress receive span creation in jms instrumentation
-      @SuppressWarnings("NullAway") // request is ignored in SpanKindExtractor.alwaysConsumer()
       Context context =
           InstrumenterUtil.suppressSpan(
-              receiveInstrumenter(), Java8BytecodeBridge.currentContext(), null);
+              receiveInstrumenter(), Java8BytecodeBridge.currentContext(), SpanKind.CONSUMER);
       return context.makeCurrent();
     }
 

instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/JmsDestinationAccessorInstrumentation.java

@@ -10,6 +10,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.internal.InstrumenterUtil;
@@ -44,10 +45,9 @@ public static Scope onEnter() {
         return null;
       }
       // suppress receive span creation in jms instrumentation
-      @SuppressWarnings("NullAway") // request is ignored in SpanKindExtractor.alwaysConsumer()
       Context context =
           InstrumenterUtil.suppressSpan(
-              receiveInstrumenter(), Java8BytecodeBridge.currentContext(), null);
+              receiveInstrumenter(), Java8BytecodeBridge.currentContext(), SpanKind.CONSUMER);
       return context.makeCurrent();
     }