wip

Author: estringana

datadog-sidecar-ffi/src/lib.rs

@@ -410,6 +410,35 @@ pub unsafe extern "C" fn ddog_sidecar_telemetry_enqueueConfig(
     MaybeError::None
 }
 
+/// Reports an endpoint to the telemetry.
+#[no_mangle]
+#[allow(clippy::missing_safety_doc)]
+pub unsafe extern "C" fn ddog_sidecar_telemetry_addEndpoint(
+    transport: &mut Box<SidecarTransport>,
+    instance_id: &InstanceId,
+    queue_id: &QueueId,
+    r#type: CharSlice,
+    method: ddtelemetry::data::Method,
+    path: CharSlice,
+    operation_name: CharSlice,
+    resource_name: CharSlice,
+) {
+    let endpoint = TelemetryActions::AddEndpoint(ddtelemetry::data::Endpoint {
+        r#type: Some(r#type.to_utf8_lossy().into_owned()),
+        method: Some(method),
+        path: Some(path.to_utf8_lossy().into_owned()),
+        operation_name: operation_name.to_utf8_lossy().into_owned(),
+        resource_name: resource_name.to_utf8_lossy().into_owned(),
+    });
+
+    try_c!(blocking::enqueue_actions(
+        transport,
+        instance_id,
+        queue_id,
+        vec![SidecarAction::Telemetry(endpoint)],
+    ));
+}
+
 /// Reports a dependency to the telemetry.
 #[no_mangle]
 #[allow(clippy::missing_safety_doc)]

datadog-sidecar/src/service/mod.rs

@@ -71,6 +71,5 @@ pub enum SidecarAction {
     RegisterTelemetryMetric(MetricContext),
     AddTelemetryMetricPoint((String, f64, Vec<Tag>)),
     PhpComposerTelemetryFile(PathBuf),
-    ClearQueueId,
-    AddEndpoint(ddtelemetry::data::Endpoint),
+    ClearQueueId
 }

datadog-sidecar/src/service/sidecar_server.rs

@@ -448,7 +448,13 @@ impl SidecarInterface for SidecarServer {
                     }
                     SidecarAction::ClearQueueId => {
                         remove_entry = true;
-                    }
+                    },
+                    SidecarAction::Telemetry(TelemetryActions::AddEndpoint(ref endpoint)) => {
+                        if telemetry.buffered_endpoints.insert(endpoint.clone()) {
+                            buffered_info_changed = true;
+                            actions_to_process.push(action);
+                        }
+                    },
                     SidecarAction::Telemetry(TelemetryActions::Lifecycle(
                         LifecycleAction::Stop,
                     )) => {

datadog-sidecar/src/service/telemetry.rs

@@ -62,6 +62,7 @@ pub struct TelemetryCachedClient {
     pub config_sent: bool,
     pub buffered_integrations: HashSet<Integration>,
     pub buffered_composer_paths: HashSet<PathBuf>,
+    pub buffered_endpoints: HashSet<ddtelemetry::data::Endpoint>,
     pub telemetry_metrics: Arc<Mutex<HashMap<String, ContextKey>>>,
     pub handle: Arc<Mutex<Option<JoinHandle<()>>>>,
 }
@@ -99,6 +100,7 @@ impl TelemetryCachedClient {
             config_sent: false,
             buffered_integrations: HashSet::new(),
             buffered_composer_paths: HashSet::new(),
+            buffered_endpoints: HashSet::new(),
             telemetry_metrics: Default::default(),
             handle: Arc::new(Mutex::new(None)),
         }
@@ -153,9 +155,6 @@ impl TelemetryCachedClient {
                 SidecarAction::AddTelemetryMetricPoint(point) => {
                     actions.push(self.to_telemetry_point(point));
                 }
-                SidecarAction::AddEndpoint(endpoint) => {
-                    actions.push(TelemetryActions::AddEndpoint(endpoint));
-                }
                 SidecarAction::PhpComposerTelemetryFile(_) => {} // handled separately
                 SidecarAction::ClearQueueId => {}                // handled separately
             }