DataDog
diff --git a/‎Cargo.lock‎
Lines changed: 1 addition & 0 deletions b/‎Cargo.lock‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎appsec/tests/integration/src/test/groovy/com/datadog/appsec/php/integration/Laminas33Tests.groovy‎
Lines changed: 16 additions & 16 deletions b/‎appsec/tests/integration/src/test/groovy/com/datadog/appsec/php/integration/Laminas33Tests.groovy‎
Lines changed: 16 additions & 16 deletions
diff --git a/‎components-rs/common.h‎
Lines changed: 29 additions & 2 deletions b/‎components-rs/common.h‎
Lines changed: 29 additions & 2 deletions
diff --git a/‎components-rs/datadog.h‎
Lines changed: 4 additions & 0 deletions b/‎components-rs/datadog.h‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎components-rs/ffe.rs‎
Lines changed: 1 addition & 1 deletion b/‎components-rs/ffe.rs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎components-rs/lib.rs‎
Lines changed: 50 additions & 0 deletions b/‎components-rs/lib.rs‎
Lines changed: 50 additions & 0 deletions
diff --git a/‎components-rs/sidecar.h‎
Lines changed: 17 additions & 0 deletions b/‎components-rs/sidecar.h‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎ext/configuration.c‎
Lines changed: 4 additions & 0 deletions b/‎ext/configuration.c‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎ext/configuration.h‎
Lines changed: 3 additions & 0 deletions b/‎ext/configuration.h‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎ext/datadog.c‎
Lines changed: 1 addition & 1 deletion b/‎ext/datadog.c‎
Lines changed: 1 addition & 1 deletion
@@ -82,19 +82,19 @@ class Laminas33Tests {
         })
 
         assert endpoints.size() == 26
-        assert endpoints.find { it.path == '/' && it.method == 'OTHER' && it.operationName == 'http.request' && it.resourceName == '* /' } != null
+        assert endpoints.find { it.path == '/' && it.method == '*' && it.operationName == 'http.request' && it.resourceName == '* /' } != null
         assert endpoints.find {
-            it.path == '/application[/:action]' && it.method == 'OTHER' && it.operationName == 'http.request' && it.resourceName == '* /application[/:action]'
+            it.path == '/application[/:action]' && it.method == '*' && it.operationName == 'http.request' && it.resourceName == '* /application[/:action]'
         } != null
-        assert endpoints.find { it.path == '/authenticate' && it.method == 'OTHER' && it.operationName == 'http.request' && it.resourceName == '* /authenticate' } != null
-        assert endpoints.find { it.path == '/behind-auth' && it.method == 'OTHER' && it.operationName == 'http.request' && it.resourceName == '* /behind-auth' } != null
+        assert endpoints.find { it.path == '/authenticate' && it.method == '*' && it.operationName == 'http.request' && it.resourceName == '* /authenticate' } != null
+        assert endpoints.find { it.path == '/behind-auth' && it.method == '*' && it.operationName == 'http.request' && it.resourceName == '* /behind-auth' } != null
         assert endpoints.find {
-            it.path == '/dynamic-path[/:param01]' && it.method == 'OTHER' && it.operationName == 'http.request' && it.resourceName == '* /dynamic-path[/:param01]'
+            it.path == '/dynamic-path[/:param01]' && it.method == '*' && it.operationName == 'http.request' && it.resourceName == '* /dynamic-path[/:param01]'
         } != null
-        assert endpoints.find { it.path == '/resource' && it.method == 'OTHER' && it.operationName == 'http.request' && it.resourceName == '* /resource' } != null
-        assert endpoints.find { it.path == '/resource/:resourceId' && it.method == 'OTHER' && it.operationName == 'http.request' && it.resourceName == '* /resource/:resourceId' } != null
-        assert endpoints.find { it.path == '/resource/:resourceId/:subId' && it.method == 'OTHER' && it.operationName == 'http.request' && it.resourceName == '* /resource/:resourceId/:subId' } != null
-        assert endpoints.find { it.path == '/chain/:chainId' && it.method == 'OTHER' && it.operationName == 'http.request' && it.resourceName == '* /chain/:chainId' } != null
+        assert endpoints.find { it.path == '/resource' && it.method == '*' && it.operationName == 'http.request' && it.resourceName == '* /resource' } != null
+        assert endpoints.find { it.path == '/resource/:resourceId' && it.method == '*' && it.operationName == 'http.request' && it.resourceName == '* /resource/:resourceId' } != null
+        assert endpoints.find { it.path == '/resource/:resourceId/:subId' && it.method == '*' && it.operationName == 'http.request' && it.resourceName == '* /resource/:resourceId/:subId' } != null
+        assert endpoints.find { it.path == '/chain/:chainId' && it.method == '*' && it.operationName == 'http.request' && it.resourceName == '* /chain/:chainId' } != null
         assert endpoints.find { it.path == '/verb-test' && it.method == 'GET' && it.operationName == 'http.request' && it.resourceName == 'GET /verb-test' } != null
         assert endpoints.find { it.path == '/verb-test' && it.method == 'POST' && it.operationName == 'http.request' && it.resourceName == 'POST /verb-test' } != null
         assert endpoints.find { it.path == '/verb-test' && it.method == 'PUT' && it.operationName == 'http.request' && it.resourceName == 'PUT /verb-test' } != null
