Skip to content

Commit 67f51c6

Browse files
jolarsenjolarsen
authored
Bom 320 (#2561)
1 parent 1db3435 commit 67f51c6

File tree

10 files changed

+19
-104
lines changed

10 files changed

+19
-104
lines changed

‎domenetjenester/iay/pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,6 @@
1616

1717
<dependencies>
1818
<dependency>
19-
<!-- for Bean validation -->
20-
<groupId>org.hibernate.validator</groupId>
21-
<artifactId>hibernate-validator</artifactId>
22-
</dependency>
23-
<dependency>
24-
<!-- for Bean validation -->
25-
<groupId>org.glassfish</groupId>
26-
<artifactId>jakarta.el</artifactId>
27-
</dependency>
28-
29-
<dependency>
3019
<groupId>no.nav.fpsak.tidsserie</groupId>
3120
<artifactId>fpsak-tidsserie</artifactId>
3221
</dependency>

‎domenetjenester/lonnskomp/pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,6 @@
1515
<name>Abakus :: Domenetjeneste :: Lønnskompensasjon</name>
1616

1717
<dependencies>
18-
<dependency>
19-
<!-- for Bean validation -->
20-
<groupId>org.hibernate.validator</groupId>
21-
<artifactId>hibernate-validator</artifactId>
22-
</dependency>
23-
<dependency>
24-
<!-- for Bean validation -->
25-
<groupId>org.glassfish</groupId>
26-
<artifactId>jakarta.el</artifactId>
27-
</dependency>
28-
2918
<dependency>
3019
<groupId>no.nav.foreldrepenger.abakus</groupId>
3120
<artifactId>prosesstask</artifactId>

‎domenetjenester/vedtak/pom.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,14 @@
5454
<artifactId>kafka-clients</artifactId>
5555
</dependency>
5656

57+
<!-- Validering av vedtak -->
5758
<dependency>
58-
<!-- for Bean validation -->
5959
<groupId>org.hibernate.validator</groupId>
6060
<artifactId>hibernate-validator</artifactId>
6161
</dependency>
6262
<dependency>
63-
<!-- for Bean validation -->
64-
<groupId>org.glassfish</groupId>
65-
<artifactId>jakarta.el</artifactId>
63+
<groupId>org.glassfish.expressly</groupId>
64+
<artifactId>expressly</artifactId>
6665
</dependency>
6766

6867
<dependency>

‎kodeverk/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,6 @@
4242
<artifactId>jackson-datatype-jsr310</artifactId>
4343
</dependency>
4444

45-
<!-- for Bean validation -->
46-
<dependency>
47-
<groupId>org.hibernate.validator</groupId>
48-
<artifactId>hibernate-validator</artifactId>
49-
<scope>test</scope>
50-
</dependency>
51-
<dependency>
52-
<groupId>org.glassfish</groupId>
53-
<artifactId>jakarta.el</artifactId>
54-
<scope>test</scope>
55-
</dependency>
56-
5745
</dependencies>
5846

5947
<build>

‎kontrakt-vedtak/pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,6 @@
4343
<artifactId>jackson-datatype-jsr310</artifactId>
4444
</dependency>
4545

46-
<!-- Test -->
47-
<dependency>
48-
<groupId>org.hibernate.validator</groupId>
49-
<artifactId>hibernate-validator</artifactId>
50-
<scope>test</scope>
51-
</dependency>
52-
<dependency>
53-
<groupId>org.glassfish</groupId>
54-
<artifactId>jakarta.el</artifactId>
55-
<scope>test</scope>
56-
</dependency>
5746

5847
</dependencies>
5948

‎kontrakt/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
<scope>test</scope>
4848
</dependency>
4949
<dependency>
50-
<groupId>org.glassfish</groupId>
51-
<artifactId>jakarta.el</artifactId>
50+
<groupId>org.glassfish.expressly</groupId>
51+
<artifactId>expressly</artifactId>
5252
<scope>test</scope>
5353
</dependency>
5454

‎pom.xml‎

Lines changed: 5 additions & 5 deletions
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.1.3</version>
10+
<version>3.2.0</version>
1111
</parent>
1212

1313
<groupId>no.nav.foreldrepenger.abakus</groupId>
@@ -35,9 +35,9 @@
3535

3636
<kontrakt.java.version>21</kontrakt.java.version>
3737

38-
<felles.version>7.1.0</felles.version>
39-
<prosesstask.version>5.0.7</prosesstask.version>
40-
<kontrakter.version>9.1.8</kontrakter.version>
38+
<felles.version>7.1.2</felles.version>
39+
<prosesstask.version>5.0.8</prosesstask.version>
40+
<kontrakter.version>9.1.12</kontrakter.version>
4141
<tidsserie.version>2.7.1</tidsserie.version>
4242

4343
<!-- Forteller til maven-deploy-plugin at artefaktet ikke skal deployes.
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>no.nav.foreldrepenger.felles</groupId>
5656
<artifactId>fp-bom</artifactId>
57-
<version>3.1.3</version>
57+
<version>3.2.0</version>
5858
<scope>import</scope>
5959
<type>pom</type>
6060
</dependency>

‎web/pom.xml‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -146,22 +146,6 @@
146146
</dependency>
147147

148148
<!-- Metrics, logging, helse- og selftest -->
149-
<dependency>
150-
<groupId>io.prometheus</groupId>
151-
<artifactId>simpleclient_servlet</artifactId>
152-
</dependency>
153-
<dependency>
154-
<groupId>io.prometheus</groupId>
155-
<artifactId>simpleclient_hotspot</artifactId>
156-
</dependency>
157-
<dependency>
158-
<groupId>io.prometheus</groupId>
159-
<artifactId>simpleclient</artifactId>
160-
</dependency>
161-
<dependency>
162-
<groupId>io.prometheus</groupId>
163-
<artifactId>simpleclient_common</artifactId>
164-
</dependency>
165149
<dependency>
166150
<groupId>ch.qos.logback</groupId>
167151
<artifactId>logback-classic</artifactId>
@@ -185,8 +169,8 @@
185169
<artifactId>hibernate-validator</artifactId>
186170
</dependency>
187171
<dependency>
188-
<groupId>org.glassfish</groupId>
189-
<artifactId>jakarta.el</artifactId>
172+
<groupId>org.glassfish.expressly</groupId>
173+
<artifactId>expressly</artifactId>
190174
</dependency>
191175

192176
<!-- OpenAPI (swagger) -->

‎web/src/main/java/no/nav/foreldrepenger/abakus/app/metrics/PrometheusRestService.java‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,21 @@
11
package no.nav.foreldrepenger.abakus.app.metrics;
22

33

4-
import io.prometheus.client.CollectorRegistry;
5-
import io.prometheus.client.Gauge;
6-
import io.prometheus.client.exporter.common.TextFormat;
7-
import io.swagger.v3.oas.annotations.Operation;
8-
import no.nav.vedtak.felles.prosesstask.api.TaskMonitor;
4+
import static no.nav.vedtak.log.metrics.MetricsUtil.REGISTRY;
95

6+
import io.swagger.v3.oas.annotations.Operation;
107
import jakarta.enterprise.context.ApplicationScoped;
118
import jakarta.ws.rs.GET;
129
import jakarta.ws.rs.Path;
13-
import jakarta.ws.rs.core.Response;
14-
15-
import java.io.IOException;
16-
import java.io.StringWriter;
17-
import java.io.Writer;
1810

1911
@Path("/metrics")
2012
@ApplicationScoped
2113
public class PrometheusRestService {
2214

23-
private static final Gauge TASK_GAUGE = Gauge.build().name("prosesstask_antall").labelNames("status").help("No tasks w/status.").register();
24-
2515
@GET
2616
@Operation(tags = "metrics", hidden = true)
2717
@Path("/prometheus")
28-
public Response prometheus() {
29-
TaskMonitor.monitoredStatuses().forEach(s -> TASK_GAUGE.labels(TaskMonitor.statusLabel(s)).set(TaskMonitor.TASK_GAUGES.get(s).get()));
30-
try (final Writer writer = new StringWriter()) {
31-
TextFormat.writeFormat(TextFormat.CONTENT_TYPE_004, writer, CollectorRegistry.defaultRegistry.metricFamilySamples());
32-
return Response.ok().encoding("UTF-8").entity(writer.toString()).header("content-type", TextFormat.CONTENT_TYPE_004).build();
33-
} catch (IOException e) {
34-
//TODO logg?
35-
}
36-
37-
return null;
18+
public String prometheus() {
19+
return REGISTRY.scrape();
3820
}
3921
}

‎web/src/main/java/no/nav/foreldrepenger/abakus/app/tjenester/ApplicationServiceStarter.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@
77
import java.util.concurrent.TimeUnit;
88
import java.util.stream.Collectors;
99

10+
import org.slf4j.Logger;
11+
import org.slf4j.LoggerFactory;
12+
1013
import jakarta.enterprise.context.ApplicationScoped;
1114
import jakarta.enterprise.inject.Any;
1215
import jakarta.enterprise.inject.Instance;
1316
import jakarta.inject.Inject;
14-
15-
import org.slf4j.Logger;
16-
import org.slf4j.LoggerFactory;
17-
18-
import io.prometheus.client.hotspot.DefaultExports;
1917
import no.nav.vedtak.log.metrics.Controllable;
2018

2119
/**
@@ -45,9 +43,6 @@ public ApplicationServiceStarter(@Any Instance<Controllable> services) {
4543
}
4644

4745
public void startServices() {
48-
// Prometheus
49-
DefaultExports.initialize();
50-
5146
// Services
5247
LOGGER.info("Starter {} services", services.size());
5348
CompletableFuture.allOf(services.stream().map(service -> runAsync(service::start)).toArray(CompletableFuture[]::new)).join();

0 commit comments

Comments
 (0)