Import the right features for HTTP-based crates (#2217)

* Import the right features for HTTP-based crates

Resolves #2056 by making sure we import the right features for the vast majority of crates, which are HTTP-based on azure_core. Those not using HTTP-based azure_core will need to use a path dependency until after GA and will then probably need to use a version dependency...which should be the norm by then anyway.

* Fix wasm32 build

Don't really need these features on by default anyway.

Author: heaths

.taplo.toml

@@ -0,0 +1,16 @@
+[formatting]
+align_single_comments = false
+array_auto_collapse = false
+array_trailing_comma = true
+indent_string = "  "
+
+[[rule]]
+include = ["**/Cargo.toml"]
+keys = [
+  "dependencies",
+  "build-dependencies",
+  "dev-dependencies",
+]
+
+[rule.formatting]
+reorder_keys = true

Cargo.toml

@@ -28,14 +28,14 @@ repository = "https://github.com/azure/azure-sdk-for-rust"
 rust-version = "1.80"
 
 [workspace.dependencies.typespec]
+default-features = false
 path = "sdk/typespec"
 version = "0.2.0"
-default-features = false
 
 [workspace.dependencies.typespec_client_core]
+default-features = false
 path = "sdk/typespec/typespec_client_core"
 version = "0.1.0"
-default-features = false
 
 [workspace.dependencies.typespec_macros]
 version = "0.1.0"

sdk/core/azure_core/Cargo.toml

@@ -14,40 +14,45 @@ edition.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-typespec = { workspace = true, features = ["http", "json"] }
-typespec_client_core = { workspace = true, features = ["http", "json"] }
 async-lock = { workspace = true }
 async-trait.workspace = true
 bytes.workspace = true
 futures.workspace = true
-tracing.workspace = true
+hmac = { workspace = true, optional = true }
+once_cell.workspace = true
+openssl = { workspace = true, optional = true }
+paste.workspace = true
+pin-project.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-pin-project.workspace = true
-paste.workspace = true
-tokio = { workspace = true, optional = true }
-hmac = { workspace = true, optional = true }
 sha2 = { workspace = true, optional = true }
-openssl = { workspace = true, optional = true }
-once_cell.workspace = true
+tokio = { workspace = true, optional = true }
+tracing.workspace = true
+typespec = { workspace = true, features = ["http", "json"] }
+typespec_client_core = { workspace = true, features = ["http", "json"] }
 
 [build-dependencies]
 rustc_version.workspace = true
 
 [dev-dependencies]
 azure_identity.path = "../../identity/azure_identity"
 azure_security_keyvault_secrets.path = "../../keyvault/azure_security_keyvault_secrets"
+thiserror.workspace = true
 time.workspace = true
-tracing-subscriber.workspace = true
 tokio.workspace = true
-thiserror.workspace = true
+tracing-subscriber.workspace = true
 
 [features]
-default = []
+default = [
+  "reqwest",
+  "reqwest_deflate",
+  "reqwest_gzip",
+]
 azurite_workaround = []
 hmac_openssl = ["dep:openssl"]
 hmac_rust = ["dep:sha2", "dep:hmac"]
 reqwest = ["typespec_client_core/reqwest"]
+reqwest_deflate = ["typespec_client_core/reqwest_deflate"]
 reqwest_gzip = ["typespec_client_core/reqwest_gzip"]
 reqwest_rustls = ["typespec_client_core/reqwest_rustls"]
 test = ["typespec_client_core/test"]
@@ -60,9 +65,9 @@ features = [
   "hmac_openssl",
   "hmac_rust",
   "reqwest",
+  "reqwest_deflate",
   "reqwest_gzip",
   "reqwest_rustls",
-  "test",
   "tokio_fs",
   "tokio_sleep",
   "xml",

sdk/core/azure_core_amqp/Cargo.toml

@@ -18,17 +18,17 @@ categories = ["api-bindings"]
 edition = "2021"
 
 [dependencies]
-tokio.workspace = true
-azure_core.workspace = true
-time.workspace = true
-tracing.workspace = true
+azure_core = { path = "../azure_core", default-features = false }
 fe2o3-amqp = { workspace = true, optional = true }
+fe2o3-amqp-cbs = { workspace = true, optional = true }
 fe2o3-amqp-ext = { workspace = true, optional = true }
 fe2o3-amqp-management = { workspace = true, optional = true }
-fe2o3-amqp-cbs = { workspace = true, optional = true }
 fe2o3-amqp-types = { workspace = true, optional = true }
 serde_amqp = { workspace = true, optional = true }
 serde_bytes = { workspace = true, optional = true }
+time.workspace = true
+tokio.workspace = true
+tracing.workspace = true
 uuid = { workspace = true }
 
 [dev-dependencies]

sdk/core/azure_core_test/src/lib.rs

@@ -17,7 +17,6 @@ use std::path::{Path, PathBuf};
 
 #[cfg_attr(target_arch = "wasm32", allow(dead_code))]
 const ASSETS_FILE: &str = "assets.json";
-const SPAN_TARGET: &str = "test-proxy";
 
 /// Context information required by recorded client library tests.
 ///
@@ -28,20 +27,20 @@ pub struct TestContext {
     repo_dir: &'static Path,
     crate_dir: &'static Path,
     service_dir: &'static str,
-    test_module: &'static str,
-    test_name: &'static str,
+    module_name: &'static str,
+    name: &'static str,
     recording: Option<Recording>,
 }
 
 impl TestContext {
     pub(crate) fn new(
         crate_dir: &'static str,
-        test_module: &'static str,
-        test_name: &'static str,
+        module_dir: &'static str,
+        name: &'static str,
     ) -> azure_core::Result<Self> {
         let service_dir = parent_of(crate_dir, "sdk")
             .ok_or_else(|| Error::message(ErrorKind::Other, "not under 'sdk' folder in repo"))?;
-        let test_module = Path::new(test_module)
+        let test_module = Path::new(module_dir)
             .file_stem()
             .ok_or_else(|| Error::message(ErrorKind::Other, "invalid test module"))?
             .to_str()
@@ -50,8 +49,8 @@ impl TestContext {
             repo_dir: find_ancestor_of(crate_dir, ".git")?,
             crate_dir: Path::new(crate_dir),
             service_dir,
-            test_module,
-            test_name,
+            module_name: test_module,
+            name,
             recording: None,
         })
     }
@@ -100,13 +99,13 @@ impl TestContext {
     }
 
     /// Gets the module name containing the current test.
-    pub fn test_module(&self) -> &'static str {
-        self.test_module
+    pub fn module_name(&self) -> &'static str {
+        self.module_name
     }
 
     /// Gets the current test function name.
-    pub fn test_name(&self) -> &'static str {
-        self.test_name
+    pub fn name(&self) -> &'static str {
+        self.name
     }
 
     /// Gets the recording assets file under the crate directory.
