Merge branch 'main' into log-attributes-update

cijothomas · web-flow · commit ffeb1ecc8489 · 2024-09-13T20:12:43.000-07:00
diff --git a/opentelemetry-http/src/lib.rs b/opentelemetry-http/src/lib.rs
@@ -83,6 +83,7 @@ mod reqwest {
         }
     }
 
+    #[cfg(not(target_arch = "wasm32"))]
     #[async_trait]
     impl HttpClient for reqwest::blocking::Client {
         async fn send(&self, request: Request<Vec<u8>>) -> Result<Response<Bytes>, HttpError> {

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ mod reqwest {`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
	`86`	`+ #[cfg(not(target_arch = "wasm32"))]`
`86`	`87`	`#[async_trait]`
`87`	`88`	`impl HttpClient for reqwest::blocking::Client {`
`88`	`89`	`async fn send(&self, request: Request<Vec<u8>>) -> Result<Response<Bytes>, HttpError> {`