Fix rebase after libdatadog refacto

components-rs/common.h

@@ -178,10 +178,22 @@ typedef enum ddog_MetricNamespace {
 
 typedef struct ddog_BlockingTransport_SidecarInterfaceResponse__SidecarInterfaceRequest ddog_BlockingTransport_SidecarInterfaceResponse__SidecarInterfaceRequest;
 
+/**
+ * `InstanceId` is a structure that holds session and runtime identifiers.
+ */
 typedef struct ddog_InstanceId ddog_InstanceId;
 
 typedef struct ddog_SidecarActionsBuffer ddog_SidecarActionsBuffer;
 
+/**
+ * `SidecarTransport` is a type alias for the `BlockingTransport` struct from the `datadog_ipc`
+ * crate. It is used for sending `SidecarInterfaceRequest` and receiving
+ * `SidecarInterfaceResponse`.
+ *
+ * This transport is used for communication between different parts of the sidecar service.
+ * It is a blocking transport, meaning that it will block the current thread until the operation is
+ * complete.
+ */
 typedef struct ddog_BlockingTransport_SidecarInterfaceResponse__SidecarInterfaceRequest ddog_SidecarTransport;
 
 typedef enum ddog_LogLevel {
@@ -262,7 +274,10 @@ typedef struct ddog_MappedMem_ShmHandle ddog_MappedMem_ShmHandle;
  */
 typedef struct ddog_PlatformHandle_File ddog_PlatformHandle_File;
 
-typedef struct ddog_RuntimeMeta ddog_RuntimeMeta;
+/**
+ * `RuntimeMetadata` is a struct that represents the runtime metadata of a language.
+ */
+typedef struct ddog_RuntimeMetadata ddog_RuntimeMetadata;
 
 typedef struct ddog_ShmHandle ddog_ShmHandle;
 

components-rs/ddtrace.h

@@ -8,6 +8,10 @@
 #include "telemetry.h"
 #include "sidecar.h"
 
+/**
+ * `QueueId` is a struct that represents a unique identifier for a queue.
+ * It contains a single field, `inner`, which is a 64-bit unsigned integer.
+ */
 typedef uint64_t ddog_QueueId;
 
 /**

components-rs/sidecar.h

@@ -11,6 +11,10 @@
 #include <stdio.h>
 #include "common.h"
 
+/**
+ * `QueueId` is a struct that represents a unique identifier for a queue.
+ * It contains a single field, `inner`, which is a 64-bit unsigned integer.
+ */
 typedef uint64_t ddog_QueueId;
 
 /**
@@ -73,11 +77,11 @@ void ddog_sidecar_instanceId_drop(struct ddog_InstanceId *instance_id);
 
 ddog_QueueId ddog_sidecar_queueId_generate(void);
 
-struct ddog_RuntimeMeta *ddog_sidecar_runtimeMeta_build(ddog_CharSlice language_name,
- ddog_CharSlice language_version,
- ddog_CharSlice tracer_version);
+struct ddog_RuntimeMetadata *ddog_sidecar_runtimeMeta_build(ddog_CharSlice language_name,
+  ddog_CharSlice language_version,
+  ddog_CharSlice tracer_version);
 
-void ddog_sidecar_runtimeMeta_drop(struct ddog_RuntimeMeta *meta);
+void ddog_sidecar_runtimeMeta_drop(struct ddog_RuntimeMetadata *meta);
 
 ddog_MaybeError ddog_sidecar_telemetry_enqueueConfig(ddog_SidecarTransport **transport,
  const struct ddog_InstanceId *instance_id,
@@ -102,7 +106,7 @@ ddog_MaybeError ddog_sidecar_telemetry_addIntegration(ddog_SidecarTransport **tr
 ddog_MaybeError ddog_sidecar_telemetry_flushServiceData(ddog_SidecarTransport **transport,
  const struct ddog_InstanceId *instance_id,
  const ddog_QueueId *queue_id,
- const struct ddog_RuntimeMeta *runtime_meta,
+ const struct ddog_RuntimeMetadata *runtime_meta,
  ddog_CharSlice service_name,
  ddog_CharSlice env_name);
 

components-rs/sidecar.rs

@@ -2,7 +2,7 @@ use std::ffi::{c_char, CStr, OsStr};
 #[cfg(unix)]
 use std::os::unix::ffi::OsStrExt;
 use datadog_sidecar::config::{self, LogMethod};
-use datadog_sidecar::interface::blocking::SidecarTransport;
+use datadog_sidecar::service::blocking::SidecarTransport;
 use ddcommon_ffi::slice::AsBytes;
 use ddcommon_ffi::{CharSlice, self as ffi, MaybeError};
 use ddtelemetry_ffi::try_c;

components-rs/telemetry.rs

@@ -1,5 +1,5 @@
-use datadog_sidecar::interface::blocking::SidecarTransport;
-use datadog_sidecar::interface::{blocking, InstanceId, QueueId, SidecarAction};
+use datadog_sidecar::service::blocking::SidecarTransport;
+use datadog_sidecar::service::{blocking, InstanceId, QueueId, SidecarAction};
 use ddcommon_ffi::slice::AsBytes;
 use ddcommon_ffi::{CharSlice, MaybeError, self as ffi};
 use ddcommon::tag::parse_tags;

ext/telemetry.c

@@ -121,7 +121,7 @@ void ddtrace_telemetry_finalize(void) {
  }
 
  ddog_CharSlice php_version = dd_zend_string_to_CharSlice(Z_STR_P(zend_get_constant_str(ZEND_STRL("PHP_VERSION"))));
- struct ddog_RuntimeMeta *meta = ddog_sidecar_runtimeMeta_build(DDOG_CHARSLICE_C("php"), php_version, DDOG_CHARSLICE_C(PHP_DDTRACE_VERSION));
+ struct ddog_RuntimeMetadata *meta = ddog_sidecar_runtimeMeta_build(DDOG_CHARSLICE_C("php"), php_version, DDOG_CHARSLICE_C(PHP_DDTRACE_VERSION));
 
  ddog_sidecar_telemetry_flushServiceData(&ddtrace_sidecar, ddtrace_sidecar_instance_id, &DDTRACE_G(telemetry_queue_id), meta, service_name, env_name);