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
13 changes: 13 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

[workspace]
members = [
"libdd-sampling",
"datadog-opentelemetry",
"datadog-opentelemetry/examples/propagator",
"datadog-opentelemetry/examples/simple_tracing",
Expand Down
2 changes: 2 additions & 0 deletions datadog-opentelemetry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ readme.workspace = true
authors.workspace = true

[dependencies]
# Internal dependencies
libdd-sampling = { path = "../libdd-sampling" }

# External dependencies
foldhash = { workspace = true }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ use std::{borrow::Cow, sync::OnceLock};

use rustc_version_runtime::version;

use crate::core::configuration::sampling_rule_config::{ParsedSamplingRules, SamplingRuleConfig};
use crate::core::configuration::sources::{
CompositeConfigSourceResult, CompositeSource, ConfigKey, ConfigSourceOrigin,
};
use crate::core::configuration::supported_configurations::SupportedConfigurations;
use crate::core::log::LevelFilter;
use crate::core::telemetry;
use crate::{dd_error, dd_warn};
use libdd_sampling::{ParsedSamplingRules, SamplingRuleConfig};

/// Different types of remote configuration updates that can trigger callbacks
#[derive(Debug, Clone)]
Expand Down
5 changes: 3 additions & 2 deletions datadog-opentelemetry/src/core/configuration/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@
#[allow(clippy::module_inception)]
mod configuration;
pub(crate) mod remote_config;
mod sampling_rule_config;
mod sources;
mod supported_configurations;

pub use configuration::{Config, ConfigBuilder, OtlpProtocol, TracePropagationStyle};
pub(crate) use configuration::{ConfigurationProvider, RemoteConfigUpdate};
pub use sampling_rule_config::SamplingRuleConfig;

// Re-export from libdd-sampling
pub use libdd_sampling::SamplingRuleConfig;
20 changes: 0 additions & 20 deletions datadog-opentelemetry/src/core/constants.rs

This file was deleted.

5 changes: 3 additions & 2 deletions datadog-opentelemetry/src/core/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
//! Core components of the SDK

pub mod configuration;
pub(crate) mod constants;
pub mod sampling;

// Re-export from libdd-sampling
pub use libdd_sampling::{dd_constants as constants, dd_sampling as sampling};

mod error;

Expand Down
20 changes: 6 additions & 14 deletions datadog-opentelemetry/src/sampling/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,14 @@

//! Datadog sampling logic

pub(crate) mod agent_service_sampler;
pub(crate) mod constants;
pub(crate) mod datadog_sampler;
pub(crate) mod glob_matcher;
pub(crate) mod otel_mappings;
pub(crate) mod rate_limiter;
pub(crate) mod rate_sampler;
pub(crate) mod rules_sampler;
pub(crate) mod sampling_rule;
mod types;
pub(crate) mod utils;

// Re-export from libdd-sampling
pub use libdd_sampling::{
AttributeFactory, AttributeLike, DatadogSampler, SamplingData, SamplingRule,
SamplingRulesCallback, SpanProperties, TraceIdLike, ValueLike,
};

// Re-export key public types
pub use datadog_sampler::{DatadogSampler, SamplingRulesCallback};
pub use otel_mappings::{OtelAttributeFactory, OtelSamplingData};
pub use sampling_rule::SamplingRule;
pub use types::{
AttributeFactory, AttributeLike, SamplingData, SpanProperties, TraceIdLike, ValueLike,
};
Loading
Loading