fixup bug in WithSpanInterceptor

Author: skykanin

src/main/java/no/ssb/dlp/pseudo/service/accessgroups/CloudIdentityService.java

@@ -1,7 +1,6 @@
 package no.ssb.dlp.pseudo.service.accessgroups;
 
 import io.micronaut.cache.annotation.Cacheable;
-import io.opentelemetry.api.trace.Span;
 import io.reactivex.Flowable;
 import jakarta.inject.Singleton;
 import lombok.RequiredArgsConstructor;

src/main/java/no/ssb/dlp/pseudo/service/tracing/WithSpanContext.java

@@ -13,6 +13,8 @@
 public final class WithSpanContext {
     private static final ContextKey<Span> WITH_SPAN_KEY = ContextKey.named("pseudo.withspan.span");
 
+    private WithSpanContext(){ }
+
     public static Span currentSpan() {
         Span span = Context.current().get(WITH_SPAN_KEY);
         return span != null ? span : Span.current();

src/main/java/no/ssb/dlp/pseudo/service/tracing/WithSpanInterceptor.java

@@ -110,18 +110,18 @@ private static void addSpanAttributes(Span span, MethodInvocationContext<Object,
         }
     }
 
-    private static void setAttribute(Span span, String name, Object value) {
+    private static void setAttribute(Span span, String attributeName, Object value) {
         switch (value) {
-            case String stringValue -> span.setAttribute(name, stringValue);
-            case Boolean booleanValue -> span.setAttribute(name, booleanValue);
-            case Long longValue -> span.setAttribute(name, longValue);
-            case Integer intValue -> span.setAttribute(name, intValue.longValue());
-            case Short shortValue -> span.setAttribute(name, shortValue.longValue());
-            case Byte byteValue -> span.setAttribute(name, byteValue.longValue());
-            case Double doubleValue -> span.setAttribute(name, doubleValue);
-            case Float floatValue -> span.setAttribute(name, floatValue.doubleValue());
-            case Character charValue -> span.setAttribute(name, String.valueOf(charValue));
-            default -> span.setAttribute(name, String.valueOf(value));
+            case String stringValue -> span.setAttribute(attributeName, stringValue);
+            case Boolean booleanValue -> span.setAttribute(attributeName, booleanValue);
+            case Long longValue -> span.setAttribute(attributeName, longValue);
+            case Integer intValue -> span.setAttribute(attributeName, intValue.longValue());
+            case Short shortValue -> span.setAttribute(attributeName, shortValue.longValue());
+            case Byte byteValue -> span.setAttribute(attributeName, byteValue.longValue());
+            case Double doubleValue -> span.setAttribute(attributeName, doubleValue);
+            case Float floatValue -> span.setAttribute(attributeName, floatValue.doubleValue());
+            case Character charValue -> span.setAttribute(attributeName, String.valueOf(charValue));
+            case null, default -> span.setAttribute(attributeName, String.valueOf(value));
         }
     }
 }