Skip to content
Draft
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
871 changes: 35 additions & 836 deletions datadog-opentelemetry/src/core/configuration/configuration.rs

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion datadog-opentelemetry/src/core/configuration/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ mod configuration;
pub(crate) mod remote_config;
mod sampling_rule_config;
mod sources;
mod supported_configurations;

#[cfg(test)]
pub(crate) use configuration::SupportedConfigurations;
pub use configuration::{Config, ConfigBuilder, OtlpProtocol, TracePropagationStyle};
pub(crate) use configuration::{ConfigurationProvider, RemoteConfigUpdate};
pub use sampling_rule_config::SamplingRuleConfig;
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,7 @@ struct RemoteConfigClient {
impl RemoteConfigClient {
/// Creates a new remote configuration client
pub fn new(config: Arc<Config>) -> Result<Self, RemoteConfigClientError> {
#[allow(clippy::unnecessary_to_owned)]
let agent_url = hyper::Uri::from_maybe_shared(config.trace_agent_url().to_string())
.map_err(|_| RemoteConfigClientError::InvalidAgentUri)?;
let mut parts = agent_url.into_parts();
Expand Down
4 changes: 2 additions & 2 deletions datadog-opentelemetry/src/core/configuration/sources.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use libdd_telemetry::data::ConfigurationOrigin;

use crate::dd_warn;

use super::supported_configurations::{is_alias_deprecated, SupportedConfigurations};
use super::configuration::{is_alias_deprecated, SupportedConfigurations};

/// Source of a configuration value
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
Expand Down Expand Up @@ -268,7 +268,7 @@ mod tests {
HashMapSource,
};
use crate::core::configuration::sources::ConfigKey;
use crate::core::configuration::supported_configurations::SupportedConfigurations;
use crate::core::configuration::SupportedConfigurations;

#[test]
fn test_composite_source_single_origin() {
Expand Down
Loading
Loading