CR fixes

Author: Shlomi Kushchi

sdk/core/azure_core_amqp/Cargo.toml

@@ -29,9 +29,9 @@ serde.workspace = true
 serde_amqp = { workspace = true, optional = true }
 serde_bytes = { workspace = true, optional = true }
 tokio.workspace = true
-tokio-socks = "0.5"
-tokio-native-tls = "0.3"
-native-tls = "0.2"
+tokio-socks = { version = "0.5", optional = true }
+native-tls = { version = "0.2", optional = true }
+tokio-native-tls = { version = "0.3", optional = true }
 tracing.workspace = true
 typespec = { workspace = true, features = ["amqp"] }
 typespec_macros.workspace = true
@@ -52,6 +52,7 @@ fe2o3_amqp = [
   "serde_amqp",
   "serde_bytes",
 ]
+socks5 = ["dep:tokio-socks", "dep:native-tls", "dep:tokio-native-tls"]
 
 [lints]
 workspace = true

sdk/core/azure_core_amqp/README.md

@@ -8,7 +8,16 @@ This crate is part of a collection of crates: for more information please refer
 
 ## SOCKS5 Proxy Support
 
-This crate supports SOCKS5 proxy connections for corporate environments. SOCKS5 support is enabled by configuring the `custom_endpoint` option with a SOCKS5 URL:
+This crate supports SOCKS5 proxy connections for corporate environments.
+
+**Note**: SOCKS5 support requires enabling the `socks5` feature:
+
+```toml
+[dependencies]
+azure_core_amqp = { version = "0.8", features = ["socks5"] }
+```
+
+SOCKS5 support is enabled by configuring the `custom_endpoint` option with a SOCKS5 URL:
 
 ```rust,no_run
 use azure_core::http::Url;

sdk/core/azure_core_amqp/src/fe2o3/connection.rs

@@ -4,6 +4,7 @@
 use super::error::{Fe2o3ConnectionError, Fe2o3ConnectionOpenError, Fe2o3TransportError};
 use crate::connection::{AmqpConnectionApis, AmqpConnectionOptions};
 use crate::error::AmqpErrorKind;
+#[cfg(feature = "socks5")]
 use crate::socks5::SocksConnection;
 use crate::value::{AmqpOrderedMap, AmqpSymbol, AmqpValue};
 use azure_core::{http::Url, Result};
@@ -45,6 +46,7 @@ impl Drop for Fe2o3AmqpConnection {
     }
 }
 
+
 #[cfg_attr(target_arch = "wasm32", async_trait::async_trait(?Send))]
 #[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
 impl AmqpConnectionApis for Fe2o3AmqpConnection {
@@ -123,58 +125,59 @@ impl AmqpConnectionApis for Fe2o3AmqpConnection {
             } else {
                 "direct"
             };
-            let connection = if endpoint.scheme() == "socks5" || endpoint.scheme() == "socks5h" {
-                debug!(
-                    connection_id = %id,
-                    proxy_scheme = %endpoint.scheme(),
-                    target_host = %url.host_str().unwrap_or("unknown"),
-                    "Opening AMQP connection through SOCKS5 proxy"
-                );
-
-                // Use fe2o3's open_with_stream() to inject SOCKS5 connection
-                let stream = SocksConnection::connect(&endpoint, &url)
-                    .await
-                    .map_err(|e| {
-                        error!(
+            let connection = {
+                #[cfg(feature = "socks5")]
+                {
+                    if endpoint.scheme() == "socks5" || endpoint.scheme() == "socks5h" {
+                        debug!(
                             connection_id = %id,
-                            proxy_url = %SocksConnection::mask_credentials(&endpoint),
-                            error = %e,
-                            "Failed to establish SOCKS5 connection"
+                            proxy_scheme = %endpoint.scheme(),
+                            target_host = %url.host_str().unwrap_or("unknown"),
+                            "Opening AMQP connection through SOCKS5 proxy"
                         );
-                        e
-                    })?;
 
-                debug!(
-                    connection_id = %id,
-                    "Opening AMQP connection with SOCKS5 stream"
-                );
+                        let stream =
+                            SocksConnection::connect(&endpoint, &url)
+                                .await
+                                .map_err(|e| {
+                                    error!(
+                                        connection_id = %id,
+                                        proxy_url = %SocksConnection::mask_credentials(&endpoint),
+                                        error = %e,
+                                        "Failed to establish SOCKS5 connection"
+                                    );
+                                    e
+                                })?;
 
-                builder.open_with_stream(stream).await.map_err(|e| {
-                    error!(
-                        connection_id = %id,
-                        error = %e,
-                        "Failed to open AMQP connection over SOCKS5 stream"
-                    );
-                    azure_core::Error::from(Fe2o3ConnectionOpenError(e))
-                })?
-            } else {
-                debug!(
-                    connection_id = %id,
-                    endpoint = %endpoint,
-                    "Opening direct AMQP connection"
-                );
-
-                // Maintain existing behavior for non-SOCKS5 URLs
-                let endpoint_str = endpoint.to_string();
-                builder.open(endpoint).await.map_err(|e| {
-                    error!(
-                        connection_id = %id,
-                        endpoint = %endpoint_str,
-                        error = %e,
-                        "Failed to open direct AMQP connection"
-                    );
-                    azure_core::Error::from(Fe2o3ConnectionOpenError(e))
-                })?
+                        debug!(connection_id = %id, "Opening AMQP connection with SOCKS5 stream");
+                        builder.open_with_stream(stream).await.map_err(|e| {
+                            error!(connection_id = %id, error = %e, "Failed to open AMQP connection over SOCKS5 stream");
+                            azure_core::Error::from(Fe2o3ConnectionOpenError(e))
+                        })?
+                    } else {
+                        debug!(connection_id = %id, endpoint = %endpoint, "Opening direct AMQP connection");
+                        let endpoint_str = endpoint.to_string();
+                        builder.open(endpoint).await.map_err(|e| {
+                            error!(connection_id = %id, endpoint = %endpoint_str, error = %e, "Failed to open direct AMQP connection");
+                            azure_core::Error::from(Fe2o3ConnectionOpenError(e))
+                        })?
+                    }
+                }
+                #[cfg(not(feature = "socks5"))]
+                {
+                    if endpoint.scheme() == "socks5" || endpoint.scheme() == "socks5h" {
+                        return Err(azure_core::Error::with_message(
+                            azure_core::error::ErrorKind::Amqp,
+                            "SOCKS5 proxy support is not enabled. Enable the 'socks5' feature to use SOCKS5 proxies."
+                        ));
+                    }
+                    debug!(connection_id = %id, endpoint = %endpoint, "Opening direct AMQP connection");
+                    let endpoint_str = endpoint.to_string();
+                    builder.open(endpoint).await.map_err(|e| {
+                        error!(connection_id = %id, endpoint = %endpoint_str, error = %e, "Failed to open direct AMQP connection");
+                        azure_core::Error::from(Fe2o3ConnectionOpenError(e))
+                    })?
+                }
             };
 
             debug!(

sdk/core/azure_core_amqp/src/lib.rs

@@ -21,6 +21,7 @@ mod receiver;
 mod sender;
 mod session;
 mod simple_value;
+#[cfg(feature = "socks5")]
 mod socks5;
 mod value;
 

sdk/eventhubs/azure_messaging_eventhubs/Cargo.toml

@@ -44,6 +44,7 @@ tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] }
 
 [features]
 in_memory_checkpoint_store = []
+socks5 = ["azure_core_amqp/socks5"]
 default = ["azure_core_amqp/default"]
 
 [[bench]]

sdk/eventhubs/azure_messaging_eventhubs/examples/eventhubs_socks5_proxy.rs

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+#![cfg(feature = "socks5")]
+
 //! This sample demonstrates how to connect to an Event Hub through a SOCKS5 proxy using the `ProducerClient`.
 //!
 //! # SOCKS5 Proxy Setup
@@ -31,8 +33,10 @@
 //!
 //! # Usage
 //!
+//! **Note**: This example requires the `socks5` feature to be enabled.
+//!
 //! ```bash
