Skip to content

Commit e5ce12c

Browse files
authored
Fix: Disjoint PRs caused failures on main~ (#937)
## Description - 2 disjoint PRs (with checks passing on each PR) getting merged caused the main to break. - Note that I have enabled `Require a merge from main before merging ` : this should not be a problem henceforth ## Testing - checks pass 👍 ## Additional Notes to the Reviewer NO_CHANGELOG=true
1 parent ca0d48c commit e5ce12c

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

src/test/java/com/databricks/jdbc/telemetry/latency/TelemetryCollectorTest.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@
44
import static org.mockito.Mockito.*;
55

66
import com.databricks.jdbc.common.util.DatabricksThreadContextHolder;
7+
import com.databricks.jdbc.model.telemetry.StatementTelemetryDetails;
78
import com.databricks.jdbc.model.telemetry.latency.ChunkDetails;
89
import com.databricks.jdbc.model.telemetry.latency.OperationType;
10+
import com.databricks.jdbc.telemetry.TelemetryHelper;
911
import org.junit.jupiter.api.AfterEach;
1012
import org.junit.jupiter.api.BeforeEach;
1113
import org.junit.jupiter.api.Test;
1214
import org.junit.jupiter.params.ParameterizedTest;
1315
import org.junit.jupiter.params.provider.CsvSource;
1416
import org.junit.jupiter.params.provider.EnumSource;
17+
import org.mockito.MockedStatic;
1518

1619
public class TelemetryCollectorTest {
1720
private final TelemetryCollector handler = TelemetryCollector.getInstance();
@@ -71,16 +74,12 @@ void testRecordOperationLatency_WithCloseOperation() {
7174
String methodName = "closeStatement";
7275
long latency = 100L;
7376

74-
// Ensure telemetry is collected for the statement id prior to close
75-
handler.recordGetOperationStatus(TEST_STATEMENT_ID, 1L);
76-
handler.recordOperationLatency(latency, methodName);
77-
// Allow asynchronous export to complete and internal map to be cleared
78-
try {
79-
Thread.sleep(200);
80-
} catch (InterruptedException e) {
81-
Thread.currentThread().interrupt();
77+
try (MockedStatic<TelemetryHelper> mockedStatic = mockStatic(TelemetryHelper.class)) {
78+
handler.recordOperationLatency(latency, methodName);
79+
80+
mockedStatic.verify(
81+
() -> TelemetryHelper.exportTelemetryLog(any(StatementTelemetryDetails.class)));
8282
}
83-
assertNull(handler.getTelemetryDetails(TEST_STATEMENT_ID));
8483
}
8584

8685
@ParameterizedTest

0 commit comments

Comments
 (0)