Revert "runtime agnostic register"

This reverts commit d3e8d05.

Author: shashitnak

Cargo.lock

@@ -39,7 +39,7 @@ uuid = { version = "1.7", features = ["v4"] }                  # A library to ge
 # Non-feature optional dependencies
 libflate = { version = "2", optional = true }
 tokio = { version = "1", features = ["full"], optional = true }
-async-std = { version = "1", features = ["default", "tokio1"], optional = true }
+async-std = { version = "1", features = ["default"], optional = true }
 
 [build-dependencies]
 reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] }

Cargo.toml

@@ -49,7 +49,7 @@ pub fn sha_dynamic(schema: &dynamic::Schema) -> String {
 /// * `user_version` - An arbitrary string you can set to distinguish data sent by different versions of your edge server. For example, this can be the SHA of the Git commit for your deployed server code. We plan to make this value visible in Apollo Studio.
 /// * `platform` - The infrastructure environment that your edge server is running in (localhost, kubernetes/deployment, aws lambda, google cloud run, google cloud function, AWS ECS, etc.)
 #[instrument(err, skip(authorization_token, schema))]
-pub fn register<
+pub async fn register<
     Q: ObjectType + 'static,
     M: ObjectType + 'static,
     S: SubscriptionType + 'static,
@@ -120,9 +120,8 @@ pub fn register<
         }))
         .header("content-type", "application/json")
         .header("X-Api-Key", authorization_token)
-        .send();
-
-    let result = eval_future(result);
+        .send()
+        .await;
 
     match result {
         Ok(data) => {
@@ -131,7 +130,7 @@ pub fn register<
                 message = "Schema correctly registered",
                 response = &tracing::field::debug(&data)
             );
-            let text = eval_future(data.text());
+            let text = data.text().await;
             debug!(target: TARGET_LOG, data = ?text);
             Ok(())
         }
@@ -152,7 +151,7 @@ pub fn register<
 /// * `user_version` - An arbitrary string you can set to distinguish data sent by different versions of your edge server. For example, this can be the SHA of the Git commit for your deployed server code. We plan to make this value visible in Apollo Studio.
 /// * `platform` - The infrastructure environment that your edge server is running in (localhost, kubernetes/deployment, aws lambda, google cloud run, google cloud function, AWS ECS, etc.)
 #[instrument(err, skip(authorization_token, schema))]
-pub fn register_dynamic(
+pub async fn register_dynamic(
     authorization_token: &str,
     schema: &dynamic::Schema,
     server_id: &str,
@@ -219,9 +218,8 @@ pub fn register_dynamic(
         }))
         .header("content-type", "application/json")
         .header("X-Api-Key", authorization_token)
-        .send();
-
-    let result = eval_future(result);
+        .send()
+        .await;
 
     match result {
         Ok(data) => {
@@ -230,7 +228,7 @@ pub fn register_dynamic(
                 message = "Schema correctly registered",
                 response = &tracing::field::debug(&data)
             );
-            let text = eval_future(data.text());
+            let text = data.text().await;
             debug!(target: TARGET_LOG, data = ?text);
             Ok(())
         }
@@ -241,15 +239,3 @@ pub fn register_dynamic(
         }
     }
 }
-
-fn eval_future<T>(fut: impl std::future::Future<Output = T>) -> T {
-    cfg_if::cfg_if! {
-        if #[cfg(feature = "tokio-comp")] {
-            tokio::runtime::Runtime::new().unwrap().block_on(fut)
-        } else if #[cfg(feature = "async-std-comp")] {
-            async_std::task::block_on(result)
-        } else {
-            compile_error!("tokio-comp or async-std-comp features required");
-        }
-    }
-}