Skip to content

S
SkyAPM-php-sdk

SkyAPM / SkyAPM-php-sdk

通知 14
Star 1
Fork 0
S
SkyAPM-php-sdk

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 ce4d2b08 编写于 作者: H heyanlong
浏览文件
操作

3.2.8

上级 f63b2f09
隐藏空白更改
内联 并排
Showing with 73 addition and 16 deletion
README.md
浏览文件 @ ce4d2b08
......@@ -12,7 +12,7 @@ SkyAPM PHP
* [中文文档](docs/README_ZH.md)
## Docker image
[SkyAPM PHP](https://hub.docker.com/r/skyapm/skywalking-php)
Go to Docker hub -> [SkyAPM PHP](https://hub.docker.com/r/skyapm/skywalking-php)
```shell script
docker run -d -e SW_AGENT_COLLECTOR_BACKEND_SERVICES=127.0.0.1:11800 skywalking-php
```
......
agent/cmd/main.go
浏览文件 @ ce4d2b08
......@@ -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.7"
app.Version = "3.2.8"
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"},
......
package-release-template.xml 0 → 100644
浏览文件 @ ce4d2b08
{{release}}
<release>
<version>
<release>{{version}}</release>
<api>{{version}}</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<notes>
{{notes}}
</notes>
</release>
\ No newline at end of file
package-template.xml
浏览文件 @ ce4d2b08
......@@ -46,6 +46,20 @@
<providesextension>skywalking</providesextension>
<extsrcrelease />
<changelog>
{{release}}
<release>
<version>
<release>3.2.8</release>
<api>3.2.8</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<notes>
Fix bugs and add Dockerfile
</notes>
</release>
<release>
<version>
<release>3.2.6</release>
......
package.xml
浏览文件 @ ce4d2b08
......@@ -15,10 +15,10 @@
<email>yanlong@php.net</email>
<active>yes</active>
</lead>
<date>2020-02-13</date>
<date>2020-03-23</date>
<version>
<release>3.2.6</release>
<api>3.2.6</api>
<release>3.2.8</release>
<api>3.2.8</api>
</version>
<stability>
<release>stable</release>
......@@ -31,6 +31,7 @@
<contents>
<dir name="/">
<file role="doc" name="CREDITS" />
<file role="doc" name="Dockerfile" />
<file role="doc" name="EXPERIMENTAL" />
<file role="doc" name="LICENSE" />
<file role="doc" name="README.md" />
......@@ -82,6 +83,8 @@
<file role="src" name="encode.c" />
<file role="src" name="go.mod" />
<file role="src" name="go.sum" />
<file role="src" name="nginx.conf" />
<file role="src" name="package-release-template.xml" />
<file role="src" name="pecl-package.php" />
<file role="src" name="php.ini" />
<file role="src" name="php_skywalking.h" />
......@@ -105,6 +108,7 @@
<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="service.sh" />
<file role="src" name="skywalking.c" />
<file role="src" name="skywalking.php" />
<file role="test" name="tests/c.phpt" />
......@@ -158,6 +162,20 @@
<providesextension>skywalking</providesextension>
<extsrcrelease />
<changelog>
<release>
<version>
<release>3.2.8</release>
<api>3.2.8</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<notes>
Fix bugs and add Dockerfile
</notes>
</release>
<release>
<version>
<release>3.2.6</release>
......
pecl-package.php
浏览文件 @ ce4d2b08
#!/usr/bin/env php
<?php
if (!isset($argv[1]) || !isset($argv[2])) {
exit("❌ No version number found");
}
// check file lists
$version = "";
$version = $argv[1];
$desc = $argv[2];
$root_dir = dirname(__FILE__);
$file_list_raw = explode(PHP_EOL, `git ls-files`);
$header = file_get_contents("$root_dir/php_skywalking.h");
$header = preg_replace("/PHP_SKYWALKING_VERSION \"(\d.\d.\d)\"/i", 'PHP_SKYWALKING_VERSION "' . $version . '"', $header);
file_put_contents("$root_dir/php_skywalking.h", $header);
if(preg_match("/PHP_SKYWALKING_VERSION \"(\d.\d.\d)\"/i", $header, $matches)) {
if(isset($matches[1])) {
$version = $matches[1];
}
}
if ($version === "") {
exit("❌No version number found");
}
$agent = file_get_contents("$root_dir/agent/cmd/main.go");
$agent = preg_replace("/app.Version = \"(\d.\d.\d)\"/i", 'app.Version = "' . $version . '"', $agent);
file_put_contents("$root_dir/agent/cmd/main.go", $agent);
echo "version: $version\n";
......@@ -61,10 +63,19 @@ foreach ($file_list_raw as $file) {
$file_list[] = "<file role=\"{$role}\" name=\"{$file}\" />\n";
}
$release = file_get_contents(__DIR__ . '/package-release-template.xml');
$release = str_replace("{{version}}", $version, $release);
$release = str_replace("{{notes}}", $desc, $release);
$template = file_get_contents(__DIR__ . '/package-template.xml');
$template = str_replace("{{release}}", $release, $template);
file_put_contents(__DIR__ . '/package-template.xml', $template);
$template = file_get_contents(__DIR__ . '/package-template.xml');
$template = str_replace("{{file_list}}", implode(" ", $file_list), $template);
$template = str_replace("{{version}}", $version, $template);
$template = str_replace("{{date}}", date("Y-m-d"), $template);
$template = str_replace("{{release}}", "", $template);
file_put_contents("package.xml", $template);
php_skywalking.h
浏览文件 @ ce4d2b08
......@@ -25,7 +25,7 @@ extern zend_module_entry skywalking_module_entry;
#define phpext_skywalking_ptr &skywalking_module_entry
#define SKY_DEBUG 0
#define PHP_SKYWALKING_VERSION "3.2.7" /* Replace with version number for your extension */
#define PHP_SKYWALKING_VERSION "3.2.8" /* Replace with version number for your extension */
#ifdef PHP_WIN32
# define PHP_SKYWALKING_API __declspec(dllexport)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或