Merge branch 'main' into add-build-tag

Cargo.toml

@@ -19,7 +19,7 @@ moka = { version = "0.12.5", default-features = false, features = [
     "future",
 ], optional = true }
 hyper-rustls = { version = "0.25.0", optional = true }
-rustls = { version = "0.23.1", optional = true, features = ["std"], default-features = false }
+rustls = { version = "0.23.2", optional = true, features = ["std"], default-features = false }
 rustls-pki-types = "1.3.1"
 inquire = { version = "0.7.1", optional = true }
 opentelemetry-otlp = { version = "0.15.0", features = [
@@ -123,6 +123,12 @@ opentelemetry-appender-tracing = { version = "0.3.0" }
 opentelemetry-prometheus = "0.15.0"
 phonenumber = "0.3.3"
 chrono = "0.4.35"
+async-graphql-extension-apollo-tracing = { git = "https://github.com/tailcallhq/async_graphql_apollo_studio_extension/" }
+
+[patch.crates-io]
+# TODO: update this once https://github.com/haixuanTao/opentelemetry-system-metrics/pull/2 gets merged
+async-graphql-value = {git ="https://github.com/tusharmath/async-graphql.git", branch = "add-setter"}
+async-graphql = {git ="https://github.com/tusharmath/async-graphql.git", branch = "add-setter"}
 
 [dev-dependencies]
 criterion = "0.5.1"

autogen/src/gen_gql_schema.rs

@@ -64,6 +64,7 @@ static OBJECT_WHITELIST: &[&str] = &[
     "OtlpExporter",
     "PrometheusFormat",
     "PrometheusExporter",
+    "Apollo",
 ];
 
 #[derive(Clone, Copy)]

aws-lambda/src/runtime.rs

@@ -58,5 +58,6 @@ pub fn init_runtime() -> TargetRuntime {
         file: init_file(),
         env: init_env(),
         cache: init_cache(),
+        extensions: Arc::new(vec![]),
     }
 }

benches/data_loader_bench.rs

@@ -79,6 +79,7 @@ fn benchmark_data_loader(c: &mut Criterion) {
                     env: Arc::new(Env {}),
                     file: Arc::new(File {}),
                     cache: Arc::new(Cache {}),
+                    extensions: Arc::new(vec![]),
                 };
                 let loader = HttpDataLoader::new(rt, None, false);
                 let loader = loader.to_data_loader(Batch::default().delay(1));

benches/impl_path_string_for_evaluation_context.rs

@@ -244,6 +244,7 @@ fn request_context() -> RequestContext {
         env: Arc::new(Env {}),
         file: Arc::new(File {}),
         cache: Arc::new(InMemoryCache::new()),
+        extensions: Arc::new(vec![]),
     };
     RequestContext {
         req_headers: HeaderMap::new(),

cloudflare/src/runtime.rs

@@ -37,5 +37,6 @@ pub fn init(env: Rc<worker::Env>) -> anyhow::Result<TargetRuntime> {
         env: init_env(env.clone()),
         file: init_file(env.clone(), bucket_id)?,
         cache: init_cache(env),
+        extensions: Arc::new(vec![]),
     })
 }

examples/apollo-tracing.graphql

@@ -0,0 +1,17 @@
+schema
+  @server(port: 8000, graphiql: true, hostname: "0.0.0.0")
+  @upstream(baseURL: "http://jsonplaceholder.typicode.com")
+  @telemetry(export: {apollo: {apiKey: "{{env.APOLLO_KEY}}", graphRef: "{{env.APOLLO_GRAPH_REF}}"}}) {
+  query: Query
+}
+
+type Query @cache(maxAge: 30000) {
+  posts: [Post] @http(path: "/posts")
+}
+
+type Post {
+  id: Int!
+  userId: Int!
+  title: String!
+  body: String!
+}

generated/.tailcallrc.graphql

@@ -408,6 +408,28 @@ directive @upstream(
   userAgent: String
 ) on SCHEMA
 
