diff --git a/felles/log/src/main/java/no/nav/vedtak/log/tracing/OtelSpanWrapper.java b/felles/log/src/main/java/no/nav/vedtak/log/tracing/OtelSpanWrapper.java index 71ef98a70..f315a089d 100644 --- a/felles/log/src/main/java/no/nav/vedtak/log/tracing/OtelSpanWrapper.java +++ b/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; } diff --git a/felles/oidc/src/main/java/no/nav/vedtak/sikkerhet/oidc/validator/ConsumerMetric.java b/felles/oidc/src/main/java/no/nav/vedtak/sikkerhet/oidc/validator/ConsumerMetric.java deleted file mode 100644 index 48414419b..000000000 --- a/felles/oidc/src/main/java/no/nav/vedtak/sikkerhet/oidc/validator/ConsumerMetric.java +++ /dev/null @@ -1,36 +0,0 @@ -package no.nav.vedtak.sikkerhet.oidc.validator; - -import static no.nav.vedtak.log.metrics.MetricsUtil.REGISTRY; - -import io.micrometer.core.instrument.Counter; -import no.nav.vedtak.sikkerhet.kontekst.IdentType; -import no.nav.vedtak.sikkerhet.oidc.config.OpenIDProvider; - -public class ConsumerMetric { - - private static final String FORELDREPENGER_KONSUMENTER = "foreldrepenger.konsumenter"; - - private ConsumerMetric() { - } - - public static void registrer(String klientNavn, String konsument, OpenIDProvider tokenType, IdentType identType, String acrLevel) { - counter(klientNavn, konsument, tokenType, identType, acrLevel).increment(); - } - public static void registrer(String klientNavn, String konsument, OpenIDProvider tokenType, IdentType identType) { - counter(klientNavn, konsument, tokenType, identType, null).increment(); - } - - private static Counter counter(String klientNavn, String konsument, OpenIDProvider tokenType, IdentType identType, String acrLevel) { - var counter = Counter.builder(FORELDREPENGER_KONSUMENTER) - .tag("klient", klientNavn) - .tag("tokenType", tokenType.name()) - .tag("identYype", identType.name()) - .tag("konsument", konsument) - .description("Konsument og token brukt."); - - if (acrLevel != null) { - counter.tag("acrLevel", acrLevel); - } - return counter.register(REGISTRY); - } -} diff --git a/felles/oidc/src/main/java/no/nav/vedtak/sikkerhet/oidc/validator/OidcTokenValidator.java b/felles/oidc/src/main/java/no/nav/vedtak/sikkerhet/oidc/validator/OidcTokenValidator.java index 756ec2f13..e9bb4777e 100644 --- a/felles/oidc/src/main/java/no/nav/vedtak/sikkerhet/oidc/validator/OidcTokenValidator.java +++ b/felles/oidc/src/main/java/no/nav/vedtak/sikkerhet/oidc/validator/OidcTokenValidator.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)); } diff --git a/pom.xml b/pom.xml index 74f5e74f1..b0ac78e98 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ no.nav.foreldrepenger.felles fp-bom - 3.6.0 + 3.6.1 felles-root @@ -33,7 +33,7 @@ no.nav.foreldrepenger.felles fp-bom - 3.6.0 + 3.6.1 import pom