update to 1.2.0

3 files changed, 104 insertions, 40 deletions

diff --git a/PHPINFO b/PHPINFO
index 1530db8..782cd21 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 => 1.1.0
+Version => 1.2.0
 DATADOG TRACER CONFIGURATION => {
-    "date": "2024-06-11T06:03:18Z",
-    "os_name": "Linux builder.remirepo.net 6.8.11-200.fc39.x86_64 #1 SMP PREEMPT_DYNAMIC Sun May 26 20:05:41 UTC 2024 x86_64",
-    "os_version": "6.8.11-200.fc39.x86_64",
-    "version": "1.1.0",
+    "date": "2024-07-24T05:35:13Z",
+    "os_name": "Linux builder.remirepo.net 6.9.9-100.fc39.x86_64 #1 SMP PREEMPT_DYNAMIC Thu Jul 11 19:26:10 UTC 2024 x86_64",
+    "os_version": "6.9.9-100.fc39.x86_64",
+    "version": "1.2.0",
     "lang": "php",
-    "lang_version": "8.2.20",
+    "lang_version": "8.2.21",
     "env": null,
     "enabled": true,
     "service": null,
@@ -120,6 +120,7 @@ datadog.trace.128_bit_traceid_logging_enabled => Off => Off
 datadog.trace.bgs_connect_timeout => 2000 => 2000
 datadog.trace.bgs_timeout => 5000 => 5000
 datadog.trace.agent_flush_interval => 5000 => 5000
+datadog.telemetry_heartbeat_interval => 60 => 60
 datadog.trace.agent_flush_after_n_requests => 10 => 10
 datadog.trace.shutdown_timeout => 5000 => 5000
 datadog.trace.startup_logs => On => On
@@ -133,6 +134,7 @@ 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)(?:(?:"|%22)?)(?:(?:old[-_]?|new[-_]?)?p(?:ass)?w(?:or)?d(?:1|2)?|pass(?:[-_]?phrase)?|secret|(?:api[-_]?|private[-_]?|public[-_]?|access[-_]?|secret[-_]?|app(?:lication)?[-_]?)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(?:-{5})?(?:\n|%0A)?|(?:ssh-(?:rsa|dss)|ecdsa-[a-z0-9]+-[a-z0-9]+)(?:\s|%20|%09)+(?:[a-z0-9/.+]|%2F|%5C|%2B){100,}(?:=|%3D)*(?:(?:\s|%20|%09)+[a-z0-9._-]+)?) => (?i)(?:(?:"|%22)?)(?:(?:old[-_]?|new[-_]?)?p(?:ass)?w(?:or)?d(?:1|2)?|pass(?:[-_]?phrase)?|secret|(?:api[-_]?|private[-_]?|public[-_]?|access[-_]?|secret[-_]?|app(?:lication)?[-_]?)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(?:-{5})?(?:\n|%0A)?|(?:ssh-(?:rsa|dss)|ecdsa-[a-z0-9]+-[a-z0-9]+)(?:\s|%20|%09)+(?:[a-z0-9/.+]|%2F|%5C|%2B){100,}(?:=|%3D)*(?:(?:\s|%20|%09)+[a-z0-9._-]+)?)
+datadog.trace.memcached_obfuscation => On => On
 datadog.trace.client_ip_enabled => Off => Off
 datadog.trace.client_ip_header => no value => no value
 datadog.trace.forked_process => On => On
@@ -150,6 +152,15 @@ datadog.trace.otel_enabled => Off => Off
 datadog.trace.log_file => no value => no value
 datadog.trace.log_level => error => error
 datadog.appsec.sca_enabled => Off => Off
+datadog.trace.git_metadata_enabled => On => On
+datadog.git_commit_sha => no value => no value
+datadog.git_repository_url => no value => no value
+datadog.openai_service => no value => no value
+datadog.openai_metrics_enabled => On => On
+datadog.openai_logs_enabled => Off => Off
+datadog.openai_span_char_limit => 128 => 128
+datadog.openai_span_prompt_completion_sample_rate => 1.0 => 1.0
+datadog.openai_log_prompt_completion_sample_rate => 0.1 => 0.1
 datadog.trace.amqp_enabled => On => On
 datadog.trace.amqp_analytics_enabled => Off => Off
 datadog.amqp_analytics_enabled => Off => Off
@@ -261,6 +272,11 @@ datadog.trace.nette_analytics_enabled => Off => Off
 datadog.nette_analytics_enabled => Off => Off
 datadog.trace.nette_analytics_sample_rate => 1 => 1
 datadog.nette_analytics_sample_rate => 1 => 1
