From 5d140cd4735a3a0e30b9f3c99bfde902cb0b4097 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 11 Jul 2022 07:25:50 +0200 Subject: update to 0.76.0 drop PHP 5 support --- PHPINFO | 11 +++++-- REFLECTION | 78 ++++++++++++++++++++++++++++++++++++++++++--- php-pecl-datadog-trace.spec | 8 +++-- 3 files changed, 87 insertions(+), 10 deletions(-) diff --git a/PHPINFO b/PHPINFO index f4a2b14..cbf1190 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 => disabled -Version => 0.75.0 -DATADOG TRACER CONFIGURATION => {"date":"2022-06-13T05:00:43Z","os_name":"Linux builder.remirepo.net 5.17.13-200.fc35.x86_64 #1 SMP PREEMPT Mon Jun 6 14:38:57 UTC 2022 x86_64","os_version":"5.17.13-200.fc35.x86_64","version":"0.75.0","lang":"php","lang_version":"8.0.20","env":null,"enabled":true,"service":null,"enabled_cli":false,"agent_url":"http:\/\/localhost:8126","debug":false,"analytics_enabled":false,"sample_rate":1,"sampling_rules":[],"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","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":"default","enabled_from_env":false,"opcache.file_cache":null,"agent_error":"Failed to connect to localhost port 8126 after 0 ms: Connexion refus\u00e9e"} +Version => 0.76.0 +DATADOG TRACER CONFIGURATION => {"date":"2022-07-11T04:57:48Z","os_name":"Linux builder.remirepo.net 5.18.9-100.fc35.x86_64 #1 SMP PREEMPT_DYNAMIC Sat Jul 2 15:57:56 UTC 2022 x86_64","os_version":"5.18.9-100.fc35.x86_64","version":"0.76.0","lang":"php","lang_version":"8.0.21","env":null,"enabled":true,"service":null,"enabled_cli":false,"agent_url":"http:\/\/localhost:8126","debug":false,"analytics_enabled":false,"sample_rate":1,"sampling_rules":[],"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","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":"default","enabled_from_env":false,"opcache.file_cache":null,"agent_error":"Failed to connect to localhost port 8126 after 0 ms: Connexion refus\u00e9e"} Directive => Local Value => Master Value ddtrace.disable => Off => Off @@ -48,13 +48,15 @@ datadog.trace.resource_uri_fragment_regex => no value => no value datadog.trace.resource_uri_mapping_incoming => no value => no value datadog.trace.resource_uri_mapping_outgoing => no value => no value datadog.trace.resource_uri_query_param_allowed => no value => no value -datadog.trace.http_url_query_param_allowed => no value => no value +datadog.trace.http_url_query_param_allowed => * => * datadog.trace.sample_rate => 1 => 1 datadog.sampling_rate => 1 => 1 datadog.trace.sampling_rules => [] => [] datadog.trace.header_tags => no value => no value datadog.trace.x_datadog_tags_max_length => 512 => 512 datadog.trace.propagate_service => Off => Off +datadog.propagation_style_extract => Datadog,B3,B3 single header => Datadog,B3,B3 single header +datadog.propagation_style_inject => Datadog => Datadog datadog.trace.traced_internal_functions => no value => no value datadog.trace.agent_timeout => 500 => 500 datadog.trace.agent_connect_timeout => 100 => 100 @@ -76,6 +78,9 @@ datadog.trace.beta_high_memory_pressure_percent => 80 => 80 datadog.trace.warn_legacy_dd_trace => On => On datadog.trace.retain_thread_capabilities => Off => Off datadog.version => no value => no value +datadog.trace.obfuscation_query_string_regexp => (?i)(?:p(?:ass)?w(?:or)?d|pass(?:_?phrase)?|secret|(?:api_?|private_?|public_?|access_?|secret_?)key(?:_?id)?|token|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)(?:(?:\s|%20)*(?:=|%3D)[^&]+|(?:"|%22)(?:\s|%20)*(?::|%3A)(?:\s|%20)*(?:"|%22)(?:%2[^2]|%[^2]|[^"%])+(?:"|%22))|bearer(?:\s|%20)+[a-z0-9\._\-]|token(?::|%3A)[a-z0-9]{13}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L](?:[\w=-]|%3D)+\.ey[I-L](?:[\w=-]|%3D)+(?:\.(?:[\w.+\/=-]|%3D|%2F|%2B)+)?|[\-]{5}BEGIN(?:[a-z\s]|%20)+PRIVATE(?:\s|%20)KEY[\-]{5}[^\-]+[\-]{5}END(?:[a-z\s]|%20)+PRIVATE(?:\s|%20)KEY|ssh-rsa(?:\s|%20)*(?:[a-z0-9\/\.+]|%2F|%5C|%2B){100,} => (?i)(?:p(?:ass)?w(?:or)?d|pass(?:_?phrase)?|secret|(?:api_?|private_?|public_?|access_?|secret_?)key(?:_?id)?|token|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)(?:(?:\s|%20)*(?:=|%3D)[^&]+|(?:"|%22)(?:\s|%20)*(?::|%3A)(?:\s|%20)*(?:"|%22)(?:%2[^2]|%[^2]|[^"%])+(?:"|%22))|bearer(?:\s|%20)+[a-z0-9\._\-]|token(?::|%3A)[a-z0-9]{13}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L](?:[\w=-]|%3D)+\.ey[I-L](?:[\w=-]|%3D)+(?:\.(?:[\w.+\/=-]|%3D|%2F|%2B)+)?|[\-]{5}BEGIN(?:[a-z\s]|%20)+PRIVATE(?:\s|%20)KEY[\-]{5}[^\-]+[\-]{5}END(?:[a-z\s]|%20)+PRIVATE(?:\s|%20)KEY|ssh-rsa(?:\s|%20)*(?:[a-z0-9\/\.+]|%2F|%5C|%2B){100,} +datadog.trace.client_ip_header_disabled => Off => Off +datadog.trace.client_ip_header => no value => no value datadog.trace.cakephp_enabled => On => On datadog.trace.cakephp_analytics_enabled => Off => Off datadog.cakephp_analytics_enabled => Off => Off diff --git a/REFLECTION b/REFLECTION index 73594e0..34c3479 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #120 ddtrace version 0.75.0 ] { +Extension [ extension #118 ddtrace version 0.76.0 ] { - Dependencies { Dependency [ json (Required) ] @@ -119,7 +119,7 @@ Extension [ extension #120 ddtrace version 0.75.0 ] { Current = '' } Entry [ datadog.trace.http_url_query_param_allowed ] - Current = '' + Current = '*' } Entry [ datadog.trace.sample_rate ] Current = '1' @@ -139,6 +139,12 @@ Extension [ extension #120 ddtrace version 0.75.0 ] { Entry [ datadog.trace.propagate_service ] Current = 'false' } + Entry [ datadog.propagation_style_extract ] + Current = 'Datadog,B3,B3 single header' + } + Entry [ datadog.propagation_style_inject ] + Current = 'Datadog' + } Entry [ datadog.trace.traced_internal_functions ] Current = '' } @@ -202,6 +208,15 @@ Extension [ extension #120 ddtrace version 0.75.0 ] { Entry [ datadog.version ] Current = '' } + Entry [ datadog.trace.obfuscation_query_string_regexp ] + Current = '(?i)(?:p(?:ass)?w(?:or)?d|pass(?:_?phrase)?|secret|(?:api_?|private_?|public_?|access_?|secret_?)key(?:_?id)?|token|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)(?:(?:\s|%20)*(?:=|%3D)[^&]+|(?:"|%22)(?:\s|%20)*(?::|%3A)(?:\s|%20)*(?:"|%22)(?:%2[^2]|%[^2]|[^"%])+(?:"|%22))|bearer(?:\s|%20)+[a-z0-9\._\-]|token(?::|%3A)[a-z0-9]{13}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L](?:[\w=-]|%3D)+\.ey[I-L](?:[\w=-]|%3D)+(?:\.(?:[\w.+\/=-]|%3D|%2F|%2B)+)?|[\-]{5}BEGIN(?:[a-z\s]|%20)+PRIVATE(?:\s|%20)KEY[\-]{5}[^\-]+[\-]{5}END(?:[a-z\s]|%20)+PRIVATE(?:\s|%20)KEY|ssh-rsa(?:\s|%20)*(?:[a-z0-9\/\.+]|%2F|%5C|%2B){100,}' + } + Entry [ datadog.trace.client_ip_header_disabled ] + Current = 'false' + } + Entry [ datadog.trace.client_ip_header ] + Current = '' + } Entry [ datadog.trace.cakephp_enabled ] Current = 'true' } @@ -535,7 +550,7 @@ Extension [ extension #120 ddtrace version 0.75.0 ] { } - Constants [7] { - Constant [ string DD_TRACE_VERSION ] { 0.75.0 } + Constant [ string DD_TRACE_VERSION ] { 0.76.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 } @@ -738,8 +753,9 @@ Extension [ extension #120 ddtrace version 0.75.0 ] { } Function [ function dd_untrace ] { - - Parameters [1] { + - Parameters [2] { Parameter #0 [ $function_name ] + Parameter #1 [ $class_name = ] } } Function [ function dd_trace_compile_time_microseconds ] { @@ -782,6 +798,13 @@ Extension [ extension #120 ddtrace version 0.75.0 ] { Parameter #1 [ $value ] } } + Function [ function DDTrace\add_distributed_tag ] { + + - Parameters [2] { + Parameter #0 [ $key ] + Parameter #1 [ $value ] + } + } Function [ function DDTrace\additional_trace_meta ] { - Parameters [0] { @@ -876,9 +899,54 @@ Extension [ extension #120 ddtrace version 0.75.0 ] { Parameter #1 [ $message ] } } + Function [ function DDTrace\Testing\extract_ip_from_headers ] { + + - Parameters [1] { + Parameter #0 [ $headers ] + } + } + Function [ function DDTrace\install_hook ] { + + - Parameters [3] { + Parameter #0 [ Closure|Generator|string $target ] + Parameter #1 [ ?Closure $begin ] + Parameter #2 [ ?Closure $end ] + } + - Return [ int ] + } + Function [ function DDTrace\remove_hook ] { + + - Parameters [1] { + Parameter #0 [ int $id ] + } + - Return [ void ] + } } - - Classes [2] { + - Classes [3] { + Class [ class DDTrace\HookData ] { + + - Constants [0] { + } + + - Static properties [0] { + } + + - Static methods [0] { + } + + - Properties [5] { + Property [ public int $id ] + Property [ public array $args ] + Property [ public mixed $returned ] + Property [ public ?Throwable $exception ] + Property [ public mixed $data ] + } + + - Methods [0] { + } + } + Class [ class DDTrace\SpanData ] { - Constants [0] { diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec index 6a12941..0772ae2 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.75.0 +Version: 0.76.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 @@ -45,7 +45,7 @@ BuildRequires: devtoolset-6-toolchain %endif BuildRequires: make BuildRequires: %{?dtsprefix}gcc -BuildRequires: %{?scl_prefix}php-devel >= 5.4 +BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-pear BuildRequires: curl-devel BuildRequires: %{?scl_prefix}php-json @@ -265,6 +265,10 @@ fi %changelog +* Mon Jul 11 2022 Remi Collet - 0.76.0-1 +- update to 0.76.0 +- drop PHP 5 support + * Mon Jun 13 2022 Remi Collet - 0.75.0-1 - update to 0.75.0 -- cgit