-//! cargo run --example eventhubs_socks5_proxy
+//! cargo run --features socks5 --example eventhubs_socks5_proxy
 //! ```
 
 use azure_identity::DeveloperToolsCredential;

sdk/eventhubs/azure_messaging_eventhubs/tests/eventhubs_socks5_messaging.rs

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All Rights reserved
 // Licensed under the MIT license.
 
+#![cfg(feature = "socks5")]
+
 //! SOCKS5 Proxy Messaging Tests for EventHubs
 //!
 //! These tests verify EventHub message operations (send/receive) work through SOCKS5 proxies.
@@ -21,7 +23,7 @@
 //!
 //! 3. **Run messaging tests**:
 //!    ```bash
-//!    AZURE_TEST_MODE=live cargo test --test eventhubs_socks5_messaging
+//!    AZURE_TEST_MODE=live cargo test --features socks5 --test eventhubs_socks5_messaging
 //!    ```
 //!
 //! # Test Coverage

sdk/eventhubs/azure_messaging_eventhubs/tests/eventhubs_socks5_proxy.rs

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All Rights reserved
 // Licensed under the MIT license.
 
+#![cfg(feature = "socks5")]
+
 //! SOCKS5 Proxy Integration Tests for EventHubs
 //!
 //! These tests verify EventHub connections work through SOCKS5 proxies.
@@ -26,9 +28,9 @@
 //!    export SOCKS5_PROXY_URL_WITH_AUTH="socks5://user:pass@my-proxy-domain:12345"
 //!    ```
 //!
-//! 3. **Run live tests**:
+//! 3. **Run live tests** (requires the `socks5` feature):
 //!    ```bash
-//!    AZURE_TEST_MODE=live cargo test --test eventhubs_socks5_proxy
+//!    AZURE_TEST_MODE=live cargo test --features socks5 --test eventhubs_socks5_proxy
 //!    ```
 //!
 //! # Default Configuration