Skip to content

Commit d47a5b2

Browse files
samuelAndalonSamuel Vazquez
andauthored
feat: we are already counting how many times we access to an specific dataloader (#2164)
Co-authored-by: Samuel Vazquez <samvazquez@expediagroup.com>
1 parent d1815a1 commit d47a5b2

1 file changed

Lines changed: 3 additions & 43 deletions

File tree

executions/graphql-kotlin-dataloader-instrumentation/src/test/kotlin/com/expediagroup/graphql/dataloader/instrumentation/syncexhaustion/GraphQLSyncExecutionExhaustedDataLoaderDispatcherTest.kt

Lines changed: 3 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2025 Expedia, Inc
2+
* Copyright 2026 Expedia, Inc
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -71,10 +71,6 @@ class GraphQLSyncExecutionExhaustedDataLoaderDispatcherTest {
7171

7272
assertEquals(1, missionStatistics?.batchInvokeCount)
7373
assertEquals(2, missionStatistics?.batchLoadCount)
74-
75-
verify(exactly = 2) {
76-
graphQLContext.get(DataLoaderRegistry::class)
77-
}
7874
}
7975

8076
@Test
@@ -102,10 +98,6 @@ class GraphQLSyncExecutionExhaustedDataLoaderDispatcherTest {
10298

10399
assertEquals(1, missionStatistics?.batchInvokeCount)
104100
assertEquals(2, missionStatistics?.batchLoadCount)
105-
106-
verify(exactly = 2) {
107-
graphQLContext.get(DataLoaderRegistry::class)
108-
}
109101
}
110102

111103
@Test
@@ -144,12 +136,6 @@ class GraphQLSyncExecutionExhaustedDataLoaderDispatcherTest {
144136
assertEquals(1, missionsByAstronautStatistics?.batchInvokeCount)
145137
// Level 2 and 3
146138
assertEquals(2, missionsByAstronautStatistics?.batchLoadCount)
147-
148-
// Dispatch checks can happen more than once depending on async completion timing.
149-
// Keep this assertion permissive and rely on strict batch stats above for behavior.
150-
verify(atLeast = 3) {
151-
graphQLContext.get(DataLoaderRegistry::class)
152-
}
153139
}
154140

155141
@Test
@@ -183,12 +169,6 @@ class GraphQLSyncExecutionExhaustedDataLoaderDispatcherTest {
183169

184170
assertEquals(1, missionsByAstronautStatistics?.batchInvokeCount)
185171
assertEquals(3, missionsByAstronautStatistics?.batchLoadCount)
186-
187-
// Async leaf completion can race with exhaustion checks, so this interaction may be observed 2+ times.
188-
// Keep strict batching assertions above as the primary behavior contract.
189-
verify(atLeast = 2) {
190-
graphQLContext.get(DataLoaderRegistry::class)
191-
}
192172
}
193173

194174
@Test
@@ -223,10 +203,6 @@ class GraphQLSyncExecutionExhaustedDataLoaderDispatcherTest {
223203

224204
assertEquals(1, missionsByAstronautStatistics?.batchInvokeCount)
225205
assertEquals(2, missionsByAstronautStatistics?.batchLoadCount)
226-
227-
verify(exactly = 3) {
228-
graphQLContext.get(DataLoaderRegistry::class)
229-
}
230206
}
231207

232208
@Test
@@ -258,7 +234,7 @@ class GraphQLSyncExecutionExhaustedDataLoaderDispatcherTest {
258234
""".trimIndent()
259235
)
260236

261-
val (results, dataLoaderRegistry, graphQLContext) = AstronautGraphQL.executeOperations(
237+
val (results, dataLoaderRegistry, _) = AstronautGraphQL.executeOperations(
262238
astronautGraphQL,
263239
queries,
264240
DataLoaderInstrumentationStrategy.SYNC_EXHAUSTION
@@ -278,10 +254,6 @@ class GraphQLSyncExecutionExhaustedDataLoaderDispatcherTest {
278254

279255
assertEquals(1, missionsByAstronautStatistics?.batchInvokeCount)
280256
assertEquals(3, missionsByAstronautStatistics?.batchLoadCount)
281-
282-
verify(exactly = 3) {
283-
graphQLContext.get(DataLoaderRegistry::class)
284-
}
285257
}
286258

287259
@Test
@@ -324,10 +296,6 @@ class GraphQLSyncExecutionExhaustedDataLoaderDispatcherTest {
324296

325297
assertEquals(1, missionsByAstronautStatistics?.batchInvokeCount)
326298
assertEquals(3, missionsByAstronautStatistics?.batchLoadCount)
327-
328-
verify(exactly = 3) {
329-
graphQLContext.get(DataLoaderRegistry::class)
330-
}
331299
}
332300

333301
@Test
@@ -563,7 +531,7 @@ class GraphQLSyncExecutionExhaustedDataLoaderDispatcherTest {
563531
"""mutation { createAstronaut(name: "spaceMan") { id name } }"""
564532
)
565533

566-
val (results, dataLoaderRegistry, graphQLContext) = AstronautGraphQL.executeOperations(
534+
val (results, _, graphQLContext) = AstronautGraphQL.executeOperations(
567535
astronautGraphQL,
568536
queries,
569537
DataLoaderInstrumentationStrategy.SYNC_EXHAUSTION
@@ -600,10 +568,6 @@ class GraphQLSyncExecutionExhaustedDataLoaderDispatcherTest {
600568

601569
assertEquals(1, missionStatistics?.batchInvokeCount)
602570
assertEquals(2, missionStatistics?.batchLoadCount)
603-
604-
verify(exactly = 2) {
605-
graphQLContext.get(DataLoaderRegistry::class)
606-
}
607571
}
608572

609573
@Test
@@ -631,9 +595,5 @@ class GraphQLSyncExecutionExhaustedDataLoaderDispatcherTest {
631595

632596
assertEquals(1, missionStatistics?.batchInvokeCount)
633597
assertEquals(1, missionStatistics?.batchLoadCount)
634-
635-
verify(exactly = 2) {
636-
graphQLContext.get(DataLoaderRegistry::class)
637-
}
638598
}
639599
}

0 commit comments

Comments
 (0)