diff --git a/agent/cmd/main.go b/agent/cmd/main.go index bd43c8e87d4297fa5af35903654977ad28a9fc6d..6f9d08539a6ad7ffa4e53ecf187f1494289bebf8 100644 --- a/agent/cmd/main.go +++ b/agent/cmd/main.go @@ -20,7 +20,7 @@ func main() { app := cli.NewApp() app.Name = "sky_php_agent" app.Usage = "the skywalking trace sending agent" - app.Version = "3.2.5" + app.Version = "3.2.6" app.Flags = []cli.Flag{ &cli.StringSliceFlag{Name: "grpc", Usage: "SkyWalking collector grpc address", Value: cli.NewStringSlice("127.0.0.1:11800")}, &cli.StringFlag{Name: "socket", Usage: "Pipeline for communicating with PHP", Value: "/var/run/sky-agent.sock"}, diff --git a/package-template.xml b/package-template.xml index a3c59e8ed99b804523fe13b455e4374b754e24e1..f2834e324c208b872cbc48ee58145b83f353cfd5 100644 --- a/package-template.xml +++ b/package-template.xml @@ -26,7 +26,7 @@ Apache2.0 - Fix the empty field bug in span refs for skywalking v6. + Fix the mistake of field entryOperationName in sw6 header. @@ -46,6 +46,19 @@ skywalking + + + 3.2.6 + 3.2.6 + + + stable + stable + + + Fix the mistake of field entryOperationName in sw6 header. + + 3.2.5 diff --git a/package.xml b/package.xml index a3c830c94bdffdf477783c940d0f663a4c195881..9531750333a8011f6d2bb730fde257c2db9e6efd 100644 --- a/package.xml +++ b/package.xml @@ -15,10 +15,10 @@ yanlong@php.net yes - 2020-02-11 + 2020-02-13 - 3.2.5 - 3.2.5 + 3.2.6 + 3.2.6 stable @@ -26,7 +26,7 @@ Apache2.0 - Fix the empty field bug in span refs for skywalking v6. + Fix the mistake of field entryOperationName in sw6 header. @@ -158,6 +158,19 @@ skywalking + + + 3.2.6 + 3.2.6 + + + stable + stable + + + Fix the mistake of field entryOperationName in sw6 header. + + 3.2.5 diff --git a/php_skywalking.h b/php_skywalking.h index 3b53390e8a851db1535f842ff426beb709e71bf4..6f3aca9ae922d90048a015290405fd957e7c2db2 100644 --- a/php_skywalking.h +++ b/php_skywalking.h @@ -24,7 +24,8 @@ extern zend_module_entry skywalking_module_entry; #define phpext_skywalking_ptr &skywalking_module_entry -#define PHP_SKYWALKING_VERSION "3.2.5" /* Replace with version number for your extension */ +#define SKY_DEBUG 0 +#define PHP_SKYWALKING_VERSION "3.2.6" /* Replace with version number for your extension */ #ifdef PHP_WIN32 # define PHP_SKYWALKING_API __declspec(dllexport) diff --git a/skywalking.c b/skywalking.c index ae65467b41ac676b2cdc4e887aa362e0dc8bf75b..fd9acacf7c728835db93710e7d3463d77b230a60 100644 --- a/skywalking.c +++ b/skywalking.c @@ -68,11 +68,17 @@ ZEND_DECLARE_MODULE_GLOBALS(skywalking) /* True global resources - no need for thread safety here */ static int le_skywalking; +#if SKY_DEBUG +static int application_instance = 1; +static int application_id = 1; +static int cli_debug = 1; +#else static int application_instance = 0; static int application_id = 0; +static int cli_debug = 0; +#endif static char application_uuid[37] = {0}; static int sky_increment_id = 0; -static int cli_debug = 0; static void (*ori_execute_ex)(zend_execute_data *execute_data); static void (*ori_execute_internal)(zend_execute_data *execute_data, zval *return_value); @@ -83,7 +89,11 @@ ZEND_API void sky_execute_internal(zend_execute_data *execute_data, zval *return */ /* Remove comments and fill if you need to have entries in php.ini*/ PHP_INI_BEGIN() +#if SKY_DEBUG + STD_PHP_INI_BOOLEAN("skywalking.enable", "1", PHP_INI_ALL, OnUpdateBool, enable, zend_skywalking_globals, skywalking_globals) +#else STD_PHP_INI_BOOLEAN("skywalking.enable", "0", PHP_INI_ALL, OnUpdateBool, enable, zend_skywalking_globals, skywalking_globals) +#endif STD_PHP_INI_ENTRY("skywalking.version", "6", PHP_INI_ALL, OnUpdateLong, version, zend_skywalking_globals, skywalking_globals) STD_PHP_INI_ENTRY("skywalking.app_code", "hello_skywalking", PHP_INI_ALL, OnUpdateString, app_code, zend_skywalking_globals, skywalking_globals) STD_PHP_INI_ENTRY("skywalking.sock_path", "/var/run/sky-agent.sock", PHP_INI_ALL, OnUpdateString, sock_path, zend_skywalking_globals, skywalking_globals)