Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.

Commit 94ef612

Browse files
heyanlongheyanlong
committed
5.0.1
1 parent 25eca48 commit 94ef612

File tree

7 files changed

+82
-17
lines changed

7 files changed

+82
-17
lines changed

‎config.m4‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if test "$PHP_SKYWALKING" != "no"; then
1818
AC_MSG_ERROR([rustfmt command missing, please reinstall the cargo distribution])
1919
fi
2020

21-
EXTRA_LDFLAGS="$EXTRA_LDFLAGS target/release/libsky_core_report.a"
21+
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $srcdir/target/release/libsky_core_report.a"
2222
LIBS="-lpthread $LIBS"
2323

2424
SKYWALKING_SHARED_LIBADD="-lpthread $SKYWALKING_SHARED_LIBADD"
@@ -54,18 +54,19 @@ if test "$PHP_SKYWALKING" != "no"; then
5454
src/sky_util_php.c \
5555
src/sky_utils.c \
5656
, $ext_shared)
57+
PHP_ADD_BUILD_DIR($ext_builddir/src)
5758
fi
5859

5960
if test -r $phpincludedir/ext/mysqli/mysqli_mysqlnd.h; then
6061
AC_DEFINE([MYSQLI_USE_MYSQLND], 1, [Whether mysqlnd is enabled])
6162
fi
62-
shared_objects_skywalking="target/release/libsky_core_report.a $shared_objects_skywalking"
63+
shared_objects_skywalking="$srcdir/target/release/libsky_core_report.a $shared_objects_skywalking"
6364
dnl PHP_SUBST(shared_objects_skywalking)
6465
case $host in
6566
*darwin*)
66-
echo "target/release/libsky_core_report.a:\n cargo build --release" >> Makefile.objects
67+
echo "$srcdir/target/release/libsky_core_report.a:\n cargo build --release --manifest-path=$srcdir/Cargo.toml" >> Makefile.objects
6768
;;
6869
*)
69-
echo -e "target/release/libsky_core_report.a:\n cargo build --release" >> Makefile.objects
70+
echo -e "$srcdir/target/release/libsky_core_report.a:\n cargo build --release --manifest-path=$srcdir/Cargo.toml" >> Makefile.objects
7071
;;
7172
esac

‎docs/BUILDING.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ On a Mac, you will first need to install Xcode or Command Line Tools for Xcode a
3434
## Build from source (PHP Extension)
3535

