update to 0.91.0

raise build dependency on rust 1.70

3 files changed, 74 insertions, 22 deletions

diff --git a/PHPINFO b/PHPINFO
index ad0f91f..1c7dd40 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -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.90.0
+Version => 0.91.0
 DATADOG TRACER CONFIGURATION => {
-    "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",
+    "date": "2023-09-07T05:49:50Z",
+    "os_name": "Linux builder.remirepo.net 6.4.13-100.fc37.x86_64 #1 SMP PREEMPT_DYNAMIC Wed Aug 30 16:43:51 UTC 2023 x86_64",
+    "os_version": "6.4.13-100.fc37.x86_64",
+    "version": "0.91.0",
     "lang": "php",
-    "lang_version": "8.1.21",
+    "lang_version": "8.1.23",
     "env": null,
     "enabled": true,
     "service": null,
@@ -22,7 +22,7 @@ DATADOG TRACER CONFIGURATION => {
     "agent_url": "http:\/\/localhost:8126",
     "debug": false,
     "analytics_enabled": false,
-    "sample_rate": 1,
+    "sample_rate": -1,
     "sampling_rules": [],
     "tags": [],
     "service_mapping": [],
@@ -96,8 +96,8 @@ datadog.trace.resource_uri_query_param_allowed => no value => no value
 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.sample_rate => -1 => -1
+datadog.sampling_rate => -1 => -1
 datadog.trace.sampling_rules => [] => []
 datadog.span_sampling_rules => [] => []
 datadog.span_sampling_rules_file => no value => no value
@@ -129,9 +129,11 @@ datadog.trace.agent_flush_interval => 5000 => 5000
 datadog.trace.agent_flush_after_n_requests => 10 => 10
 datadog.trace.shutdown_timeout => 5000 => 5000
 datadog.trace.startup_logs => On => On
+datadog.trace.once_logs => On => On
 datadog.trace.agent_debug_verbose_curl => Off => Off
 datadog.trace.debug_curl_output => Off => Off
 datadog.trace.beta_high_memory_pressure_percent => 80 => 80
+datadog.trace.sidecar_trace_sender => Off => Off
 datadog.trace.warn_legacy_dd_trace => On => On
 datadog.trace.retain_thread_capabilities => Off => Off
 datadog.version => no value => no value
@@ -145,6 +147,9 @@ datadog.trace.agent_stack_initial_size => 131072 => 131072
 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.amqp_enabled => On => On
 datadog.trace.amqp_analytics_enabled => Off => Off
 datadog.amqp_analytics_enabled => Off => Off
diff --git a/REFLECTION b/REFLECTION
index 4c7e006..82784ee 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #124 ddtrace version 0.90.0 ] {
+Extension [ <persistent> extension #125 ddtrace version 0.91.0 ] {
 
   - Dependencies {
     Dependency [ json (Required) ]
@@ -146,10 +146,10 @@ Extension [ <persistent> extension #124 ddtrace version 0.90.0 ] {
       Current = '0'
     }
     Entry [ datadog.trace.sample_rate <ALL> ]
-      Current = '1'
+      Current = '-1'
     }
     Entry [ datadog.sampling_rate <ALL> ]
-      Current = '1'
+      Current = '-1'
     }
     Entry [ datadog.trace.sampling_rules <ALL> ]
       Current = '[]'
@@ -244,6 +244,9 @@ Extension [ <persistent> extension #124 ddtrace version 0.90.0 ] {
     Entry [ datadog.trace.startup_logs <ALL> ]
       Current = 'true'
     }
+    Entry [ datadog.trace.once_logs <ALL> ]
+      Current = 'true'
+    }
     Entry [ datadog.trace.agent_debug_verbose_curl <SYSTEM> ]
       Current = 'false'
     }
@@ -253,6 +256,9 @@ Extension [ <persistent> extension #124 ddtrace version 0.90.0 ] {
     Entry [ datadog.trace.beta_high_memory_pressure_percent <SYSTEM> ]
       Current = '80'
     }
+    Entry [ datadog.trace.sidecar_trace_sender <SYSTEM> ]
+      Current = 'false'
+    }
     Entry [ datadog.trace.warn_legacy_dd_trace <ALL> ]
       Current = 'true'
     }
@@ -292,6 +298,15 @@ Extension [ <persistent> extension #124 ddtrace version 0.90.0 ] {
     Entry [ datadog.dbm_propagation_mode <ALL> ]
       Current = 'disabled'
     }
+    Entry [ datadog.trace.wordpress_additional_actions <ALL> ]
+      Current = ''
+    }
+    Entry [ datadog.trace.wordpress_callbacks <ALL> ]
+      Current = 'false'
+    }
+    Entry [ datadog.trace.wordpress_enhanced_integration <ALL> ]
+      Current = 'false'
+    }
     Entry [ datadog.trace.amqp_enabled <ALL> ]
       Current = 'true'
     }
@@ -768,7 +783,7 @@ Extension [ <persistent> extension #124 ddtrace version 0.90.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.90.0 }
+    Constant [ string DD_TRACE_VERSION ] { 0.91.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 }
@@ -1183,6 +1198,12 @@ Extension [ <persistent> extension #124 ddtrace version 0.90.0 ] {
       }
       - Return [ string ]
     }
