Skip to content
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
3 changes: 3 additions & 0 deletions datadog-sidecar-ffi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -378,17 +378,20 @@ pub unsafe extern "C" fn ddog_sidecar_telemetry_enqueueConfig(
config_value: ffi::CharSlice,
origin: data::ConfigurationOrigin,
config_id: ffi::CharSlice,
seq_id: ffi::Option<u64>,
) -> MaybeError {
let config_id = if config_id.is_empty() {
None
} else {
Some(config_id.to_utf8_lossy().into_owned())
};
let seq_id = seq_id.to_std();
let config_entry = TelemetryActions::AddConfig(data::Configuration {
name: config_key.to_utf8_lossy().into_owned(),
value: config_value.to_utf8_lossy().into_owned(),
origin,
config_id,
seq_id,
});
try_c!(blocking::enqueue_actions(
transport,
Expand Down
3 changes: 3 additions & 0 deletions libdd-telemetry-ffi/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ pub unsafe extern "C" fn ddog_telemetry_builder_with_config(
value: ffi::CharSlice,
origin: data::ConfigurationOrigin,
config_id: ffi::CharSlice,
seq_id: ffi::Option<u64>,
) -> MaybeError {
let name = name.to_utf8_lossy().into_owned();
let value = value.to_utf8_lossy().into_owned();
Expand All @@ -110,11 +111,13 @@ pub unsafe extern "C" fn ddog_telemetry_builder_with_config(
} else {
Some(config_id.to_utf8_lossy().into_owned())
};
let seq_id = seq_id.to_std();
builder.configurations.insert(data::Configuration {
name,
value,
origin,
config_id,
seq_id,
});
MaybeError::None
}
Expand Down
2 changes: 2 additions & 0 deletions libdd-telemetry/src/data/payloads.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ pub struct Configuration {
pub value: String,
pub origin: ConfigurationOrigin,
pub config_id: Option<String>,
pub seq_id: Option<u64>,
}

#[derive(Serialize, Deserialize, Debug, Hash, PartialEq, Eq, Clone)]
Expand All @@ -39,6 +40,7 @@ pub enum ConfigurationOrigin {
Default,
LocalStableConfig,
FleetStableConfig,
Calculated,
}

#[derive(Serialize, Debug)]
Expand Down
Loading