MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove a metric aggregator.

This commit is contained in:
Jon Chambers 2020-07-27 12:35:54 -04:00 committed by Jon Chambers
parent 89bafea61f
commit acbe410e0b
2 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
service/pom.xml
View File

@ -80,31 +80,6 @@
<version>1.5.2</version> <version>1.5.2</version>
</dependency> </dependency>
<dependency>
<groupId>com.newrelic.telemetry</groupId>
<artifactId>micrometer-registry-new-relic</artifactId>
<version>0.5.0</version>
<exclusions>
<exclusion>
<groupId>com.newrelic.telemetry</groupId>
<artifactId>telemetry</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.newrelic.telemetry</groupId>
<artifactId>telemetry-http-okhttp</artifactId>
<version>0.6.1</version>
</dependency>
<dependency>
<groupId>com.newrelic.telemetry</groupId>
<artifactId>dropwizard-metrics-newrelic</artifactId>
<version>0.5.0</version>
</dependency>
<dependency> <dependency>
<groupId>com.amazonaws</groupId> <groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId> <artifactId>aws-java-sdk-s3</artifactId>

18
service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
View File

@ -43,9 +43,7 @@ import io.dropwizard.setup.Bootstrap;
import io.dropwizard.setup.Environment; import io.dropwizard.setup.Environment;
import io.lettuce.core.RedisURI; import io.lettuce.core.RedisURI;
import io.lettuce.core.cluster.RedisClusterClient; import io.lettuce.core.cluster.RedisClusterClient;
import io.micrometer.NewRelicRegistryConfig;
import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Metrics;
import io.micrometer.newrelic.NewRelicRegistry;
import io.micrometer.wavefront.WavefrontConfig; import io.micrometer.wavefront.WavefrontConfig;
import io.micrometer.wavefront.WavefrontMeterRegistry; import io.micrometer.wavefront.WavefrontMeterRegistry;
import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.jce.provider.BouncyCastleProvider;
@ -248,22 +246,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
.build()); .build());
} }
{
final MicrometerConfiguration micrometerNewRelicConfig = micrometerConfigurationByName.get("newrelic");
Metrics.addRegistry(NewRelicRegistry.builder(new NewRelicRegistryConfig() {
@Override
public String get(final String key) {
return null;
}
@Override
public String apiKey() {
return micrometerNewRelicConfig.getApiKey();
}
}).build());
}
environment.getObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); environment.getObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
environment.getObjectMapper().setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE); environment.getObjectMapper().setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE);
environment.getObjectMapper().setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY); environment.getObjectMapper().setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);