add tracing events

.github/workflows/build-test.yml

@@ -31,7 +31,7 @@ jobs:
           scan-type: 'fs'
           format: 'table'
           scan-ref: '.'
-          severity: 'HIGH,CRITICAL'
+          severity: 'CRITICAL'
           ignore-unfixed: true
           exit-code: 1
 

src/main/java/no/ssb/dlp/pseudo/service/pseudo/PseudoField.java

@@ -1,6 +1,7 @@
 package no.ssb.dlp.pseudo.service.pseudo;
 
 import com.google.common.base.Stopwatch;
+import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.instrumentation.annotations.AddingSpanAttributes;
 import io.opentelemetry.instrumentation.annotations.SpanAttribute;
 import io.opentelemetry.instrumentation.annotations.WithSpan;
@@ -19,6 +20,7 @@
 import no.ssb.dlp.pseudo.service.pseudo.metadata.FieldMetric;
 import no.ssb.dlp.pseudo.service.pseudo.metadata.PseudoMetadataProcessor;
 
+import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -84,12 +86,13 @@ public PseudoField(String name, String pattern, String pseudoFunc, EncryptedKeys
      * @param values                 The values to be processed.
      * @return A Flowable stream that processes the field values by applying the configured pseudo rules, and returns them as a lists of strings.
      */
-    @WithSpan
+    @AddingSpanAttributes
     public Flowable<String> process(@SpanAttribute("pseudoConfigSplitter") PseudoConfigSplitter pseudoConfigSplitter,
                                     @SpanAttribute("recordProcessorFactory") RecordMapProcessorFactory recordProcessorFactory,
                                     @SpanAttribute("values") List<String> values,
                                     @SpanAttribute("pseudoOperation") PseudoOperation pseudoOperation,
                                     String correlationId) {
+        Span.current().addEvent("process pseudo field", Instant.now());
         Stopwatch stopwatch = Stopwatch.createStarted();
         List<PseudoConfig> pseudoConfigs = pseudoConfigSplitter.splitIfNecessary(this.getPseudoConfig());
 

src/main/java/no/ssb/dlp/pseudo/service/pseudo/RecordMapProcessorFactory.java

@@ -2,6 +2,8 @@
 
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.crypto.tink.Aead;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.instrumentation.annotations.AddingSpanAttributes;
 import io.opentelemetry.instrumentation.annotations.WithSpan;
 import jakarta.inject.Singleton;
 import lombok.RequiredArgsConstructor;
@@ -30,6 +32,7 @@
 import no.ssb.dlp.pseudo.service.pseudo.metadata.FieldMetric;
 import no.ssb.dlp.pseudo.service.pseudo.metadata.PseudoMetadataProcessor;
 
+import java.time.Instant;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -47,8 +50,9 @@ public class RecordMapProcessorFactory {
     private final PseudoSecrets pseudoSecrets;
     private final LoadingCache<String, Aead> aeadCache;
 
-    @WithSpan
+    @AddingSpanAttributes
     public RecordMapProcessor<PseudoMetadataProcessor> newPseudonymizeRecordProcessor(List<PseudoConfig> pseudoConfigs, String correlationId) {
+        Span.current().addEvent("newPseudonymizeRecordProcessor", Instant.now());
         ValueInterceptorChain chain = new ValueInterceptorChain();
         PseudoMetadataProcessor metadataProcessor = new PseudoMetadataProcessor(correlationId);
 

src/main/java/no/ssb/dlp/pseudo/service/pseudo/metadata/PseudoMetadataProcessor.java

@@ -1,11 +1,13 @@
 package no.ssb.dlp.pseudo.service.pseudo.metadata;
 
-import io.opentelemetry.instrumentation.annotations.WithSpan;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.instrumentation.annotations.AddingSpanAttributes;
 import io.reactivex.processors.ReplayProcessor;
 import lombok.Value;
 import no.ssb.dlp.pseudo.core.util.Json;
 import org.reactivestreams.Publisher;
 
+import java.time.Instant;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -35,16 +37,19 @@ public void addLog(String log) {
     public void addMetric(FieldMetric fieldMetric) {
         metrics.onNext(fieldMetric);
     }
-    @WithSpan
+    @AddingSpanAttributes
     public Publisher<String> getMetadata() {
+        Span.current().addEvent("getMetadata", Instant.now());
         return datadocMetadata.map(FieldMetadata::toDatadocVariable).map(Json::from);
     }
-    @WithSpan
+    @AddingSpanAttributes
     public Publisher<String> getLogs() {
+        Span.current().addEvent("getLogs", Instant.now());
         return logs.map(Json::from);
     }
-    @WithSpan
+    @AddingSpanAttributes
     public Publisher<String> getMetrics() {
+        Span.current().addEvent("getMetrics", Instant.now());
         return metrics.groupBy(FieldMetric::name)
                 .flatMapSingle(group ->
                     group.count().map(c -> Map.of(group.getKey(), c.intValue())