@@ -153,8 +152,8 @@ impl TestContext {
     pub(crate) fn test_recording_file(&self) -> String {
         let path = self
             .test_data_dir()
-            .join(self.test_module)
-            .join(self.test_name)
+            .join(self.module_name)
+            .join(self.name)
             .as_path()
             .with_extension("json");
         path.to_str()
@@ -238,8 +237,8 @@ mod tests {
             .unwrap()
             .replace("\\", "/")
             .ends_with("sdk/core/azure_core_test"));
-        assert_eq!(ctx.test_module(), "lib");
-        assert_eq!(ctx.test_name(), "test_context_new");
+        assert_eq!(ctx.module_name(), "lib");
+        assert_eq!(ctx.name(), "test_context_new");
         assert_eq!(
             ctx.test_recording_file().replace("\\", "/"),
             "sdk/core/azure_core_test/tests/data/lib/test_context_new.json"

sdk/core/azure_core_test/src/proxy/client.rs

@@ -15,6 +15,7 @@ use azure_core::{
     ClientMethodOptions, ClientOptions, Context, Method, Pipeline, Request, RequestContent, Result,
     Url,
 };
+use tracing::Span;
 
 /// The test-proxy client.
 ///
@@ -45,6 +46,7 @@ impl Client {
         &self.endpoint
     }
 
+    #[tracing::instrument(level = "trace", skip_all, fields(endpoint = %self.endpoint), err)]
     pub async fn record_start(
         &self,
         body: RequestContent<StartPayload>,
@@ -66,6 +68,7 @@ impl Client {
         Ok(RecordStartResult { recording_id })
     }
 
+    #[tracing::instrument(level = "trace", skip_all, fields(endpoint = %self.endpoint, recording_id), err)]
     pub async fn record_stop(
         &self,
         recording_id: &str,
@@ -85,12 +88,17 @@ impl Client {
         Ok(())
     }
 
+    #[tracing::instrument(level = "trace", skip_all, fields(endpoint = %self.endpoint, recording_id), err)]
     pub async fn playback_start(
         &self,
         body: RequestContent<StartPayload>,
         options: Option<ClientPlaybackStartOptions<'_>>,
     ) -> Result<PlaybackStartResult> {
         let options = options.unwrap_or_default();
+        Span::current().record(
+            stringify!(recording_id),
+            options.recording_id.map(AsRef::as_ref),
+        );
         let ctx = Context::with_context(&options.method_options.context);
         let mut url = self.endpoint.clone();
         url = url.join("/Playback/Start")?;
@@ -109,6 +117,7 @@ impl Client {
         Ok(result)
     }
 
+    #[tracing::instrument(level = "trace", skip_all, fields(endpoint = %self.endpoint, recording_id), err)]
     pub async fn playback_stop(
         &self,
         recording_id: &str,
@@ -126,12 +135,17 @@ impl Client {
         Ok(())
     }
 
+    #[tracing::instrument(level = "trace", skip_all, fields(endpoint = %self.endpoint, recording_id), err)]
     pub async fn set_matcher(
         &self,
         matcher: Matcher,
         options: Option<ClientSetMatcherOptions<'_>>,
     ) -> Result<()> {
         let options = options.unwrap_or_default();
+        Span::current().record(
+            stringify!(recording_id),
+            options.recording_id.map(AsRef::as_ref),
+        );
         let ctx = Context::with_context(&options.method_options.context);
         let mut url = self.endpoint.clone();
         url = url.join("/Admin/SetMatcher")?;
@@ -144,6 +158,7 @@ impl Client {
         Ok(())
     }
 
+    #[tracing::instrument(level = "trace", skip_all, fields(endpoint = %self.endpoint, recording_id), err)]
     pub async fn add_sanitizer<S>(
         &self,
         sanitizer: S,
@@ -154,6 +169,10 @@ impl Client {
         azure_core::Error: From<<S as AsHeaders>::Error>,
     {
         let options = options.unwrap_or_default();
+        Span::current().record(
+            stringify!(recording_id),
+            options.recording_id.map(AsRef::as_ref),
+        );
         let ctx = Context::with_context(&options.method_options.context);
         let mut url = self.endpoint.clone();
         url = url.join("/Admin/AddSanitizer")?;
@@ -166,12 +185,17 @@ impl Client {
         Ok(())
     }
 
+    #[tracing::instrument(level = "trace", skip_all, fields(endpoint = %self.endpoint, recording_id), err)]
     pub async fn remove_sanitizers(
         &self,
         body: RequestContent<SanitizerList>,
         options: Option<ClientRemoveSanitizersOptions<'_>>,
     ) -> Result<RemovedSanitizers> {
         let options = options.unwrap_or_default();
+        Span::current().record(
+            stringify!(recording_id),
+            options.recording_id.map(AsRef::as_ref),
+        );
         let ctx = Context::with_context(&options.method_options.context);
         let mut url = self.endpoint.clone();
         url = url.join("/Admin/RemoveSanitizers")?;
@@ -187,8 +211,13 @@ impl Client {
             .await
     }
 
+    #[tracing::instrument(level = "trace", skip_all, fields(endpoint = %self.endpoint, recording_id), err)]
     pub async fn reset(&self, options: Option<ClientResetOptions<'_>>) -> Result<()> {
         let options = options.unwrap_or_default();
+        Span::current().record(
+            stringify!(recording_id),
+            options.recording_id.map(AsRef::as_ref),
+        );
         let ctx = Context::with_context(&options.method_options.context);
         let mut url = self.endpoint.clone();
         url = url.join("/Admin/Reset")?;