Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
SkyAPM
SkyAPM-php-sdk
提交
ebf093c5
S
SkyAPM-php-sdk
项目概览
SkyAPM
/
SkyAPM-php-sdk
通知
14
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyAPM-php-sdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
ebf093c5
编写于
2月 13, 2020
作者:
何
何延龙
提交者:
GitHub
2月 13, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #185 from SkyAPM/develop
3.2.6
上级
df2b059d
356d3015
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
45 addition
and
8 deletion
+45
-8
agent/cmd/main.go
agent/cmd/main.go
+1
-1
package-template.xml
package-template.xml
+14
-1
package.xml
package.xml
+17
-4
php_skywalking.h
php_skywalking.h
+2
-1
skywalking.c
skywalking.c
+11
-1
未找到文件。
agent/cmd/main.go
浏览文件 @
ebf093c5
...
...
@@ -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"
},
...
...
package-template.xml
浏览文件 @
ebf093c5
...
...
@@ -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>
...
...
package.xml
浏览文件 @
ebf093c5
...
...
@@ -15,10 +15,10 @@
<email>
yanlong@php.net
</email>
<active>
yes
</active>
</lead>
<date>
2020-02-1
1
</date>
<date>
2020-02-1
3
</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>
...
...
@@ -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=
"/"
>
...
...
@@ -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>
...
...
php_skywalking.h
浏览文件 @
ebf093c5
...
...
@@ -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)
...
...
skywalking.c
浏览文件 @
ebf093c5
...
...
@@ -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
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录