Skip to content

Commit c889fa1

Browse files
author
Zhen
committed
Removed two not used EventListeners
Change to unmodified map to return pool and connection metrics to users
1 parent 561d7f2 commit c889fa1

11 files changed

+43
-75
lines changed

‎driver/src/main/java/org/neo4j/driver/internal/async/NettyConnection.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.neo4j.driver.internal.messaging.PullAllMessage;
3535
import org.neo4j.driver.internal.messaging.ResetMessage;
3636
import org.neo4j.driver.internal.messaging.RunMessage;
37-
import org.neo4j.driver.internal.metrics.ListenerEvent.ConnectionListenerEvent;
37+
import org.neo4j.driver.internal.metrics.ListenerEvent;
3838
import org.neo4j.driver.internal.metrics.MetricsListener;
3939
import org.neo4j.driver.internal.spi.Connection;
4040
import org.neo4j.driver.internal.spi.ResponseHandler;
@@ -57,7 +57,7 @@ public class NettyConnection implements Connection
5757

5858
private final AtomicReference<Status> status = new AtomicReference<>( Status.OPEN );
5959
private final MetricsListener metricsListener;
60-
private final ConnectionListenerEvent inUseEvent;
60+
private final ListenerEvent inUseEvent;
6161

6262
public NettyConnection( Channel channel, ChannelPool channelPool, Clock clock, MetricsListener metricsListener )
6363
{
@@ -69,8 +69,8 @@ public NettyConnection( Channel channel, ChannelPool channelPool, Clock clock, M
6969
this.releaseFuture = new CompletableFuture<>();
7070
this.clock = clock;
7171
this.metricsListener = metricsListener;
72-
this.inUseEvent = metricsListener.createConnectionListenerEvent();
73-
metricsListener.afterAcquiredOrCreated( this.serverAddress, this.inUseEvent );
72+
this.inUseEvent = metricsListener.createListenerEvent();
73+
metricsListener.afterConnectionCreated( this.serverAddress, this.inUseEvent );
7474
}
7575

7676
@Override
@@ -131,11 +131,11 @@ public CompletionStage<Void> release()
131131
{
132132
if ( status.compareAndSet( Status.OPEN, Status.RELEASED ) )
133133
{
134-
metricsListener.afterReleased( this.serverAddress, this.inUseEvent );
135134
ChannelReleasingResetResponseHandler handler = new ChannelReleasingResetResponseHandler( channel,
136135
channelPool, messageDispatcher, clock, releaseFuture );
137136

138137
writeResetMessageIfNeeded( handler, false );
138+
metricsListener.afterConnectionReleased( this.serverAddress, this.inUseEvent );
139139
}
140140
return releaseFuture;
141141
}
@@ -145,11 +145,11 @@ public void terminateAndRelease( String reason )
145145
{
146146
if ( status.compareAndSet( Status.OPEN, Status.TERMINATED ) )
147147
{
148-
metricsListener.afterReleased( this.serverAddress, this.inUseEvent );
149148
setTerminationReason( channel, reason );
150149
channel.close();
151150
channelPool.release( channel );
152151
releaseFuture.complete( null );
152+
metricsListener.afterConnectionReleased( this.serverAddress, this.inUseEvent );
153153
}
154154
}
155155

‎driver/src/main/java/org/neo4j/driver/internal/async/pool/ConnectionPoolImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public CompletionStage<Connection> acquire( BoltServerAddress address )
8787
assertNotClosed();
8888
ChannelPool pool = getOrCreatePool( address );
8989

90-
ListenerEvent.PoolListenerEvent acquireEvent = metricsListener.createPoolListenerEvent();
90+
ListenerEvent acquireEvent = metricsListener.createListenerEvent();
9191
metricsListener.beforeAcquiringOrCreating( address, acquireEvent );
9292
Future<Channel> connectionFuture = pool.acquire();
9393

‎driver/src/main/java/org/neo4j/driver/internal/async/pool/NettyChannelPool.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
import org.neo4j.driver.internal.BoltServerAddress;
2828
import org.neo4j.driver.internal.async.ChannelConnector;
29-
import org.neo4j.driver.internal.metrics.ListenerEvent.ConnectionListenerEvent;
29+
import org.neo4j.driver.internal.metrics.ListenerEvent;
3030

3131
import static java.util.Objects.requireNonNull;
3232

@@ -60,7 +60,7 @@ public NettyChannelPool( BoltServerAddress address, ChannelConnector connector,
6060
@Override
6161
protected ChannelFuture connectChannel( Bootstrap bootstrap )
6262
{
63-
ConnectionListenerEvent creatingEvent = handler.channelCreating( address );
63+
ListenerEvent creatingEvent = handler.channelCreating( address );
6464
ChannelFuture channelFuture = connector.connect( address, bootstrap );
6565
channelFuture.addListener( future ->
6666
{

‎driver/src/main/java/org/neo4j/driver/internal/async/pool/NettyChannelTracker.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.util.concurrent.atomic.AtomicInteger;
2727

2828
import org.neo4j.driver.internal.BoltServerAddress;
29-
import org.neo4j.driver.internal.metrics.ListenerEvent.ConnectionListenerEvent;
29+
import org.neo4j.driver.internal.metrics.ListenerEvent;
3030
import org.neo4j.driver.internal.metrics.MetricsListener;
3131
import org.neo4j.driver.v1.Logger;
3232
import org.neo4j.driver.v1.Logging;
@@ -65,20 +65,19 @@ public void channelAcquired( Channel channel )
6565
@Override
6666
public void channelCreated( Channel channel )
6767
{
68-
throw new IllegalStateException( "A fatal error happened in this driver as this method should never be called. " +
69-
"Contact the driver developer." );
68+
throw new IllegalStateException( "Untraceable channel created." );
7069
}
7170

72-
public void channelCreated( Channel channel, ConnectionListenerEvent creatingEvent )
71+
public void channelCreated( Channel channel, ListenerEvent creatingEvent )
7372
{
7473
log.debug( "Channel %s created", channel );
7574
incrementInUse( channel );
7675
metricsListener.afterCreated( serverAddress( channel ), creatingEvent );
7776
}
7877

79-
public ConnectionListenerEvent channelCreating( BoltServerAddress address )
78+
public ListenerEvent channelCreating( BoltServerAddress address )
8079
{
81-
ConnectionListenerEvent creatingEvent = metricsListener.createConnectionListenerEvent();
80+
ListenerEvent creatingEvent = metricsListener.createListenerEvent();
8281
metricsListener.beforeCreating( address, creatingEvent );
8382
return creatingEvent;
8483
}

‎driver/src/main/java/org/neo4j/driver/internal/metrics/ConnectionPoolMetricsListener.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
*/
1919
package org.neo4j.driver.internal.metrics;
2020

21-
import org.neo4j.driver.internal.metrics.ListenerEvent.PoolListenerEvent;
22-
2321
public interface ConnectionPoolMetricsListener
2422
{
2523
void beforeCreating();
@@ -30,11 +28,11 @@ public interface ConnectionPoolMetricsListener
3028

3129
void afterClosed();
3230

33-
void beforeAcquiringOrCreating( PoolListenerEvent listenerEvent );
31+
void beforeAcquiringOrCreating( ListenerEvent listenerEvent );
3432

3533
void afterAcquiringOrCreating();
3634

37-
void afterAcquiredOrCreated( PoolListenerEvent listenerEvent );
35+
void afterAcquiredOrCreated( ListenerEvent listenerEvent );
3836

3937
void afterTimedOutToAcquireOrCreate();
4038
}

‎driver/src/main/java/org/neo4j/driver/internal/metrics/InternalAbstractMetrics.java

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ public abstract class InternalAbstractMetrics implements Metrics, MetricsListene
3333
{
3434

3535
@Override
36-
public void beforeCreating( BoltServerAddress serverAddress, ListenerEvent.ConnectionListenerEvent creatingEvent )
36+
public void beforeCreating( BoltServerAddress serverAddress, ListenerEvent creatingEvent )
3737
{
3838

3939
}
4040

4141
@Override
42-
public void afterCreated( BoltServerAddress serverAddress, ListenerEvent.ConnectionListenerEvent creatingEvent )
42+
public void afterCreated( BoltServerAddress serverAddress, ListenerEvent creatingEvent )
4343
{
4444

4545
}
@@ -63,7 +63,7 @@ public void afterTimedOutToAcquireOrCreate( BoltServerAddress serverAddress )
6363
}
6464

6565
@Override
66-
public void beforeAcquiringOrCreating( BoltServerAddress serverAddress, ListenerEvent.PoolListenerEvent acquireEvent )
66+
public void beforeAcquiringOrCreating( BoltServerAddress serverAddress, ListenerEvent acquireEvent )
6767
{
6868

6969
}
@@ -75,31 +75,25 @@ public void afterAcquiringOrCreating( BoltServerAddress serverAddress )
7575
}
7676

7777
@Override
78-
public void afterAcquiredOrCreated( BoltServerAddress serverAddress, ListenerEvent.PoolListenerEvent acquireEvent )
78+
public void afterAcquiredOrCreated( BoltServerAddress serverAddress, ListenerEvent acquireEvent )
7979
{
8080

8181
}
8282

8383
@Override
84-
public void afterAcquiredOrCreated( BoltServerAddress serverAddress, ListenerEvent.ConnectionListenerEvent inUseEvent )
84+
public void afterConnectionCreated( BoltServerAddress serverAddress, ListenerEvent inUseEvent )
8585
{
8686

8787
}
8888

8989
@Override
90-
public void afterReleased( BoltServerAddress serverAddress, ListenerEvent.ConnectionListenerEvent inUseEvent )
90+
public void afterConnectionReleased( BoltServerAddress serverAddress, ListenerEvent inUseEvent )
9191
{
9292

9393
}
9494

9595
@Override
96-
public ListenerEvent.PoolListenerEvent createPoolListenerEvent()
97-
{
98-
return null;
99-
}
100-
101-
@Override
102-
public ListenerEvent.ConnectionListenerEvent createConnectionListenerEvent()
96+
public ListenerEvent createListenerEvent()
10397
{
10498
return null;
10599
}

‎driver/src/main/java/org/neo4j/driver/internal/metrics/InternalConnectionPoolMetrics.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.concurrent.atomic.AtomicLong;
2626

2727
import org.neo4j.driver.internal.BoltServerAddress;
28-
import org.neo4j.driver.internal.metrics.ListenerEvent.PoolListenerEvent;
2928
import org.neo4j.driver.internal.metrics.spi.ConnectionPoolMetrics;
3029
import org.neo4j.driver.internal.metrics.spi.Histogram;
3130
import org.neo4j.driver.internal.metrics.spi.PoolStatus;
@@ -88,7 +87,7 @@ public void afterClosed()
8887
}
8988

9089
@Override
91-
public void beforeAcquiringOrCreating( PoolListenerEvent listenerEvent )
90+
public void beforeAcquiringOrCreating( ListenerEvent listenerEvent )
9291
{
9392
listenerEvent.start();
9493
acquiring.incrementAndGet();
@@ -101,7 +100,7 @@ public void afterAcquiringOrCreating()
101100
}
102101

103102
@Override
104-
public void afterAcquiredOrCreated( PoolListenerEvent listenerEvent )
103+
public void afterAcquiredOrCreated( ListenerEvent listenerEvent )
105104
{
106105
long elapsed = listenerEvent.elapsed();
107106
acquisitionTimeHistogram.recordValue( elapsed );

‎driver/src/main/java/org/neo4j/driver/internal/metrics/InternalMetrics.java

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@
2424

2525
import org.neo4j.driver.internal.BoltServerAddress;
2626
import org.neo4j.driver.internal.async.pool.ConnectionPoolImpl;
27-
import org.neo4j.driver.internal.metrics.ListenerEvent.ConnectionListenerEvent;
28-
import org.neo4j.driver.internal.metrics.ListenerEvent.PoolListenerEvent;
2927
import org.neo4j.driver.internal.metrics.spi.ConnectionMetrics;
3028
import org.neo4j.driver.internal.metrics.spi.ConnectionPoolMetrics;
3129
import org.neo4j.driver.internal.spi.ConnectionPool;
3230
import org.neo4j.driver.v1.Config;
3331
import org.neo4j.driver.v1.exceptions.ClientException;
3432

3533
import static java.lang.String.format;
34+
import static java.util.Collections.unmodifiableMap;
3635

3736
public class InternalMetrics extends InternalAbstractMetrics
3837
{
@@ -56,14 +55,14 @@ public void addMetrics( BoltServerAddress serverAddress, ConnectionPoolImpl pool
5655
}
5756

5857
@Override
59-
public void beforeCreating( BoltServerAddress serverAddress, ConnectionListenerEvent creatingEvent )
58+
public void beforeCreating( BoltServerAddress serverAddress, ListenerEvent creatingEvent )
6059
{
6160
poolMetrics( serverAddress ).beforeCreating();
6261
connectionMetrics( serverAddress ).beforeCreating( creatingEvent );
6362
}
6463

6564
@Override
66-
public void afterCreated( BoltServerAddress serverAddress, ConnectionListenerEvent creatingEvent )
65+
public void afterCreated( BoltServerAddress serverAddress, ListenerEvent creatingEvent )
6766
{
6867
poolMetrics( serverAddress ).afterCreated();
6968
connectionMetrics( serverAddress ).afterCreated( creatingEvent );
@@ -82,7 +81,7 @@ public void afterClosed( BoltServerAddress serverAddress )
8281
}
8382

8483
@Override
85-
public void beforeAcquiringOrCreating( BoltServerAddress serverAddress, PoolListenerEvent listenerEvent )
84+
public void beforeAcquiringOrCreating( BoltServerAddress serverAddress, ListenerEvent listenerEvent )
8685
{
8786
poolMetrics( serverAddress ).beforeAcquiringOrCreating( listenerEvent );
8887
}
@@ -94,19 +93,19 @@ public void afterAcquiringOrCreating( BoltServerAddress serverAddress )
9493
}
9594

9695
@Override
97-
public void afterAcquiredOrCreated( BoltServerAddress serverAddress, PoolListenerEvent listenerEvent )
96+
public void afterAcquiredOrCreated( BoltServerAddress serverAddress, ListenerEvent listenerEvent )
9897
{
9998
poolMetrics( serverAddress ).afterAcquiredOrCreated( listenerEvent );
10099
}
101100

102101
@Override
103-
public void afterAcquiredOrCreated( BoltServerAddress serverAddress, ConnectionListenerEvent inUseEvent )
102+
public void afterConnectionCreated( BoltServerAddress serverAddress, ListenerEvent inUseEvent )
104103
{
105104
connectionMetrics( serverAddress ).acquiredOrCreated( inUseEvent );
106105
}
107106

108107
@Override
109-
public void afterReleased( BoltServerAddress serverAddress, ConnectionListenerEvent inUseEvent )
108+
public void afterConnectionReleased( BoltServerAddress serverAddress, ListenerEvent inUseEvent )
110109
{
111110
connectionMetrics( serverAddress ).released( inUseEvent );
112111
}
@@ -118,27 +117,21 @@ public void afterTimedOutToAcquireOrCreate( BoltServerAddress serverAddress )
118117
}
119118

120119
@Override
121-
public PoolListenerEvent createPoolListenerEvent()
122-
{
123-
return new NanoTimeBasedListenerEvent();
124-
}
125-
126-
@Override
127-
public ConnectionListenerEvent createConnectionListenerEvent()
120+
public ListenerEvent createListenerEvent()
128121
{
129122
return new NanoTimeBasedListenerEvent();
130123
}
131124

132125
@Override
133126
public Map<String,ConnectionPoolMetrics> connectionPoolMetrics()
134127
{
135-
return this.connectionPoolMetrics;
128+
return unmodifiableMap( this.connectionPoolMetrics );
136129
}
137130

138131
@Override
139132
public Map<String,ConnectionMetrics> connectionMetrics()
140133
{
141-
return this.connectionMetrics;
134+
return unmodifiableMap( this.connectionMetrics );
142135
}
143136

144137
@Override

‎driver/src/main/java/org/neo4j/driver/internal/metrics/ListenerEvent.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,6 @@
2121
public interface ListenerEvent
2222
{
2323
void start();
24-
2524
long elapsed();
26-
27-
interface PoolListenerEvent extends ListenerEvent
28-
{
29-
}
30-
31-
interface ConnectionListenerEvent extends ListenerEvent
32-
{
33-
}
3425
}
3526

0 commit comments

Comments
 (0)