Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Guard against NPE in MongoMetricsConnectionPoolListener #2454

Merged
merged 1 commit into from Feb 17, 2021
Merged

Guard against NPE in MongoMetricsConnectionPoolListener #2454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 24 additions & 12 deletions ...java/io/micrometer/core/instrument/binder/mongodb/MongoMetricsConnectionPoolListener.java
View file
Open in desktop
Expand Up @@ -81,38 +81,50 @@ public void connectionPoolClosed(ConnectionPoolClosedEvent event) {

@Override
public void connectionCheckedOut(ConnectionCheckedOutEvent event) {
checkedOutCount.get(event.getConnectionId().getServerId())
.incrementAndGet();
AtomicInteger gauge = checkedOutCount.get(event.getConnectionId().getServerId());
if (gauge != null) {
gauge.incrementAndGet();
}
}

@Override
public void connectionCheckedIn(ConnectionCheckedInEvent event) {
checkedOutCount.get(event.getConnectionId().getServerId())
.decrementAndGet();
AtomicInteger gauge = checkedOutCount.get(event.getConnectionId().getServerId());
if (gauge != null) {
gauge.decrementAndGet();
}
}

@Override
public void waitQueueEntered(ConnectionPoolWaitQueueEnteredEvent event) {
waitQueueSize.get(event.getServerId())
.incrementAndGet();
AtomicInteger gauge = waitQueueSize.get(event.getServerId());
if (gauge != null) {
gauge.incrementAndGet();
}
}

@Override
public void waitQueueExited(ConnectionPoolWaitQueueExitedEvent event) {
waitQueueSize.get(event.getServerId())
.decrementAndGet();
AtomicInteger gauge = waitQueueSize.get(event.getServerId());
if (gauge != null) {
gauge.decrementAndGet();
}
}

@Override
public void connectionAdded(ConnectionAddedEvent event) {
poolSize.get(event.getConnectionId().getServerId())
.incrementAndGet();
AtomicInteger gauge = poolSize.get(event.getConnectionId().getServerId());
if (gauge != null) {
gauge.incrementAndGet();
}
}

@Override
public void connectionRemoved(ConnectionRemovedEvent event) {
poolSize.get(event.getConnectionId().getServerId())
.decrementAndGet();
AtomicInteger gauge = poolSize.get(event.getConnectionId().getServerId());
if (gauge != null) {
gauge.decrementAndGet();
}
}

private Gauge registerGauge(ServerId serverId, String metricName, String description, Map<ServerId, AtomicInteger> metrics) {
Expand Down
25 changes: 22 additions & 3 deletions .../io/micrometer/core/instrument/binder/mongodb/MongoMetricsConnectionPoolListenerTest.java
View file
Open in desktop
Expand Up @@ -18,8 +18,12 @@
import com.mongodb.MongoClient;
import com.mongodb.MongoClientOptions;
import com.mongodb.ServerAddress;
import com.mongodb.event.ClusterListenerAdapter;
import com.mongodb.event.ClusterOpeningEvent;
import com.mongodb.connection.ClusterId;
import com.mongodb.connection.ConnectionId;
import com.mongodb.connection.ConnectionPoolSettings;
import com.mongodb.connection.ServerId;
import com.mongodb.event.*;
import io.micrometer.core.Issue;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Tags;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
Expand All @@ -28,6 +32,7 @@
import java.util.concurrent.atomic.AtomicReference;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;

/**
* Tests for {@link MongoMetricsConnectionPoolListener}.
Expand All @@ -36,9 +41,10 @@
*/
class MongoMetricsConnectionPoolListenerTest extends AbstractMongoDbTest {

private final MeterRegistry registry = new SimpleMeterRegistry();

@Test
void shouldCreatePoolMetrics() {
MeterRegistry registry = new SimpleMeterRegistry();
AtomicReference<String> clusterId = new AtomicReference<>();
MongoClientOptions options = MongoClientOptions.builder()
.minConnectionsPerHost(2)
Expand Down Expand Up @@ -71,4 +77,17 @@ public void clusterOpening(ClusterOpeningEvent event) {
.isNull();
}

@Test
@Issue("#2384")
void whenConnectionCheckedInAfterPoolClose_thenNoExceptionThrown() {
ServerId serverId = new ServerId(new ClusterId(), new ServerAddress(HOST, port));
ConnectionId connectionId = new ConnectionId(serverId);
MongoMetricsConnectionPoolListener listener = new MongoMetricsConnectionPoolListener(registry);
listener.connectionPoolOpened(new ConnectionPoolOpenedEvent(serverId, ConnectionPoolSettings.builder().build()));
listener.connectionCheckedOut(new ConnectionCheckedOutEvent(connectionId));
listener.connectionPoolClosed(new ConnectionPoolClosedEvent(serverId));
assertThatCode(() -> listener.connectionCheckedIn(new ConnectionCheckedInEvent(connectionId)))
.doesNotThrowAnyException();
}

}