From 10ed17590e85326244ddcfdae86afa04b68f076d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 Nov 2020 09:04:12 +0100 Subject: update to 0.51.0 --- PHPINFO | 4 ++-- REFLECTION | 9 +++++++-- php-pecl-datadog-trace.spec | 36 +++++++++++++++++++++--------------- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/PHPINFO b/PHPINFO index a1bb389..338aa13 100644 --- a/PHPINFO +++ b/PHPINFO @@ -7,8 +7,8 @@ For help, check out the documentation at https://docs.datadoghq.com/tracing/lang (c) Datadog 2020 Datadog tracing support => enabled -Version => 0.49.0 -DATADOG TRACER CONFIGURATION => {"date":"2020-10-15T07:26:43Z","os_name":"Linux builder.remirepo.net 5.8.13-100.fc31.x86_64 #1 SMP Thu Oct 1 21:46:25 UTC 2020 x86_64","os_version":"5.8.13-100.fc31.x86_64","version":"0.49.0","lang":"php","lang_version":"7.3.23","env":null,"enabled":true,"service":null,"enabled_cli":false,"agent_url":"http://localhost:8126","debug":false,"analytics_enabled":false,"sample_rate":1.000000,"sampling_rules":null,"tags":null,"service_mapping":null,"distributed_tracing_enabled":true,"priority_sampling_enabled":true,"dd_version":null,"architecture":"x86_64","sapi":"cli","ddtrace.request_init_hook":"/usr/share/pear/datadog_trace/bridge/dd_wrap_autoloader.php","open_basedir_configured":false,"uri_fragment_regex":null,"uri_mapping_incoming":null,"uri_mapping_outgoing":null,"auto_flush_enabled":false,"generate_root_span":true,"http_client_split_by_domain":false,"measure_compile_time":true,"report_hostname_on_root_span":false,"traced_internal_functions":null,"auto_prepend_file_configured":false,"integrations_disabled":null,"enabled_from_env":true,"opcache.file_cache":null,"agent_error":"Failed to connect to localhost port 8126: Connection refused"} +Version => 0.51.0 +DATADOG TRACER CONFIGURATION => {"date":"2020-11-18T07:33:24Z","os_name":"Linux builder.remirepo.net 5.9.8-200.fc33.x86_64 #1 SMP Tue Nov 10 21:58:19 UTC 2020 x86_64","os_version":"5.9.8-200.fc33.x86_64","version":"0.51.0","lang":"php","lang_version":"7.4.12","env":null,"enabled":true,"service":null,"enabled_cli":false,"agent_url":"http://localhost:8126","debug":false,"analytics_enabled":false,"sample_rate":1.000000,"sampling_rules":null,"tags":null,"service_mapping":null,"distributed_tracing_enabled":true,"priority_sampling_enabled":true,"dd_version":null,"architecture":"x86_64","sapi":"cli","ddtrace.request_init_hook":"/usr/share/pear/datadog_trace/bridge/dd_wrap_autoloader.php","open_basedir_configured":false,"uri_fragment_regex":null,"uri_mapping_incoming":null,"uri_mapping_outgoing":null,"auto_flush_enabled":false,"generate_root_span":true,"http_client_split_by_domain":false,"measure_compile_time":true,"report_hostname_on_root_span":false,"traced_internal_functions":null,"auto_prepend_file_configured":false,"integrations_disabled":null,"enabled_from_env":true,"opcache.file_cache":null,"agent_error":"Failed to connect to localhost port 8126: Connection refused"} Diagnostics agent_error => Failed to connect to localhost port 8126: Connection refused diff --git a/REFLECTION b/REFLECTION index 324a211..f9f9fa9 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #116 ddtrace version 0.49.0 ] { +Extension [ extension #117 ddtrace version 0.51.0 ] { - INI { Entry [ ddtrace.disable ] @@ -10,7 +10,7 @@ Extension [ extension #116 ddtrace version 0.49.0 ] { } - Constants [1] { - Constant [ string DD_TRACE_VERSION ] { 0.49.0 } + Constant [ string DD_TRACE_VERSION ] { 0.51.0 } } - Functions { @@ -192,6 +192,11 @@ Extension [ extension #116 ddtrace version 0.49.0 ] { Parameter #0 [ $dir ] } } + Function [ function DDTrace\additional_trace_meta ] { + + - Parameters [0] { + } + } Function [ function DDTrace\trace_function ] { - Parameters [2] { diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec index 8c81ce1..6b1ed39 100644 --- a/php-pecl-datadog-trace.spec +++ b/php-pecl-datadog-trace.spec @@ -26,7 +26,7 @@ Summary: APM and distributed tracing for PHP Name: %{?sub_prefix}php-pecl-datadog-trace -Version: 0.49.0 +Version: 0.51.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. # mpack is MIT @@ -37,11 +37,20 @@ Source0: https://pecl.php.net/get/%{proj_name}-%{version}.tgz # ddtrace only supports 64-bit platforms ExcludeArch: %{ix86} %{arm} -%if 0%{?rhel} == 6 +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 +%if 0%{?dtsversion} == 0 BuildRequires: devtoolset-6-toolchain +%global dtsversion 6 +%if 0%{?rhel} == 6 +BuildRequires: autoconf268 +%global dtsenable export PHP_AUTOCONF=autoconf268; export PHP_AUTOHEADER=autoheader268; source /opt/rh/devtoolset-6/enable %else -BuildRequires: %{?dtsprefix}gcc +%global dtsenable source /opt/rh/devtoolset-6/enable +%endif +%global dtsprefix devtoolset-6- %endif +%endif +BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 5.4 BuildRequires: %{?scl_prefix}php-pear BuildRequires: curl-devel @@ -68,9 +77,6 @@ Provides: %{?scl_prefix}php-pecl-%{safe_name}%{?_isa} = %{version}-%{rele %if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -%if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-%{safe_name} <= %{version} -%endif %if "%{php_version}" > "7.3" Obsoletes: php73-pecl-%{safe_name} <= %{version} %endif @@ -108,11 +114,11 @@ cd NTS : PEAR installer stuff sed -e 's:@php_dir@:%{pear_phpdir}:' \ -e 's:_BUILD_FROM_PECL_:1:' \ - -i src/ext/ddtrace.c + -i ext/php?/ddtrace.c -cp src/ext/mpack/LICENSE LICENSE.mpack +cp ext/vendor/mpack/LICENSE LICENSE.mpack : Sanity check, really often broken -extver=$(sed -n '/#define PHP_DDTRACE_VERSION /{s/.* "//;s/".*$//;p}' src/ext/version.h) +extver=$(sed -n '/#define PHP_DDTRACE_VERSION /{s/.* "//;s/".*$//;p}' ext/version.h) if test "x${extver}" != "x%{version}"; then : Error: Upstream extension version is ${extver}, expecting %{version}. exit 1 @@ -136,9 +142,6 @@ EOF %build -%if 0%{?rhel} == 6 -source /opt/rh/devtoolset-6/enable -%endif %{?dtsenable} cd NTS @@ -159,9 +162,6 @@ make %{?_smp_mflags} %install -%if 0%{?rhel} == 6 -source /opt/rh/devtoolset-6/enable -%endif %{?dtsenable} make -C NTS install INSTALL_ROOT=%{buildroot} @@ -265,6 +265,12 @@ fi %changelog +* Wed Nov 18 2020 Remi Collet - 0.51.0-1 +- update to 0.51.0 + +* Fri Nov 6 2020 Remi Collet - 0.50.0-1 +- update to 0.50.0 + * Thu Oct 15 2020 Remi Collet - 0.49.0-1 - update to 0.49.0 - allow PHP 5.4 and 5.5 -- cgit