From eaee48b8fe3f7625505779648540cf1ea1ef49e4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 30 Apr 2021 07:19:48 +0200 Subject: update to 4.1.2 --- PHPINFO | 6 ++++-- REFLECTION | 25 ++++++++++++++++++++++++- php-pecl-skywalking.spec | 21 +++++++++++---------- 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/PHPINFO b/PHPINFO index 9cb9dd0..d338720 100644 --- a/PHPINFO +++ b/PHPINFO @@ -7,9 +7,11 @@ skywalking.version => 8 => 8 skywalking.app_code => hello_skywalking => hello_skywalking skywalking.authentication => no value => no value skywalking.grpc => 127.0.0.1:11800 => 127.0.0.1:11800 -skywalking.grpc_tls_enable => 0 => 0 +skywalking.grpc_tls_enable => Off => Off skywalking.grpc_tls_pem_root_certs => no value => no value skywalking.grpc_tls_pem_private_key => no value => no value skywalking.grpc_tls_pem_cert_chain => no value => no value -skywalking.log_enable => 0 => 0 +skywalking.log_enable => Off => Off skywalking.log_path => /tmp/skywalking-php.log => /tmp/skywalking-php.log +skywalking.error_handler_enable => Off => Off +skywalking.mq_max_message_length => 20480 => 20480 diff --git a/REFLECTION b/REFLECTION index cd9b473..2788be2 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #117 skywalking version 4.1.1 ] { +Extension [ extension #120 skywalking version 4.1.2 ] { - Dependencies { Dependency [ json (Required) ] @@ -41,6 +41,12 @@ Extension [ extension #117 skywalking version 4.1.1 ] { Entry [ skywalking.log_path ] Current = '/tmp/skywalking-php.log' } + Entry [ skywalking.error_handler_enable ] + Current = '0' + } + Entry [ skywalking.mq_max_message_length ] + Current = '20480' + } } - Functions { @@ -49,6 +55,23 @@ Extension [ extension #117 skywalking version 4.1.1 ] { - Parameters [0] { } } + Function [ function skywalking_log ] { + + - Parameters [4] { + Parameter #0 [ $name ] + Parameter #1 [ $key ] + Parameter #2 [ $value ] + Parameter #3 [ $is_error ] + } + } + Function [ function skywalking_tag ] { + + - Parameters [3] { + Parameter #0 [ $name ] + Parameter #1 [ $key ] + Parameter #2 [ $value ] + } + } } } diff --git a/php-pecl-skywalking.spec b/php-pecl-skywalking.spec index 63f919a..fc309ca 100644 --- a/php-pecl-skywalking.spec +++ b/php-pecl-skywalking.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-skywalking # -# Copyright (c) 2019-2020 Remi Collet +# Copyright (c) 2019-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -20,12 +20,13 @@ Summary: The PHP instrument agent for Apache SkyWalking Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 4.1.1 +Version: 4.1.2 Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz License: ASL 2.0 URL: https://pecl.php.net/package/%{pecl_name} +BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-pear @@ -35,6 +36,7 @@ BuildRequires: %{?scl_prefix}php-pcre BuildRequires: libcurl-devel BuildRequires: protobuf-devel BuildRequires: protobuf-compiler +BuildRequires: boost-devel # Missing in EPEL https://bugzilla.redhat.com/1757147 BuildRequires: grpc-devel BuildRequires: grpc-plugins @@ -68,12 +70,6 @@ Obsoletes: php80-pecl-%{pecl_name} <= %{version} %endif %endif -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter private shared -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif - %description The package is the PHP instrumentation agent, which is compatible with @@ -117,12 +113,14 @@ extension=%{pecl_name}.so ;skywalking.app_code = 'hello_skywalking' ;skywalking.authentication = '' ;skywalking.grpc = '127.0.0.1:11800' -;skywalking.grpc_tls_enable = 0 +;skywalking.grpc_tls_enable = Off ;skywalking.grpc_tls_pem_root_certs = '' ;skywalking.grpc_tls_pem_private_key = '' ;skywalking.grpc_tls_pem_cert_chain = '' -;skywalking.log_enable = 0 +;skywalking.log_enable = Off ;skywalking.log_path = '/tmp/skywalking-php.log'; +;skywalking.error_handler_enable = Off +;skywalking.mq_max_message_length = 20480 EOF @@ -243,6 +241,9 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \ # TODO : missing grpc in EPEL %changelog +* Fri Apr 30 2021 Remi Collet - 4.1.2-1 +- update to 4.1.2 + * Thu Nov 19 2020 Remi Collet - 4.1.1-1 - update to 4.1.1 - drop patch merged upstream -- cgit