Skip to content
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.

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

Telemetry roadmap config #4061

Merged
merged 22 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions apollo-router/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ console = ["tokio/tracing", "console-subscriber"]
# See https://github.com/apollographql/federation-rs/pull/185
docs_rs = ["router-bridge/docs_rs"]

# Enables the use of new telemetry features that are under development
# and not yet ready for production use.
telemetry_next = []

[package.metadata.docs.rs]
features = ["docs_rs"]

Expand Down
15 changes: 15 additions & 0 deletions apollo-router/src/plugins/telemetry/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,27 @@ pub(crate) struct Conf {
/// Logging configuration
#[serde(rename = "experimental_logging", default)]
pub(crate) logging: Logging,

#[cfg(feature = "telemetry_next")]
#[serde(rename = "logging", default)]
#[allow(dead_code)]
pub(crate) new_logging: config_new::logging::Logging,
/// Metrics configuration
pub(crate) metrics: Metrics,
/// Tracing configuration
pub(crate) tracing: Tracing,
/// Apollo reporting configuration
pub(crate) apollo: apollo::Config,

#[cfg(feature = "telemetry_next")]
/// Event configuration
pub(crate) events: config_new::events::Events,
BrynCooke marked this conversation as resolved.
Show resolved Hide resolved
#[cfg(feature = "telemetry_next")]
/// Span configuration
pub(crate) spans: config_new::spans::Spans,
BrynCooke marked this conversation as resolved.
Show resolved Hide resolved
#[cfg(feature = "telemetry_next")]
/// Instrument configuration
pub(crate) instruments: config_new::instruments::Instruments,
BrynCooke marked this conversation as resolved.
Show resolved Hide resolved
}

/// Metrics configuration
Expand Down
Loading