+input Apollo {
+  """
+  Setting `apiKey` for Apollo.
+  """
+  apiKey: String!
+  """
+  Setting `graphRef` for Apollo in the format <graphId>@<variant>.
+  """
+  graphRef: String!
+  """
+  Setting `platform` for Apollo.
+  """
+  platform: String!
+  """
+  Setting `userVersion` for Apollo.
+  """
+  userVersion: String!
+  """
+  Setting `version` for Apollo.
+  """
+  version: String!
+}
 input Batch {
   delay: Int!
   headers: [String!]
@@ -733,6 +755,7 @@ input TelemetryExporter {
   stdout: StdoutExporter
   otlp: OtlpExporter
   prometheus: PrometheusExporter
+  apollo: Apollo
 }
 input Schema {
   Obj: JSON

generated/.tailcallrc.schema.json

@@ -85,6 +85,38 @@
         }
       }
     },
+    "Apollo": {
+      "type": "object",
+      "required": [
+        "apiKey",
+        "graphRef"
+      ],
+      "properties": {
+        "apiKey": {
+          "description": "Setting `apiKey` for Apollo.",
+          "type": "string"
+        },
+        "graphRef": {
+          "description": "Setting `graphRef` for Apollo in the format <graphId>@<variant>.",
+          "type": "string"
+        },
+        "platform": {
+          "description": "Setting `platform` for Apollo.",
+          "default": "platform",
+          "type": "string"
+        },
+        "userVersion": {
+          "description": "Setting `userVersion` for Apollo.",
+          "default": "1.0",
+          "type": "string"
+        },
+        "version": {
+          "description": "Setting `version` for Apollo.",
+          "default": "1.0",
+          "type": "string"
+        }
+      }
+    },
     "Arg": {
       "type": "object",
       "required": [
@@ -1730,6 +1762,18 @@
             }
           },
           "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "required": [
+            "apollo"
+          ],
+          "properties": {
+            "apollo": {
+              "$ref": "#/definitions/Apollo"
+            }
+          },
+          "additionalProperties": false
         }
       ]
     },

src/app_context.rs

@@ -4,7 +4,7 @@ use async_graphql::dynamic::{self, DynamicRequest};
 use async_graphql::Response;
 
 use crate::blueprint::Type::ListType;
-use crate::blueprint::{Blueprint, Definition};
+use crate::blueprint::{Blueprint, Definition, SchemaModifiers};
 use crate::data_loader::DataLoader;
 use crate::graphql::GraphqlDataLoader;
 use crate::grpc;
@@ -104,7 +104,8 @@ impl AppContext {
             }
         }
 
