From 6331479b222868cda18352a2a8fcaec08c9f0e17 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 18 Jan 2024 15:46:27 +0100 Subject: update to 0.97.0 --- 2383.patch | 68 --------------------------------------------- PHPINFO | 17 ++++++++---- REFLECTION | 19 +++++++++++-- php-pecl-datadog-trace.spec | 7 +++-- 4 files changed, 33 insertions(+), 78 deletions(-) delete mode 100644 2383.patch diff --git a/2383.patch b/2383.patch deleted file mode 100644 index 04716bd..0000000 --- a/2383.patch +++ /dev/null @@ -1,68 +0,0 @@ -From e1db8a922682e3979cb6a67e1af0a778a921c5d0 Mon Sep 17 00:00:00 2001 -From: Gustavo Lopes -Date: Tue, 21 Nov 2023 17:39:48 +0000 -Subject: [PATCH] Use global-dynamic for tsrm cache - ---- - ext/ddtrace.h | 6 +++--- - ext/handlers_api.h | 6 +++--- - zend_abstract_interface/tsrmls_cache.h | 6 +++--- - 3 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/ext/ddtrace.h b/ext/ddtrace.h -index d7072328f9..6322ac78e1 100644 ---- a/ext/ddtrace.h -+++ b/ext/ddtrace.h -@@ -108,11 +108,11 @@ ZEND_END_MODULE_GLOBALS(ddtrace) - - #ifdef ZTS - # if defined(__has_attribute) && __has_attribute(tls_model) --# define ATTR_TLS_LOCAL_DYNAMIC __attribute__((tls_model("local-dynamic"))) -+# define ATTR_TLS_GLOBAL_DYNAMIC __attribute__((tls_model("global-dynamic"))) - # else --# define ATTR_TLS_LOCAL_DYNAMIC -+# define ATTR_TLS_GLOBAL_DYNAMIC - # endif --extern __thread void *ATTR_TLS_LOCAL_DYNAMIC TSRMLS_CACHE; -+extern __thread void *ATTR_TLS_GLOBAL_DYNAMIC TSRMLS_CACHE; - # define DDTRACE_G(v) TSRMG(ddtrace_globals_id, zend_ddtrace_globals *, v) - #else - # define DDTRACE_G(v) (ddtrace_globals.v) -diff --git a/ext/handlers_api.h b/ext/handlers_api.h -index 353183bef1..bdd73e7559 100644 ---- a/ext/handlers_api.h -+++ b/ext/handlers_api.h -@@ -8,12 +8,12 @@ - #if PHP_VERSION_ID >= 80000 && PHP_VERSION_ID < 80101 && defined(ZTS) - - # if defined(__has_attribute) && __has_attribute(tls_model) --# define ATTR_TLS_LOCAL_DYNAMIC __attribute__((tls_model("local-dynamic"))) -+# define ATTR_TLS_GLOBAL_DYNAMIC __attribute__((tls_model("global-dynamic"))) - # else --# define ATTR_TLS_LOCAL_DYNAMIC -+# define ATTR_TLS_GLOBAL_DYNAMIC - # endif - --extern __thread void *ATTR_TLS_LOCAL_DYNAMIC TSRMLS_CACHE; -+extern __thread void *ATTR_TLS_GLOBAL_DYNAMIC TSRMLS_CACHE; - #endif - - typedef struct datadog_php_zif_handler_s { -diff --git a/zend_abstract_interface/tsrmls_cache.h b/zend_abstract_interface/tsrmls_cache.h -index a703909f58..2d86e89d62 100644 ---- a/zend_abstract_interface/tsrmls_cache.h -+++ b/zend_abstract_interface/tsrmls_cache.h -@@ -5,10 +5,10 @@ - #if PHP_VERSION_ID >= 80000 && PHP_VERSION_ID < 80101 && defined(ZTS) - - # if defined(__has_attribute) && __has_attribute(tls_model) --# define ATTR_TLS_LOCAL_DYNAMIC __attribute__((tls_model("local-dynamic"))) -+# define ATTR_TLS_GLOBAL_DYNAMIC __attribute__((tls_model("global-dynamic"))) - # else --# define ATTR_TLS_LOCAL_DYNAMIC -+# define ATTR_TLS_GLOBAL_DYNAMIC - # endif - --extern __thread void *ATTR_TLS_LOCAL_DYNAMIC TSRMLS_CACHE; -+extern __thread void *ATTR_TLS_GLOBAL_DYNAMIC TSRMLS_CACHE; - #endif diff --git a/PHPINFO b/PHPINFO index 682ab2a..59227a4 100644 --- a/PHPINFO +++ b/PHPINFO @@ -7,14 +7,14 @@ For help, check out the documentation at https://docs.datadoghq.com/tracing/lang (c) Datadog 2020 Datadog tracing support => disabled -Version => 0.96.0 +Version => 0.97.0 DATADOG TRACER CONFIGURATION => { - "date": "2023-12-20T13:40:13Z", - "os_name": "Linux builder.remirepo.net 6.6.6-200.fc39.x86_64 #1 SMP PREEMPT_DYNAMIC Mon Dec 11 17:29:08 UTC 2023 x86_64", - "os_version": "6.6.6-200.fc39.x86_64", - "version": "0.96.0", + "date": "2024-01-18T13:09:36Z", + "os_name": "Linux builder.remirepo.net 6.6.11-200.fc39.x86_64 #1 SMP PREEMPT_DYNAMIC Wed Jan 10 19:25:59 UTC 2024 x86_64", + "os_version": "6.6.11-200.fc39.x86_64", + "version": "0.97.0", "lang": "php", - "lang_version": "8.2.14", + "lang_version": "8.2.15", "env": null, "enabled": true, "service": null, @@ -170,6 +170,11 @@ datadog.trace.codeigniter_analytics_enabled => Off => Off datadog.codeigniter_analytics_enabled => Off => Off datadog.trace.codeigniter_analytics_sample_rate => 1 => 1 datadog.codeigniter_analytics_sample_rate => 1 => 1 +datadog.trace.exec_enabled => On => On +datadog.trace.exec_analytics_enabled => Off => Off +datadog.exec_analytics_enabled => Off => Off +datadog.trace.exec_analytics_sample_rate => 1 => 1 +datadog.exec_analytics_sample_rate => 1 => 1 datadog.trace.curl_enabled => On => On datadog.trace.curl_analytics_enabled => Off => Off datadog.curl_analytics_enabled => Off => Off diff --git a/REFLECTION b/REFLECTION index 6d25695..d925228 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #80 ddtrace version 0.96.0 ] { +Extension [ extension #84 ddtrace version 0.97.0 ] { - Dependencies { Dependency [ json (Required) ] @@ -367,6 +367,21 @@ Extension [ extension #80 ddtrace version 0.96.0 ] { Entry [ datadog.codeigniter_analytics_sample_rate ] Current = '1' } + Entry [ datadog.trace.exec_enabled ] + Current = 'true' + } + Entry [ datadog.trace.exec_analytics_enabled ] + Current = '0' + } + Entry [ datadog.exec_analytics_enabled ] + Current = '0' + } + Entry [ datadog.trace.exec_analytics_sample_rate ] + Current = '1' + } + Entry [ datadog.exec_analytics_sample_rate ] + Current = '1' + } Entry [ datadog.trace.curl_enabled ] Current = 'true' } @@ -828,7 +843,7 @@ Extension [ extension #80 ddtrace version 0.96.0 ] { Constant [ int DDTrace\DBM_PROPAGATION_DISABLED ] { 0 } Constant [ int DDTrace\DBM_PROPAGATION_SERVICE ] { 1 } Constant [ int DDTrace\DBM_PROPAGATION_FULL ] { 2 } - Constant [ string DD_TRACE_VERSION ] { 0.96.0 } + Constant [ string DD_TRACE_VERSION ] { 0.97.0 } Constant [ int DD_TRACE_PRIORITY_SAMPLING_AUTO_KEEP ] { 1 } Constant [ int DD_TRACE_PRIORITY_SAMPLING_AUTO_REJECT ] { 0 } Constant [ int DD_TRACE_PRIORITY_SAMPLING_USER_KEEP ] { 2 } diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec index cf28f56..c112009 100644 --- a/php-pecl-datadog-trace.spec +++ b/php-pecl-datadog-trace.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-datadog-trace # -# Copyright (c) 2019-2023 Remi Collet +# Copyright (c) 2019-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -35,7 +35,7 @@ Summary: APM and distributed tracing for PHP Name: %{?scl_prefix}php-pecl-datadog-trace -Version: 0.96.0 +Version: 0.97.0 Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} # extension is dual-licensed under Apache 2.0 or BSD3. # bundled rust ext are MIT AND Apache-2.0 @@ -298,6 +298,9 @@ fi %changelog +* Thu Jan 18 2024 Remi Collet - 0.97.0-1 +- update to 0.97.0 + * Wed Dec 20 2023 Remi Collet - 0.96.0-1 - update to 0.96.0 -- cgit