5.0.1

heyanlong · heyanlong · commit 94ef6123de38 · 2022-06-30T17:57:29.000+08:00
diff --git a/config.m4 b/config.m4
@@ -18,7 +18,7 @@ if test "$PHP_SKYWALKING" != "no"; then
     AC_MSG_ERROR([rustfmt command missing, please reinstall the cargo distribution])
   fi
 
-  EXTRA_LDFLAGS="$EXTRA_LDFLAGS target/release/libsky_core_report.a"
+  EXTRA_LDFLAGS="$EXTRA_LDFLAGS $srcdir/target/release/libsky_core_report.a"
   LIBS="-lpthread $LIBS"
 
   SKYWALKING_SHARED_LIBADD="-lpthread $SKYWALKING_SHARED_LIBADD"
@@ -54,18 +54,19 @@ if test "$PHP_SKYWALKING" != "no"; then
       src/sky_util_php.c \
       src/sky_utils.c \
   , $ext_shared)
+  PHP_ADD_BUILD_DIR($ext_builddir/src)
 fi
 
 if test -r $phpincludedir/ext/mysqli/mysqli_mysqlnd.h; then
     AC_DEFINE([MYSQLI_USE_MYSQLND], 1, [Whether mysqlnd is enabled])
 fi
-shared_objects_skywalking="target/release/libsky_core_report.a $shared_objects_skywalking"
+shared_objects_skywalking="$srcdir/target/release/libsky_core_report.a $shared_objects_skywalking"
 dnl PHP_SUBST(shared_objects_skywalking)
 case $host in
     *darwin*)
-      echo "target/release/libsky_core_report.a:\n	cargo build --release" >> Makefile.objects
+      echo "$srcdir/target/release/libsky_core_report.a:\n	cargo build --release --manifest-path=$srcdir/Cargo.toml" >> Makefile.objects
       ;;
     *)
-      echo -e "target/release/libsky_core_report.a:\n	cargo build --release" >> Makefile.objects
+      echo -e "$srcdir/target/release/libsky_core_report.a:\n	cargo build --release --manifest-path=$srcdir/Cargo.toml" >> Makefile.objects
       ;;
 esac
