Merge pull request #34017 from def-/pr-rdkafka

build(deps): Switch to (mostly) upstream librdkafka

Author: def-

Cargo.lock

@@ -28,7 +28,7 @@ banana
     SASL PASSWORD SECRET password,
     SECURITY PROTOCOL SASL_PLAINTEXT
   )
-contains:Disconnected during handshake; broker might require SSL encryption
+contains:Disconnected: connection closed by peer: receive 0 after POLLIN
 
 ! CREATE CONNECTION kafka_invalid TO KAFKA (
     BROKER 'kafka:9096',

test/kafka-auth/test-kafka-sasl-ssl.td

@@ -26,7 +26,7 @@ banana
     BROKER 'kafka:9093',
     SECURITY PROTOCOL PLAINTEXT
   )
-contains:Disconnected during handshake; broker might require SSL encryption
+contains:Disconnected: connection closed by peer: receive 0 after POLLIN
 
 ! CREATE CONNECTION kafka_invalid TO KAFKA (
     BROKER 'kafka:9093'
@@ -44,7 +44,7 @@ contains:Invalid CA certificate
     BROKER 'kafka:9093',
     SSL CERTIFICATE AUTHORITY = 'this is garbage'
   )
-contains:ssl.ca.pem failed: not in PEM format?
+contains:failed to read certificate #0 from ssl.ca.pem: not in PEM format?:
 
 # ==> Test without an SSH tunnel. <==
 

test/kafka-auth/test-kafka-ssl.td

@@ -331,7 +331,8 @@ def assert_error(self, c: Composition, error: str) -> None:
         c.testdrive(
             dedent(
                 f"""
-                $ set-sql-timeout duration=60s
+                # Takes > 60s following librdkafka update
+                $ set-sql-timeout duration=240s
                 # Sinks generally halt after receiving an error, which means that they may alternate
                 # between `stalled` and `starting`. Instead of relying on the current status, we
                 # check that there is a stalled status with the expected error.