update to 0.87.0

3 files changed, 163 insertions, 22 deletions

diff --git a/PHPINFO b/PHPINFO
index ed81c24..b15fae1 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.86.3
+Version => 0.87.0
 DATADOG TRACER CONFIGURATION => {
-    "date": "2023-04-06T08:58:54Z",
-    "os_name": "Linux builder.remirepo.net 6.2.8-200.fc37.x86_64 #1 SMP PREEMPT_DYNAMIC Wed Mar 22 19:11:02 UTC 2023 x86_64",
-    "os_version": "6.2.8-200.fc37.x86_64",
-    "version": "0.86.3",
+    "date": "2023-05-13T06:22:33Z",
+    "os_name": "Linux builder.remirepo.net 6.2.14-200.fc37.x86_64 #1 SMP PREEMPT_DYNAMIC Mon May  1 00:57:50 UTC 2023 x86_64",
+    "os_version": "6.2.14-200.fc37.x86_64",
+    "version": "0.87.0",
     "lang": "php",
-    "lang_version": "8.1.17",
+    "lang_version": "8.1.19",
     "env": null,
     "enabled": true,
     "service": null,
@@ -83,6 +83,7 @@ datadog.trace.http_client_split_by_domain => Off => Off
 datadog.trace.redis_client_split_by_host => Off => Off
 datadog.trace.memory_limit => no value => no value
 datadog.trace.report_hostname => Off => Off
+datadog.trace.flush_collect_cycles => Off => Off
 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
@@ -135,6 +136,11 @@ 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.amqp_enabled => On => On
+datadog.trace.amqp_analytics_enabled => Off => Off
+datadog.amqp_analytics_enabled => Off => Off
+datadog.trace.amqp_analytics_sample_rate => 1 => 1
+datadog.amqp_analytics_sample_rate => 1 => 1
 datadog.trace.cakephp_enabled => On => On
 datadog.trace.cakephp_analytics_enabled => Off => Off
 datadog.cakephp_analytics_enabled => Off => Off
@@ -165,11 +171,21 @@ datadog.trace.guzzle_analytics_enabled => Off => Off
 datadog.guzzle_analytics_enabled => Off => Off
 datadog.trace.guzzle_analytics_sample_rate => 1 => 1
 datadog.guzzle_analytics_sample_rate => 1 => 1
+datadog.trace.laminas_enabled => On => On
+datadog.trace.laminas_analytics_enabled => Off => Off
+datadog.laminas_analytics_enabled => Off => Off
+datadog.trace.laminas_analytics_sample_rate => 1 => 1
+datadog.laminas_analytics_sample_rate => 1 => 1
 datadog.trace.laravel_enabled => On => On
 datadog.trace.laravel_analytics_enabled => Off => Off
 datadog.laravel_analytics_enabled => Off => Off
 datadog.trace.laravel_analytics_sample_rate => 1 => 1
 datadog.laravel_analytics_sample_rate => 1 => 1
+datadog.trace.laravelqueue_enabled => On => On
+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.lumen_enabled => On => On
 datadog.trace.lumen_analytics_enabled => Off => Off
 datadog.lumen_analytics_enabled => Off => Off
@@ -235,6 +251,11 @@ datadog.trace.roadrunner_analytics_enabled => Off => Off
 datadog.roadrunner_analytics_enabled => Off => Off
 datadog.trace.roadrunner_analytics_sample_rate => 1 => 1
 datadog.roadrunner_analytics_sample_rate => 1 => 1
+datadog.trace.sqlsrv_enabled => On => On
+datadog.trace.sqlsrv_analytics_enabled => Off => Off
+datadog.sqlsrv_analytics_enabled => Off => Off
+datadog.trace.sqlsrv_analytics_sample_rate => 1 => 1
+datadog.sqlsrv_analytics_sample_rate => 1 => 1
 datadog.trace.slim_enabled => On => On
 datadog.trace.slim_analytics_enabled => Off => Off
 datadog.slim_analytics_enabled => Off => Off
diff --git a/REFLECTION b/REFLECTION
index a041b56..cf8c9bd 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #122 ddtrace version 0.86.3 ] {
+Extension [ <persistent> extension #122 ddtrace version 0.87.0 ] {
 
   - Dependencies {
     Dependency [ json (Required) ]
@@ -106,6 +106,9 @@ Extension [ <persistent> extension #122 ddtrace version 0.86.3 ] {
     Entry [ datadog.trace.report_hostname <ALL> ]
       Current = 'false'
     }
+    Entry [ datadog.trace.flush_collect_cycles <ALL> ]
+      Current = 'false'
+    }
     Entry [ datadog.trace.resource_uri_fragment_regex <ALL> ]
       Current = ''
     }
@@ -262,6 +265,21 @@ Extension [ <persistent> extension #122 ddtrace version 0.86.3 ] {
     Entry [ datadog.dbm_propagation_mode <ALL> ]
       Current = 'disabled'
     }
+    Entry [ datadog.trace.amqp_enabled <ALL> ]
+      Current = 'true'
+    }
+    Entry [ datadog.trace.amqp_analytics_enabled <ALL> ]
+      Current = '0'
+    }
+    Entry [ datadog.amqp_analytics_enabled <ALL> ]
+      Current = '0'
+    }
+    Entry [ datadog.trace.amqp_analytics_sample_rate <ALL> ]
+      Current = '1'
+    }
+    Entry [ datadog.amqp_analytics_sample_rate <ALL> ]
+      Current = '1'
+    }
     Entry [ datadog.trace.cakephp_enabled <ALL> ]
       Current = 'true'
     }