+datadog.trace.openai_enabled => On => On
+datadog.trace.openai_analytics_enabled => Off => Off
+datadog.openai_analytics_enabled => Off => Off
+datadog.trace.openai_analytics_sample_rate => 1 => 1
+datadog.openai_analytics_sample_rate => 1 => 1
 datadog.trace.pcntl_enabled => On => On
 datadog.trace.pcntl_analytics_enabled => Off => Off
 datadog.pcntl_analytics_enabled => Off => Off
diff --git a/REFLECTION b/REFLECTION
index 6476564..af2a304 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #108 ddtrace version 1.1.0 ] {
+Extension [ <persistent> extension #109 ddtrace version 1.2.0 ] {
 
   - Dependencies {
     Dependency [ json (Required) ]
@@ -220,6 +220,9 @@ Extension [ <persistent> extension #108 ddtrace version 1.1.0 ] {
     Entry [ datadog.trace.agent_flush_interval <SYSTEM> ]
       Current = '5000'
     }
+    Entry [ datadog.telemetry_heartbeat_interval <SYSTEM> ]
+      Current = '60'
+    }
     Entry [ datadog.trace.agent_flush_after_n_requests <ALL> ]
       Current = '10'
     }
@@ -259,6 +262,9 @@ Extension [ <persistent> extension #108 ddtrace version 1.1.0 ] {
     Entry [ datadog.trace.obfuscation_query_string_regexp <ALL> ]
       Current = '(?i)(?:(?:"|%22)?)(?:(?:old[-_]?|new[-_]?)?p(?:ass)?w(?:or)?d(?:1|2)?|pass(?:[-_]?phrase)?|secret|(?:api[-_]?|private[-_]?|public[-_]?|access[-_]?|secret[-_]?|app(?:lication)?[-_]?)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(?:-{5})?(?:\n|%0A)?|(?:ssh-(?:rsa|dss)|ecdsa-[a-z0-9]+-[a-z0-9]+)(?:\s|%20|%09)+(?:[a-z0-9/.+]|%2F|%5C|%2B){100,}(?:=|%3D)*(?:(?:\s|%20|%09)+[a-z0-9._-]+)?)'
     }
+    Entry [ datadog.trace.memcached_obfuscation <ALL> ]
+      Current = 'true'
+    }
     Entry [ datadog.trace.client_ip_enabled <ALL> ]
       Current = 'false'
     }
@@ -310,6 +316,33 @@ Extension [ <persistent> extension #108 ddtrace version 1.1.0 ] {
     Entry [ datadog.appsec.sca_enabled <SYSTEM> ]
       Current = 'false'
     }
+    Entry [ datadog.trace.git_metadata_enabled <ALL> ]
+      Current = 'true'
+    }
+    Entry [ datadog.git_commit_sha <ALL> ]
+      Current = ''
+    }
+    Entry [ datadog.git_repository_url <ALL> ]
+      Current = ''
+    }
+    Entry [ datadog.openai_service <ALL> ]
+      Current = ''
+    }
+    Entry [ datadog.openai_metrics_enabled <ALL> ]
+      Current = 'true'
+    }
+    Entry [ datadog.openai_logs_enabled <ALL> ]
+      Current = 'false'
+    }
+    Entry [ datadog.openai_span_char_limit <ALL> ]
+      Current = '128'
+    }
+    Entry [ datadog.openai_span_prompt_completion_sample_rate <ALL> ]
+      Current = '1.0'
+    }
+    Entry [ datadog.openai_log_prompt_completion_sample_rate <ALL> ]
+      Current = '0.1'
+    }
     Entry [ datadog.trace.amqp_enabled <ALL> ]
       Current = 'true'
     }
@@ -643,6 +676,21 @@ Extension [ <persistent> extension #108 ddtrace version 1.1.0 ] {
     Entry [ datadog.nette_analytics_sample_rate <ALL> ]
       Current = '1'
     }
+    Entry [ datadog.trace.openai_enabled <ALL> ]
+      Current = 'true'
+    }
+    Entry [ datadog.trace.openai_analytics_enabled <ALL> ]
+      Current = '0'
+    }
+    Entry [ datadog.openai_analytics_enabled <ALL> ]
+      Current = '0'
+    }
+    Entry [ datadog.trace.openai_analytics_sample_rate <ALL> ]
+      Current = '1'
+    }
+    Entry [ datadog.openai_analytics_sample_rate <ALL> ]
+      Current = '1'
+    }
     Entry [ datadog.trace.pcntl_enabled <ALL> ]
       Current = 'true'
     }
@@ -863,7 +911,7 @@ Extension [ <persistent> extension #108 ddtrace version 1.1.0 ] {
     Constant [ int DDTrace\DBM_PROPAGATION_FULL ] { 2 }
     Constant [ int DDTrace\Internal\SPAN_FLAG_OPENTELEMETRY ] { 1 }
     Constant [ int DDTrace\Internal\SPAN_FLAG_OPENTRACING ] { 2 }
-    Constant [ string DD_TRACE_VERSION ] { 1.1.0 }
+    Constant [ string DD_TRACE_VERSION ] { 1.2.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 }
@@ -1412,7 +1460,7 @@ Extension [ <persistent> extension #108 ddtrace version 1.1.0 ] {
     }
   }
 
