Merge pull request #185 from SkyAPM/develop

3.2.6
SkyAPM · Feb 13, 2020 · ebf093c · ebf093c
2 parents df2b059 + 356d301
commit ebf093c
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 8 deletions.
diff --git 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
@@ -26,7 +26,7 @@
     </stability>
     <license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache2.0</license>
     <notes>
-        Fix the empty field bug in span refs for skywalking v6.
+        Fix the mistake of field entryOperationName in sw6 header.
     </notes>
     <contents>
         <dir name="/">
@@ -46,6 +46,19 @@
     <providesextension>skywalking</providesextension>
     <extsrcrelease />
     <changelog>
+        <release>
+            <version>
+                <release>3.2.6</release>
+                <api>3.2.6</api>
+            </version>
+            <stability>
+                <release>stable</release>
+                <api>stable</api>
+            </stability>
+            <notes>
+                Fix the mistake of field entryOperationName in sw6 header.
+            </notes>
+        </release>
         <release>
             <version>
                 <release>3.2.5</release>

diff --git a/package.xml b/package.xml
@@ -15,18 +15,18 @@
         <email>[email protected]</email>
         <active>yes</active>
     </lead>
-    <date>2020-02-11</date>
+    <date>2020-02-13</date>
     <version>
-        <release>3.2.5</release>
-        <api>3.2.5</api>
+        <release>3.2.6</release>
+        <api>3.2.6</api>
     </version>
     <stability>
         <release>stable</release>
         <api>stable</api>
     </stability>
     <license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache2.0</license>
     <notes>
-        Fix the empty field bug in span refs for skywalking v6.
+        Fix the mistake of field entryOperationName in sw6 header.
     </notes>
     <contents>
         <dir name="/">
@@ -158,6 +158,19 @@
     <providesextension>skywalking</providesextension>
     <extsrcrelease />
     <changelog>
+        <release>
+            <version>
+                <release>3.2.6</release>
+                <api>3.2.6</api>
+            </version>
+            <stability>
+                <release>stable</release>
+                <api>stable</api>
+            </stability>
+            <notes>
+                Fix the mistake of field entryOperationName in sw6 header.
+            </notes>
+        </release>
         <release>
             <version>
                 <release>3.2.5</release>

diff --git 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
@@ -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)