Merge branch 'master' into feature/pdl-pip-api

Author: jolarsen

felles/log/src/main/java/no/nav/vedtak/log/tracing/OtelSpanWrapper.java

@@ -21,11 +21,6 @@ public static OtelSpanWrapper forApplikasjon() {
         return new OtelSpanWrapper(tracer);
     }
 
-    public static OtelSpanWrapper forBibliotek(String libraryName, String libraryVersion) {
-        var tracer = GlobalOpenTelemetry.getTracer(libraryName, libraryVersion);
-        return new OtelSpanWrapper(tracer);
-    }
-
     public OtelSpanWrapper(Tracer tracer) {
         this.tracer = tracer;
     }
@@ -60,7 +55,7 @@ public <E extends Exception> void span(String navn,
         }
     }
 
-    public <V> V span(String navn,
+    public <V> V spanCallable(String navn,
                       UnaryOperator<SpanBuilder> spanBuilderTransformer,
                       Callable<V> runnable) throws Exception {
         var span = startSpan(navn, spanBuilderTransformer);

felles/oidc/src/main/java/no/nav/vedtak/sikkerhet/oidc/validator/ConsumerMetric.java

@@ -1,7 +1,5 @@
 package no.nav.vedtak.sikkerhet.oidc.validator;
 
-import static no.nav.vedtak.sikkerhet.oidc.validator.ConsumerMetric.registrer;
-
 import java.security.Key;
 import java.util.List;
 import java.util.Objects;
@@ -153,7 +151,6 @@ private OidcTokenValidatorResult validateAzure(JwtClaims claims, String subject)
         var oid = getAzureOid(claims);
         if (isAzureClientCredentials(claims, subject, oid)) {
             var brukSubject = Optional.ofNullable(JwtUtil.getStringClaim(claims, AzureProperty.AZP_NAME)).orElse(subject);
-            registrer(clientName, brukSubject, OpenIDProvider.AZUREAD, IdentType.Systemressurs);
             // Ta med bakoverkompatibelt navn ettersom azp_name er ganske langt (tabeller / opprettet_av)
             var sisteKolon = brukSubject.lastIndexOf(':');
             if (sisteKolon >= 0) {
@@ -167,7 +164,6 @@ private OidcTokenValidatorResult validateAzure(JwtClaims claims, String subject)
             }
         } else {
             var brukSubject = Optional.ofNullable(JwtUtil.getStringClaim(claims, AzureProperty.NAV_IDENT)).orElse(subject);
-            registrer(clientName, "Saksbehandler", OpenIDProvider.AZUREAD, IdentType.InternBruker);
             var grupper = Optional.ofNullable(JwtUtil.getStringListClaim(claims, AzureProperty.GRUPPER))
                     .map(arr -> AnsattGruppeProvider.instance().getAnsattGrupperFraStrings(arr))
                     .orElse(Set.of());
@@ -204,7 +200,6 @@ private OidcTokenValidatorResult validateTokenX(JwtClaims claims, String subject
             return OidcTokenValidatorResult.invalid("TokenX token ikke på nivå 4");
         }
         var brukSubject = Optional.ofNullable(JwtUtil.getStringClaim(claims, PID)).orElse(subject);
-        registrer(clientName, "Borger", OpenIDProvider.TOKENX, IdentType.EksternBruker, acrClaim);
         return OidcTokenValidatorResult.valid(brukSubject, IdentType.EksternBruker, JwtUtil.getExpirationTimeRaw(claims));
     }
 

felles/oidc/src/main/java/no/nav/vedtak/sikkerhet/oidc/validator/OidcTokenValidator.java

@@ -7,7 +7,7 @@
     <parent>
         <groupId>no.nav.foreldrepenger.felles</groupId>
         <artifactId>fp-bom</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
     </parent>
 
     <artifactId>felles-root</artifactId>
@@ -33,7 +33,7 @@
             <dependency>
                 <groupId>no.nav.foreldrepenger.felles</groupId>
                 <artifactId>fp-bom</artifactId>
-                <version>3.6.0</version>
+                <version>3.6.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>