Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 19:08:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add dynamic configuration to enable detailed Lettuce metrics

Browse Source
This commit is contained in:
Chris Eager
2024-02-09 09:22:51 -06:00
committed by Chris Eager
parent ff59ef8094
commit 699b0c775a
9 changed files with 76 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsUtilTest.java
View File

@@ -7,12 +7,20 @@ package org.whispersystems.textsecuregcm.metrics;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import java.util.List;
import org.assertj.core.api.AbstractStringAssert;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicMetricsConfiguration;
import org.whispersystems.textsecuregcm.storage.DynamicConfigurationManager;
class MetricsUtilTest {
@@ -25,10 +33,18 @@ class MetricsUtilTest {
MetricsUtil.name(MetricsUtilTest.class, "namespace", "metric"));
}
@Test
void lettuceTagRejection() {
@ParameterizedTest
@ValueSource(booleans = {true, false})
void lettuceTagRejection(final boolean enableLettuceRemoteTag) {
DynamicConfiguration dynamicConfiguration = mock(DynamicConfiguration.class);
DynamicMetricsConfiguration metricsConfiguration = new DynamicMetricsConfiguration(enableLettuceRemoteTag);
when(dynamicConfiguration.getMetricsConfiguration()).thenReturn(metricsConfiguration);
DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager =
mock(DynamicConfigurationManager.class);
when(dynamicConfigurationManager.getConfiguration()).thenReturn(dynamicConfiguration);
MeterRegistry registry = new SimpleMeterRegistry();
MetricsUtil.configureMeterFilters(registry.config());
MetricsUtil.configureMeterFilters(registry.config(), dynamicConfigurationManager);
registry.counter("lettuce.command.completion.max", "command", "hello", "remote", "world", "allowed", "!").increment();
final List<Meter> meters = registry.getMeters();
@@ -37,6 +53,13 @@ class MetricsUtilTest {
Meter meter = meters.get(0);
assertThat(meter.getId().getName()).isEqualTo("chat.lettuce.command.completion.max");
assertThat(meter.getId().getTag("command")).isNull();
AbstractStringAssert<?> remoteTag = assertThat(meter.getId().getTag("remote"));
if (enableLettuceRemoteTag) {
remoteTag.isNotNull();
} else {
remoteTag.isNull();
}
assertThat(meter.getId().getTag("allowed")).isNotNull();
}
}