@@ -352,6 +370,21 @@ Extension [ <persistent> extension #122 ddtrace version 0.86.3 ] {
     Entry [ datadog.guzzle_analytics_sample_rate <ALL> ]
       Current = '1'
     }
+    Entry [ datadog.trace.laminas_enabled <ALL> ]
+      Current = 'true'
+    }
+    Entry [ datadog.trace.laminas_analytics_enabled <ALL> ]
+      Current = '0'
+    }
+    Entry [ datadog.laminas_analytics_enabled <ALL> ]
+      Current = '0'
+    }
+    Entry [ datadog.trace.laminas_analytics_sample_rate <ALL> ]
+      Current = '1'
+    }
+    Entry [ datadog.laminas_analytics_sample_rate <ALL> ]
+      Current = '1'
+    }
     Entry [ datadog.trace.laravel_enabled <ALL> ]
       Current = 'true'
     }
@@ -367,6 +400,21 @@ Extension [ <persistent> extension #122 ddtrace version 0.86.3 ] {
     Entry [ datadog.laravel_analytics_sample_rate <ALL> ]
       Current = '1'
     }
+    Entry [ datadog.trace.laravelqueue_enabled <ALL> ]
+      Current = 'true'
+    }
+    Entry [ datadog.trace.laravelqueue_analytics_enabled <ALL> ]
+      Current = '0'
+    }
+    Entry [ datadog.laravelqueue_analytics_enabled <ALL> ]
+      Current = '0'
+    }
+    Entry [ datadog.trace.laravelqueue_analytics_sample_rate <ALL> ]
+      Current = '1'
+    }
+    Entry [ datadog.laravelqueue_analytics_sample_rate <ALL> ]
+      Current = '1'
+    }
     Entry [ datadog.trace.lumen_enabled <ALL> ]
       Current = 'true'
     }
@@ -562,6 +610,21 @@ Extension [ <persistent> extension #122 ddtrace version 0.86.3 ] {
     Entry [ datadog.roadrunner_analytics_sample_rate <ALL> ]
       Current = '1'
     }
+    Entry [ datadog.trace.sqlsrv_enabled <ALL> ]
+      Current = 'true'
+    }
+    Entry [ datadog.trace.sqlsrv_analytics_enabled <ALL> ]
+      Current = '0'
+    }
+    Entry [ datadog.sqlsrv_analytics_enabled <ALL> ]
+      Current = '0'
+    }
+    Entry [ datadog.trace.sqlsrv_analytics_sample_rate <ALL> ]
+      Current = '1'
+    }
+    Entry [ datadog.sqlsrv_analytics_sample_rate <ALL> ]
+      Current = '1'
+    }
     Entry [ datadog.trace.slim_enabled <ALL> ]
       Current = 'true'
     }
@@ -654,11 +717,13 @@ Extension [ <persistent> extension #122 ddtrace version 0.86.3 ] {
     }
   }
 
