Handle multiple ResultSet#close calls

Close #67

Author: ttddyy

datasource-micrometer/src/main/java/net/ttddyy/observation/tracing/DataSourceObservationListener.java

@@ -379,10 +379,17 @@ private void handleResultSet(MethodExecutionContext executionContext) {
 			return;
 		}
 
+		String methodName = executionContext.getMethod().getName();
+		boolean isClose = "close".equals(methodName);
+
 		ResultSet resultSet = (ResultSet) executionContext.getTarget();
 		ResultSetAttributes resultSetAttributes = connectionAttributes.resultSetAttributesManager
 			.getByResultSet(resultSet);
-		if (resultSetAttributes == null) {
+
+		// "close" could be called multiple times. When this is a second close, do not
+		// start ob.
+		boolean createResultSetAttributes = (resultSetAttributes == null) && !isClose;
+		if (createResultSetAttributes) {
 			boolean isGeneratedKey = connectionAttributes.resultSetAttributesManager.isGeneratedKeys(resultSet);
 			resultSetAttributes = createResultSetAttributesAndStartObservation(executionContext, isGeneratedKey);
 
@@ -400,14 +407,17 @@ private void handleResultSet(MethodExecutionContext executionContext) {
 			connectionAttributes.resultSetAttributesManager.add(resultSet, statement, resultSetAttributes);
 		}
 
-		ResultSetOperation operation = new ResultSetOperation(executionContext.getMethod(),
-				executionContext.getMethodArgs(), executionContext.getResult(), executionContext.getThrown());
-		resultSetAttributes.context.addOperation(operation);
+		if (resultSetAttributes != null) {
+			ResultSetOperation operation = new ResultSetOperation(executionContext.getMethod(),
+					executionContext.getMethodArgs(), executionContext.getResult(), executionContext.getThrown());
+			resultSetAttributes.context.addOperation(operation);
+		}
 
-		String methodName = executionContext.getMethod().getName();
-		if ("close".equals(methodName)) {
+		if (isClose) {
 			connectionAttributes.resultSetAttributesManager.removeByResultSet(resultSet);
-			stopResultSetObservation(resultSetAttributes.scope, executionContext.getThrown());
+			if (resultSetAttributes != null) {
+				stopResultSetObservation(resultSetAttributes.scope, executionContext.getThrown());
+			}
 		}
 		else if ("next".equals(methodName)) {
 			boolean hasNext = Boolean.TRUE.equals(executionContext.getResult());

datasource-micrometer/src/test/java/net/ttddyy/observation/tracing/DataSourceObservationListenerTests.java

@@ -675,4 +675,29 @@ void resultSetObservationWithNullResult() throws Exception {
 		TracerAssert.assertThat(this.tracer).reportedSpans().hasSize(1);
 	}
 
+	@Test
+	void resultSetObservationWithMultipleClose() throws Exception {
+		this.registry.observationConfig().observationHandler(new ResultSetTracingObservationHandler(this.tracer));
+		DataSourceObservationListener listener = new DataSourceObservationListener(this.registry);
+
+		ResultSet resultSet = mock(ResultSet.class);
+
+		ConnectionInfo connectionInfo = new ConnectionInfo();
+		connectionInfo.setConnectionId("id-1");
+		connectionInfo.setDataSourceName("myDS");
+
+		Statement statement = mock(Statement.class);
+		given(resultSet.getStatement()).willReturn(statement);
+
+		createResultSetObservation(listener, connectionInfo, resultSet, true);
+
+		// call "close"
+		listener.afterMethod(createResultSetCloseMethodExecutionContext(connectionInfo, resultSet));
+
+		// call "close" again
+		listener.afterMethod(createResultSetCloseMethodExecutionContext(connectionInfo, resultSet));
+
+		TracerAssert.assertThat(this.tracer).reportedSpans().hasSize(1);
+	}
+
 }