-        let schema = blueprint.to_schema();
+        let schema = blueprint
+            .to_schema_with(SchemaModifiers::default().extensions(runtime.extensions.clone()));
 
         AppContext {
             schema,

src/blueprint/blueprint.rs

@@ -1,4 +1,5 @@
 use std::collections::{BTreeSet, HashMap};
+use std::sync::Arc;
 
 use async_graphql::dynamic::{Schema, SchemaBuilder};
 use async_graphql::extensions::ApolloTracing;
@@ -11,6 +12,7 @@ use super::telemetry::Telemetry;
 use super::GlobalTimeout;
 use crate::blueprint::{Server, Upstream};
 use crate::lambda::Expression;
+use crate::schema_extension::SchemaExtension;
 
 /// Blueprint is an intermediary representation that allows us to generate
 /// graphQL APIs. It can only be generated from a valid Config.
@@ -172,15 +174,18 @@ pub struct UnionTypeDefinition {
 
 ///
 /// Controls the kind of blueprint that is generated.
-#[derive(Copy, Clone, Debug, Default)]
+#[derive(Clone, Default, Setters)]
 pub struct SchemaModifiers {
     /// If true, the generated schema will not have any resolvers.
     pub no_resolver: bool,
+    /// List of extensions to add to the schema.
+    pub extensions: Arc<Vec<SchemaExtension>>,
 }
 
 impl SchemaModifiers {
-    pub fn no_resolver() -> Self {
-        Self { no_resolver: true }
+    pub fn with_no_resolver(mut self) -> Self {
+        self.no_resolver = true;
+        self
     }
 }
 
@@ -244,6 +249,10 @@ impl Blueprint {
             schema = schema.disable_introspection();
         }
 
+        for extension in schema_modifiers.extensions.iter().cloned() {
+            schema = schema.extension(extension);
+        }
+
         // We should safely assume the blueprint is correct and,
         // generation of schema cannot fail.
         schema.finish().unwrap()

src/blueprint/operation.rs

@@ -48,7 +48,7 @@ pub async fn validate_operations(
     blueprint: &Blueprint,
     operations: Vec<OperationQuery>,
 ) -> Valid<(), String> {
-    let schema = blueprint.to_schema_with(SchemaModifiers::no_resolver());
+    let schema = blueprint.to_schema_with(SchemaModifiers::default().with_no_resolver());
     Valid::from_iter(
         futures_util::future::join_all(operations.iter().map(|op| op.validate(&schema)))
             .await

src/blueprint/server.rs

@@ -113,27 +113,32 @@ impl TryFrom<crate::config::ConfigModule> for Server {
                 (config_server).get_response_headers(),
             ))
             .fuse(to_script(&config_module))
-            .map(|(hostname, http, response_headers, script)| Server {
-                enable_apollo_tracing: (config_server).enable_apollo_tracing(),
-                enable_cache_control_header: (config_server).enable_cache_control(),
-                enable_set_cookie_header: (config_server).enable_set_cookies(),
-                enable_graphiql: (config_server).enable_graphiql(),
-                enable_introspection: (config_server).enable_introspection(),
-                enable_query_validation: (config_server).enable_query_validation(),
-                enable_response_validation: (config_server).enable_http_validation(),
-                enable_batch_requests: (config_server).enable_batch_requests(),
-                enable_showcase: (config_server).enable_showcase(),
-                experimental_headers: (config_server).get_experimental_headers(),
-                global_response_timeout: (config_server).get_global_response_timeout(),
-                http,
-                worker: (config_server).get_workers(),
-                port: (config_server).get_port(),
-                hostname,
-                vars: (config_server).get_vars(),
-                pipeline_flush: (config_server).get_pipeline_flush(),
-                response_headers,
-                script,
-            })
+            .fuse(handle_experimental_headers(
+                (config_server).get_experimental_headers(),
+            ))
+            .map(
+                |(hostname, http, response_headers, script, experimental_headers)| Server {
+                    enable_apollo_tracing: (config_server).enable_apollo_tracing(),
+                    enable_cache_control_header: (config_server).enable_cache_control(),
+                    enable_set_cookie_header: (config_server).enable_set_cookies(),
+                    enable_graphiql: (config_server).enable_graphiql(),
+                    enable_introspection: (config_server).enable_introspection(),
+                    enable_query_validation: (config_server).enable_query_validation(),
+                    enable_response_validation: (config_server).enable_http_validation(),
+                    enable_batch_requests: (config_server).enable_batch_requests(),
+                    enable_showcase: (config_server).enable_showcase(),
+                    experimental_headers,
+                    global_response_timeout: (config_server).get_global_response_timeout(),
+                    http,
+                    worker: (config_server).get_workers(),
+                    port: (config_server).get_port(),
+                    hostname,
+                    vars: (config_server).get_vars(),
+                    pipeline_flush: (config_server).get_pipeline_flush(),
+                    response_headers,
+                    script,
+                },
+            )
             .to_result()
     }
 }
@@ -187,6 +192,27 @@ fn handle_response_headers(resp_headers: Vec<(String, String)>) -> Valid<HeaderM
     .trace("schema")
 }
 
+fn handle_experimental_headers(headers: BTreeSet<String>) -> Valid<BTreeSet<String>, String> {
+    Valid::from_iter(headers.iter(), |h| {
+        if !h.to_lowercase().starts_with("x-") {
+            Valid::fail(
+                format!(
+                    "Experimental headers must start with 'x-' or 'X-'. Got: '{}'",
+                    h
+                )
+                .to_string(),
+            )
+        } else {
+            Valid::succeed(h.clone())
+        }
+    })
+    .map_to(headers)
+    .trace("experimental")
+    .trace("headers")
+    .trace("@server")
+    .trace("schema")
+}
+
 #[cfg(test)]
 mod tests {
     use crate::config::ConfigModule;