@@ -105,24 +105,24 @@ class Laminas33Tests {
         assert endpoints.find { it.path == '/multi-verb' && it.method == 'OPTIONS' && it.operationName == 'http.request' && it.resourceName == 'OPTIONS /multi-verb' } != null
         assert endpoints.find { it.path == '/multi-verb' && it.method == 'POST' && it.operationName == 'http.request' && it.resourceName == 'POST /multi-verb' } != null
         assert endpoints.find { it.path == '/multi-verb' && it.method == 'PUT' && it.operationName == 'http.request' && it.resourceName == 'PUT /multi-verb' } != null
-        assert endpoints.find { it.path == '/profile' && it.method == 'OTHER' && it.operationName == 'http.request' && it.resourceName == '* /profile' } != null
+        assert endpoints.find { it.path == '/profile' && it.method == '*' && it.operationName == 'http.request' && it.resourceName == '* /profile' } != null
         assert endpoints.find {
-            it.path == '/regex-year/%year%' && it.method == 'OTHER' && it.operationName == 'http.request' && it.resourceName == '* /regex-year/%year%'
+            it.path == '/regex-year/%year%' && it.method == '*' && it.operationName == 'http.request' && it.resourceName == '* /regex-year/%year%'
         } != null
         assert endpoints.find {
-            it.path == '/scheme-only-page' && it.method == 'OTHER' && it.operationName == 'http.request' && it.resourceName == '* /scheme-only-page'
+            it.path == '/scheme-only-page' && it.method == '*' && it.operationName == 'http.request' && it.resourceName == '* /scheme-only-page'
         } != null
         assert endpoints.find {
-            it.path == '/placeholder-literal' && it.method == 'OTHER' && it.operationName == 'http.request' && it.resourceName == '* /placeholder-literal'
+            it.path == '/placeholder-literal' && it.method == '*' && it.operationName == 'http.request' && it.resourceName == '* /placeholder-literal'
         } != null
         assert endpoints.find {
-            it.path == '/wildcard-keys' && it.method == 'OTHER' && it.operationName == 'http.request' && it.resourceName == '* /wildcard-keys'
+            it.path == '/wildcard-keys' && it.method == '*' && it.operationName == 'http.request' && it.resourceName == '* /wildcard-keys'
         } != null
         assert endpoints.find {
-            it.path == '/wildcard-keys/*' && it.method == 'OTHER' && it.operationName == 'http.request' && it.resourceName == '* /wildcard-keys/*'
+            it.path == '/wildcard-keys/*' && it.method == '*' && it.operationName == 'http.request' && it.resourceName == '* /wildcard-keys/*'
         } != null
         assert endpoints.find {
-            it.path == '/any-verb' && it.method == 'OTHER' && it.operationName == 'http.request' && it.resourceName == '* /any-verb'
+            it.path == '/any-verb' && it.method == '*' && it.operationName == 'http.request' && it.resourceName == '* /any-verb'
         } != null
     }
 
 
