Skip to content

Give a reachable public path to some items #1461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SimonSapin merged 2 commits into from
Aug 8, 2022
Merged

Give a reachable public path to some items #1461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8275ae
Give a reachable public path to some items
SimonSapin Aug 4, 2022
d87451e
Remove some items from the (documented) public API
SimonSapin Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apollo-router/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@ use thiserror::Error;
use tokio::task::JoinError;
use tracing::level_filters::LevelFilter;

pub use crate::configuration::ConfigurationError;
pub(crate) use crate::graphql::Error;
use crate::graphql::Response;
use crate::json_ext::Path;
use crate::json_ext::Value;
pub use crate::reload::Error as ReloadError;
Copy link
Contributor

@garypen garypen Aug 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes me sad... This is part of the code we copied from tracing_subscriber and is another good reason why we should get rid of our hot reload for tracing stuff...

Copy link
Contributor Author

@SimonSapin SimonSapin Aug 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good news! #1463 removes this type entirely

pub use crate::spec::SpecError;

/// Error types for execution.
Expand Down
11 changes: 4 additions & 7 deletions apollo-router/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,11 @@ mod state_machine;
pub mod subscriber;
mod traits;

pub use configuration::Configuration;
pub use configuration::*;
pub use context::Context;
pub use executable::main;
pub use executable::Executable;
pub use router::ApolloRouter;
pub use router::ConfigurationKind;
pub use router::SchemaKind;
pub use router::ShutdownKind;
pub use executable::*;
pub use router::*;
#[doc(hidden)]
pub use router_factory::__create_test_service_factory_from_yaml;
pub use services::http_ext;
pub use spec::Schema;
Expand Down
2 changes: 1 addition & 1 deletion apollo-router/src/plugins/telemetry/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ mod metrics;
mod otlp;
mod tracing;

pub static ROUTER_SPAN_NAME: &str = "router";
static ROUTER_SPAN_NAME: &str = "router";
static CLIENT_NAME: &str = "apollo_telemetry::client_name";
static CLIENT_VERSION: &str = "apollo_telemetry::client_version";
const ATTRIBUTES: &str = "apollo_telemetry::metrics_attributes";
Expand Down
7 changes: 4 additions & 3 deletions apollo-router/src/services/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ use http_ext::IntoHeaderValue;
use multimap::MultiMap;
use serde_json_bytes::ByteString;
use static_assertions::assert_impl_all;
pub use subgraph_service::SubgraphService;
use tower::BoxError;

pub use self::execution_service::*;
pub use self::router_service::*;
pub use self::subgraph_service::*;
use crate::error::Error;
use crate::graphql::Request;
use crate::graphql::Response;
Expand All @@ -31,12 +31,13 @@ use crate::json_ext::Value;
use crate::query_planner::fetch::OperationKind;
use crate::query_planner::QueryPlan;
use crate::query_planner::QueryPlanOptions;
use crate::*;
pub use crate::spec::Query;
use crate::Context;

mod execution_service;
pub mod http_ext;
pub(crate) mod layers;
pub mod new_service;
pub(crate) mod new_service;
mod router_service;
pub(crate) mod subgraph_service;

Expand Down
2 changes: 1 addition & 1 deletion apollo-router/src/spec/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ mod selection;
use displaydoc::Display;
pub(crate) use field_type::*;
pub(crate) use fragments::*;
pub(crate) use query::*;
pub use query::Query;
pub use schema::Schema;
pub(crate) use selection::*;
use thiserror::Error;
Expand Down