-  - Constants [10] {
+  - Constants [12] {
+    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.86.3 }
+    Constant [ string DD_TRACE_VERSION ] { 0.87.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 }
@@ -812,14 +877,14 @@ Extension [ <persistent> extension #122 ddtrace version 0.86.3 ] {
     Function [ <internal:ddtrace> function DDTrace\consume_distributed_tracing_headers ] {
 
       - Parameters [1] {
-        Parameter #0 [ <required> callable $callback ]
+        Parameter #0 [ <required> callable|array $headersOrCallback ]
       }
       - Return [ void ]
     }
     Function [ <internal:ddtrace> function DDTrace\generate_distributed_tracing_headers ] {
 
       - Parameters [1] {
-        Parameter #0 [ <optional> array $inject = null ]
+        Parameter #0 [ <optional> ?array $inject = null ]
       }
       - Return [ array ]
     }
@@ -1126,10 +1191,11 @@ Extension [ <persistent> extension #122 ddtrace version 0.86.3 ] {
     }
     Function [ <internal:ddtrace> function DDTrace\install_hook ] {
 
-      - Parameters [3] {
-        Parameter #0 [ <required> Closure|Generator|string $target ]
+      - Parameters [4] {
+        Parameter #0 [ <required> Closure|Generator|callable|string $target ]
         Parameter #1 [ <optional> ?Closure $begin = null ]
         Parameter #2 [ <optional> ?Closure $end = null ]
+        Parameter #3 [ <optional> int $flags = 0 ]
       }
       - Return [ int ]
     }
@@ -1142,7 +1208,7 @@ Extension [ <persistent> extension #122 ddtrace version 0.86.3 ] {
     }
   }
 
-  - Classes [5] {
+  - Classes [6] {
     Class [ <internal:ddtrace> class DDTrace\HookData ] {
 
       - Constants [0] {
@@ -1162,7 +1228,7 @@ Extension [ <persistent> extension #122 ddtrace version 0.86.3 ] {
         Property [ public ?Throwable $exception ]
       }
 
-      - Methods [3] {
+      - Methods [4] {
         Method [ <internal:ddtrace> public method span ] {
 
           - Parameters [1] {
@@ -1186,6 +1252,14 @@ Extension [ <persistent> extension #122 ddtrace version 0.86.3 ] {
           }
           - Return [ bool ]
         }
+
+        Method [ <internal:ddtrace> public method overrideReturnValue ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> mixed &$value ]
+          }
+          - Return [ bool ]
+        }
       }
     }
 
@@ -1230,7 +1304,7 @@ Extension [ <persistent> extension #122 ddtrace version 0.86.3 ] {
       - Static methods [0] {
       }
 
-      - Properties [10] {
+      - Properties [11] {
         Property [ public ?string $name = '' ]
         Property [ public ?string $resource = '' ]
         Property [ public ?string $service = '' ]
@@ -1239,11 +1313,12 @@ Extension [ <persistent> extension #122 ddtrace version 0.86.3 ] {
         Property [ public array $metrics = [] ]
         Property [ public ?Throwable $exception = NULL ]
         Property [ public readonly string $id = '' ]
+        Property [ public array $links = [] ]
         Property [ public readonly ?DDTrace\SpanData $parent = NULL ]
         Property [ public readonly DDTrace\SpanStack $stack ]
       }
 
-      - Methods [2] {
+      - Methods [3] {
         Method [ <internal:ddtrace> public method getDuration ] {
 
           - Parameters [0] {
@@ -1257,6 +1332,13 @@ Extension [ <persistent> extension #122 ddtrace version 0.86.3 ] {
           }
           - Return [ int ]
         }
+
+        Method [ <internal:ddtrace> public method getLink ] {
+
+          - Parameters [0] {
+          }
+          - Return [ DDTrace\SpanLink ]
+        }
       }
     }
 
@@ -1371,6 +1453,35 @@ Extension [ <persistent> extension #122 ddtrace version 0.86.3 ] {
         }
       }
     }
+
+    Class [ <internal:ddtrace> class DDTrace\SpanLink implements JsonSerializable ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [5] {
+        Property [ public string $traceId ]
+        Property [ public string $spanId ]
+        Property [ public string $traceState ]
+        Property [ public array $attributes ]
+        Property [ public int $droppedAttributesCount ]
+      }
+
+      - Methods [1] {
+        Method [ <internal:ddtrace, prototype JsonSerializable> public method jsonSerialize ] {
+
+          - Parameters [0] {
+          }
+          - Return [ mixed ]
+        }
+      }
+    }
   }
 }
 
diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec
index 75ed197..151a966 100644
--- a/php-pecl-datadog-trace.spec
+++ b/php-pecl-datadog-trace.spec
@@ -12,6 +12,12 @@
 %global _root_libdir %{_libdir}
 %endif
 
+# Defined in Fedora >= 37 and RHEL >= 10, in PHP >= 7.4 for remirepo
+%{!?__phpize:      %global __phpize       %{_bindir}/phpize}
+%{!?__ztsphpize:   %global __ztsphpize    %{_bindir}/zts-phpize}
+%{!?__phpconfig:   %global __phpconfig    %{_bindir}/php-config}
+%{!?__ztsphpconfig:%global __ztsphpconfig %{_bindir}/zts-php-config}
+
 # pecl name
 %global proj_name  datadog_trace
 # no underscore for package name
@@ -26,7 +32,7 @@
 
 Summary:        APM and distributed tracing for PHP
 Name:           %{?scl_prefix}php-pecl-datadog-trace
-Version:        0.86.3
+Version:        0.87.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
@@ -124,18 +130,18 @@ EOF
 %{?dtsenable}
 
 cd NTS
-%{_bindir}/phpize
+%{__phpize}
 %configure \
     --enable-ddtrace \
-    --with-php-config=%{_bindir}/php-config
+    --with-php-config=%{__phpconfig}
 make %{?_smp_mflags}
 
 %if %{with_zts}
 cd ../ZTS
-%{_bindir}/zts-phpize
+%{__ztsphpize}
 %configure \
     --enable-ddtrace \
-    --with-php-config=%{_bindir}/zts-php-config
+    --with-php-config=%{__ztsphpconfig}
 make %{?_smp_mflags}
 %endif
 
@@ -251,6 +257,9 @@ fi
 
 
 %changelog
+* Sat May 13 2023 Remi Collet <remi@remirepo.net> - 0.87.0-1
+- update to 0.87.0
+
 * Thu Apr  6 2023 Remi Collet <remi@remirepo.net> - 0.86.3-1
 - update to 0.86.3