diff options
| -rw-r--r-- | 0001-fix-test-for-php-8.5-194.patch | 27 | ||||
| -rw-r--r-- | PHPINFO | 3 | ||||
| -rw-r--r-- | REFLECTION | 5 | ||||
| -rw-r--r-- | php-pecl-opentelemetry.spec | 73 |
4 files changed, 85 insertions, 23 deletions
diff --git a/0001-fix-test-for-php-8.5-194.patch b/0001-fix-test-for-php-8.5-194.patch new file mode 100644 index 0000000..e5bd230 --- /dev/null +++ b/0001-fix-test-for-php-8.5-194.patch @@ -0,0 +1,27 @@ +From 3953640bf49ac099f383d2aa26da5bf1910561c8 Mon Sep 17 00:00:00 2001 +From: Brett McBride <brett.a.mcbride@gmail.com> +Date: Mon, 25 Aug 2025 22:49:36 +1000 +Subject: [PATCH] fix test for php 8.5 (#194) + +Deprecated: Increment on non-numeric string is deprecated, use str_increment() instead in /home/runner/work/opentelemetry-php-instrumentation/opentelemetry-php-instrumentation/ext/tests/multiple_hooks_modify_params.php +--- + ext/tests/multiple_hooks_modify_params.phpt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ext/tests/multiple_hooks_modify_params.phpt b/ext/tests/multiple_hooks_modify_params.phpt +index 136ebe5..90e92f9 100644 +--- a/ext/tests/multiple_hooks_modify_params.phpt ++++ b/ext/tests/multiple_hooks_modify_params.phpt +@@ -11,7 +11,7 @@ function helloWorld($a) { + var_dump($a); + } + +-helloWorld('a'); ++helloWorld(1); + ?> + --EXPECT-- +-string(1) "c" ++int(3) +-- +2.51.0 + @@ -2,12 +2,13 @@ opentelemetry opentelemetry hooks => enabled -extension version => 1.1.0beta2 +extension version => 1.2.0 Directive => Local Value => Master Value opentelemetry.conflicts => no value => no value opentelemetry.validate_hook_functions => On => On opentelemetry.allow_stack_extension => Off => Off opentelemetry.attr_hooks_enabled => Off => Off +opentelemetry.display_warnings => Off => Off opentelemetry.attr_pre_handler_function => OpenTelemetry\API\Instrumentation\WithSpanHandler::pre => OpenTelemetry\API\Instrumentation\WithSpanHandler::pre opentelemetry.attr_post_handler_function => OpenTelemetry\API\Instrumentation\WithSpanHandler::post => OpenTelemetry\API\Instrumentation\WithSpanHandler::post @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #87 opentelemetry version 1.1.0beta2 ] { +Extension [ <persistent> extension #100 opentelemetry version 1.2.0 ] { - INI { Entry [ opentelemetry.conflicts <ALL> ] @@ -13,6 +13,9 @@ Extension [ <persistent> extension #87 opentelemetry version 1.1.0beta2 ] { Entry [ opentelemetry.attr_hooks_enabled <ALL> ] Current = 'Off' } + Entry [ opentelemetry.display_warnings <ALL> ] + Current = 'Off' + } Entry [ opentelemetry.attr_pre_handler_function <ALL> ] Current = 'OpenTelemetry\API\Instrumentation\WithSpanHandler::pre' } diff --git a/php-pecl-opentelemetry.spec b/php-pecl-opentelemetry.spec index 7195a6c..55fef09 100644 --- a/php-pecl-opentelemetry.spec +++ b/php-pecl-opentelemetry.spec @@ -1,8 +1,8 @@ # remirepo spec file for php-pecl-opentelemetry # -# Copyright (c) 2023-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2023-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -10,12 +10,14 @@ %bcond_without tests +%global pie_vend open-telemetry +%global pie_proj ext-opentelemetry %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name opentelemetry %global ini_name 40-%{pecl_name}.ini -%global upstream_version 1.1.0 -%global upstream_prever beta2 +%global upstream_version 1.2.0 +#global upstream_prever beta3 %global upstream_lower %(echo %{upstream_prever} | tr '[:upper:]' '[:lower:]') %global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} %global _configure ../%{sources}/configure @@ -23,31 +25,35 @@ Summary: OpenTelemetry auto-instrumentation support extension Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: Apache-2.0 URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{sources}.tgz +Patch0: 0001-fix-test-for-php-8.5-194.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ -BuildRequires: %{?scl_prefix}php-devel >= 8.0 +BuildRequires: %{?scl_prefix}php-devel >= 8.1 BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} -Provides: %{?scl_prefix}php-%{pecl_name} = %{version} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +Provides: %{?scl_prefix}php-%{pecl_name} = %{version} +Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version} +Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version} %description OpenTelemetry auto-instrumentation extension. This is a PHP extension for OpenTelemetry, to enable auto-instrumentation. -It is based on zend_observer and requires php8+ +It is based on zend_observer. The extension allows creating pre and post hook functions to arbitrary PHP functions and methods, which allows those methods to be wrapped with telemetry. @@ -65,6 +71,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd %{sources} +%patch -P0 -p2 + : Sanity check, really often broken extver=$(sed -n '/#define PHP_OPENTELEMETRY_VERSION /{s/.* "//;s/".*$//;p}' php_%{pecl_name}.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then @@ -89,6 +97,7 @@ extension=%{pecl_name}.so ;opentelemetry.validate_hook_functions = On ;opentelemetry.allow_stack_extension = Off ;opentelemetry.attr_hooks_enabled = Off +;opentelemetry.display_warnings = Off ;opentelemetry.attr_pre_handler_function =OpenTelemetry\API\Instrumentation\WithSpanHandler::pre ;opentelemetry.attr_post_handler_function = OpenTelemetry\API\Instrumentation\WithSpanHandler::post EOF @@ -99,26 +108,29 @@ EOF cd %{sources} %{__phpize} +sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global cd ../NTS %configure \ --enable-opentelemetry \ --with-php-config=%{__phpconfig} -make %{?_smp_mflags} + +%make_build %if %{with_zts} cd ../ZTS %configure \ --enable-opentelemetry \ --with-php-config=%{__ztsphpconfig} -make %{?_smp_mflags} + +%make_build %endif %install %{?dtsenable} -make -C NTS install INSTALL_ROOT=%{buildroot} +%make_install -C NTS # install config file install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} @@ -127,7 +139,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml %if %{with_zts} -make -C ZTS install INSTALL_ROOT=%{buildroot} +%make_install -C ZTS install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif @@ -149,11 +161,8 @@ cd %{sources} %if %{with tests} : Upstream test suite for NTS extension -TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ -%{__php} -n run-tests.php --show-diff +%{__php} -n run-tests.php -q --show-diff %endif %if %{with_zts} @@ -165,7 +174,6 @@ REPORT_EXIT_STATUS=1 \ %files -#%%doc %%{pecl_docdir}/%%{pecl_name} %license %{sources}/LICENSE* %{pecl_xmldir}/%{name}.xml @@ -179,6 +187,29 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Thu Sep 4 2025 Remi Collet <remi@remirepo.net> - 1.2.0-2 +- add upstream patch for PHP 8.5.0beta2 + +* Wed Jul 9 2025 Remi Collet <remi@remirepo.net> - 1.2.0-1 +- update to 1.2.0 +- drop support for PHP 8.0 + +* Wed May 14 2025 Remi Collet <remi@remirepo.net> - 1.1.3-1 +- update to 1.1.3 + +* Thu Jan 23 2025 Remi Collet <remi@remirepo.net> - 1.1.2-1 +- update to 1.1.2 + +* Tue Jan 21 2025 Remi Collet <remi@remirepo.net> - 1.1.1-1 +- update to 1.1.1 +- re-license spec file to CECILL-2.1 + +* Thu Oct 3 2024 Remi Collet <remi@remirepo.net> - 1.1.0-1 +- update to 1.1.0 + +* Tue Sep 10 2024 Remi Collet <remi@remirepo.net> - 1.1.0~beta3-1 +- update to 1.1.0beta3 + * Wed Sep 4 2024 Remi Collet <remi@remirepo.net> - 1.1.0~beta2-1 - update to 1.1.0beta2 - open https://github.com/open-telemetry/opentelemetry-php/issues/1376 PHP 8.4 compatibility |