Merge branch 'master' of github.com:DataDog/dd-trace-php into leiyks-use-rust-span-in-tracer

Author: bwoebi

.gitlab/generate-package.php

@@ -488,6 +488,7 @@
     IMAGE: "<?= $image ?>"
     ABI_NO: "<?= $abi_no ?>"
     PHP_VERSION: "<?= $major_minor ?>"
+    GIT_STRATEGY: clone
     GIT_CONFIG_COUNT: 1
     GIT_CONFIG_KEY_0: core.longpaths
     GIT_CONFIG_VALUE_0: true

.gitlab/generate-tracer.php

@@ -120,6 +120,7 @@ function before_script_steps() {
     GIT_CONFIG_KEY_0: core.longpaths
     GIT_CONFIG_VALUE_0: true
     CONTAINER_NAME: $CI_JOB_NAME_SLUG
+    GIT_STRATEGY: clone
     IMAGE: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_windows"
   script: |
     # Make sure we actually fail if a command fails

.gitlab/run_php_language_tests.sh

@@ -33,6 +33,11 @@ if [[ -n "${PHP_MAJOR_MINOR}" && $(version $PHP_MAJOR_MINOR) -ge $(version 7.4)
   extra_args="-j$(nproc)"
 fi
 
+# run-tests supports flaky since 8.1
+if [[ -n "${PHP_MAJOR_MINOR}" && $(version $PHP_MAJOR_MINOR) -ge $(version 8.1) ]]; then
+  sed -i "/flaky_functions = /a 'socket_create','stream_context_create'," run-tests.php
+fi
+
 php run-tests.php -q \
   -p /usr/local/bin/php \
   --show-diff \

Cargo.lock

@@ -48,6 +48,8 @@ regex = "1.10.5"
 regex-automata = "0.4.5"
 http = "1.0"
 libc = "0.2"
+bincode = { version = "1.3.3" }
+hashbrown = "0.15"
 
 [build-dependencies]
 cbindgen = "0.27"

components-rs/Cargo.toml

@@ -396,6 +396,8 @@ typedef struct ddog_DebuggerPayload ddog_DebuggerPayload;
 
 typedef struct ddog_DslString ddog_DslString;
 
+typedef struct ddog_HashMap_ShmCacheKey__ShmCache ddog_HashMap_ShmCacheKey__ShmCache;
+
 /**
  * `InstanceId` is a structure that holds session and runtime identifiers.
  */
@@ -603,6 +605,8 @@ typedef struct ddog_Vec_DebuggerPayload {
   uintptr_t capacity;
 } ddog_Vec_DebuggerPayload;
 
+typedef struct ddog_HashMap_ShmCacheKey__ShmCache ddog_ShmCacheMap;
+
 /**
  * Holds the raw parts of a Rust Vec; it should only be created from Rust,
  * never from C.

components-rs/common.h

@@ -282,6 +282,22 @@ void ddog_sidecar_telemetry_add_integration_log_buffer(enum ddog_Log category,
                                                        struct ddog_SidecarActionsBuffer *buffer,
                                                        ddog_CharSlice log);
 
+ddog_ShmCacheMap *ddog_sidecar_telemetry_cache_new(void);
+
+void ddog_sidecar_telemetry_cache_drop(ddog_ShmCacheMap*);
+
+bool ddog_sidecar_telemetry_config_sent(const ddog_ShmCacheMap *cache,
+                                        ddog_CharSlice service,
+                                        ddog_CharSlice env);
+
+ddog_MaybeError ddog_sidecar_telemetry_filter_flush(struct ddog_SidecarTransport **transport,
+                                                    const struct ddog_InstanceId *instance_id,
+                                                    const ddog_QueueId *queue_id,
+                                                    struct ddog_SidecarActionsBuffer *buffer,
+                                                    ddog_ShmCacheMap *cache,
+                                                    ddog_CharSlice service,
+                                                    ddog_CharSlice env);
+
 void ddog_init_span_func(void (*free_func)(struct _zend_string*),
                          void (*addref_func)(struct _zend_string*));
 

components-rs/ddtrace.h

@@ -9,7 +9,7 @@ pub mod telemetry;
 pub mod bytes;
 
 use ddcommon::entity_id::{get_container_id, set_cgroup_file};
-use http::uri::Scheme;
+use http::uri::{PathAndQuery, Scheme};
 use http::Uri;
 use std::borrow::Cow;
 use std::ffi::c_char;
@@ -91,6 +91,9 @@ pub unsafe extern "C" fn ddtrace_parse_agent_url(
             if url.scheme().is_none() {
                 let mut parts = url.into_parts();
                 parts.scheme = Some(Scheme::HTTP);
+                if parts.path_and_query.is_none() {
+                    parts.path_and_query = Some(PathAndQuery::from_static("/"));
+                }
                 url = Uri::from_parts(parts).unwrap();
             }
             Box::new(Endpoint::from_url(url))