diff --git a/pom.xml b/pom.xml index 3f0b5de17..87dce4cdb 100644 --- a/pom.xml +++ b/pom.xml @@ -46,9 +46,9 @@ 2.41.11 - 3.44.0 + 3.47.0 1.14.1 - 2.20.0 + 2.21.0 4.0.16 2.13.2 + 33.5.0-jre 4.4.16 4.5.14 - 2.20.0 + 2.21.0 2.3.0 3.0.2 - 2.2.20 - 1.5.23 + 2.3.0 + 1.5.25 2.0.6 6.8.1.RELEASE 9.0.13 8.1 - 2.25.1 + 2.25.3 3.5.0 - 1.15.4 + 1.16.2 4.1.127.Final 4.29.4 0.15.4 1.2.4 - 2024.0.10 + 2025.0.2 2.3.0 3.1.0 0.2.0 2.0.17 - 30.2.0 - 2.2.36 + 31.2.0 + 2.2.42 2.0.3 @@ -284,6 +285,11 @@ gson ${gson.version} + + com.google.guava + guava + ${guava.version} + com.redis testcontainers-redis diff --git a/service/pom.xml b/service/pom.xml index 2df5ab16f..96ec3442a 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -11,11 +11,11 @@ service - 9.6.0 - 5.1.0 + 9.7.0 + 5.2.0 v3-rev20250904-2.0.0 - 3.6.0 - 0.29.6.RELEASE + 4.0.0 + 0.30.2.RELEASE 4.5.0 @@ -266,26 +266,12 @@ com.google.cloud google-cloud-pubsub - - - - com.google.guava - failureaccess - - com.google.firebase firebase-admin ${firebase-admin.version} - - - - com.google.guava - failureaccess - - @@ -297,11 +283,6 @@ io.opentelemetry.instrumentation opentelemetry-instrumentation-api-incubator - - - com.google.guava - failureaccess - diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsHttpChannelListenerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsHttpChannelListenerTest.java index 9373d745d..0696a9e33 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsHttpChannelListenerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsHttpChannelListenerTest.java @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; +import io.micrometer.core.instrument.Tags; import org.eclipse.jetty.http.HttpURI; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Response; @@ -55,7 +56,7 @@ class MetricsHttpChannelListenerTest { when(meterRegistry.counter(eq(MetricsHttpChannelListener.REQUEST_COUNTER_NAME), any(Iterable.class))) .thenReturn(requestCounter); - when(meterRegistry.counter(eq(MetricsHttpChannelListener.REQUESTS_BY_VERSION_COUNTER_NAME), any(Iterable.class))) + when(meterRegistry.counter(eq(MetricsHttpChannelListener.REQUESTS_BY_VERSION_COUNTER_NAME), any(Tags.class))) .thenReturn(requestsByVersionCounter); when(meterRegistry.counter(eq(MetricsHttpChannelListener.RESPONSE_BYTES_COUNTER_NAME), any(Iterable.class))) @@ -152,7 +153,7 @@ class MetricsHttpChannelListenerTest { listener.onComplete(request); if (versionActive) { - final ArgumentCaptor> tagCaptor = ArgumentCaptor.forClass(Iterable.class); + final ArgumentCaptor tagCaptor = ArgumentCaptor.forClass(Tags.class); verify(meterRegistry).counter(eq(MetricsHttpChannelListener.REQUESTS_BY_VERSION_COUNTER_NAME), tagCaptor.capture()); final Set tags = new HashSet<>(); diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsRequestEventListenerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsRequestEventListenerTest.java index 531c540b7..3b3352244 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsRequestEventListenerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsRequestEventListenerTest.java @@ -24,6 +24,7 @@ import io.dropwizard.jersey.jackson.JacksonMessageBodyProvider; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tag; +import io.micrometer.core.instrument.Tags; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import java.io.IOException; @@ -122,7 +123,7 @@ class MetricsRequestEventListenerTest { .thenReturn(responseBytesCounter); when(meterRegistry.counter(eq(MetricsRequestEventListener.REQUEST_BYTES_COUNTER_NAME), any(Iterable.class))) .thenReturn(requestBytesCounter); - when(meterRegistry.counter(eq(MetricsRequestEventListener.REQUESTS_BY_VERSION_COUNTER_NAME), any(Iterable.class))) + when(meterRegistry.counter(eq(MetricsRequestEventListener.REQUESTS_BY_VERSION_COUNTER_NAME), any(Tags.class))) .thenReturn(requestsByVersionCounter); listener.onEvent(event);