remove addr from establishConnection type

plabayo · Feb 27, 2025 · 4434b07 · 4434b07
1 parent 0d6344e
commit 4434b07
Show file tree

Hide file tree

Showing 10 changed files with 173 additions and 199 deletions.
diff --git a/rama-haproxy/src/client/layer.rs b/rama-haproxy/src/client/layer.rs
diff --git a/rama-http-backend/src/client/conn.rs b/rama-http-backend/src/client/conn.rs
@@ -70,7 +70,6 @@ where
             #[cfg(not(any(feature = "rustls", feature = "boring")))]
             req,
             conn,
-            addr,
         } = self.inner.connect(ctx, req).await.map_err(Into::into)?;
 
         #[cfg(any(feature = "rustls", feature = "boring"))]
@@ -120,7 +119,6 @@ where
                     ctx,
                     req,
                     conn: svc,
-                    addr,
                 })
             }
             Version::HTTP_11 | Version::HTTP_10 | Version::HTTP_09 => {
@@ -139,7 +137,6 @@ where
                     ctx,
                     req,
                     conn: svc,
-                    addr,
                 })
             }
             version => Err(OpaqueError::from_display(format!(

diff --git a/rama-http-backend/src/client/mod.rs b/rama-http-backend/src/client/mod.rs
@@ -164,7 +164,7 @@ where
         // so that the other end can read it... This might however give issues in
         // case switching http versions requires more work than version. If so,
         // your first place will be to check here and/or in the [`HttpConnector`].
-        let EstablishedClientConnection { ctx, req, conn, .. } = connector
+        let EstablishedClientConnection { ctx, req, conn } = connector
             .connect(ctx, req)
             .await
             .map_err(|err| OpaqueError::from_boxed(err).with_context(|| uri.to_string()))?;

diff --git a/rama-http-backend/src/client/proxy/layer/proxy_connector/service.rs b/rama-http-backend/src/client/proxy/layer/proxy_connector/service.rs
@@ -147,33 +147,21 @@ where
                     tracing::trace!(
                         "http proxy connector: no proxy required or set: proceed with direct connection"
                     );
-                    let EstablishedClientConnection {
-                        ctx,
-                        req,
-                        conn,
-                        addr,
-                    } = established_conn;
+                    let EstablishedClientConnection { ctx, req, conn } = established_conn;
                     return Ok(EstablishedClientConnection {
                         ctx,
                         req,
                         conn: Either::A(conn),
-                        addr,
                     });
                 };
             }
         };
         // and do the handshake otherwise...
 
-        let EstablishedClientConnection {
-            ctx,
-            req,
-            conn,
-            addr,
-        } = established_conn;
+        let EstablishedClientConnection { ctx, req, conn } = established_conn;
 
         tracing::trace!(
             authority = %transport_ctx.authority,
-            proxy_addr = %addr,
             "http proxy connector: connected to proxy",
         );
 
@@ -190,7 +178,6 @@ where
                 ctx,
                 req,
                 conn: Either::A(conn),
-                addr,
             });
         }
 
@@ -214,14 +201,12 @@ where
 
         tracing::trace!(
             authority = %transport_ctx.authority,
-            proxy_addr = %addr,
             "http proxy connector: connected to proxy: ready secure request",
         );
         Ok(EstablishedClientConnection {
             ctx,
             req,
             conn: Either::B(conn),
-            addr,
         })
     }
 }
diff --git a/rama-net/src/client/conn.rs b/rama-net/src/client/conn.rs
@@ -1,5 +1,5 @@
 use rama_core::{Context, Service, error::BoxError};
-use std::{fmt, future::Future, net::SocketAddr};
+use std::{fmt, future::Future};
 
 /// The established connection to a server returned for the http client to be used.
 pub struct EstablishedClientConnection<S, State, Request> {
@@ -9,8 +9,6 @@ pub struct EstablishedClientConnection<S, State, Request> {
     pub req: Request,
     /// The established connection stream/service/... to the server.
     pub conn: S,
-    /// The target address connected to.
-    pub addr: SocketAddr,
 }
 
 impl<S: fmt::Debug, State: fmt::Debug, Request: fmt::Debug> fmt::Debug
@@ -21,7 +19,6 @@ impl<S: fmt::Debug, State: fmt::Debug, Request: fmt::Debug> fmt::Debug
             .field("ctx", &self.ctx)
             .field("req", &self.req)
             .field("conn", &self.conn)
-            .field("addr", &self.addr)
             .finish()
     }
 }
