Skip to content

Commit 74002c4

Browse files
authored
refactor: fjerner foreldrepenger.konsumenter metrikk som ikke lenger … (#1404)
* refactor: fjerner foreldrepenger.konsumenter metrikk som ikke lenger trenges. * chore: bom 3.6.1
1 parent be38e14 commit 74002c4

File tree

4 files changed

+2
-48
lines changed

4 files changed

+2
-48
lines changed

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

-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ public static OtelSpanWrapper forApplikasjon() {
2121
return new OtelSpanWrapper(tracer);
2222
}
2323

24-
public static OtelSpanWrapper forBibliotek(String libraryName, String libraryVersion) {
25-
var tracer = GlobalOpenTelemetry.getTracer(libraryName, libraryVersion);
26-
return new OtelSpanWrapper(tracer);
27-
}
28-
2924
public OtelSpanWrapper(Tracer tracer) {
3025
this.tracer = tracer;
3126
}

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

-36
This file was deleted.

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

-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package no.nav.vedtak.sikkerhet.oidc.validator;
22

3-
import static no.nav.vedtak.sikkerhet.oidc.validator.ConsumerMetric.registrer;
4-
53
import java.security.Key;
64
import java.util.List;
75
import java.util.Objects;
@@ -153,7 +151,6 @@ private OidcTokenValidatorResult validateAzure(JwtClaims claims, String subject)
153151
var oid = getAzureOid(claims);
154152
if (isAzureClientCredentials(claims, subject, oid)) {
155153
var brukSubject = Optional.ofNullable(JwtUtil.getStringClaim(claims, AzureProperty.AZP_NAME)).orElse(subject);
156-
registrer(clientName, brukSubject, OpenIDProvider.AZUREAD, IdentType.Systemressurs);
157154
// Ta med bakoverkompatibelt navn ettersom azp_name er ganske langt (tabeller / opprettet_av)
158155
var sisteKolon = brukSubject.lastIndexOf(':');
159156
if (sisteKolon >= 0) {
@@ -167,7 +164,6 @@ private OidcTokenValidatorResult validateAzure(JwtClaims claims, String subject)
167164
}
168165
} else {
169166
var brukSubject = Optional.ofNullable(JwtUtil.getStringClaim(claims, AzureProperty.NAV_IDENT)).orElse(subject);
170-
registrer(clientName, "Saksbehandler", OpenIDProvider.AZUREAD, IdentType.InternBruker);
171167
var grupper = Optional.ofNullable(JwtUtil.getStringListClaim(claims, AzureProperty.GRUPPER))
172168
.map(arr -> AnsattGruppeProvider.instance().getAnsattGrupperFraStrings(arr))
173169
.orElse(Set.of());
@@ -204,7 +200,6 @@ private OidcTokenValidatorResult validateTokenX(JwtClaims claims, String subject
204200
return OidcTokenValidatorResult.invalid("TokenX token ikke på nivå 4");
205201
}
206202
var brukSubject = Optional.ofNullable(JwtUtil.getStringClaim(claims, PID)).orElse(subject);
207-
registrer(clientName, "Borger", OpenIDProvider.TOKENX, IdentType.EksternBruker, acrClaim);
208203
return OidcTokenValidatorResult.valid(brukSubject, IdentType.EksternBruker, JwtUtil.getExpirationTimeRaw(claims));
209204
}
210205

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>no.nav.foreldrepenger.felles</groupId>
99
<artifactId>fp-bom</artifactId>
10-
<version>3.6.0</version>
10+
<version>3.6.1</version>
1111
</parent>
1212

1313
<artifactId>felles-root</artifactId>
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>no.nav.foreldrepenger.felles</groupId>
3535
<artifactId>fp-bom</artifactId>
36-
<version>3.6.0</version>
36+
<version>3.6.1</version>
3737
<scope>import</scope>
3838
<type>pom</type>
3939
</dependency>

0 commit comments

Comments
 (0)