diff options
| -rw-r--r-- | PHPINFO | 25 | ||||
| -rw-r--r-- | REFLECTION | 50 | ||||
| -rw-r--r-- | php-pecl-datadog-trace.spec | 46 |
3 files changed, 87 insertions, 34 deletions
@@ -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.89.0 +Version => 0.90.0 DATADOG TRACER CONFIGURATION => { - "date": "2023-07-04T06:22:32Z", - "os_name": "Linux builder.remirepo.net 6.3.8-100.fc37.x86_64 #1 SMP PREEMPT_DYNAMIC Thu Jun 15 01:51:54 UTC 2023 x86_64", - "os_version": "6.3.8-100.fc37.x86_64", - "version": "0.89.0", + "date": "2023-07-17T12:14:12Z", + "os_name": "Linux builder.remirepo.net 6.3.12-100.fc37.x86_64 #1 SMP PREEMPT_DYNAMIC Wed Jul 5 20:09:58 UTC 2023 x86_64", + "os_version": "6.3.12-100.fc37.x86_64", + "version": "0.90.0", "lang": "php", - "lang_version": "8.1.20", + "lang_version": "8.1.21", "env": null, "enabled": true, "service": null, @@ -72,12 +72,13 @@ datadog.tags => no value => no value datadog.trace.global_tags => no value => no value datadog.trace.agent_port => 0 => 0 datadog.trace.analytics_enabled => Off => Off +datadog.trace.append_trace_ids_to_logs => Off => Off datadog.trace.auto_flush_enabled => Off => Off datadog.trace.cli_enabled => Off => Off datadog.trace.measure_compile_time => On => On datadog.trace.debug => Off => Off datadog.trace.enabled => Off => On -datadog.trace.telemetry_enabled => Off => Off +datadog.instrumentation_telemetry_enabled => On => On datadog.trace.health_metrics_enabled => Off => Off datadog.trace.health_metrics_heartbeat_sample_rate => 0.001 => 0.001 datadog.trace.db_client_split_by_instance => Off => Off @@ -102,6 +103,9 @@ datadog.span_sampling_rules => [] => [] datadog.span_sampling_rules_file => no value => no value datadog.trace.header_tags => no value => no value datadog.trace.x_datadog_tags_max_length => 512 => 512 +datadog.trace.peer_service_mapping => no value => no value +datadog.trace.peer_service_defaults_enabled => Off => Off +datadog.trace.remove_integration_service_names_enabled => Off => Off datadog.trace.propagate_service => Off => Off datadog.trace.propagation_style_extract => tracecontext,Datadog,B3,B3 single header => tracecontext,Datadog,B3,B3 single header datadog.propagation_style_extract => tracecontext,Datadog,B3,B3 single header => tracecontext,Datadog,B3,B3 single header @@ -116,6 +120,7 @@ datadog.log_backtrace => Off => Off datadog.trace.generate_root_span => On => On datadog.trace.spans_limit => 1000 => 1000 datadog.trace.128_bit_traceid_generation_enabled => Off => Off +datadog.trace.128_bit_traceid_logging_enabled => Off => Off datadog.trace.agent_max_consecutive_failures => 3 => 3 datadog.trace.agent_attempt_retry_time_msec => 5000 => 5000 datadog.trace.bgs_connect_timeout => 2000 => 2000 @@ -190,6 +195,12 @@ datadog.trace.laravelqueue_analytics_enabled => Off => Off datadog.laravelqueue_analytics_enabled => Off => Off datadog.trace.laravelqueue_analytics_sample_rate => 1 => 1 datadog.laravelqueue_analytics_sample_rate => 1 => 1 +datadog.trace.logs_enabled => On => On +datadog.logs_injection => On => On +datadog.trace.logs_analytics_enabled => Off => Off +datadog.logs_analytics_enabled => Off => Off +datadog.trace.logs_analytics_sample_rate => 1 => 1 +datadog.logs_analytics_sample_rate => 1 => 1 datadog.trace.lumen_enabled => On => On datadog.trace.lumen_analytics_enabled => Off => Off datadog.lumen_analytics_enabled => Off => Off @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #123 ddtrace version 0.89.0 ] { +Extension [ <persistent> extension #124 ddtrace version 0.90.0 ] { - Dependencies { Dependency [ json (Required) ] @@ -72,6 +72,9 @@ Extension [ <persistent> extension #123 ddtrace version 0.89.0 ] { Entry [ datadog.trace.analytics_enabled <ALL> ] Current = 'false' } + Entry [ datadog.trace.append_trace_ids_to_logs <ALL> ] + Current = 'false' + } Entry [ datadog.trace.auto_flush_enabled <ALL> ] Current = 'false' } @@ -88,8 +91,8 @@ Extension [ <persistent> extension #123 ddtrace version 0.89.0 ] { Current = '0' Default = 'true' } - Entry [ datadog.trace.telemetry_enabled <SYSTEM> ] - Current = 'false' + Entry [ datadog.instrumentation_telemetry_enabled <SYSTEM> ] + Current = 'true' } Entry [ datadog.trace.health_metrics_enabled <SYSTEM> ] Current = 'false' @@ -163,6 +166,15 @@ Extension [ <persistent> extension #123 ddtrace version 0.89.0 ] { Entry [ datadog.trace.x_datadog_tags_max_length <ALL> ] Current = '512' } + Entry [ datadog.trace.peer_service_mapping <ALL> ] + Current = '' + } + Entry [ datadog.trace.peer_service_defaults_enabled <ALL> ] + Current = 'false' + } + Entry [ datadog.trace.remove_integration_service_names_enabled <ALL> ] + Current = 'false' + } Entry [ datadog.trace.propagate_service <ALL> ] Current = 'false' } @@ -205,6 +217,9 @@ Extension [ <persistent> extension #123 ddtrace version 0.89.0 ] { Entry [ datadog.trace.128_bit_traceid_generation_enabled <ALL> ] Current = 'false' } + Entry [ datadog.trace.128_bit_traceid_logging_enabled <ALL> ] + Current = 'false' + } Entry [ datadog.trace.agent_max_consecutive_failures <ALL> ] Current = '3' } @@ -427,6 +442,24 @@ Extension [ <persistent> extension #123 ddtrace version 0.89.0 ] { Entry [ datadog.laravelqueue_analytics_sample_rate <ALL> ] Current = '1' } + Entry [ datadog.trace.logs_enabled <ALL> ] + Current = 'true' + } + Entry [ datadog.logs_injection <ALL> ] + Current = 'true' + } + Entry [ datadog.trace.logs_analytics_enabled <ALL> ] + Current = '0' + } + Entry [ datadog.logs_analytics_enabled <ALL> ] + Current = '0' + } + Entry [ datadog.trace.logs_analytics_sample_rate <ALL> ] + Current = '1' + } + Entry [ datadog.logs_analytics_sample_rate <ALL> ] + Current = '1' + } Entry [ datadog.trace.lumen_enabled <ALL> ] Current = 'true' } @@ -735,7 +768,7 @@ Extension [ <persistent> extension #123 ddtrace version 0.89.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.89.0 } + Constant [ string DD_TRACE_VERSION ] { 0.90.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 } @@ -925,6 +958,12 @@ Extension [ <persistent> extension #123 ddtrace version 0.89.0 ] { } - Return [ string ] } + Function [ <internal:ddtrace> function DDTrace\logs_correlation_trace_id ] { + + - Parameters [0] { + } + - Return [ string ] + } Function [ <internal:ddtrace> function DDTrace\current_context ] { - Parameters [0] { @@ -1316,7 +1355,7 @@ Extension [ <persistent> extension #123 ddtrace version 0.89.0 ] { - Static methods [0] { } - - Properties [11] { + - Properties [12] { Property [ public ?string $name = '' ] Property [ public ?string $resource = '' ] Property [ public ?string $service = '' ] @@ -1326,6 +1365,7 @@ Extension [ <persistent> extension #123 ddtrace version 0.89.0 ] { Property [ public ?Throwable $exception = NULL ] Property [ public readonly string $id = '' ] Property [ public array $links = [] ] + Property [ public array $peerServiceSources = [] ] Property [ public readonly ?DDTrace\SpanData $parent = NULL ] Property [ public readonly DDTrace\SpanStack $stack ] } diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec index 3bc57b4..28b95ce 100644 --- a/php-pecl-datadog-trace.spec +++ b/php-pecl-datadog-trace.spec @@ -22,12 +22,14 @@ %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global ini_name 40-%{pecl_name}.ini +%global sources %{proj_name}-%{version} +%global _configure ../%{sources}/configure %bcond_without tests Summary: APM and distributed tracing for PHP Name: %{?scl_prefix}php-pecl-datadog-trace -Version: 0.89.0 +Version: 0.90.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 @@ -86,14 +88,13 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -c -a2 -mv %{proj_name}-%{version} NTS # Don't install tests sed -e 's/role="test"/role="src"/' \ %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ -i package.xml -cd NTS +cd %{sources} : PEAR installer stuff sed -e 's:@php_dir@:%{pear_phpdir}:' \ -e 's:_BUILD_FROM_PECL_:1:' \ @@ -127,17 +128,14 @@ replace-with = "vendored-sources" [source.vendored-sources] directory = "$(dirname $PWD)/mycargo" EOF - -: Parallel build -sed -e 's/(DDTRACE_CARGO) build /(DDTRACE_CARGO) build %{?_smp_mflags}/' -i config.m4 cd .. : Required rust version grep -h rust-version mycargo/*/Cargo.toml | sort -u | tail -n 8 +mkdir NTS %if %{with_zts} -# Duplicate source tree for NTS / ZTS build -cp -pr NTS ZTS +mkdir ZTS %endif # Create configuration file @@ -158,8 +156,10 @@ EOF source /opt/%{scl_vendor}/%{scl}/enable %endif -cd NTS +cd %{sources} %{__phpize} + +cd ../NTS %configure \ --enable-ddtrace \ --with-php-config=%{__phpconfig} @@ -167,7 +167,6 @@ make %{?_smp_mflags} %if %{with_zts} cd ../ZTS -%{__ztsphpize} %configure \ --enable-ddtrace \ --with-php-config=%{__ztsphpconfig} @@ -193,28 +192,29 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif # PEAR stuff -mkdir -p %{buildroot}%{pear_phpdir}/datadog_trace/ -cp -pr NTS/bridge %{buildroot}%{pear_phpdir}/datadog_trace/bridge +mkdir -p %{buildroot}%{pear_phpdir}/datadog_trace/ +cp -pr %{sources}/bridge %{buildroot}%{pear_phpdir}/datadog_trace/bridge # Documentation for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i +do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done %check +cd %{sources} export DD_TRACE_CLI_ENABLED=1 # Erratic results -rm ?TS/tests/ext/segfault_backtrace_*.phpt -rm ?TS/tests/ext/sandbox/memory_limit_graceful_bailout.phpt +rm tests/ext/segfault_backtrace_*.phpt +rm tests/ext/sandbox/memory_limit_graceful_bailout.phpt %if "%{php_version}" > "8.0" -rm ?TS/tests/ext/sandbox/fatal_errors_are_tracked_005.phpt +rm tests/ext/sandbox/fatal_errors_are_tracked_005.phpt %endif # XFAIL -find ?TS/tests/ -type f -exec grep -q -- '--XFAIL--' {} \; -delete -print +find tests/ -type f -exec grep -q -- '--XFAIL--' {} \; -delete -print # https://github.com/DataDog/dd-trace-php/issues/2115 -rm -r ?TS/tests/ext/telemetry +rm -r tests/ext/telemetry # DEP for ext dependencies, MOD for ext used in tests DEP="" @@ -227,7 +227,6 @@ MOD="-n -d ddtrace.request_init_hook=" [ -f %{php_extdir}/json.so ] && DEP="$DEP -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 $DEP \ --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ @@ -236,13 +235,12 @@ cd NTS %if %{with tests} : Upstream test suite for NTS extension TEST_PHP_EXECUTABLE=%{_bindir}/php \ -TEST_PHP_ARGS="$DEP $MOD -d extension=$PWD/modules/%{pecl_name}.so" \ +TEST_PHP_ARGS="$DEP $MOD -d extension=$PWD/../NTS/modules/%{pecl_name}.so" \ REPORT_EXIT_STATUS=1 \ %{_bindir}/php -n run-tests.php -q --show-diff %endif %if %{with_zts} -cd ../ZTS : Minimal load test for ZTS extension %{__ztsphp} --no-php-ini $DEP \ --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ @@ -272,7 +270,7 @@ fi %files %doc %{pecl_docdir}/%{pecl_name} -%{?_licensedir:%license NTS/LICENSE*} +%{?_licensedir:%license %{sources}/LICENSE*} %dir %{pear_phpdir}/datadog_trace %{pear_phpdir}/datadog_trace/bridge @@ -287,6 +285,10 @@ fi %changelog +* Mon Jul 17 2023 Remi Collet <remi@remirepo.net> - 0.90.0-1 +- update to 0.90.0 +- build out of sources tree + * Tue Jul 4 2023 Remi Collet <remi@remirepo.net> - 0.89.0-1 - update to 0.89.0 |