@@ -34,7 +31,6 @@ impl<S: Clone, State: Clone, Request: Clone> Clone
             ctx: self.ctx.clone(),
             req: self.req.clone(),
             conn: self.conn.clone(),
-            addr: self.addr,
         }
     }
 }

diff --git a/rama-net/src/stream/layer/tracker/outgoing.rs b/rama-net/src/stream/layer/tracker/outgoing.rs
@@ -59,21 +59,12 @@ where
         ctx: Context<State>,
         req: Request,
     ) -> Result<Self::Response, Self::Error> {
-        let EstablishedClientConnection {
-            mut ctx,
-            req,
-            conn,
-            addr,
-        } = self.inner.connect(ctx, req).await?;
+        let EstablishedClientConnection { mut ctx, req, conn } =
+            self.inner.connect(ctx, req).await?;
         let conn = BytesRWTracker::new(conn);
         let handle = conn.handle();
         ctx.insert(handle);
-        Ok(EstablishedClientConnection {
-            ctx,
-            req,
-            conn,
-            addr,
-        })
+        Ok(EstablishedClientConnection { ctx, req, conn })
     }
 }
 

diff --git a/rama-tcp/src/client/service/connector.rs b/rama-tcp/src/client/service/connector.rs
@@ -107,7 +107,7 @@ where
             .map_err(Into::into)?;
 
         if let Some(proxy) = ctx.get::<ProxyAddress>() {
-            let (conn, addr) = crate::client::tcp_connect(
+            let (conn, _addr) = crate::client::tcp_connect(
                 &ctx,
                 proxy.authority.clone(),
                 true,
@@ -116,12 +116,7 @@ where
             )
             .await
             .context("tcp connector: conncept to proxy")?;
-            return Ok(EstablishedClientConnection {
-                ctx,
-                req,
-                conn,
-                addr,
-            });
+            return Ok(EstablishedClientConnection { ctx, req, conn });
         }
 
         let transport_ctx = ctx
@@ -143,16 +138,11 @@ where
         }
 
         let authority = transport_ctx.authority.clone();
-        let (conn, addr) =
+        let (conn, _addr) =
             crate::client::tcp_connect(&ctx, authority, false, self.dns.clone(), connector)
                 .await
                 .context("tcp connector: connect to server")?;
 
-        Ok(EstablishedClientConnection {
-            ctx,
-            req,
-            conn,
-            addr,
-        })
+        Ok(EstablishedClientConnection { ctx, req, conn })
     }
 }
diff --git a/rama-tls/src/boring/client/connector.rs b/rama-tls/src/boring/client/connector.rs
@@ -229,12 +229,8 @@ where
         ctx: Context<State>,
         req: Request,
     ) -> Result<Self::Response, Self::Error> {
-        let EstablishedClientConnection {
-            mut ctx,
-            req,
-            conn,
-            addr,
-        } = self.inner.connect(ctx, req).await.map_err(Into::into)?;
+        let EstablishedClientConnection { mut ctx, req, conn } =
+            self.inner.connect(ctx, req).await.map_err(Into::into)?;
 
         let transport_ctx = ctx
             .get_or_try_insert_with_ctx(|ctx| req.try_ref_into_transport_ctx(ctx))
@@ -260,7 +256,6 @@ where
                 conn: AutoTlsStream {
                     inner: AutoTlsStreamData::Plain { inner: conn },
                 },
-                addr,
             });
         }
 
@@ -282,7 +277,6 @@ where
             conn: AutoTlsStream {
                 inner: AutoTlsStreamData::Secure { inner: stream },
             },
-            addr,
         })
     }
 }
@@ -303,12 +297,8 @@ where
         ctx: Context<State>,
         req: Request,
     ) -> Result<Self::Response, Self::Error> {
-        let EstablishedClientConnection {
-            mut ctx,
-            req,
-            conn,
-            addr,
-        } = self.inner.connect(ctx, req).await.map_err(Into::into)?;
+        let EstablishedClientConnection { mut ctx, req, conn } =
+            self.inner.connect(ctx, req).await.map_err(Into::into)?;
 
         let transport_ctx = ctx
             .get_or_try_insert_with_ctx(|ctx| req.try_ref_into_transport_ctx(ctx))
@@ -328,12 +318,7 @@ where
         let (conn, negotiated_params) = self.handshake(connector_data, host, conn).await?;
         ctx.insert(negotiated_params);
 
-        Ok(EstablishedClientConnection {
-            ctx,
-            req,
-            conn,
-            addr,
-        })
+        Ok(EstablishedClientConnection { ctx, req, conn })
     }
 }
 