-  - Classes [8] {
+  - Classes [9] {
     Class [ <internal:ddtrace> class DDTrace\HookData ] {
 
       - Constants [0] {
@@ -1544,12 +1592,13 @@ Extension [ <persistent> extension #108 ddtrace version 1.1.0 ] {
       - Static methods [0] {
       }
 
-      - Properties [14] {
+      - Properties [15] {
         Property [ public ?string $name = '' ]
         Property [ public ?string $resource = '' ]
         Property [ public ?string $service = '' ]
         Property [ public string $env = '' ]
         Property [ public string $version = '' ]
+        Property [ public array $meta_struct = [] ]
         Property [ public ?string $type = '' ]
         Property [ public array $meta = [] ]
         Property [ public array $metrics = [] ]
@@ -1603,12 +1652,13 @@ Extension [ <persistent> extension #108 ddtrace version 1.1.0 ] {
       - Static methods [0] {
       }
 
-      - Properties [22] {
+      - Properties [24] {
         Property [ public ?string $name = '' ]
         Property [ public ?string $resource = '' ]
         Property [ public ?string $service = '' ]
         Property [ public string $env = '' ]
         Property [ public string $version = '' ]
+        Property [ public array $meta_struct = [] ]
         Property [ public ?string $type = '' ]
         Property [ public array $meta = [] ]
         Property [ public array $metrics = [] ]
@@ -1626,6 +1676,7 @@ Extension [ <persistent> extension #108 ddtrace version 1.1.0 ] {
         Property [ public array $tracestateTags = [] ]
         Property [ public string $parentId ]
         Property [ public string $traceId = '' ]
+        Property [ public ?DDTrace\GitMetadata $gitMetadata = NULL ]
       }
 
       - Methods [4] {
@@ -1833,6 +1884,26 @@ Extension [ <persistent> extension #108 ddtrace version 1.1.0 ] {
         }
       }
     }
+
+    Class [ <internal:ddtrace> class DDTrace\GitMetadata ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [2] {
+        Property [ public string $commitSha = '' ]
+        Property [ public string $repositoryUrl = '' ]
+      }
+
+      - Methods [0] {
+      }
+    }
   }
 }
 
diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec
index b2c634c..d39abb1 100644
--- a/php-pecl-datadog-trace.spec
+++ b/php-pecl-datadog-trace.spec
@@ -28,7 +28,7 @@
 # extension name
 %global pecl_name        ddtrace
 
-%global upstream_version 1.1.0
+%global upstream_version 1.2.0
 #global upstream_prever  beta1
 %global with_zts         0%{!?_without_zts:%{?__ztsphp:1}}
 %global ini_name         40-%{pecl_name}.ini
@@ -51,12 +51,6 @@ Source2:        %{proj_name}-deps-%{upstream_version}%{?upstream_prever}.tgz
 # ddtrace only supports 64-bit platforms
 ExcludeArch:    %{ix86} %{arm}
 
-%if 0%{?rhel} == 7 && 0%{?dtsversion} == 0
-BuildRequires:  devtoolset-6-toolchain
-%global dtsversion 6
-%global dtsenable source /opt/rh/devtoolset-6/enable
-%global dtsprefix devtoolset-6-
-%endif
 BuildRequires:  make
 BuildRequires:  cargo >= 1.70
 BuildRequires:  rust >= 1.70
@@ -104,7 +98,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 # Don't install tests
 sed -e 's/role="test"/role="src"/' \
-    %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+    -e '/LICENSE/s/role="doc"/role="src"/' \
     -i package.xml
 
 cd %{sources}
@@ -267,29 +261,9 @@ REPORT_EXIT_STATUS=1 \
 %endif
 
 
-%if 0%{?fedora} < 24 && 0%{?rhel} < 8
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
-    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
-    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
-    %{pecl_uninstall} %{proj_name} >/dev/null || :
-fi
-%endif
-
-
 %files
 %doc %{pecl_docdir}/%{pecl_name}
-%{?_licensedir:%license %{sources}/LICENSE*}
+%license %{sources}/LICENSE*
 %dir %{pear_phpdir}/datadog_trace
      %{pear_phpdir}/datadog_trace/src
 
@@ -304,6 +278,9 @@ fi
 
 
 %changelog
+* Wed Jul 24 2024 Remi Collet <remi@remirepo.net> - 1.2.0-1
+- update to 1.2.0
+
 * Tue Jun 11 2024 Remi Collet <remi@remirepo.net> - 1.1.0-1
 - update to 1.1.0