diff --git a/docs/BUILDING.md b/docs/BUILDING.md
@@ -34,9 +34,9 @@ On a Mac, you will first need to install Xcode or Command Line Tools for Xcode a
 ## Build from source (PHP Extension)
 
 ```shell script
-curl -Lo v5.0.0.tar.gz https://github.com/SkyAPM/SkyAPM-php-sdk/archive/v5.0.0.tar.gz
-tar zxvf v5.0.0.tar.gz
-cd SkyAPM-php-sdk-5.0.0
+curl -Lo v5.0.1.tar.gz https://github.com/SkyAPM/SkyAPM-php-sdk/archive/v5.0.1.tar.gz
+tar zxvf v5.0.1.tar.gz
+cd SkyAPM-php-sdk-5.0.1
 phpize
 ./configure
 make
diff --git a/package.xml b/package.xml
@@ -26,10 +26,10 @@
 		<email>yanlong@php.net</email>
 		<active>yes</active>
 	</lead>
-	<date>2022-06-27</date>
+	<date>2022-06-30</date>
 	<version>
-		<release>5.0.0</release>
-		<api>5.0.0</api>
+		<release>5.0.1</release>
+		<api>5.0.1</api>
 	</version>
 	<stability>
 		<release>stable</release>
@@ -82,7 +82,6 @@
 			<file role="src" name="scripts/version.sh"/>
 			<file role="src" name="skywalking.c"/>
 			<file role="src" name="skywalking.php"/>
-			<file role="doc" name="src/protocol"/>
 			<file role="src" name="src/reporter/grpc.rs"/>
 			<file role="src" name="src/reporter/ipc.rs"/>
 			<file role="src" name="src/reporter/mod.rs"/>
@@ -142,6 +141,39 @@
 			<file role="src" name="src/sky_utils.c"/>
 			<file role="src" name="src/sky_utils.h"/>
 			<file role="src" name="swoole.php"/>
+			<file role="src" name="src/protocol/.asf.yaml"/>
+			<file role="doc" name="src/protocol/WORKSPACE"/>
+			<file role="doc" name="src/protocol/README.md"/>
+			<file role="doc" name="src/protocol/.gitignore"/>
+			<file role="doc" name="src/protocol/.git"/>
+			<file role="doc" name="src/protocol/.bazelrc"/>
+			<file role="src" name="src/protocol/service-mesh-probe/service-mesh.proto"/>
+			<file role="src" name="src/protocol/service-mesh-probe/service-mesh-compat.proto"/>
+			<file role="src" name="src/protocol/language-agent/MeterCompat.proto"/>
+			<file role="src" name="src/protocol/language-agent/TracingCompat.proto"/>
+			<file role="src" name="src/protocol/language-agent/Meter.proto"/>
+			<file role="src" name="src/protocol/language-agent/CLRMetricCompat.proto"/>
+			<file role="src" name="src/protocol/language-agent/JVMMetricCompat.proto"/>
+			<file role="src" name="src/protocol/language-agent/Tracing.proto"/>
+			<file role="src" name="src/protocol/language-agent/ConfigurationDiscoveryService.proto"/>
+			<file role="src" name="src/protocol/language-agent/JVMMetric.proto"/>
+			<file role="src" name="src/protocol/language-agent/CLRMetric.proto"/>
+			<file role="doc" name="src/protocol/language-agent/BUILD"/>
+			<file role="src" name="src/protocol/management/ManagementCompat.proto"/>
+			<file role="src" name="src/protocol/management/Management.proto"/>
+			<file role="src" name="src/protocol/browser/BrowserPerfCompat.proto"/>
+			<file role="src" name="src/protocol/browser/BrowserPerf.proto"/>
+			<file role="doc" name="src/protocol/common/BUILD"/>
+			<file role="src" name="src/protocol/common/Common.proto"/>
+			<file role="src" name="src/protocol/profile/ProfileCompat.proto"/>
+			<file role="src" name="src/protocol/profile/Profile.proto"/>
+			<file role="doc" name="src/protocol/bazel/BUILD"/>
+			<file role="src" name="src/protocol/bazel/repositories.bzl"/>
+			<file role="src" name="src/protocol/.github/workflows/ci.yaml"/>
+			<file role="src" name="src/protocol/ebpf/profiling/Process.proto"/>
+			<file role="src" name="src/protocol/ebpf/profiling/Profile.proto"/>
+			<file role="src" name="src/protocol/event/Event.proto"/>
+			<file role="src" name="src/protocol/logging/Logging.proto"/>
 		</dir>
 	</contents>
 	<dependencies>
@@ -157,6 +189,17 @@
 	<providesextension>skywalking</providesextension>
 	<extsrcrelease/>
 	<changelog>
+		<release>
+			<version>
+				<release>5.0.1</release>
+				<api>5.0.1</api>
+			</version>
+			<stability>
+				<release>stable</release>
+				<api>stable</api>
+			</stability>
+			<notes>Support Skywalking 9.0.0</notes>
+		</release>
 		<release>
 			<version>
 				<release>5.0.0</release>
diff --git a/php_skywalking.h b/php_skywalking.h
@@ -38,7 +38,7 @@
 extern zend_module_entry skywalking_module_entry;
 # define phpext_skywalking_ptr &skywalking_module_entry
 
-#define PHP_SKYWALKING_VERSION "5.0.0"
+#define PHP_SKYWALKING_VERSION "5.0.1"
 
 
 #define SKY_STRCMP(s1, s2) ((s1) != nullptr && strcmp(s1, s2) == 0)
diff --git a/scripts/package.py b/scripts/package.py
@@ -16,16 +16,23 @@
 import xml.dom.minidom
 import time, os
 
-version = '5.0.0'
+version = '5.0.1'
 
 git = os.popen('git ls-files')
 res = git.read()
 child = []
 
-for line in res.splitlines():
+git_files = res.splitlines()
+
+for root, dirs, files in os.walk("./src/protocol"):
+    for file in files:
+        git_files.append((root + "/" + file)[2:])
+
+for line in git_files:
     if line == "":
         continue
-
+    if line == "src/protocol":
+        continue
     if line == "package.xml" or line[0:1] == '.':
         continue
 
@@ -98,6 +105,20 @@
     {'key': 'providesextension', 'value': 'skywalking'},
     {'key': 'extsrcrelease'},
     {'key': 'changelog', 'child': [
+        {'key': 'release', 'child': [
+            {'key': 'version', 'child': [
+                {'key': 'release', 'value': '5.0.1'},
+                {'key': 'api', 'value': '5.0.1'}
+            ]
+             },
+            {'key': 'stability', 'child': [
+                {'key': 'release', 'value': 'stable'},
+                {'key': 'api', 'value': 'stable'}
+            ]
+             },
+            {'key': 'notes', 'value': 'Support Skywalking 9.0.0'}
+        ]
+         },
         {'key': 'release', 'child': [
             {'key': 'version', 'child': [
                     {'key': 'release', 'value': '5.0.0'},
diff --git a/scripts/version.sh b/scripts/version.sh
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-VERSION=5.0.0
+VERSION=5.0.1
 OS=`uname`
 
 echo "OS: $OS"
diff --git a/skywalking.c b/skywalking.c
@@ -39,7 +39,7 @@
 #include "ext/standard/info.h"
 #include "php_skywalking.h"
 
-#include "sky_core_module.h"
+#include "src/sky_core_module.h"
 
 #ifdef MYSQLI_USE_MYSQLND
 #include "ext/mysqli/php_mysqli_structs.h"

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`# limitations under the License.`
`16`	`16`	`#`
`17`	`17`
`18`		`-VERSION=5.0.0`
	`18`	`+VERSION=5.0.1`
`19`	`19`	OS=`uname`
`20`	`20`
`21`	`21`	`echo "OS: $OS"`