@@ -351,12 +336,8 @@ where
         ctx: Context<State>,
         req: Request,
     ) -> Result<Self::Response, Self::Error> {
-        let EstablishedClientConnection {
-            mut ctx,
-            req,
-            conn,
-            addr,
-        } = self.inner.connect(ctx, req).await.map_err(Into::into)?;
+        let EstablishedClientConnection { mut ctx, req, conn } =
+            self.inner.connect(ctx, req).await.map_err(Into::into)?;
 
         let host = match ctx
             .get::<TlsTunnel>()
@@ -375,7 +356,6 @@ where
                     conn: AutoTlsStream {
                         inner: AutoTlsStreamData::Plain { inner: conn },
                     },
-                    addr,
                 });
             }
         };
@@ -391,7 +371,6 @@ where
             conn: AutoTlsStream {
                 inner: AutoTlsStreamData::Secure { inner: stream },
             },
-            addr,
         })
     }
 }

diff --git a/rama-tls/src/rustls/client/connector.rs b/rama-tls/src/rustls/client/connector.rs
@@ -231,12 +231,8 @@ where
         ctx: Context<State>,
         req: Request,
     ) -> Result<Self::Response, Self::Error> {
-        let EstablishedClientConnection {
-            mut ctx,
-            req,
-            conn,
-            addr,
-        } = self.inner.connect(ctx, req).await.map_err(Into::into)?;
+        let EstablishedClientConnection { mut ctx, req, conn } =
+            self.inner.connect(ctx, req).await.map_err(Into::into)?;
         let transport_ctx = ctx
             .get_or_try_insert_with_ctx(|ctx| req.try_ref_into_transport_ctx(ctx))
             .map_err(|err| {
@@ -261,7 +257,6 @@ where
                 conn: AutoTlsStream {
                     inner: AutoTlsStreamData::Plain { inner: conn },
                 },
-                addr,
             });
         }
 
@@ -290,7 +285,6 @@ where
             conn: AutoTlsStream {
                 inner: AutoTlsStreamData::Secure { inner: stream },
             },
-            addr,
         })
     }
 }
@@ -311,12 +305,8 @@ where
         ctx: Context<State>,
         req: Request,
     ) -> Result<Self::Response, Self::Error> {
-        let EstablishedClientConnection {
-            mut ctx,
-            req,
-            conn,
-            addr,
-        } = self.inner.connect(ctx, req).await.map_err(Into::into)?;
+        let EstablishedClientConnection { mut ctx, req, conn } =
+            self.inner.connect(ctx, req).await.map_err(Into::into)?;
 
         let transport_ctx = ctx
             .get_or_try_insert_with_ctx(|ctx| req.try_ref_into_transport_ctx(ctx))
@@ -336,12 +326,7 @@ where
         let (conn, negotiated_params) = self.handshake(connector_data, server_host, conn).await?;
         ctx.insert(negotiated_params);
 
-        Ok(EstablishedClientConnection {
-            ctx,
-            req,
-            conn,
-            addr,
-        })
+        Ok(EstablishedClientConnection { ctx, req, conn })
     }
 }
 
@@ -359,12 +344,8 @@ where
         ctx: Context<State>,
         req: Request,
     ) -> Result<Self::Response, Self::Error> {
-        let EstablishedClientConnection {
-            mut ctx,
-            req,
-            conn,
-            addr,
-        } = self.inner.connect(ctx, req).await.map_err(Into::into)?;
+        let EstablishedClientConnection { mut ctx, req, conn } =
+            self.inner.connect(ctx, req).await.map_err(Into::into)?;
 
         let server_host = match ctx
             .get::<TlsTunnel>()
@@ -383,7 +364,6 @@ where
                     conn: AutoTlsStream {
                         inner: AutoTlsStreamData::Plain { inner: conn },
                     },
-                    addr,
                 });
             }
         };
@@ -399,7 +379,6 @@ where
             conn: AutoTlsStream {
                 inner: AutoTlsStreamData::Secure { inner: conn },
             },
-            addr,
         })
     }
 }

diff --git a/tests/integration/examples/example_tests/tls_boring_dynamic_certs.rs b/tests/integration/examples/example_tests/tls_boring_dynamic_certs.rs
@@ -178,8 +178,7 @@ where
             TlsConnector::auto(tcp_connector).with_connector_data(tls_connector_data),
         );
 
-        let EstablishedClientConnection { ctx, req, conn, .. } =
-            connector.connect(ctx, req).await?;
+        let EstablishedClientConnection { ctx, req, conn } = connector.connect(ctx, req).await?;
 
         // Extra logic to extract certificates
         let params = ctx.get::<NegotiatedTlsParameters>().unwrap();