3636
```shell script
37-
curl -Lo v5.0.0.tar.gz https://github.com/SkyAPM/SkyAPM-php-sdk/archive/v5.0.0.tar.gz
38-
tar zxvf v5.0.0.tar.gz
39-
cd SkyAPM-php-sdk-5.0.0
37+
curl -Lo v5.0.1.tar.gz https://github.com/SkyAPM/SkyAPM-php-sdk/archive/v5.0.1.tar.gz
38+
tar zxvf v5.0.1.tar.gz
39+
cd SkyAPM-php-sdk-5.0.1
4040
phpize
4141
./configure
4242
make

‎package.xml‎

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
<email>yanlong@php.net</email>
2727
<active>yes</active>
2828
</lead>
29-
<date>2022-06-27</date>
29+
<date>2022-06-30</date>
3030
<version>
31-
<release>5.0.0</release>
32-
<api>5.0.0</api>
31+
<release>5.0.1</release>
32+
<api>5.0.1</api>
3333
</version>
3434
<stability>
3535
<release>stable</release>
@@ -82,7 +82,6 @@
8282
<file role="src" name="scripts/version.sh"/>
8383
<file role="src" name="skywalking.c"/>
8484
<file role="src" name="skywalking.php"/>
85-
<file role="doc" name="src/protocol"/>
8685
<file role="src" name="src/reporter/grpc.rs"/>
8786
<file role="src" name="src/reporter/ipc.rs"/>
8887
<file role="src" name="src/reporter/mod.rs"/>
@@ -142,6 +141,39 @@
142141
<file role="src" name="src/sky_utils.c"/>
143142
<file role="src" name="src/sky_utils.h"/>
144143
<file role="src" name="swoole.php"/>
144+
<file role="src" name="src/protocol/.asf.yaml"/>
145+
<file role="doc" name="src/protocol/WORKSPACE"/>
146+
<file role="doc" name="src/protocol/README.md"/>
147+
<file role="doc" name="src/protocol/.gitignore"/>
148+
<file role="doc" name="src/protocol/.git"/>
149+
<file role="doc" name="src/protocol/.bazelrc"/>
150+
<file role="src" name="src/protocol/service-mesh-probe/service-mesh.proto"/>
151+
<file role="src" name="src/protocol/service-mesh-probe/service-mesh-compat.proto"/>
152+
<file role="src" name="src/protocol/language-agent/MeterCompat.proto"/>
153+
<file role="src" name="src/protocol/language-agent/TracingCompat.proto"/>
154+
<file role="src" name="src/protocol/language-agent/Meter.proto"/>
155+
<file role="src" name="src/protocol/language-agent/CLRMetricCompat.proto"/>
156+
<file role="src" name="src/protocol/language-agent/JVMMetricCompat.proto"/>
157+
<file role="src" name="src/protocol/language-agent/Tracing.proto"/>
158+
<file role="src" name="src/protocol/language-agent/ConfigurationDiscoveryService.proto"/>
159+
<file role="src" name="src/protocol/language-agent/JVMMetric.proto"/>
160+
<file role="src" name="src/protocol/language-agent/CLRMetric.proto"/>
161+
<file role="doc" name="src/protocol/language-agent/BUILD"/>
162+
<file role="src" name="src/protocol/management/ManagementCompat.proto"/>
163+
<file role="src" name="src/protocol/management/Management.proto"/>
164+
<file role="src" name="src/protocol/browser/BrowserPerfCompat.proto"/>
165+
<file role="src" name="src/protocol/browser/BrowserPerf.proto"/>
166+
<file role="doc" name="src/protocol/common/BUILD"/>
167+
<file role="src" name="src/protocol/common/Common.proto"/>
168+
<file role="src" name="src/protocol/profile/ProfileCompat.proto"/>
169+
<file role="src" name="src/protocol/profile/Profile.proto"/>
170+
<file role="doc" name="src/protocol/bazel/BUILD"/>
171+
<file role="src" name="src/protocol/bazel/repositories.bzl"/>
172+
<file role="src" name="src/protocol/.github/workflows/ci.yaml"/>
173+
<file role="src" name="src/protocol/ebpf/profiling/Process.proto"/>
174+
<file role="src" name="src/protocol/ebpf/profiling/Profile.proto"/>
175+
<file role="src" name="src/protocol/event/Event.proto"/>
176+
<file role="src" name="src/protocol/logging/Logging.proto"/>
145177
</dir>
146178
</contents>
147179
<dependencies>
@@ -157,6 +189,17 @@
157189
<providesextension>skywalking</providesextension>
158190
<extsrcrelease/>
159191
<changelog>
192+
<release>
193+
<version>
194+
<release>5.0.1</release>
195+
<api>5.0.1</api>
196+
</version>
197+
<stability>
198+
<release>stable</release>
199+
<api>stable</api>
200+
</stability>
201+
<notes>Support Skywalking 9.0.0</notes>
202+
</release>
160203
<release>
161204
<version>
162205
<release>5.0.0</release>

‎php_skywalking.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
extern zend_module_entry skywalking_module_entry;
3939
# define phpext_skywalking_ptr &skywalking_module_entry
4040

41-
#define PHP_SKYWALKING_VERSION "5.0.0"
41+
#define PHP_SKYWALKING_VERSION "5.0.1"
4242

4343

4444
#define SKY_STRCMP(s1, s2) ((s1) != nullptr && strcmp(s1, s2) == 0)

‎scripts/package.py‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,23 @@
1616
import xml.dom.minidom
1717
import time, os
1818

19-
version = '5.0.0'
19+
version = '5.0.1'
2020

2121
git = os.popen('git ls-files')
2222
res = git.read()
2323
child = []
2424

25-
for line in res.splitlines():
25+
git_files = res.splitlines()
26+
27+
for root, dirs, files in os.walk("./src/protocol"):
28+
for file in files:
29+
git_files.append((root + "/" + file)[2:])
30+
31+
for line in git_files:
2632
if line == "":
2733
continue
28-
34+
if line == "src/protocol":
35+
continue
2936
if line == "package.xml" or line[0:1] == '.':
3037
continue
3138

@@ -98,6 +105,20 @@
98105
{'key': 'providesextension', 'value': 'skywalking'},
99106
{'key': 'extsrcrelease'},
100107
{'key': 'changelog', 'child': [
108+
{'key': 'release', 'child': [
109+
{'key': 'version', 'child': [
110+
{'key': 'release', 'value': '5.0.1'},
111+
{'key': 'api', 'value': '5.0.1'}
112+
]
113+
},
114+
{'key': 'stability', 'child': [
115+
{'key': 'release', 'value': 'stable'},
116+
{'key': 'api', 'value': 'stable'}
117+
]
118+
},
119+
{'key': 'notes', 'value': 'Support Skywalking 9.0.0'}
120+
]
121+
},
101122
{'key': 'release', 'child': [
102123
{'key': 'version', 'child': [
103124
{'key': 'release', 'value': '5.0.0'},

‎scripts/version.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616
#
1717

18-
VERSION=5.0.0
18+
VERSION=5.0.1
1919
OS=`uname`
2020

2121
echo "OS: $OS"

‎skywalking.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include "ext/standard/info.h"
4040
#include "php_skywalking.h"
4141

42-
#include "sky_core_module.h"
42+
#include "src/sky_core_module.h"
4343

4444
#ifdef MYSQLI_USE_MYSQLND
4545
#include "ext/mysqli/php_mysqli_structs.h"

0 commit comments

Comments
 (0)