@@ -1231,6 +1231,10 @@ typedef struct ddog_FfeExposure {
   uint64_t timestamp_ms;
   ddog_CharSlice flag_key;
   ddog_CharSlice subject_id;
+  /**
+   * UTF-8 JSON object. Empty, invalid, or non-object JSON is serialized as
+   * an empty subject attribute object.
+   */
   ddog_CharSlice subject_attributes_json;
   ddog_CharSlice allocation_key;
   ddog_CharSlice variant;
@@ -1239,16 +1243,39 @@ typedef struct ddog_FfeExposure {
 typedef struct ddog_Slice_FfeExposure {
   /**
    * Should be non-null and suitably aligned for the underlying type. It is
-   * allowed to point to read-only memory if `len` is zero.
+   * allowed but not recommended for the pointer to be null when the len is
+   * zero.
    */
   const struct ddog_FfeExposure *ptr;
   /**
    * The number of elements (not bytes) that `.ptr` points to. Must be less
-   * than or equal to `isize::MAX`.
+   * than or equal to [isize::MAX].
    */
   uintptr_t len;
 } ddog_Slice_FfeExposure;
 
+typedef struct ddog_FfeEvaluationMetric {
+  ddog_CharSlice flag_key;
+  ddog_CharSlice variant;
+  ddog_CharSlice reason;
+  ddog_CharSlice error_type;
+  ddog_CharSlice allocation_key;
+} ddog_FfeEvaluationMetric;
+
+typedef struct ddog_Slice_FfeEvaluationMetric {
+  /**
+   * Should be non-null and suitably aligned for the underlying type. It is
+   * allowed but not recommended for the pointer to be null when the len is
+   * zero.
+   */
+  const struct ddog_FfeEvaluationMetric *ptr;
+  /**
+   * The number of elements (not bytes) that `.ptr` points to. Must be less
+   * than or equal to [isize::MAX].
+   */
+  uintptr_t len;
+} ddog_Slice_FfeEvaluationMetric;
+
 /**
  * Holds the raw parts of a Rust Vec; it should only be created from Rust,
  * never from C.
 
@@ -51,6 +51,10 @@ void ddtrace_drop_rust_string(char *input, uintptr_t len);
 
 struct ddog_Endpoint *datadog_parse_agent_url(ddog_CharSlice url);
 
+struct ddog_Endpoint *datadog_otel_metrics_endpoint_from_url(ddog_CharSlice url);
+
+struct ddog_Endpoint *datadog_otel_metrics_endpoint_from_agent_url(ddog_CharSlice url);
+
 void datadog_endpoint_as_crashtracker_config(const struct ddog_Endpoint *endpoint,
                                              void (*callback)(ddog_crasht_EndpointConfig, void*),
                                              void *userdata);
 
@@ -276,7 +276,7 @@ fn assignment_value_to_json(value: &AssignmentValue) -> String {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::bytes::ZendString;
+    use crate::bytes::{OwnedZendString, ZendString};
     use std::alloc::{alloc_zeroed, dealloc, Layout};
     use std::ffi::CString;
     use std::mem;
 
@@ -18,13 +18,17 @@ use http::uri::{PathAndQuery, Scheme};
 use http::Uri;
 use std::borrow::Cow;
 use std::ffi::{c_char, OsStr};
+#[cfg(unix)]
+use std::path::Path;
 use std::ptr::null_mut;
 use uuid::Uuid;
 
 pub use libdd_crashtracker_ffi::*;
 pub use libdd_library_config_ffi::*;
 pub use datadog_sidecar_ffi::*;
 use libdd_common::{parse_uri, Endpoint};
+#[cfg(unix)]
+use libdd_common::connector::uds::socket_path_to_uri;
 use libdd_common_ffi::slice::AsBytes;
 pub use libdd_common_ffi::*;
 pub use libdd_telemetry_ffi::*;
@@ -146,6 +150,52 @@ pub unsafe extern "C" fn datadog_parse_agent_url(
         })
 }
 
+#[cfg(unix)]
+fn otel_metrics_endpoint_from_unix_socket(_socket_path: &str) -> std::option::Option<Box<Endpoint>> {
+    socket_path_to_uri(Path::new(_socket_path)).ok().and_then(|uri| {
+        let mut parts = uri.into_parts();
+        parts.path_and_query = Some(PathAndQuery::from_static("/v1/metrics"));
+        Uri::from_parts(parts)
+            .ok()
+            .map(|url| Box::new(Endpoint::from_url(url)))
+    })
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn datadog_otel_metrics_endpoint_from_url(url: CharSlice) -> std::option::Option<Box<Endpoint>> {
+    let url_str = url.to_utf8_lossy();
+    #[cfg(unix)]
+    if let Some(socket_path) = url_str.strip_prefix("unix://") {
+        let socket_path = socket_path.strip_suffix("/v1/metrics").unwrap_or(socket_path);
+        return otel_metrics_endpoint_from_unix_socket(socket_path);
+    }
+    parse_uri(url_str.as_ref())
+        .ok()
+        .map(|url| Box::new(Endpoint::from_url(url)))
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn datadog_otel_metrics_endpoint_from_agent_url(url: CharSlice) -> std::option::Option<Box<Endpoint>> {
+    let url_str = url.to_utf8_lossy();
+    #[cfg(unix)]
+    if let Some(socket_path) = url_str.strip_prefix("unix://") {
+        return otel_metrics_endpoint_from_unix_socket(socket_path);
+    }
+    if url_str.starts_with("http") {
+        let parsed = parse_uri(url_str.as_ref()).ok();
+        let scheme = parsed.as_ref().and_then(|u| u.scheme_str()).unwrap_or("http");
+        let host = parsed
+            .as_ref()
+            .and_then(|u| u.host())
+            .unwrap_or("localhost");
+        parse_uri(&format!("{}://{}:4318/v1/metrics", scheme, host))
+            .ok()
+            .map(|url| Box::new(Endpoint::from_url(url)))
+    } else {
+        datadog_parse_agent_url(url)
+    }
+}
+
 #[no_mangle]
 #[cfg(unix)]
 pub unsafe extern "C" fn datadog_endpoint_as_crashtracker_config(
 
@@ -195,6 +195,7 @@ ddog_MaybeError ddog_sidecar_session_set_config(struct ddog_SidecarTransport **t
                                                 ddog_CharSlice session_id,
                                                 const struct ddog_Endpoint *agent_endpoint,
                                                 const struct ddog_Endpoint *dogstatsd_endpoint,
+                                                const struct ddog_Endpoint *otlp_metrics_endpoint,
                                                 ddog_CharSlice language,
                                                 ddog_CharSlice language_version,
                                                 ddog_CharSlice tracer_version,
@@ -314,6 +315,22 @@ ddog_MaybeError ddog_sidecar_send_ffe_exposure_batch(struct ddog_SidecarTranspor
                                                      const struct ddog_FfeTelemetryContext *context,
                                                      struct ddog_Slice_FfeExposure exposures);
 
+/**
+ * Send structured FFE evaluation metric events to the sidecar. The sidecar
+ * owns aggregation, OTLP/protobuf serialization, and OTLP HTTP delivery. This
+ * function is caller-driven so SDKs with existing host-language hooks can
+ * safely coexist until they explicitly migrate.
+ *
+ * # Safety
+ * `context` and every element in `metrics` must contain valid UTF-8
+ * `CharSlice` values. Empty `metrics` is a no-op.
+ */
+ddog_MaybeError ddog_sidecar_send_ffe_evaluation_metrics(struct ddog_SidecarTransport **transport,
+                                                         const struct ddog_InstanceId *instance_id,
+                                                         const ddog_QueueId *queue_id,
+                                                         const struct ddog_FfeTelemetryContext *context,
+                                                         struct ddog_Slice_FfeEvaluationMetric metrics);
+
 ddog_MaybeError ddog_sidecar_send_debugger_diagnostics(struct ddog_SidecarTransport **transport,
                                                        const struct ddog_InstanceId *instance_id,
                                                        ddog_QueueId queue_id,
 
@@ -6,6 +6,7 @@
 #include "logging.h"
 #include <json/json.h>
 #include "sidecar.h"
+#include "otel_config.h"
 #include <components/log/log.h>
 #include <zai_string/string.h>
 
@@ -127,6 +128,9 @@ static void dd_ini_env_to_ini_name(const zai_str env_name, zai_config_name *ini_
         } else if (env_name.ptr == strstr(env_name.ptr, "DD_DYNAMIC_INSTRUMENTATION_")) {
             ini_name->ptr[sizeof("datadog.dynamic_instrumentation") - 1] = '.';
         }
+    } else if (env_name.ptr == strstr(env_name.ptr, "OTEL_")) {
+        ini_name->len = env_name.len;
+        memcpy(ini_name->ptr, env_name.ptr, env_name.len);
     } else {
         ini_name->len = 0;
         assert(false && "Unexpected env var name: missing 'DD_' prefix");
 
@@ -87,6 +87,9 @@ enum datadog_sidecar_connection_mode {
     CONFIG(BOOL, DD_TRACE_AGENTLESS, "false", .ini_change = zai_config_system_ini_change)                      \
     CONFIG(STRING, DD_VERSION, "", .ini_change = datadog_alter_dd_version,                                     \
            .env_config_fallback = ddtrace_conf_otel_resource_attributes_version)                               \
+    CONFIG(STRING, OTEL_EXPORTER_OTLP_METRICS_ENDPOINT, "",                                                    \
+           .ini_change = zai_config_system_ini_change,                                                         \
+           .env_config_fallback = ddtrace_conf_otel_otlp_endpoint)                                             \
     CONFIG(INT, DD_TRACE_BUFFER_SIZE, "2097152", .ini_change = zai_config_system_ini_change)                   \
     CONFIG(INT, DD_TRACE_AGENT_MAX_PAYLOAD_SIZE, "52428800", .ini_change = zai_config_system_ini_change)       \
     CONFIG(INT, DD_TRACE_AGENT_STACK_BACKLOG, "12", .ini_change = zai_config_system_ini_change)                \
 
@@ -158,7 +158,7 @@ static void dd_activate_once(void) {
 
     // must run before the first zai_hook_activate as tracer telemetry setup installs a global hook
     if (!datadog_disable) {
-        // Only set up the sidecar when it's actually needed (appsec, telemetry, or trace sender).
+        // Only set up the sidecar when it's actually needed (appsec, telemetry, trace sender, or OTLP metrics).
         ddog_RemoteConfigFlags flags = {0};
         bool enable_sidecar = datadog_sidecar_should_enable(&flags);
         if (enable_sidecar) {