Skip to content

Commit fec1b16

Browse files
authored
fix: add null check before sending metrics (#302)
1 parent 7f8ae07 commit fec1b16

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/main/java/io/getunleash/metric/ClientMetrics.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ public class ClientMetrics implements UnleashEvent {
1212
private final String appName;
1313
private final String instanceId;
1414
private final String connectionId;
15-
private final MetricsBucket bucket;
15+
@Nullable private final MetricsBucket bucket;
1616
private final String environment;
1717
private final String specVersion;
1818
@Nullable private final String platformName;
1919
@Nullable private final String platformVersion;
2020
@Nullable private final String yggdrasilVersion;
2121

22-
ClientMetrics(UnleashConfig config, MetricsBucket bucket) {
22+
ClientMetrics(UnleashConfig config, @Nullable MetricsBucket bucket) {
2323
this.environment = config.getEnvironment();
2424
this.appName = config.getAppName();
2525
this.instanceId = config.getInstanceId();
@@ -43,6 +43,7 @@ public String getConnectionId() {
4343
return connectionId;
4444
}
4545

46+
@Nullable
4647
public MetricsBucket getBucket() {
4748
return bucket;
4849
}

src/main/java/io/getunleash/metric/DefaultHttpMetricsSender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public int registerClient(ClientRegistration registration) {
5656
}
5757

5858
public int sendMetrics(ClientMetrics metrics) {
59-
if (!unleashConfig.isDisableMetrics()) {
59+
if (!unleashConfig.isDisableMetrics() && metrics.getBucket() != null) {
6060
try {
6161
int statusCode = post(clientMetricsURL, metrics);
6262
eventDispatcher.dispatch(metrics);

src/test/java/io/getunleash/event/SubscriberTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ void subscribersAreNotified() {
7878
assertThat(testSubscriber.events)
7979
.filteredOn(e -> e instanceof ClientRegistration)
8080
.hasSize(1);
81-
assertThat(testSubscriber.events).filteredOn(e -> e instanceof ClientMetrics).hasSize(1);
8281
}
8382

8483
private class TestSubscriber implements UnleashSubscriber {

0 commit comments

Comments
 (0)