Fix wrong namespace

DataDog · Apr 3, 2024 · a2e7477 · a2e7477
1 parent 4249d1c
commit a2e7477
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 20 deletions.
diff --git a/components-rs/common.h b/components-rs/common.h
@@ -136,6 +136,20 @@ typedef enum ddog_Log {
   DDOG_LOG_HOOK_TRACE = (5 | (4 << 4)),
 } ddog_Log;
 
+typedef enum ddog_MetricNamespace {
+  DDOG_METRIC_NAMESPACE_TRACERS,
+  DDOG_METRIC_NAMESPACE_PROFILERS,
+  DDOG_METRIC_NAMESPACE_RUM,
+  DDOG_METRIC_NAMESPACE_APPSEC,
+  DDOG_METRIC_NAMESPACE_IDE_PLUGINS,
+  DDOG_METRIC_NAMESPACE_LIVE_DEBUGGER,
+  DDOG_METRIC_NAMESPACE_IAST,
+  DDOG_METRIC_NAMESPACE_GENERAL,
+  DDOG_METRIC_NAMESPACE_TELEMETRY,
+  DDOG_METRIC_NAMESPACE_APM,
+  DDOG_METRIC_NAMESPACE_SIDECAR,
+} ddog_MetricNamespace;
+
 typedef struct ddog_BlockingTransport_SidecarInterfaceResponse__SidecarInterfaceRequest ddog_BlockingTransport_SidecarInterfaceResponse__SidecarInterfaceRequest;
 
 typedef struct ddog_InstanceId ddog_InstanceId;
@@ -166,20 +180,6 @@ typedef enum ddog_LogLevel {
   DDOG_LOG_LEVEL_DEBUG,
 } ddog_LogLevel;
 
-typedef enum ddog_MetricNamespace {
-  DDOG_METRIC_NAMESPACE_TRACERS,
-  DDOG_METRIC_NAMESPACE_PROFILERS,
-  DDOG_METRIC_NAMESPACE_RUM,
-  DDOG_METRIC_NAMESPACE_APPSEC,
-  DDOG_METRIC_NAMESPACE_IDE_PLUGINS,
-  DDOG_METRIC_NAMESPACE_LIVE_DEBUGGER,
-  DDOG_METRIC_NAMESPACE_IAST,
-  DDOG_METRIC_NAMESPACE_GENERAL,
-  DDOG_METRIC_NAMESPACE_TELEMETRY,
-  DDOG_METRIC_NAMESPACE_APM,
-  DDOG_METRIC_NAMESPACE_SIDECAR,
-} ddog_MetricNamespace;
-
 typedef enum ddog_MetricType {
   DDOG_METRIC_TYPE_GAUGE,
   DDOG_METRIC_TYPE_COUNT,

diff --git a/components-rs/ddtrace.h b/components-rs/ddtrace.h
@@ -174,7 +174,8 @@ ddog_MaybeError ddog_sidecar_telemetry_buffer_flush(ddog_SidecarTransport **tran
                                                     struct ddog_SidecarActionsBuffer *buffer);
 
 void ddog_sidecar_telemetry_register_metric_buffer(struct ddog_SidecarActionsBuffer *buffer,
-                                                   ddog_CharSlice metric_name);
+                                                   ddog_CharSlice metric_name,
+                                                   enum ddog_MetricNamespace namespace_);
 
 void ddog_sidecar_telemetry_add_span_metric_point_buffer(struct ddog_SidecarActionsBuffer *buffer,
                                                          ddog_CharSlice metric_name,

diff --git a/components-rs/telemetry.rs b/components-rs/telemetry.rs
@@ -4,6 +4,7 @@ use ddcommon_ffi::slice::AsBytes;
 use ddcommon_ffi::CharSlice;
 use ddcommon::tag::parse_tags;
 use ddtelemetry::data;
+use ddtelemetry::data::metrics::MetricNamespace;
 use ddtelemetry::data::{Dependency, Integration};
 use ddtelemetry::metrics::MetricContext;
 use ddtelemetry::worker::TelemetryActions;
@@ -134,11 +135,12 @@ pub extern "C" fn ddog_sidecar_telemetry_buffer_flush(
 pub unsafe extern "C" fn ddog_sidecar_telemetry_register_metric_buffer(
     buffer: &mut SidecarActionsBuffer,
     metric_name: CharSlice,
+    namespace: MetricNamespace,
 ) {
 
     buffer.buffer.push(SidecarAction::RegisterTelemetryMetric(MetricContext {
         name: metric_name.to_utf8_lossy().into_owned(),
-        namespace: data::metrics::MetricNamespace::Tracers,
+        namespace,
         metric_type: data::metrics::MetricType::Count,
         tags: Vec::default(),
         common: true,

diff --git a/ext/telemetry.c b/ext/telemetry.c
@@ -80,7 +80,7 @@ void ddtrace_telemetry_finalize(void) {
 
     // Telemetry metrics
     ddog_CharSlice metric_name = DDOG_CHARSLICE_C("spans_created");
-    ddog_sidecar_telemetry_register_metric_buffer(buffer, metric_name);
+    ddog_sidecar_telemetry_register_metric_buffer(buffer, metric_name, DDOG_METRIC_NAMESPACE_TRACERS);
     zend_string *integration_name;
     zval *metric_value;
     ZEND_HASH_FOREACH_STR_KEY_VAL(&DDTRACE_G(telemetry_spans_created_per_integration), integration_name, metric_value) {
@@ -90,7 +90,7 @@ void ddtrace_telemetry_finalize(void) {
     } ZEND_HASH_FOREACH_END();
 
     metric_name = DDOG_CHARSLICE_C("logs_created");
-    ddog_sidecar_telemetry_register_metric_buffer(buffer, metric_name);
+    ddog_sidecar_telemetry_register_metric_buffer(buffer, metric_name, DDOG_METRIC_NAMESPACE_GENERAL);
     static struct {
         ddog_CharSlice level;
         ddog_CharSlice tags;

diff --git a/tests/ext/telemetry/metrics_logs_created.phpt b/tests/ext/telemetry/metrics_logs_created.phpt
@@ -55,7 +55,7 @@ array(2) {
   [0]=>
   array(7) {
     ["namespace"]=>
-    string(7) "tracers"
+    string(7) "general"
     ["metric"]=>
     string(12) "logs_created"
     ["points"]=>
@@ -83,7 +83,7 @@ array(2) {
   [1]=>
   array(7) {
     ["namespace"]=>
-    string(7) "tracers"
+    string(7) "general"
     ["metric"]=>
     string(12) "logs_created"
     ["points"]=>