diff options
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | composer.json | 20 | ||||
| -rw-r--r-- | php-pecl-opentelemetry.spec | 85 |
4 files changed, 63 insertions, 46 deletions
@@ -2,7 +2,7 @@ opentelemetry opentelemetry hooks => enabled -extension version => 1.2.1 +extension version => 1.3.0 Directive => Local Value => Master Value opentelemetry.conflicts => no value => no value @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #104 opentelemetry version 1.2.1 ] { +Extension [ <persistent> extension #107 opentelemetry version 1.3.0 ] { - INI { Entry [ opentelemetry.conflicts <ALL> ] diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..0e74f5e --- /dev/null +++ b/composer.json @@ -0,0 +1,20 @@ +{ + "name": "open-telemetry/ext-opentelemetry", + "description": "Auto-instrumentation extension for OpenTelemetry", + "type": "php-ext", + "minimum-stability": "stable", + "license": "Apache-2.0", + "php-ext": { + "extension-name": "opentelemetry", + "build-path": "ext" + }, + "require": { + "php": "^8.0" + }, + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php-instrumentation/graphs/contributors" + } + ] +}
\ No newline at end of file diff --git a/php-pecl-opentelemetry.spec b/php-pecl-opentelemetry.spec index cb8fcee..eb6c3a4 100644 --- a/php-pecl-opentelemetry.spec +++ b/php-pecl-opentelemetry.spec @@ -6,35 +6,41 @@ # # Please, preserve the changelog entries # -%{?scl:%scl_package php-pecl-opentelemetry} +%{?scl:%scl_package php-pecl-opentelemetry} -%bcond_without tests +%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 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.2.1 +%global upstream_version 1.3.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 +%global sources %{gh_proj}-%{upstream_version}%{?upstream_prever} +%global _configure ../%{sources}/ext/configure + +# Github forge +%global gh_vend %{pie_vend} +%global gh_proj opentelemetry-php-instrumentation +%global forgeurl https://github.com/%{gh_vend}/%{gh_proj} +%global tag %{upstream_version}%{?upstream_prever} -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;')}} +Summary: OpenTelemetry auto-instrumentation support extension License: Apache-2.0 -URL: https://pecl.php.net/package/%{pecl_name} -Source0: https://pecl.php.net/get/%{sources}.tgz +Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} +Release: 1%{?dist} +%forgemeta +URL: %{forgeurl} +Source0: %{forgesource} BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ -BuildRequires: %{?scl_prefix}php-devel >= 8.1 -BuildRequires: %{?scl_prefix}php-pear +BuildRequires: %{?scl_prefix}php-devel >= 8.0 Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} @@ -66,25 +72,16 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -c -# Don't install tests -sed -e 's/role="test"/role="src"/' \ - -e '/LICENSE/s/role="doc"/role="src"/' \ - -i package.xml - -cd %{sources} +pushd %{sources}/ext : 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 : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}. exit 1 fi -cd .. +popd -mkdir NTS -%if %{with_zts} -# Duplicate source tree for NTS / ZTS build -mkdir ZTS -%endif +mkdir NTS ZTS # Create configuration file cat << 'EOF' | tee %{ini_name} @@ -105,24 +102,27 @@ EOF %build %{?dtsenable} -cd %{sources} +pushd %{sources}/ext %{__phpize} sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global +popd -cd ../NTS +pushd NTS %configure \ --enable-opentelemetry \ --with-php-config=%{__phpconfig} %make_build +popd %if %{with_zts} -cd ../ZTS +pushd ZTS %configure \ --enable-opentelemetry \ --with-php-config=%{__ztsphpconfig} %make_build +popd %endif @@ -134,24 +134,15 @@ cd ../ZTS # install config file install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} -# Install XML package description -install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml - %if %{with_zts} %make_install -C ZTS install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif -# Documentation -cd %{sources} -for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i -done - %check -cd %{sources} +cd %{sources}/ext : Minimal load test for NTS extension %{__php} --no-php-ini \ @@ -173,9 +164,10 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ %files -%license %{sources}/LICENSE* +%license %{sources}/LICENSE +%doc %{sources}/composer.json +%doc %{sources}/*.md -%{pecl_xmldir}/%{name}.xml %config(noreplace) %{php_inidir}/%{ini_name} %{php_extdir}/%{pecl_name}.so @@ -186,6 +178,11 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ %changelog +* Fri Mar 27 2026 Remi Collet <remi@remirepo.net> - 1.3.0-1 +- update to 1.3.0 +- drop pear/pecl dependency +- sources from github + * Thu Oct 2 2025 Remi Collet <remi@remirepo.net> - 1.2.1-1 - update to 1.2.1 |