diff options
| -rw-r--r-- | PHPINFO | 35 | ||||
| -rw-r--r-- | REFLECTION | 150 | ||||
| -rw-r--r-- | php-pecl-datadog-trace.spec | 34 |
3 files changed, 76 insertions, 143 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.99.1 +Version => 1.0.0beta1 DATADOG TRACER CONFIGURATION => { - "date": "2024-04-05T08:53:02Z", - "os_name": "Linux builder.remirepo.net 6.7.11-200.fc39.x86_64 #1 SMP PREEMPT_DYNAMIC Wed Mar 27 16:50:39 UTC 2024 x86_64", - "os_version": "6.7.11-200.fc39.x86_64", - "version": "0.99.1", + "date": "2024-04-17T09:23:00Z", + "os_name": "Linux builder.remirepo.net 6.8.5-201.fc39.x86_64 #1 SMP PREEMPT_DYNAMIC Thu Apr 11 18:25:26 UTC 2024 x86_64", + "os_version": "6.8.5-201.fc39.x86_64", + "version": "1.0.0beta1", "lang": "php", - "lang_version": "8.2.17", + "lang_version": "8.2.18", "env": null, "enabled": true, "service": null, @@ -27,11 +27,10 @@ DATADOG TRACER CONFIGURATION => { "tags": [], "service_mapping": [], "distributed_tracing_enabled": true, - "priority_sampling_enabled": true, "dd_version": null, "architecture": "x86_64", "sapi": "cli", - "datadog.trace.request_init_hook": "\/usr\/share\/pear\/datadog_trace\/bridge\/dd_wrap_autoloader.php", + "datadog.trace.sources_path": "\/usr\/share\/pear\/datadog_trace\/src\/", "open_basedir_configured": false, "uri_fragment_regex": null, "uri_mapping_incoming": null, @@ -42,8 +41,6 @@ DATADOG TRACER CONFIGURATION => { "measure_compile_time": true, "report_hostname_on_root_span": false, "traced_internal_functions": null, - "auto_prepend_file_configured": false, - "integrations_disabled": "default", "enabled_from_env": false, "opcache.file_cache": null, "agent_error": "Failed to connect to localhost port 8126 after 0 ms: Couldn't connect to server" @@ -53,8 +50,8 @@ Directive => Local Value => Master Value ddtrace.disable => 0 => 0 ddtrace.cgroup_file => /proc/self/cgroup => /proc/self/cgroup datadog.trace.sidecar_trace_sender => Off => Off -datadog.trace.request_init_hook => /usr/share/pear/datadog_trace/bridge/dd_wrap_autoloader.php => /usr/share/pear/datadog_trace/bridge/dd_wrap_autoloader.php -ddtrace.request_init_hook => /usr/share/pear/datadog_trace/bridge/dd_wrap_autoloader.php => /usr/share/pear/datadog_trace/bridge/dd_wrap_autoloader.php +datadog.trace.sources_path => /usr/share/pear/datadog_trace/src/ => /usr/share/pear/datadog_trace/src/ +datadog.autoload_no_compile => 0 => 0 datadog.trace.agent_url => no value => no value datadog.agent_host => no value => no value datadog.dogstatsd_url => no value => no value @@ -65,13 +62,9 @@ datadog.env => no value => no value datadog.autofinish_spans => Off => Off datadog.trace.url_as_resource_names_enabled => On => On datadog.http_server_route_based_naming => On => On -datadog.integrations_disabled => default => default -datadog.priority_sampling => On => On datadog.service => no value => no value -datadog.service_name => no value => no value datadog.service_mapping => no value => no value 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 @@ -100,9 +93,8 @@ datadog.trace.http_url_query_param_allowed => * => * datadog.trace.http_post_data_param_allowed => no value => no value datadog.trace.rate_limit => 0 => 0 datadog.trace.sample_rate => -1 => -1 -datadog.sampling_rate => -1 => -1 datadog.trace.sampling_rules => [] => [] -datadog.trace.sampling_rules_format => regex => regex +datadog.trace.sampling_rules_format => glob => glob datadog.span_sampling_rules => [] => [] datadog.span_sampling_rules_file => no value => no value datadog.trace.header_tags => no value => no value @@ -112,9 +104,7 @@ 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 => datadog,tracecontext,B3,B3 single header => datadog,tracecontext,B3,B3 single header -datadog.propagation_style_extract => datadog,tracecontext,B3,B3 single header => datadog,tracecontext,B3,B3 single header datadog.trace.propagation_style_inject => datadog,tracecontext => datadog,tracecontext -datadog.propagation_style_inject => datadog,tracecontext => datadog,tracecontext datadog.trace.propagation_style => datadog,tracecontext => datadog,tracecontext datadog.trace.traced_internal_functions => no value => no value datadog.trace.agent_timeout => 500 => 500 @@ -125,8 +115,6 @@ datadog.trace.generate_root_span => On => On datadog.trace.spans_limit => 1000 => 1000 datadog.trace.128_bit_traceid_generation_enabled => On => On 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 datadog.trace.bgs_timeout => 5000 => 5000 datadog.trace.agent_flush_interval => 5000 => 5000 @@ -153,8 +141,7 @@ datadog.trace.agent_stack_backlog => 12 => 12 datadog.trace.propagate_user_id_default => Off => Off datadog.dbm_propagation_mode => disabled => disabled datadog.trace.wordpress_additional_actions => no value => no value -datadog.trace.wordpress_callbacks => Off => Off -datadog.trace.wordpress_enhanced_integration => Off => Off +datadog.trace.wordpress_callbacks => On => On datadog.trace.otel_enabled => Off => Off datadog.trace.log_file => no value => no value datadog.trace.log_level => error => error @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #102 ddtrace version 0.99.1 ] { +Extension [ <persistent> extension #68 ddtrace version 1.0.0beta1 ] { - Dependencies { Dependency [ json (Required) ] @@ -15,11 +15,11 @@ Extension [ <persistent> extension #102 ddtrace version 0.99.1 ] { Entry [ datadog.trace.sidecar_trace_sender <SYSTEM> ] Current = 'false' } - Entry [ datadog.trace.request_init_hook <SYSTEM> ] - Current = '/usr/share/pear/datadog_trace/bridge/dd_wrap_autoloader.php' + Entry [ datadog.trace.sources_path <SYSTEM> ] + Current = '/usr/share/pear/datadog_trace/src/' } - Entry [ ddtrace.request_init_hook <SYSTEM> ] - Current = '/usr/share/pear/datadog_trace/bridge/dd_wrap_autoloader.php' + Entry [ datadog.autoload_no_compile <SYSTEM> ] + Current = '0' } Entry [ datadog.trace.agent_url <SYSTEM> ] Current = '' @@ -51,27 +51,15 @@ Extension [ <persistent> extension #102 ddtrace version 0.99.1 ] { Entry [ datadog.http_server_route_based_naming <ALL> ] Current = 'true' } - Entry [ datadog.integrations_disabled <ALL> ] - Current = 'default' - } - Entry [ datadog.priority_sampling <ALL> ] - Current = 'true' - } Entry [ datadog.service <ALL> ] Current = '' } - Entry [ datadog.service_name <ALL> ] - Current = '' - } Entry [ datadog.service_mapping <ALL> ] Current = '' } Entry [ datadog.tags <ALL> ] Current = '' } - Entry [ datadog.trace.global_tags <ALL> ] - Current = '' - } Entry [ datadog.trace.agent_port <SYSTEM> ] Current = '0' } @@ -157,14 +145,11 @@ Extension [ <persistent> extension #102 ddtrace version 0.99.1 ] { Entry [ datadog.trace.sample_rate <ALL> ] Current = '-1' } - Entry [ datadog.sampling_rate <ALL> ] - Current = '-1' - } Entry [ datadog.trace.sampling_rules <ALL> ] Current = '[]' } Entry [ datadog.trace.sampling_rules_format <ALL> ] - Current = 'regex' + Current = 'glob' } Entry [ datadog.span_sampling_rules <ALL> ] Current = '[]' @@ -193,15 +178,9 @@ Extension [ <persistent> extension #102 ddtrace version 0.99.1 ] { Entry [ datadog.trace.propagation_style_extract <ALL> ] Current = 'datadog,tracecontext,B3,B3 single header' } - Entry [ datadog.propagation_style_extract <ALL> ] - Current = 'datadog,tracecontext,B3,B3 single header' - } Entry [ datadog.trace.propagation_style_inject <ALL> ] Current = 'datadog,tracecontext' } - Entry [ datadog.propagation_style_inject <ALL> ] - Current = 'datadog,tracecontext' - } Entry [ datadog.trace.propagation_style <ALL> ] Current = 'datadog,tracecontext' } @@ -232,12 +211,6 @@ Extension [ <persistent> extension #102 ddtrace version 0.99.1 ] { Entry [ datadog.trace.128_bit_traceid_logging_enabled <ALL> ] Current = 'false' } - Entry [ datadog.trace.agent_max_consecutive_failures <ALL> ] - Current = '3' - } - Entry [ datadog.trace.agent_attempt_retry_time_msec <ALL> ] - Current = '5000' - } Entry [ datadog.trace.bgs_connect_timeout <SYSTEM> ] Current = '2000' } @@ -317,10 +290,7 @@ Extension [ <persistent> extension #102 ddtrace version 0.99.1 ] { Current = '' } Entry [ datadog.trace.wordpress_callbacks <ALL> ] - Current = 'false' - } - Entry [ datadog.trace.wordpress_enhanced_integration <ALL> ] - Current = 'false' + Current = 'true' } Entry [ datadog.trace.otel_enabled <ALL> ] Current = 'false' @@ -879,13 +849,15 @@ Extension [ <persistent> extension #102 ddtrace version 0.99.1 ] { } } - - Constants [12] { + - Constants [14] { Constant [ string DDTrace\HOOK_ALL_FILES ] { } Constant [ int DDTrace\HOOK_INSTANCE ] { 1 } 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.99.1 } + Constant [ int DDTrace\Internal\SPAN_FLAG_OPENTELEMETRY ] { 1 } + Constant [ int DDTrace\Internal\SPAN_FLAG_OPENTRACING ] { 2 } + Constant [ string DD_TRACE_VERSION ] { 1.0.0beta1 } 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 } @@ -1181,6 +1153,14 @@ Extension [ <persistent> extension #102 ddtrace version 0.99.1 ] { } - Return [ void ] } + Function [ <internal:ddtrace> function DDTrace\Internal\add_span_flag ] { + + - Parameters [2] { + Parameter #0 [ <required> DDTrace\SpanData $span ] + Parameter #1 [ <required> int $flag ] + } + - Return [ void ] + } Function [ <internal:ddtrace> function dd_trace_env_config ] { - Parameters [1] { @@ -1226,30 +1206,6 @@ Extension [ <persistent> extension #102 ddtrace version 0.99.1 ] { } - Return [ bool ] } - Function [ <internal:ddtrace> function dd_tracer_circuit_breaker_register_error ] { - - - Parameters [0] { - } - - Return [ bool ] - } - Function [ <internal:ddtrace> function dd_tracer_circuit_breaker_register_success ] { - - - Parameters [0] { - } - - Return [ bool ] - } - Function [ <internal:ddtrace> function dd_tracer_circuit_breaker_can_try ] { - - - Parameters [0] { - } - - Return [ bool ] - } - Function [ <internal:ddtrace> function dd_tracer_circuit_breaker_info ] { - - - Parameters [0] { - } - - Return [ array ] - } Function [ <internal:ddtrace> function ddtrace_config_app_name ] { - Parameters [1] { @@ -1276,13 +1232,6 @@ Extension [ <persistent> extension #102 ddtrace version 0.99.1 ] { } - Return [ bool ] } - Function [ <internal:ddtrace> function ddtrace_init ] { - - - Parameters [1] { - Parameter #0 [ <required> string $dir ] - } - - Return [ bool ] - } Function [ <internal:ddtrace> function dd_trace_send_traces_via_thread ] { - Parameters [3] { @@ -1387,38 +1336,6 @@ Extension [ <persistent> extension #102 ddtrace version 0.99.1 ] { } - Return [ void ] } - Function [ <internal, deprecated:ddtrace> function dd_trace_forward_call ] { - - - Parameters [0] { - } - - Return [ bool ] - } - Function [ <internal, deprecated:ddtrace> function dd_trace_generate_id ] { - - - Parameters [1] { - Parameter #0 [ <required> string $existingID ] - } - - Return [ string ] - } - Function [ <internal, deprecated:ddtrace> function dd_trace_push_span_id ] { - - - Parameters [1] { - Parameter #0 [ <required> string $existingID ] - } - - Return [ string ] - } - Function [ <internal, deprecated:ddtrace> function dd_trace_pop_span_id ] { - - - Parameters [0] { - } - - Return [ string ] - } - Function [ <internal, deprecated:ddtrace> function additional_trace_meta ] { - - - Parameters [0] { - } - - Return [ array ] - } Function [ <internal:ddtrace> function DDTrace\install_hook ] { - Parameters [4] { @@ -1438,7 +1355,7 @@ Extension [ <persistent> extension #102 ddtrace version 0.99.1 ] { } } - - Classes [7] { + - Classes [8] { Class [ <internal:ddtrace> class DDTrace\HookData ] { - Constants [0] { @@ -1793,6 +1710,33 @@ Extension [ <persistent> extension #102 ddtrace version 0.99.1 ] { } } + Interface [ <internal:ddtrace> interface DDTrace\Integration ] { + + - Constants [3] { + Constant [ public int NOT_LOADED ] { 0 } + Constant [ public int LOADED ] { 1 } + Constant [ public int NOT_AVAILABLE ] { 2 } + } + + - Static properties [0] { + } + + - Static methods [0] { + } + + - Properties [0] { + } + + - Methods [1] { + Method [ <internal:ddtrace> abstract public method init ] { + + - Parameters [0] { + } + - Return [ int ] + } + } + } + Class [ <internal:ddtrace> class DDTrace\SpanLink implements JsonSerializable ] { - Constants [0] { diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec index 4371872..5edaae2 100644 --- a/php-pecl-datadog-trace.spec +++ b/php-pecl-datadog-trace.spec @@ -22,29 +22,31 @@ # and delete root_cache after the build # pecl name -%global proj_name datadog_trace +%global proj_name datadog_trace # no underscore for package name -%global safe_name datadog-trace +%global safe_name datadog-trace # extension name -%global pecl_name ddtrace +%global pecl_name ddtrace -%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%global ini_name 40-%{pecl_name}.ini -%global sources %{proj_name}-%{version} -%global _configure ../%{sources}/configure +%global upstream_version 1.0.0 +%global upstream_prever beta1 +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} +%global ini_name 40-%{pecl_name}.ini +%global sources %{proj_name}-%{upstream_version}%{?upstream_prever} +%global _configure ../%{sources}/configure Summary: APM and distributed tracing for PHP Name: %{?scl_prefix}php-pecl-datadog-trace -Version: 0.99.1 +Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} 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 License: (Apache-2.0 OR BSD-3-Clause) AND MIT AND Apache-2.0 URL: https://pecl.php.net/package/%{proj_name} -Source0: https://pecl.php.net/get/%{proj_name}-%{version}.tgz +Source0: https://pecl.php.net/get/%{sources}.tgz # awfull hack, use a bundled rust registry Source1: makedeps.sh -Source2: %{proj_name}-deps-%{version}.tgz +Source2: %{proj_name}-deps-%{upstream_version}%{?upstream_prever}.tgz # ddtrace only supports 64-bit platforms ExcludeArch: %{ix86} %{arm} @@ -108,9 +110,9 @@ sed -e 's:@php_dir@:%{pear_phpdir}:' \ ext/configuration.h : Sanity check, really often broken -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}. +extver=$(cat VERSION) +if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then + : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}. exit 1 fi cd .. @@ -152,7 +154,6 @@ extension=%{pecl_name}.so ; Configuration ;ddtrace.disable = Off -;ddtrace.request_init_hook = '%{pear_phpdir}/datadog_trace/bridge/dd_wrap_autoloader.php' ;ddtrace.cgroup_file = '/proc/self/cgroup' EOF @@ -200,7 +201,6 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} # PEAR stuff mkdir -p %{buildroot}%{pear_phpdir}/datadog_trace/ -cp -pr %{sources}/bridge %{buildroot}%{pear_phpdir}/datadog_trace/bridge cp -pr %{sources}/src %{buildroot}%{pear_phpdir}/datadog_trace/src # Documentation @@ -286,7 +286,6 @@ fi %doc %{pecl_docdir}/%{pecl_name} %{?_licensedir:%license %{sources}/LICENSE*} %dir %{pear_phpdir}/datadog_trace - %{pear_phpdir}/datadog_trace/bridge %{pear_phpdir}/datadog_trace/src %{pecl_xmldir}/%{name}.xml @@ -300,6 +299,9 @@ fi %changelog +* Wed Apr 17 2024 Remi Collet <remi@remirepo.net> - 1.0.0~beta1-1 +- update to 1.0.0beta1 + * Fri Apr 5 2024 Remi Collet <remi@remirepo.net> - 0.99.1-1 - update to 0.99.1 |