+    Function [ <internal:ddtrace> function dd_trace_close_all_spans_and_flush ] {
+
+      - Parameters [0] {
+      }
+      - Return [ void ]
+    }
     Function [ <internal:ddtrace> function dd_trace_function ] {
 
       - Parameters [2] {
@@ -1208,6 +1229,13 @@ Extension [ <persistent> extension #124 ddtrace version 0.90.0 ] {
       }
       - Return [ bool ]
     }
+    Function [ <internal:ddtrace> function dd_trace_synchronous_flush ] {
+
+      - Parameters [1] {
+        Parameter #0 [ <required> int $timeout ]
+      }
+      - Return [ void ]
+    }
     Function [ <internal, deprecated:ddtrace> function dd_trace_forward_call ] {
 
       - Parameters [0] {
@@ -1279,7 +1307,7 @@ Extension [ <persistent> extension #124 ddtrace version 0.90.0 ] {
         Property [ public ?Throwable $exception ]
       }
 
-      - Methods [4] {
+      - Methods [5] {
         Method [ <internal:ddtrace> public method span ] {
 
           - Parameters [1] {
@@ -1311,6 +1339,13 @@ Extension [ <persistent> extension #124 ddtrace version 0.90.0 ] {
           }
           - Return [ bool ]
         }
+
+        Method [ <internal:ddtrace> public method getSourceFile ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
+        }
       }
     }
 
@@ -1363,10 +1398,10 @@ Extension [ <persistent> extension #124 ddtrace version 0.90.0 ] {
         Property [ public array $meta = [] ]
         Property [ public array $metrics = [] ]
         Property [ public ?Throwable $exception = NULL ]
-        Property [ public readonly string $id = '' ]
+        Property [ public readonly string $id ]
         Property [ public array $links = [] ]
         Property [ public array $peerServiceSources = [] ]
-        Property [ public readonly ?DDTrace\SpanData $parent = NULL ]
+        Property [ public readonly ?DDTrace\SpanData $parent ]
         Property [ public readonly DDTrace\SpanStack $stack ]
       }
 
@@ -1406,7 +1441,7 @@ Extension [ <persistent> extension #124 ddtrace version 0.90.0 ] {
       }
 
       - Properties [2] {
-        Property [ public readonly ?DDTrace\SpanStack $parent = NULL ]
+        Property [ public readonly ?DDTrace\SpanStack $parent ]
         Property [ public ?DDTrace\SpanData $active = NULL ]
       }
 
diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec
index 28b95ce..c917223 100644
--- a/php-pecl-datadog-trace.spec
+++ b/php-pecl-datadog-trace.spec
@@ -13,6 +13,11 @@
 %global _root_bindir %{_bindir}
 %endif
 
+# TODO: build for EL-8 and EL-9
+# see https://rpms.remirepo.net/rpmphp/zoom.php?rpm=rust
+# if needed, build using --enablerepo=stream
+# and delete root_cache after the build
+
 # pecl name
 %global proj_name  datadog_trace
 # no underscore for package name
@@ -29,7 +34,7 @@
 
 Summary:        APM and distributed tracing for PHP
 Name:           %{?scl_prefix}php-pecl-datadog-trace
-Version:        0.90.0
+Version:        0.91.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
@@ -50,7 +55,8 @@ BuildRequires:  devtoolset-6-toolchain
 %global dtsprefix devtoolset-6-
 %endif
 BuildRequires:  make
-BuildRequires:  cargo >= 1.60
+BuildRequires:  cargo >= 1.70
+BuildRequires:  rust >= 1.70
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel >= 7.0
 BuildRequires:  %{?scl_prefix}php-devel <  8.3
@@ -66,7 +72,6 @@ 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}}
 Requires:       %{?scl_prefix}php-json%{?_isa}
 %if "%{php_version}" > "8.0"
 Requires:       %{?scl_prefix}php-curl%{?_isa}
@@ -107,6 +112,7 @@ if test "x${extver}" != "x%{version}"; then
    : Error: Upstream extension version is ${extver}, expecting %{version}.
    exit 1
 fi
+cd ..
 
 : Create cargo configuration to use vendor directory
 mkdir .cargo
@@ -126,9 +132,8 @@ verbose = true
 replace-with = "vendored-sources"
 
 [source.vendored-sources]
-directory = "$(dirname $PWD)/mycargo"
+directory = "$PWD/mycargo"
 EOF
-cd ..
 
 : Required rust version
 grep -h rust-version mycargo/*/Cargo.toml | sort -u | tail -n 8
@@ -215,6 +220,9 @@ rm tests/ext/sandbox/fatal_errors_are_tracked_005.phpt
 find tests/ -type f -exec grep -q -- '--XFAIL--' {} \; -delete -print
 # https://github.com/DataDog/dd-trace-php/issues/2115
 rm -r tests/ext/telemetry
+# https://github.com/DataDog/dd-trace-php/issues/2248
+rm tests/ext/force_flush_traces.phpt
+rm tests/ext/sandbox/fatal_errors_ignored_in_tracing_closure.phpt
 
 # DEP for ext dependencies, MOD for ext used in tests
 DEP=""
@@ -285,6 +293,10 @@ fi
 
 
 %changelog
+* Thu Sep  7 2023 Remi Collet <remi@remirepo.net> - 0.91.0-1
+- update to 0.91.0
+- raise build dependency on rust 1.70
+
 * Mon Jul 17 2023 Remi Collet <remi@remirepo.net> - 0.90.0-1
 - update to 0.90.0
 - build out of sources tree