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

filter datadog metrics with dynamic allow list

Browse Source
This commit is contained in:
Jonathan Klabunde Tomer
2025-09-29 15:37:11 -07:00
committed by GitHub
parent 5a7660d3ae
commit 7f301cbf95
4 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,8 @@ import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import java.util.List;
import java.util.Set;
import org.assertj.core.api.AbstractStringAssert;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -37,7 +39,7 @@ class MetricsUtilTest {
@ValueSource(booleans = {true, false})
void lettuceTagRejection(final boolean enableLettuceRemoteTag) {
final DynamicConfiguration dynamicConfiguration = mock(DynamicConfiguration.class);
final DynamicMetricsConfiguration metricsConfiguration = new DynamicMetricsConfiguration(enableLettuceRemoteTag, false);
final DynamicMetricsConfiguration metricsConfiguration = new DynamicMetricsConfiguration(enableLettuceRemoteTag, false, null);
when(dynamicConfiguration.getMetricsConfiguration()).thenReturn(metricsConfiguration);
@SuppressWarnings("unchecked") final DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager =
mock(DynamicConfigurationManager.class);
@@ -70,7 +72,7 @@ class MetricsUtilTest {
mock(DynamicConfigurationManager.class);
final DynamicConfiguration dynamicConfiguration = mock(DynamicConfiguration.class);
final DynamicMetricsConfiguration metricsConfiguration = new DynamicMetricsConfiguration(false, enableAwsSdkMetrics);
final DynamicMetricsConfiguration metricsConfiguration = new DynamicMetricsConfiguration(false, enableAwsSdkMetrics, null);
when(dynamicConfigurationManager.getConfiguration()).thenReturn(dynamicConfiguration);
when(dynamicConfiguration.getMetricsConfiguration()).thenReturn(metricsConfiguration);
@@ -81,4 +83,25 @@ class MetricsUtilTest {
assertThat(registry.getMeters()).hasSize(enableAwsSdkMetrics ? 1 : 0);
}
@ParameterizedTest
@ValueSource(booleans={true, false})
void datadogAllowList(boolean useAllowlist) {
@SuppressWarnings("unchecked") final DynamicConfigurationManager<DynamicConfiguration> dynamicConfigurationManager =
mock(DynamicConfigurationManager.class);
final DynamicConfiguration dynamicConfiguration = mock(DynamicConfiguration.class);
final DynamicMetricsConfiguration metricsConfiguration = new DynamicMetricsConfiguration(true, true, useAllowlist ? Set.of("chat.ImportantMetrics.messages") : null);
when(dynamicConfigurationManager.getConfiguration()).thenReturn(dynamicConfiguration);
when(dynamicConfiguration.getMetricsConfiguration()).thenReturn(metricsConfiguration);
final MeterRegistry registry = new SimpleMeterRegistry();
MetricsUtil.configureDatadogAllowList(registry.config(), dynamicConfigurationManager);
registry.counter("chat.ImportantMetrics.messages").increment();
registry.counter("chat.ChattyMetrics.days_since_last_incident").increment();
assertThat(registry.getMeters()).hasSize(useAllowlist ? 1 : 2);
}
}