Put operation limits in the limits plugin

Author: goto-bus-stop

apollo-router/src/services/layers/enforce_operation_limits.rs renamed to apollo-router/src/plugins/limits/enforce_operation_limits_layer.rs

@@ -3,20 +3,20 @@ use futures::StreamExt as _;
 use futures::future::BoxFuture;
 use tower::Service;
 
+use super::operation_limits::OperationLimits;
 use crate::graphql;
 use crate::services::layers::query_analysis::ParsedDocument;
 use crate::services::supergraph;
-use crate::spec::operation_limits::OperationLimits;
 
 /// Layer that enforces operation limits and rejects GraphQL requests that exceed the limits.
 ///
 /// `ParsedDocument` must be available in the context. Otherwise, no limits are enforced.
 pub(crate) struct EnforceOperationLimitsLayer {
-    config: crate::plugins::limits::Config,
+    config: super::Config,
 }
 
 impl EnforceOperationLimitsLayer {
-    pub(crate) fn new(config: &crate::plugins::limits::Config) -> Self {
+    pub(crate) fn new(config: &super::Config) -> Self {
         Self {
             config: config.clone(),
         }
@@ -40,7 +40,7 @@ impl<S> tower::Layer<S> for EnforceOperationLimitsLayer {
 #[derive(Clone)]
 pub(crate) struct EnforceOperationLimits<S> {
     inner: S,
-    config: crate::plugins::limits::Config,
+    config: super::Config,
 }
 
 impl<S> Service<supergraph::Request> for EnforceOperationLimits<S>
@@ -69,7 +69,7 @@ where
 
         if let Some(document) = document {
             let mut query_metrics = OperationLimits::default();
-            let result = crate::spec::operation_limits::check(
+            let result = super::operation_limits::check(
                 &mut query_metrics,
                 &self.config,
                 &document.executable,

apollo-router/src/plugins/limits/mod.rs

@@ -1,5 +1,7 @@
+mod enforce_operation_limits_layer;
 mod layer;
 mod limited;
+mod operation_limits;
 
 use std::error::Error;
 
@@ -18,9 +20,9 @@ use crate::graphql;
 use crate::layers::ServiceBuilderExt;
 use crate::plugin::Plugin;
 use crate::plugin::PluginInit;
+use crate::plugins::limits::enforce_operation_limits_layer::EnforceOperationLimitsLayer;
 use crate::plugins::limits::layer::BodyLimitError;
 use crate::plugins::limits::layer::RequestBodyLimitLayer;
-use crate::services::layers::enforce_operation_limits::EnforceOperationLimitsLayer;
 use crate::services::router;
 use crate::services::supergraph;
 
@@ -148,6 +150,9 @@ impl Default for Config {
     }
 }
 
+// Pub for use in telemetry.
+pub(crate) use operation_limits::OperationLimits;
+
 struct LimitsPlugin {
     config: Config,
 }

apollo-router/src/spec/operation_limits.rs renamed to apollo-router/src/plugins/limits/operation_limits.rs

@@ -54,7 +54,7 @@ impl OperationLimits<bool> {
 }
 
 /// Returns which limits are exceeded by the given query, if any
-pub(crate) fn check(
+pub(super) fn check(
     query_metrics_in: &mut OperationLimits<u32>,
     config_limits: &crate::plugins::limits::Config,
     document: &ExecutableDocument,

apollo-router/src/plugins/telemetry/config_new/instruments.rs

@@ -2477,6 +2477,7 @@ mod tests {
     use crate::plugins::connectors::handle_responses::MappedResponse;
     use crate::plugins::connectors::make_requests::ResponseKey;
     use crate::plugins::connectors::mapping::Problem;
+    use crate::plugins::limits::OperationLimits;
     use crate::plugins::telemetry::APOLLO_PRIVATE_QUERY_ALIASES;
     use crate::plugins::telemetry::APOLLO_PRIVATE_QUERY_DEPTH;
     use crate::plugins::telemetry::APOLLO_PRIVATE_QUERY_HEIGHT;
@@ -2494,7 +2495,6 @@ mod tests {
     use crate::services::connector::request_service::TransportRequest;
     use crate::services::connector::request_service::TransportResponse;
     use crate::services::connector::request_service::transport;
-    use crate::spec::operation_limits::OperationLimits;
 
     type JsonMap = serde_json_bytes::Map<ByteString, Value>;
 

apollo-router/src/plugins/telemetry/config_new/subgraph/selectors.rs

@@ -13,6 +13,7 @@ use crate::context::OPERATION_NAME;
 use crate::plugin::serde::deserialize_jsonpath;
 use crate::plugins::cache::entity::CacheSubgraph;
 use crate::plugins::cache::metrics::CacheMetricContextKey;
+use crate::plugins::limits::OperationLimits;
 use crate::plugins::telemetry::config::AttributeValue;
 use crate::plugins::telemetry::config_new::Selector;
 use crate::plugins::telemetry::config_new::Stage;
@@ -29,7 +30,6 @@ use crate::plugins::telemetry::config_new::selectors::OperationName;
 use crate::plugins::telemetry::config_new::selectors::Query;
 use crate::plugins::telemetry::config_new::selectors::ResponseStatus;
 use crate::services::subgraph;
-use crate::spec::operation_limits::OperationLimits;
 
 #[derive(Deserialize, JsonSchema, Clone, Debug)]
 #[serde(deny_unknown_fields, rename_all = "snake_case", untagged)]

apollo-router/src/plugins/telemetry/config_new/supergraph/selectors.rs

@@ -11,6 +11,7 @@ use crate::context::CONTAINS_GRAPHQL_ERROR;
 use crate::context::OPERATION_KIND;
 use crate::context::OPERATION_NAME;
 use crate::plugin::serde::deserialize_jsonpath;
+use crate::plugins::limits::OperationLimits;
 use crate::plugins::telemetry::config::AttributeValue;
 use crate::plugins::telemetry::config_new::Selector;
 use crate::plugins::telemetry::config_new::Stage;
@@ -27,7 +28,6 @@ use crate::plugins::telemetry::config_new::selectors::Query;
 use crate::plugins::telemetry::config_new::selectors::ResponseStatus;
 use crate::services::FIRST_EVENT_CONTEXT_KEY;
 use crate::services::supergraph;
-use crate::spec::operation_limits::OperationLimits;
 
 #[derive(Deserialize, JsonSchema, Clone, Debug)]
 #[serde(deny_unknown_fields, rename_all = "snake_case", untagged)]
@@ -667,6 +667,7 @@ mod test {
 
     use crate::context::OPERATION_KIND;
     use crate::context::OPERATION_NAME;
+    use crate::plugins::limits::OperationLimits;
     use crate::plugins::telemetry::config::AttributeValue;
     use crate::plugins::telemetry::config_new::Selector;
     use crate::plugins::telemetry::config_new::selectors::OperationKind;
@@ -675,7 +676,6 @@ mod test {
     use crate::plugins::telemetry::config_new::supergraph::selectors::SupergraphSelector;
     use crate::plugins::telemetry::otel;
     use crate::services::FIRST_EVENT_CONTEXT_KEY;
-    use crate::spec::operation_limits::OperationLimits;
 
     #[test]
     fn supergraph_request_header() {

apollo-router/src/plugins/telemetry/mod.rs

@@ -93,6 +93,7 @@ use crate::metrics::filter::FilterMeterProvider;
 use crate::metrics::meter_provider_internal;
 use crate::plugin::PluginInit;
 use crate::plugin::PluginPrivate;
+use crate::plugins::limits::OperationLimits;
 use crate::plugins::telemetry::apollo::ForwardHeaders;
 use crate::plugins::telemetry::apollo_exporter::proto::reports::StatsContext;
 use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::node::Id::ResponseName;
@@ -144,7 +145,6 @@ use crate::services::layers::persisted_queries::UsedQueryIdFromManifest;
 use crate::services::router;
 use crate::services::subgraph;
 use crate::services::supergraph;
-use crate::spec::operation_limits::OperationLimits;
 
 pub(crate) mod apollo;
 pub(crate) mod apollo_exporter;

apollo-router/src/services/layers/mod.rs

@@ -1,7 +1,6 @@
 //! Layers that are internal to the execution pipeline.
 pub(crate) mod allow_only_http_post_mutations;
 pub(crate) mod apq;
-pub(crate) mod enforce_operation_limits;
 pub(crate) mod persisted_queries;
 pub(crate) mod query_analysis;
 pub(crate) mod static_page;

apollo-router/src/spec/mod.rs

@@ -4,7 +4,6 @@
 
 mod field_type;
 mod fragments;
-pub(crate) mod operation_limits;
 pub(crate) mod query;
 mod schema;
 mod selection;