Skip to content

Commit d7537b7

Browse files
committed
feat(sidecar: telemetry): handle config buffering
Signed-off-by: Alexandre Rulleau <alexandre.rulleau@datadoghq.com>
1 parent 37ec4be commit d7537b7

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

datadog-sidecar/src/service/sidecar_server.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,10 @@ impl SidecarInterface for SidecarServer {
522522
buffered_info_changed = true;
523523
}
524524
}
525+
SidecarAction::Telemetry(TelemetryActions::AddConfig(_)) => {
526+
telemetry .config_sent = true;
527+
buffered_info_changed = true;
528+
}
525529
SidecarAction::ClearQueueId => {
526530
remove_entry = true;
527531
}

datadog-sidecar/src/service/telemetry.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ pub struct TelemetryCachedClient {
5959
pub client: TelemetryWorkerHandle,
6060
pub shm_writer: Arc<OneWayShmWriter<NamedShmHandle>>,
6161
pub last_used: Instant,
62+
pub config_sent: bool,
6263
pub buffered_integrations: HashSet<Integration>,
6364
pub buffered_composer_paths: HashSet<PathBuf>,
6465
pub telemetry_metrics: Arc<Mutex<HashMap<String, ContextKey>>>,
@@ -95,6 +96,7 @@ impl TelemetryCachedClient {
9596
OneWayShmWriter::<NamedShmHandle>::new(path_for_telemetry(service, env)).unwrap(),
9697
),
9798
last_used: Instant::now(),
99+
config_sent: false,
98100
buffered_integrations: HashSet::new(),
99101
buffered_composer_paths: HashSet::new(),
100102
telemetry_metrics: Default::default(),
@@ -104,7 +106,7 @@ impl TelemetryCachedClient {
104106

105107
pub fn write_shm_file(&self) {
106108
if let Ok(buf) =
107-
bincode::serialize(&(&self.buffered_integrations, &self.buffered_composer_paths))
109+
bincode::serialize(&(&self.config_sent, &self.buffered_integrations, &self.buffered_composer_paths))
108110
{
109111
self.shm_writer.write(&buf);
110112
} else {

0 commit comments

Comments
 (0)