Merge branch 'main' into fix-flaky-test

grpc · Feb 4, 2025 · ca570c6 · ca570c6
2 parents 0f5d940 + c0cf650
commit ca570c6
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 4 deletions.
diff --git a/Sources/GRPCNIOTransportCore/Client/Connection/GRPCChannel.swift b/Sources/GRPCNIOTransportCore/Client/Connection/GRPCChannel.swift
@@ -339,7 +339,8 @@ extension GRPCChannel {
           return
         }
 
-        let (enqueued, loadBalancer) = self.state.withLock { state in
+        // Explicitly adding the types works around: https://github.com/swiftlang/swift/issues/78112
+        let (enqueued, loadBalancer) = self.state.withLock { state -> (Bool, LoadBalancer?) in
           state.enqueue(continuation: continuation, waitForReady: waitForReady, id: id)
         }
 

diff --git a/...RPCNIOTransportCoreTests/Client/Connection/ClientConnectionHandlerStateMachineTests.swift b/...RPCNIOTransportCoreTests/Client/Connection/ClientConnectionHandlerStateMachineTests.swift
@@ -16,6 +16,7 @@
 
 import NIOCore
 import NIOEmbedded
+import NIOHTTP2
 import XCTest
 
 @testable import GRPCNIOTransportCore

diff --git a/Tests/GRPCNIOTransportCoreTests/Client/Connection/GRPCChannelTests.swift b/Tests/GRPCNIOTransportCoreTests/Client/Connection/GRPCChannelTests.swift
@@ -16,6 +16,7 @@
 
 import GRPCCore
 import GRPCNIOTransportCore
+import NIOCore
 import NIOHTTP2
 import NIOPosix
 import XCTest
@@ -639,7 +640,7 @@ final class GRPCChannelTests: XCTestCase {
       TestServer(eventLoopGroup: .singletonMultiThreadedEventLoopGroup)
     }
 
-    var addresses = [SocketAddress]()
+    var addresses = [GRPCNIOTransportCore.SocketAddress]()
     for server in servers {
       let address = try await server.bind()
       addresses.append(address)
@@ -863,7 +864,7 @@ extension GRPCChannel.Config {
 }
 
 extension Endpoint {
-  init(_ addresses: SocketAddress...) {
+  init(_ addresses: GRPCNIOTransportCore.SocketAddress...) {
     self.init(addresses: addresses)
   }
 }

diff --git a/Tests/GRPCNIOTransportCoreTests/Client/Connection/LoadBalancers/LoadBalancerTest.swift b/Tests/GRPCNIOTransportCoreTests/Client/Connection/LoadBalancers/LoadBalancerTest.swift
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
+import GRPCCore
 import GRPCNIOTransportCore
+import NIOPosix
 import XCTest
 
 enum LoadBalancerTest {

diff --git a/...RPCNIOTransportCoreTests/Client/Connection/LoadBalancers/PickFirstLoadBalancerTests.swift b/...RPCNIOTransportCoreTests/Client/Connection/LoadBalancers/PickFirstLoadBalancerTests.swift
@@ -16,6 +16,7 @@
 
 import GRPCCore
 import GRPCNIOTransportCore
+import NIOCore
 import NIOHTTP2
 import NIOPosix
 import XCTest

diff --git a/...PCNIOTransportCoreTests/Client/Connection/LoadBalancers/RoundRobinLoadBalancerTests.swift b/...PCNIOTransportCoreTests/Client/Connection/LoadBalancers/RoundRobinLoadBalancerTests.swift
@@ -16,6 +16,7 @@
 
 import GRPCCore
 import GRPCNIOTransportCore
+import NIOCore
 import NIOHTTP2
 import NIOPosix
 import XCTest

diff --git a/Tests/GRPCNIOTransportCoreTests/Client/HTTP2ClientTransportConfigTests.swift b/Tests/GRPCNIOTransportCoreTests/Client/HTTP2ClientTransportConfigTests.swift
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import GRPCCore
 import GRPCNIOTransportCore
 import XCTest
 

diff --git a/Tests/GRPCNIOTransportCoreTests/Server/HTTP2ServerTransportConfigTests.swift b/Tests/GRPCNIOTransportCoreTests/Server/HTTP2ServerTransportConfigTests.swift
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import GRPCCore
 import GRPCNIOTransportCore
 import XCTest
 

diff --git a/Tests/GRPCNIOTransportHTTP2Tests/HTTP2ServerTransport+DebugTests.swift b/Tests/GRPCNIOTransportHTTP2Tests/HTTP2ServerTransport+DebugTests.swift
@@ -16,6 +16,8 @@
 
 import GRPCCore
 import GRPCNIOTransportHTTP2
+import NIOCore
+import Synchronization
 import Testing
 
 @Suite("ChannelDebugCallbacks")
@@ -96,7 +98,7 @@ struct ChannelDebugCallbackTests {
 
   private func makeServerTransport(
     kind: TransportKind,
-    address: SocketAddress,
+    address: GRPCNIOTransportCore.SocketAddress,
     debug: HTTP2ServerTransport.Config.ChannelDebuggingCallbacks
   ) -> NIOServerTransport {
     switch kind {