Skip to content

Commit 610ddda

Browse files
committed
chore(config): migrate OttlFilterConfiguration to typed config
Build the OTTL filter processor from the resolved traces configuration and remove source-map parsing from the component.
1 parent 1da1c37 commit 610ddda

3 files changed

Lines changed: 63 additions & 216 deletions

File tree

bin/agent-data-plane/src/cli/run.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ async fn create_topology(
420420
}
421421

422422
if dp_config.traces_pipeline_required() {
423-
add_baseline_traces_pipeline_to_blueprint(&mut blueprint, config, env_provider).await?;
423+
add_baseline_traces_pipeline_to_blueprint(&mut blueprint, config, config_system, env_provider).await?;
424424
}
425425

426426
// Now we move on to our actual data pipelines.
@@ -627,7 +627,8 @@ async fn add_baseline_service_checks_pipeline_to_blueprint(
627627
}
628628

629629
async fn add_baseline_traces_pipeline_to_blueprint(
630-
blueprint: &mut TopologyBlueprint, config: &GenericConfiguration, env_provider: &ADPEnvironmentProvider,
630+
blueprint: &mut TopologyBlueprint, config: &GenericConfiguration, config_system: &ConfigurationSystem,
631+
env_provider: &ADPEnvironmentProvider,
631632
) -> Result<(), GenericError> {
632633
let dd_traces_config = DatadogTraceConfiguration::from_configuration(config)
633634
.error_context("Failed to configure Datadog Traces encoder.")?
@@ -636,7 +637,8 @@ async fn add_baseline_traces_pipeline_to_blueprint(
636637
let trace_obfuscation_config = TraceObfuscationConfiguration::from_apm_configuration(config)?;
637638
let trace_sampler_config = TraceSamplerConfiguration::from_configuration(config)
638639
.error_context("Failed to configure Trace Sampler transform.")?;
639-
let ottl_filter_config = OttlFilterConfiguration::from_configuration(config)
640+
let saluki = config_system.config();
641+
let ottl_filter_config = OttlFilterConfiguration::from_configuration(&saluki.domains.traces.ottl_filter)
640642
.error_context("Failed to configure OTTL filter processor.")?;
641643
let ottl_transform_config = OttlTransformConfiguration::from_configuration(config)
642644
.error_context("Failed to configure OTTL transform processor.")?;

bin/agent-data-plane/src/components/ottl_filter_processor/config.rs

Lines changed: 0 additions & 74 deletions
This file was deleted.

0 commit comments

Comments
 (0)