Update to newest libdatadog

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

Author: bwoebi

Cargo.lock

@@ -48,7 +48,7 @@ RUN_TESTS_CMD := DD_SERVICE= DD_ENV= REPORT_EXIT_STATUS=1 TEST_PHP_SRCDIR=$(PROJ
 
 C_FILES = $(shell find components components-rs ext src/dogstatsd zend_abstract_interface -name '*.c' -o -name '*.h' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )
 TEST_FILES = $(shell find tests/ext -name '*.php*' -o -name '*.inc' -o -name '*.json' -o -name '*.yaml' -o -name 'CONFLICTS' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )
-RUST_FILES = $(BUILD_DIR)/Cargo.toml $(BUILD_DIR)/Cargo.lock $(shell find components-rs -name '*.c' -o -name '*.rs' -o -name 'Cargo.toml' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' ) $(shell find libdatadog/{build-common,datadog-ffe,datadog-ipc,datadog-ipc-macros,datadog-live-debugger,datadog-live-debugger-ffi,datadog-remote-config,datadog-sidecar,datadog-sidecar-ffi,datadog-sidecar-macros,libdd-alloc,libdd-capabilities,libdd-capabilities-impl,libdd-common,libdd-common-ffi,libdd-crashtracker,libdd-crashtracker-ffi,libdd-data-pipeline,libdd-ddsketch,libdd-dogstatsd-client,libdd-library-config,libdd-library-config-ffi,libdd-log,libdd-libunwind-sys,libdd-shared-runtime,libdd-telemetry,libdd-telemetry-ffi,libdd-tinybytes,libdd-trace-*,spawn_worker,tools/{cc_utils,sidecar_mockgen},libdd-trace-*,Cargo.toml} \( -type l -o -type f \) \( -path "*/src*" -o -path "*/examples*" -o -path "*/libdd-libunwind-sys*" -o -path "*Cargo.toml" -o -path "*/build.rs" -o -path "*/tests/dataservice.rs" -o -path "*/tests/service_functional.rs" \) -not -path "*/datadog-ipc/build.rs" -not -path "*/datadog-sidecar-ffi/build.rs")
+RUST_FILES = $(BUILD_DIR)/Cargo.toml $(BUILD_DIR)/Cargo.lock $(shell find components-rs -name '*.c' -o -name '*.rs' -o -name 'Cargo.toml' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' ) $(shell find libdatadog/{build-common,datadog-ffe,datadog-ipc,datadog-ipc-macros,datadog-live-debugger,datadog-live-debugger-ffi,datadog-remote-config,datadog-sidecar,datadog-sidecar-ffi,datadog-sidecar-macros,libdd-alloc,libdd-capabilities,libdd-capabilities-impl,libdd-common,libdd-common-ffi,libdd-crashtracker,libdd-crashtracker-ffi,libdd-data-pipeline,libdd-ddsketch,libdd-dogstatsd-client,libdd-library-config,libdd-library-config-ffi,libdd-log,libdd-shared-runtime,libdd-telemetry,libdd-telemetry-ffi,libdd-tinybytes,libdd-trace-*,spawn_worker,tools/{cc_utils,sidecar_mockgen},libdd-trace-*,Cargo.toml} \( -type l -o -type f \) \( -path "*/src*" -o -path "*/examples*" -o -path "*Cargo.toml" -o -path "*/build.rs" -o -path "*/tests/dataservice.rs" -o -path "*/tests/service_functional.rs" \) -not -path "*/datadog-ipc/build.rs" -not -path "*/datadog-sidecar-ffi/build.rs")
 ALL_OBJECT_FILES = $(C_FILES) $(RUST_FILES) $(BUILD_DIR)/Makefile
 TEST_OPCACHE_FILES = $(shell find tests/opcache -name '*.php*' -o -name '.gitkeep' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )
 TEST_STUB_FILES = $(shell find tests/ext -type d -name 'stubs' -exec find '{}' -type f \; | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )

Makefile

@@ -85,13 +85,6 @@ void ddog_apply_agent_info(struct ddog_AgentInfoReader *reader,
  */
 void ddog_apply_agent_info_concentrator_config(struct ddog_AgentInfoReader *reader);
 
-/**
- * Returns true once the sidecar has received and applied the agent /info response.
- * Used by `dd_trace_internal_fn('await_agent_info')` to block until the concentrator
- * peer-tag keys and span kinds are initialised.
- */
-bool ddog_is_agent_info_ready(void);
-
 bool ddog_shall_log(enum ddog_Log category);
 
 void ddog_set_error_log_level(bool once);
@@ -183,6 +176,13 @@ bool ddog_exception_hash_limiter_inc(struct ddog_SidecarTransport *connection,
                                      uint64_t hash,
                                      uint32_t granularity_seconds);
 
+/**
+ * Returns true once the agent /info has been received and applied.
+ * Used by the PHP extension to skip stats computation until the concentrator
+ * has been properly initialised with peer-tag keys and span kinds.
+ */
+bool ddog_is_agent_info_ready(void);
+
 /**
  * Look up (or lazily create) the concentrator for `(env, version, service)` and invoke
  * `callback` with a shared reference to it while holding the global read lock.

components-rs/ddtrace.h

@@ -10,9 +10,9 @@
 #include <stdio.h>
 #include "common.h"
 
-void drop_log_probe_capture_expressions(struct ddog_LogProbe);
+void ddog_drop_log_probe_capture_expressions(struct ddog_LogProbe);
 
-void drop_span_decoration_probe(struct ddog_SpanDecorationProbe);
+void ddog_drop_span_decoration_probe(struct ddog_SpanDecorationProbe);
 
 struct ddog_CaptureConfiguration ddog_capture_defaults(void);
 

components-rs/live-debugger.h

@@ -65,19 +65,6 @@ if test "$PHP_DDTRACE" != "no"; then
     PHP_SUBST(DDTRACE_CARGO)
   fi
 
-  dnl As required by libdd-libunwind-sys
-  if test "$PHP_DDTRACE_RUST_LIBRARY" = "-"; then
-    AC_CHECK_TOOL(DDTRACE_AUTOMAKE, automake, [:])
-    AS_IF([test "$DDTRACE_AUTOMAKE" = ":"], [AC_MSG_ERROR([Please install automake before configuring])])
-    AC_CHECK_TOOL(DDTRACE_LIBTOOL, libtool, [:])
-    AS_IF([test "$DDTRACE_LIBTOOL" = ":"], [
-      AC_CHECK_TOOL(DDTRACE_LIBTOOLIZE, libtoolize, [:])
-      AS_IF([test "$DDTRACE_LIBTOOLIZE" = ":"], [
-        AC_MSG_ERROR([Please install libtool before configuring])
-      ])
-    ])
-  fi
-
   if test "$PHP_DDTRACE_SANITIZE" != "no"; then
     dnl gcc needs -lasan, clang needs -shared-libsan
     ac_cflags=$LDFLAGS

config.m4

@@ -128,9 +128,9 @@ static bool dd_probe_file_mismatch(dd_probe_def *def, zend_execute_data *execute
 static void dd_probe_dtor(void *data) {
     dd_probe_def *def = data;
     if (def->probe.probe.tag == DDOG_PROBE_TYPE_SPAN_DECORATION) {
-        drop_span_decoration_probe(def->probe.probe.span_decoration);
+        ddog_drop_span_decoration_probe(def->probe.probe.span_decoration);
     } else if (def->probe.probe.tag == DDOG_PROBE_TYPE_LOG) {
-        drop_log_probe_capture_expressions(def->probe.probe.log);
+        ddog_drop_log_probe_capture_expressions(def->probe.probe.log);
     }
     if (def->file) {
         zend_string_release(def->file);