From 095d182c5e72439747ad6bb81e747634e045081d Mon Sep 17 00:00:00 2001
From: heyanlong <yanlong.hee@gmail.com>
Date: Tue, 11 Feb 2020 12:35:37 +0800
Subject: [PATCH] Release 3.2.5

---
 agent/cmd/main.go    |   3 +-
 package-template.xml |  16 ++++-
 package.xml          | 153 ++++++++++++++++++++++++-------------------
 php_skywalking.h     |   2 +-
 4 files changed, 101 insertions(+), 73 deletions(-)

diff --git a/agent/cmd/main.go b/agent/cmd/main.go
index 3df1924..bd43c8e 100644
--- a/agent/cmd/main.go
+++ b/agent/cmd/main.go
@@ -20,8 +20,9 @@ func main() {
 	app := cli.NewApp()
 	app.Name = "sky_php_agent"
 	app.Usage = "the skywalking trace sending agent"
+	app.Version = "3.2.5"
 	app.Flags = []cli.Flag{
-		&cli.StringSliceFlag{Name: "grpc", Usage: "SkyWalking collector grpc address", Value: cli.NewStringSlice("127.0.0.1:11800", "127.0.0.2:11800")},
+		&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"},
 		&cli.IntFlag{Name: "send-rate", Usage: "Send trace 1 second by default", Value: 1},
 	}
diff --git a/package-template.xml b/package-template.xml
index 09457fb..a3c59e8 100644
--- 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>
-        Support php7.4
+        Fix the empty field bug in span refs for skywalking v6.
     </notes>
     <contents>
         <dir name="/">
@@ -44,9 +44,21 @@
         </required>
     </dependencies>
     <providesextension>skywalking</providesextension>
-    <providesextension>skywalking</providesextension>
     <extsrcrelease />
     <changelog>
+        <release>
+            <version>
+                <release>3.2.5</release>
+                <api>3.2.5</api>
+            </version>
+            <stability>
+                <release>stable</release>
+                <api>stable</api>
+            </stability>
+            <notes>
+                Fix the empty field bug in span refs for SkyWalking v6.
+            </notes>
+        </release>
         <release>
             <version>
                 <release>3.2.4</release>
diff --git a/package.xml b/package.xml
index f1d70fe..a3c830c 100644
--- a/package.xml
+++ b/package.xml
@@ -15,10 +15,10 @@
         <email>yanlong@php.net</email>
         <active>yes</active>
     </lead>
-    <date>2019-12-09</date>
+    <date>2020-02-11</date>
     <version>
-        <release>3.2.4</release>
-        <api>3.2.4</api>
+        <release>3.2.5</release>
+        <api>3.2.5</api>
     </version>
     <stability>
         <release>stable</release>
@@ -26,7 +26,7 @@
     </stability>
     <license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache2.0</license>
     <notes>
-        Support php7.4
+        Fix the empty field bug in span refs for skywalking v6.
     </notes>
     <contents>
         <dir name="/">
@@ -34,12 +34,39 @@
             <file role="doc" name="EXPERIMENTAL" />
             <file role="doc" name="LICENSE" />
             <file role="doc" name="README.md" />
+            <file role="src" name="agent/.gitignore" />
+            <file role="src" name="agent/cmd/main.go" />
+            <file role="src" name="agent/logger/log.go" />
+            <file role="src" name="agent/pb/agent/ApplicationRegisterService.pb.go" />
+            <file role="src" name="agent/pb/agent/CLR.pb.go" />
+            <file role="src" name="agent/pb/agent/DiscoveryService.pb.go" />
+            <file role="src" name="agent/pb/agent/Downstream.pb.go" />
+            <file role="src" name="agent/pb/agent/JVM.pb.go" />
+            <file role="src" name="agent/pb/agent/JVMMetricsService.pb.go" />
+            <file role="src" name="agent/pb/agent/KeyWithIntegerValue.pb.go" />
+            <file role="src" name="agent/pb/agent/KeyWithStringValue.pb.go" />
+            <file role="src" name="agent/pb/agent/NetworkAddressRegisterService.pb.go" />
+            <file role="src" name="agent/pb/agent/TraceSegmentService.pb.go" />
+            <file role="src" name="agent/pb/agent/trace-common.pb.go" />
+            <file role="src" name="agent/pb/agent2/CLRMetric.pb.go" />
+            <file role="src" name="agent/pb/agent2/JVMMetric.pb.go" />
+            <file role="src" name="agent/pb/agent2/trace.pb.go" />
+            <file role="src" name="agent/pb/common/common.pb.go" />
+            <file role="src" name="agent/pb/register2/InstancePing.pb.go" />
+            <file role="src" name="agent/pb/register2/Register.pb.go" />
+            <file role="src" name="agent/pb/servicemesh/service-mesh.pb.go" />
+            <file role="src" name="agent/service/agent.go" />
+            <file role="src" name="agent/service/conn.go" />
+            <file role="src" name="agent/service/heartbeat.go" />
+            <file role="src" name="agent/service/register.go" />
+            <file role="src" name="agent/service/trace.go" />
             <file role="src" name="b64.h" />
             <file role="src" name="bak/.gitignore" />
             <file role="doc" name="bak/README.md" />
             <file role="doc" name="bak/README_ZH.md" />
             <file role="src" name="bak/SkyWalking.php" />
             <file role="src" name="bak/demo.php" />
+            <file role="src" name="build-sky-php-agent.sh" />
             <file role="src" name="components.h" />
             <file role="src" name="config.m4" />
             <file role="src" name="config.w32" />
@@ -53,59 +80,33 @@
             <file role="doc" name="docs/zh/qa.md" />
             <file role="doc" name="docs/zh/start-agent.md" />
             <file role="src" name="encode.c" />
+            <file role="src" name="go.mod" />
+            <file role="src" name="go.sum" />
+            <file role="src" name="pecl-package.php" />
             <file role="src" name="php.ini" />
             <file role="src" name="php_skywalking.h" />
+            <file role="doc" name="proto/README.md" />
+            <file role="src" name="proto/common/CLR.proto" />
+            <file role="src" name="proto/common/JVM.proto" />
+            <file role="src" name="proto/common/common.proto" />
+            <file role="src" name="proto/common/trace-common.proto" />
+            <file role="src" name="proto/language-agent-v2/CLRMetric.proto" />
+            <file role="src" name="proto/language-agent-v2/JVMMetric.proto" />
+            <file role="src" name="proto/language-agent-v2/trace.proto" />
+            <file role="src" name="proto/language-agent/ApplicationRegisterService.proto" />
+            <file role="src" name="proto/language-agent/DiscoveryService.proto" />
+            <file role="src" name="proto/language-agent/Downstream.proto" />
+            <file role="src" name="proto/language-agent/JVMMetricsService.proto" />
+            <file role="src" name="proto/language-agent/KeyWithIntegerValue.proto" />
+            <file role="src" name="proto/language-agent/KeyWithStringValue.proto" />
+            <file role="src" name="proto/language-agent/NetworkAddressRegisterService.proto" />
+            <file role="src" name="proto/language-agent/TraceSegmentService.proto" />
+            <file role="src" name="proto/register/InstancePing.proto" />
+            <file role="src" name="proto/register/Register.proto" />
+            <file role="src" name="proto/service-mesh-probe/istio/skywalking.config.pb.html" />
+            <file role="src" name="proto/service-mesh-probe/service-mesh.proto" />
             <file role="src" name="skywalking.c" />
             <file role="src" name="skywalking.php" />
-            <file role="src" name="src/agent/.gitignore" />
-            <file role="src" name="src/agent/build.sh" />
-            <file role="src" name="src/agent/cmd/main.go" />
-            <file role="src" name="src/agent/logger/log.go" />
-            <file role="src" name="src/agent/pb/agent/ApplicationRegisterService.pb.go" />
-            <file role="src" name="src/agent/pb/agent/CLR.pb.go" />
-            <file role="src" name="src/agent/pb/agent/DiscoveryService.pb.go" />
-            <file role="src" name="src/agent/pb/agent/Downstream.pb.go" />
-            <file role="src" name="src/agent/pb/agent/JVM.pb.go" />
-            <file role="src" name="src/agent/pb/agent/JVMMetricsService.pb.go" />
-            <file role="src" name="src/agent/pb/agent/KeyWithIntegerValue.pb.go" />
-            <file role="src" name="src/agent/pb/agent/KeyWithStringValue.pb.go" />
-            <file role="src" name="src/agent/pb/agent/NetworkAddressRegisterService.pb.go" />
-            <file role="src" name="src/agent/pb/agent/TraceSegmentService.pb.go" />
-            <file role="src" name="src/agent/pb/agent/trace-common.pb.go" />
-            <file role="src" name="src/agent/pb/agent2/CLRMetric.pb.go" />
-            <file role="src" name="src/agent/pb/agent2/JVMMetric.pb.go" />
-            <file role="src" name="src/agent/pb/agent2/trace.pb.go" />
-            <file role="src" name="src/agent/pb/common/common.pb.go" />
-            <file role="src" name="src/agent/pb/register2/InstancePing.pb.go" />
-            <file role="src" name="src/agent/pb/register2/Register.pb.go" />
-            <file role="src" name="src/agent/pb/servicemesh/service-mesh.pb.go" />
-            <file role="src" name="src/agent/service/agent.go" />
-            <file role="src" name="src/agent/service/conn.go" />
-            <file role="src" name="src/agent/service/heartbeat.go" />
-            <file role="src" name="src/agent/service/register.go" />
-            <file role="src" name="src/agent/service/trace.go" />
-            <file role="src" name="src/go.mod" />
-            <file role="src" name="src/go.sum" />
-            <file role="doc" name="src/proto/README.md" />
-            <file role="src" name="src/proto/common/CLR.proto" />
-            <file role="src" name="src/proto/common/JVM.proto" />
-            <file role="src" name="src/proto/common/common.proto" />
-            <file role="src" name="src/proto/common/trace-common.proto" />
-            <file role="src" name="src/proto/language-agent-v2/CLRMetric.proto" />
-            <file role="src" name="src/proto/language-agent-v2/JVMMetric.proto" />
-            <file role="src" name="src/proto/language-agent-v2/trace.proto" />
-            <file role="src" name="src/proto/language-agent/ApplicationRegisterService.proto" />
-            <file role="src" name="src/proto/language-agent/DiscoveryService.proto" />
-            <file role="src" name="src/proto/language-agent/Downstream.proto" />
-            <file role="src" name="src/proto/language-agent/JVMMetricsService.proto" />
-            <file role="src" name="src/proto/language-agent/KeyWithIntegerValue.proto" />
-            <file role="src" name="src/proto/language-agent/KeyWithStringValue.proto" />
-            <file role="src" name="src/proto/language-agent/NetworkAddressRegisterService.proto" />
-            <file role="src" name="src/proto/language-agent/TraceSegmentService.proto" />
-            <file role="src" name="src/proto/register/InstancePing.proto" />
-            <file role="src" name="src/proto/register/Register.proto" />
-            <file role="src" name="src/proto/service-mesh-probe/istio/skywalking.config.pb.html" />
-            <file role="src" name="src/proto/service-mesh-probe/service-mesh.proto" />
             <file role="test" name="tests/c.phpt" />
             <file role="test" name="tests/curl_001.phpt" />
             <file role="test" name="tests/curl_002.phpt" />
@@ -141,6 +142,7 @@
             <file role="src" name="travis/route.sh" />
             <file role="src" name="travis/simple-compile.sh" />
             <file role="src" name="who-uses.jpg" />
+
         </dir>
     </contents>
     <dependencies>
@@ -155,19 +157,32 @@
     </dependencies>
     <providesextension>skywalking</providesextension>
     <extsrcrelease />
- <changelog>
-  <release>
-   <version>
-    <release>3.2.4</release>
-    <api>3.2.4</api>
-   </version>
-   <stability>
-    <release>stable</release>
-    <api>stable</api>
-   </stability>
-   <notes>
-Support php7.4
-   </notes>
-  </release>
-  </changelog>
-</package>
+    <changelog>
+        <release>
+            <version>
+                <release>3.2.5</release>
+                <api>3.2.5</api>
+            </version>
+            <stability>
+                <release>stable</release>
+                <api>stable</api>
+            </stability>
+            <notes>
+                Fix the empty field bug in span refs for SkyWalking v6.
+            </notes>
+        </release>
+        <release>
+            <version>
+                <release>3.2.4</release>
+                <api>3.2.4</api>
+            </version>
+            <stability>
+                <release>stable</release>
+                <api>stable</api>
+            </stability>
+            <notes>
+            Support php7.4
+            </notes>
+        </release>
+    </changelog>
+</package>
\ No newline at end of file
diff --git a/php_skywalking.h b/php_skywalking.h
index 591842b..3b53390 100644
--- a/php_skywalking.h
+++ b/php_skywalking.h
@@ -24,7 +24,7 @@
 extern zend_module_entry skywalking_module_entry;
 #define phpext_skywalking_ptr &skywalking_module_entry
 
-#define PHP_SKYWALKING_VERSION "3.2.4" /* Replace with version number for your extension */
+#define PHP_SKYWALKING_VERSION "3.2.5" /* Replace with version number for your extension */
 
 #ifdef PHP_WIN32
 #	define PHP_SKYWALKING_API __declspec(dllexport)
-- 
GitLab