diff options
| -rw-r--r-- | 412.patch | 41 | ||||
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 4 | ||||
| -rw-r--r-- | php-pecl-datadog-trace.spec | 10 |
4 files changed, 9 insertions, 48 deletions
diff --git a/412.patch b/412.patch deleted file mode 100644 index b3718e4..0000000 --- a/412.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 2f8102cac639f97f95c4c1412ee0d367ab9c2c50 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Fri, 26 Apr 2019 07:54:26 +0200 -Subject: [PATCH] simplify regex which fails with 7.3 - ---- - tests/ext/segfault_backtrace_enabled.phpt | 2 +- - tests/ext/segfault_backtrace_enabled_via_env.phpt | 2 +- - .../ext/segfault_backtrace_enabled_via_env_disabled_in_ini.phpt | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/ext/segfault_backtrace_enabled.phpt b/tests/ext/segfault_backtrace_enabled.phpt -index 9aa2fe4b..b89f757c 100644 ---- a/tests/ext/segfault_backtrace_enabled.phpt -+++ b/tests/ext/segfault_backtrace_enabled.phpt -@@ -17,4 +17,4 @@ Received Signal 11 - Note: Backtrace below might be incomplete and have wrong entries due to optimized runtime - Backtrace: - .*ddtrace\.so.*ddtrace_backtrace_handler.* --[\S\W\D\R]* -+.* -diff --git a/tests/ext/segfault_backtrace_enabled_via_env.phpt b/tests/ext/segfault_backtrace_enabled_via_env.phpt -index f19a831e..a706195e 100644 ---- a/tests/ext/segfault_backtrace_enabled_via_env.phpt -+++ b/tests/ext/segfault_backtrace_enabled_via_env.phpt -@@ -17,4 +17,4 @@ Received Signal 11 - Note: Backtrace below might be incomplete and have wrong entries due to optimized runtime - Backtrace: - .*ddtrace\.so.*ddtrace_backtrace_handler.* --[\S\W\D\R]* -+.* -diff --git a/tests/ext/segfault_backtrace_enabled_via_env_disabled_in_ini.phpt b/tests/ext/segfault_backtrace_enabled_via_env_disabled_in_ini.phpt -index 4384382c..808b4000 100644 ---- a/tests/ext/segfault_backtrace_enabled_via_env_disabled_in_ini.phpt -+++ b/tests/ext/segfault_backtrace_enabled_via_env_disabled_in_ini.phpt -@@ -19,4 +19,4 @@ Received Signal 11 - Note: Backtrace below might be incomplete and have wrong entries due to optimized runtime - Backtrace: - .*ddtrace\.so.*ddtrace_backtrace_handler.* --[\S\W\D\R]* -+.* @@ -7,7 +7,7 @@ For help, check out the documentation at https://docs.datadoghq.com/tracing/lang (c) Datadog 2019 Datadog tracing support => enabled -Version => 0.20.0 +Version => 0.21.0 Directive => Local Value => Master Value ddtrace.disable => Off => Off @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #87 ddtrace version 0.20.0 ] { +Extension [ <persistent> extension #87 ddtrace version 0.21.0 ] { - INI { Entry [ ddtrace.disable <SYSTEM> ] @@ -21,6 +21,8 @@ Extension [ <persistent> extension #87 ddtrace version 0.20.0 ] { - Functions { Function [ <internal:ddtrace> function dd_trace ] { } + Function [ <internal:ddtrace> function dd_trace_forward_call ] { + } Function [ <internal:ddtrace> function dd_trace_reset ] { } Function [ <internal:ddtrace> function dd_trace_noop ] { diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec index 12e1b77..9f8a068 100644 --- a/php-pecl-datadog-trace.spec +++ b/php-pecl-datadog-trace.spec @@ -34,14 +34,12 @@ Summary: APM and distributed tracing for PHP Name: %{?sub_prefix}php-pecl-datadog-trace -Version: 0.20.0 +Version: 0.21.0 Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: MIT URL: http://pecl.php.net/package/%{proj_name} Source0: http://pecl.php.net/get/%{proj_name}-%{version}.tgz -Patch0: https://github.com/DataDog/dd-trace-php/pull/412.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear @@ -101,8 +99,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -b .pr412 - cp src/ext/mpack/LICENSE LICENSE.mpack : Sanity check, really often broken @@ -246,6 +242,10 @@ fi %changelog +* Thu May 2 2019 Remi Collet <remi@remirepo.net> - 0.21.0-1 +- update to 0.21.0 +- drop patch merged upstream + * Fri Apr 26 2019 Remi Collet <remi@remirepo.net> - 0.20.0-1 - update to 0.20.0 - add patch for test suite on 7.3 from |