summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PHPINFO4
-rw-r--r--REFLECTION144
-rw-r--r--php-pecl-datadog-trace.spec94
3 files changed, 208 insertions, 34 deletions
diff --git a/PHPINFO b/PHPINFO
index c92f67b..d902642 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.48.2
-DATADOG TRACER CONFIGURATION => {"date":"2020-09-11T05:32:23Z","os_name":"Linux builder.remirepo.net 5.7.15-100.fc31.x86_64 #1 SMP Tue Aug 11 17:18:01 UTC 2020 x86_64","os_version":"5.7.15-100.fc31.x86_64","version":"0.48.2","lang":"php","lang_version":"7.3.22","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.56.0
+DATADOG TRACER CONFIGURATION => {"date":"2021-03-05T05:57:37Z","os_name":"Linux builder.remirepo.net 5.10.19-200.fc33.x86_64 #1 SMP Fri Feb 26 16:21:30 UTC 2021 x86_64","os_version":"5.10.19-200.fc33.x86_64","version":"0.56.0","lang":"php","lang_version":"7.4.16","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 65b38e8..4c01e2a 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #117 ddtrace version 0.48.2 ] {
+Extension [ <persistent> extension #119 ddtrace version 0.56.0 ] {
- INI {
Entry [ ddtrace.disable <SYSTEM> ]
@@ -10,11 +10,17 @@ Extension [ <persistent> extension #117 ddtrace version 0.48.2 ] {
}
- Constants [1] {
- Constant [ string DD_TRACE_VERSION ] { 0.48.2 }
+ Constant [ string DD_TRACE_VERSION ] { 0.56.0 }
}
- Functions {
Function [ <internal:ddtrace> function dd_trace ] {
+
+ - Parameters [3] {
+ Parameter #0 [ <required> $class_or_function_name ]
+ Parameter #1 [ <required> $method_name_or_tracing_closure ]
+ Parameter #2 [ <optional> $tracing_closure ]
+ }
}
Function [ <internal:ddtrace> function dd_trace_buffer_span ] {
@@ -23,14 +29,29 @@ Extension [ <persistent> extension #117 ddtrace version 0.48.2 ] {
}
}
Function [ <internal:ddtrace> function dd_trace_check_memory_under_limit ] {
+
+ - Parameters [0] {
+ }
}
Function [ <internal:ddtrace> function dd_trace_closed_spans_count ] {
+
+ - Parameters [0] {
+ }
}
Function [ <internal:ddtrace> function dd_trace_coms_trigger_writer_flush ] {
+
+ - Parameters [0] {
+ }
}
Function [ <internal:ddtrace> function dd_trace_dd_get_memory_limit ] {
+
+ - Parameters [0] {
+ }
}
Function [ <internal:ddtrace> function dd_trace_disable_in_request ] {
+
+ - Parameters [0] {
+ }
}
Function [ <internal:ddtrace> function dd_trace_env_config ] {
@@ -39,16 +60,42 @@ Extension [ <persistent> extension #117 ddtrace version 0.48.2 ] {
}
}
Function [ <internal:ddtrace> function dd_trace_forward_call ] {
+
+ - Parameters [0] {
+ }
}
Function [ <internal:ddtrace> function dd_trace_generate_id ] {
+
+ - Parameters [1] {
+ Parameter #0 [ <optional> $existing_id ]
+ }
}
Function [ <internal:ddtrace> function dd_trace_internal_fn ] {
+
+ - Parameters [2] {
+ Parameter #0 [ <required> $function_name ]
+ Parameter #1 [ <optional> ...$vars ]
+ }
}
Function [ <internal:ddtrace> function dd_trace_noop ] {
+
+ - Parameters [0] {
+ }
}
Function [ <internal:ddtrace> function dd_trace_peek_span_id ] {
+
+ - Parameters [0] {
+ }
}
Function [ <internal:ddtrace> function dd_trace_pop_span_id ] {
+
+ - Parameters [0] {
+ }
+ }
+ Function [ <internal:ddtrace> function DDTrace\trace_id ] {
+
+ - Parameters [0] {
+ }
}
Function [ <internal:ddtrace> function dd_trace_push_span_id ] {
@@ -57,6 +104,9 @@ Extension [ <persistent> extension #117 ddtrace version 0.48.2 ] {
}
}
Function [ <internal:ddtrace> function dd_trace_reset ] {
+
+ - Parameters [0] {
+ }
}
Function [ <internal:ddtrace> function dd_trace_send_traces_via_thread ] {
@@ -84,16 +134,35 @@ Extension [ <persistent> extension #117 ddtrace version 0.48.2 ] {
}
}
Function [ <internal:ddtrace> function dd_trace_tracer_is_limited ] {
+
+ - Parameters [0] {
+ }
}
Function [ <internal:ddtrace> function dd_tracer_circuit_breaker_can_try ] {
+
+ - Parameters [0] {
+ }
}
Function [ <internal:ddtrace> function dd_tracer_circuit_breaker_info ] {
+
+ - Parameters [0] {
+ }
}
Function [ <internal:ddtrace> function dd_tracer_circuit_breaker_register_error ] {
+
+ - Parameters [0] {
+ }
}
Function [ <internal:ddtrace> function dd_tracer_circuit_breaker_register_success ] {
+
+ - Parameters [0] {
+ }
}
Function [ <internal:ddtrace> function dd_untrace ] {
+
+ - Parameters [1] {
+ Parameter #0 [ <required> $function_name ]
+ }
}
Function [ <internal:ddtrace> function dd_trace_compile_time_microseconds ] {
@@ -128,6 +197,11 @@ Extension [ <persistent> extension #117 ddtrace version 0.48.2 ] {
Parameter #0 [ <required> $dir ]
}
}
+ Function [ <internal:ddtrace> function DDTrace\additional_trace_meta ] {
+
+ - Parameters [0] {
+ }
+ }
Function [ <internal:ddtrace> function DDTrace\trace_function ] {
- Parameters [2] {
@@ -192,9 +266,16 @@ Extension [ <persistent> extension #117 ddtrace version 0.48.2 ] {
Parameter #0 [ <required> $integration_name ]
}
}
+ Function [ <internal:ddtrace> function DDTrace\Testing\trigger_error ] {
+
+ - Parameters [2] {
+ Parameter #0 [ <required> $level ]
+ Parameter #1 [ <required> $message ]
+ }
+ }
}
- - Classes [1] {
+ - Classes [2] {
Class [ <internal:ddtrace> class DDTrace\SpanData ] {
- Constants [0] {
@@ -218,6 +299,63 @@ Extension [ <persistent> extension #117 ddtrace version 0.48.2 ] {
- Methods [0] {
}
}
+
+ Class [ <internal:ddtrace> class DDTrace\FatalError extends Exception implements Throwable ] {
+
+ - Constants [0] {
+ }
+
+ - Static properties [0] {
+ }
+
+ - Static methods [0] {
+ }
+
+ - Properties [4] {
+ Property [ <default> protected $message ]
+ Property [ <default> protected $code ]
+ Property [ <default> protected $file ]
+ Property [ <default> protected $line ]
+ }
+
+ - Methods [10] {
+ Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
+
+ - Parameters [3] {
+ Parameter #0 [ <optional> $message ]
+ Parameter #1 [ <optional> $code ]
+ Parameter #2 [ <optional> $previous ]
+ }
+ }
+
+ Method [ <internal:Core, inherits Exception> public method __wakeup ] {
+ }
+
+ Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
+ }
+
+ Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
+ }
+
+ Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
+ }
+
+ Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
+ }
+
+ Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
+ }
+
+ Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
+ }
+
+ Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
+ }
+
+ Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
+ }
+ }
+ }
}
}
diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec
index 3118678..ac727b2 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-2020 Remi Collet
+# Copyright (c) 2019-2021 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -26,7 +26,7 @@
Summary: APM and distributed tracing for PHP
Name: %{?sub_prefix}php-pecl-datadog-trace
-Version: 0.48.2
+Version: 0.56.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,12 +37,15 @@ 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} == 7 && 0%{?dtsversion} == 0
BuildRequires: devtoolset-6-toolchain
-%else
-BuildRequires: %{?dtsprefix}gcc
+%global dtsversion 6
+%global dtsenable source /opt/rh/devtoolset-6/enable
+%global dtsprefix devtoolset-6-
%endif
-BuildRequires: %{?scl_prefix}php-devel > 5.6
+BuildRequires: make
+BuildRequires: %{?dtsprefix}gcc
+BuildRequires: %{?scl_prefix}php-devel >= 5.4
BuildRequires: %{?scl_prefix}php-pear
BuildRequires: curl-devel
# For tests
@@ -56,6 +59,9 @@ BuildRequires: %{?scl_prefix}php-posix
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
+%if "%{php_version}" > "8.0"
+Requires: %{?scl_prefix}php-curl%{?_isa}
+%endif
Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
@@ -68,21 +74,15 @@ 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
%if "%{php_version}" > "7.4"
Obsoletes: php74-pecl-%{safe_name} <= %{version}
%endif
+%if "%{php_version}" > "8.0"
+Obsoletes: php80-pecl-%{safe_name} <= %{version}
%endif
-
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter shared private
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
%endif
@@ -105,11 +105,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
@@ -133,9 +133,6 @@ EOF
%build
-%if 0%{?rhel} == 6
-source /opt/rh/devtoolset-6/enable
-%endif
%{?dtsenable}
cd NTS
@@ -156,9 +153,6 @@ make %{?_smp_mflags}
%install
-%if 0%{?rhel} == 6
-source /opt/rh/devtoolset-6/enable
-%endif
%{?dtsenable}
make -C NTS install INSTALL_ROOT=%{buildroot}
@@ -189,34 +183,46 @@ done
# Erratic results
rm ?TS/tests/ext/segfault_backtrace_*.phpt
rm ?TS/tests/ext/sandbox/memory_limit_graceful_bailout.phpt
+%if "%{php_version}" > "8.0"
+rm ?TS/tests/ext/sandbox/fatal_errors_are_tracked_005.phpt
+%endif
+# XFAIL
+rm ?TS/tests/ext/sandbox/hook_function/01.phpt
+rm ?TS/tests/ext/sandbox/hook_method/01.phpt
+# DEP for ext dependencies, MOD for ext used in tests
+DEP=""
MOD="-n -d ddtrace.request_init_hook="
+%if "%{php_version}" > "8.0"
+[ -f %{php_extdir}/curl.so ] && DEP="$DEP -d extension=curl.so"
+%else
[ -f %{php_extdir}/curl.so ] && MOD="$MOD -d extension=curl.so"
+%endif
[ -f %{php_extdir}/json.so ] && MOD="$MOD -d extension=json.so"
[ -f %{php_extdir}/posix.so ] && MOD="$MOD -d extension=posix.so"
cd NTS
: Minimal load test for NTS extension
-%{__php} --no-php-ini \
+%{__php} --no-php-ini $DEP \
--define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
- --modules | grep -i %{pecl_name}
+ --modules | grep -i '^%{pecl_name}$'
: Upstream test suite for NTS extension
TEST_PHP_EXECUTABLE=%{_bindir}/php \
-TEST_PHP_ARGS="$MOD -d extension=$PWD/modules/%{pecl_name}.so" \
+TEST_PHP_ARGS="$DEP $MOD -d extension=$PWD/modules/%{pecl_name}.so" \
REPORT_EXIT_STATUS=1 \
%{_bindir}/php -n run-tests.php -q --show-diff
%if %{with_zts}
cd ../ZTS
: Minimal load test for ZTS extension
-%{__ztsphp} --no-php-ini \
+%{__ztsphp} --no-php-ini $DEP \
--define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
- --modules | grep -i %{pecl_name}
+ --modules | grep -i '^%{pecl_name}$'
: Upstream test suite for ZTS extension
TEST_PHP_EXECUTABLE=%{__ztsphp} \
-TEST_PHP_ARGS="$MOD -d extension=$PWD/modules/%{pecl_name}.so" \
+TEST_PHP_ARGS="$DEP $MOD -d extension=$PWD/modules/%{pecl_name}.so" \
REPORT_EXIT_STATUS=1 \
%{__ztsphp} -n run-tests.php -q --show-diff
%endif
@@ -259,6 +265,36 @@ fi
%changelog
+* Fri Mar 5 2021 Remi Collet <remi@remirepo.net> - 0.56.0-1
+- update to 0.56.0
+
+* Fri Feb 5 2021 Remi Collet <remi@remirepo.net> - 0.55.0-1
+- update to 0.55.0
+- open https://github.com/DataDog/dd-trace-php/pull/1144
+ add missing dependency on curl extension for PHP 8
+
+* Thu Jan 21 2021 Remi Collet <remi@remirepo.net> - 0.54.0-1
+- update to 0.54.0
+
+* Thu Dec 31 2020 Remi Collet <remi@remirepo.net> - 0.53.0-1
+- update to 0.53.0
+
+* Tue Dec 1 2020 Remi Collet <remi@remirepo.net> - 0.52.0-1
+- update to 0.52.0
+
+* Wed Nov 18 2020 Remi Collet <remi@remirepo.net> - 0.51.0-1
+- update to 0.51.0
+
+* Fri Nov 6 2020 Remi Collet <remi@remirepo.net> - 0.50.0-1
+- update to 0.50.0
+
+* Thu Oct 15 2020 Remi Collet <remi@remirepo.net> - 0.49.0-1
+- update to 0.49.0
+- allow PHP 5.4 and 5.5
+
+* Tue Sep 22 2020 Remi Collet <remi@remirepo.net> - 0.48.3-1
+- update to 0.48.3
+
* Fri Sep 11 2020 Remi Collet <remi@remirepo.net> - 0.48.2-1
- update to 0.48.2