Merge pull request #26538 from gsmet/jakarta-progress-12

Jakarta progress 12
quarkusio · Jul 4, 2022 · be28a2f · be28a2f
2 parents 3a7ef4f + 7a0bd41
commit be28a2f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/ci-actions-incremental.yml b/.github/workflows/ci-actions-incremental.yml
@@ -114,6 +114,11 @@ jobs:
       gib_args: ${{ steps.get-gib-args.outputs.gib_args }}
       gib_impacted: ${{ steps.get-gib-impacted.outputs.impacted_modules }}
     steps:
+      - name: Skip non-compilable modules for jakarta-rewrite branch
+        run: |
+          echo "COMMON_MAVEN_ARGS=${COMMON_MAVEN_ARGS} -pl '"'!'":quarkus-integration-test-infinispan-client' -pl '"'!'":quarkus-integration-test-kafka-avro'" >> $COMMON_MAVEN_ARGS
+        if: github.ref_name == 'jakarta-rewrite'
+
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
@@ -188,7 +193,7 @@ jobs:
             # we filter them here so that it cascades to all the builds
             if [ "${GITHUB_REF_NAME}" == "jakarta-rewrite" ]
             then
-              GIB_IMPACTED=$(cat gib-impacted.log | grep -Pv '^(tcks/|integration-tests/grpc-|integration-tests/infinispan-client|integration-tests/kafka-avro|integration-tests/opentelemetry-grpc)')
+              GIB_IMPACTED=$(cat gib-impacted.log | grep -Pv '^(integration-tests/infinispan-client|integration-tests/kafka-avro)')
             else
               GIB_IMPACTED=$(cat gib-impacted.log)
             fi

diff --git a/.../src/main/java/io/quarkus/opentelemetry/runtime/tracing/grpc/GrpcSpanStatusExtractor.java b/.../src/main/java/io/quarkus/opentelemetry/runtime/tracing/grpc/GrpcSpanStatusExtractor.java
@@ -1,7 +1,5 @@
 package io.quarkus.opentelemetry.runtime.tracing.grpc;
 
-import javax.annotation.Nullable;
-
 import io.grpc.Status;
 import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusBuilder;
@@ -12,8 +10,8 @@ class GrpcSpanStatusExtractor implements SpanStatusExtractor<GrpcRequest, Status
     public void extract(
             final SpanStatusBuilder spanStatusBuilder,
             final GrpcRequest grpcRequest,
-            @Nullable final Status status,
-            @Nullable final Throwable error) {
+            final Status status,
+            final Throwable error) {
         if (status != null && status.isOk()) {
             spanStatusBuilder.setStatus(StatusCode.UNSET);
         } else if (error != null) {