Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
SkyAPM
SkyAPM-php-sdk
提交
defbbfd3
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 搜索 >>
提交
defbbfd3
编写于
10月 12, 2019
作者:
H
heyanlong
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop' of github.com:SkyAPM/SkyAPM-php-sdk into develop
# Conflicts: # docs/zh/install-sdk.md
上级
9753c1e8
ccba0cc8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
11 deletion
+18
-11
docs/zh/install-sdk.md
docs/zh/install-sdk.md
+2
-2
skywalking.c
skywalking.c
+16
-9
未找到文件。
docs/zh/install-sdk.md
浏览文件 @
defbbfd3
...
...
@@ -51,8 +51,8 @@ skywalking.enable=1
skywalking.version
=
6
;
app_code代码,不要含特殊字符,请使用数字、字母、下换线。
(
默认为:hello_skywalking
)
skywalking.app_code
=
hello_skywalking
;
sock文件路径(默认值为/tmp/sky
_
agent.sock)
skywalking.sock_path
=
/tmp/sky
_
agent.sock
;
sock文件路径(默认值为/tmp/sky
-
agent.sock)
skywalking.sock_path
=
/tmp/sky
-
agent.sock
```
...
...
skywalking.c
浏览文件 @
defbbfd3
...
...
@@ -70,6 +70,7 @@ ZEND_DECLARE_MODULE_GLOBALS(skywalking)
static
int
le_skywalking
;
static
int
application_instance
=
0
;
static
int
application_id
=
0
;
static
char
application_uuid
[
37
]
=
{
0
};
static
int
sky_increment_id
=
0
;
static
int
cli_debug
=
0
;
...
...
@@ -85,7 +86,7 @@ PHP_INI_BEGIN()
STD_PHP_INI_BOOLEAN
(
"skywalking.enable"
,
"0"
,
PHP_INI_ALL
,
OnUpdateBool
,
enable
,
zend_skywalking_globals
,
skywalking_globals
)
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"
,
"/tmp/sky
_
agent.sock"
,
PHP_INI_ALL
,
OnUpdateString
,
sock_path
,
zend_skywalking_globals
,
skywalking_globals
)
STD_PHP_INI_ENTRY
(
"skywalking.sock_path"
,
"/tmp/sky
-
agent.sock"
,
PHP_INI_ALL
,
OnUpdateString
,
sock_path
,
zend_skywalking_globals
,
skywalking_globals
)
PHP_INI_END
()
/* }}} */
...
...
@@ -241,7 +242,7 @@ ZEND_API void sky_execute_ex(zend_execute_data *execute_data) {
if
(
Z_TYPE_P
(
arguments
)
==
IS_ARRAY
)
{
zend_ulong
num_key
;
zval
*
entry
;
zval
*
entry
,
str_entry
;
smart_str
command
=
{
0
};
smart_str_appends
(
&
command
,
Z_STRVAL_P
(
id
));
smart_str_appends
(
&
command
,
" "
);
...
...
@@ -255,8 +256,9 @@ ZEND_API void sky_execute_ex(zend_execute_data *execute_data) {
case
IS_ARRAY
:
break
;
default:
convert_to_string
(
entry
);
smart_str_appends
(
&
command
,
Z_STRVAL_P
(
entry
));
ZVAL_COPY
(
&
str_entry
,
entry
);
convert_to_string
(
&
str_entry
);
smart_str_appends
(
&
command
,
Z_STRVAL_P
(
&
str_entry
));
smart_str_appends
(
&
command
,
" "
);
break
;
}
...
...
@@ -557,18 +559,21 @@ ZEND_API void sky_execute_internal(zend_execute_data *execute_data, zval *return
int
is_string_command
=
1
;
int
i
;
for
(
i
=
1
;
i
<
arg_count
+
1
;
++
i
)
{
zval
str_p
;
zval
*
p
=
ZEND_CALL_ARG
(
execute_data
,
i
);
if
(
Z_TYPE_P
(
p
)
==
IS_ARRAY
)
{
is_string_command
=
0
;
break
;
}
if
(
Z_TYPE_P
(
p
)
!=
IS_STRING
)
{
convert_to_string
(
p
);
ZVAL_COPY
(
&
str_p
,
p
);
if
(
Z_TYPE_P
(
&
str_p
)
!=
IS_STRING
)
{
convert_to_string
(
&
str_p
);
}
if
(
i
==
1
)
{
add_assoc_string
(
&
tags
,
"redis.key"
,
Z_STRVAL_P
(
p
));
add_assoc_string
(
&
tags
,
"redis.key"
,
Z_STRVAL_P
(
&
str_
p
));
}
smart_str_appends
(
&
command
,
zend_str_tolower_dup
(
Z_STRVAL_P
(
p
),
Z_STRLEN_P
(
p
)));
smart_str_appends
(
&
command
,
zend_str_tolower_dup
(
Z_STRVAL_P
(
&
str_p
),
Z_STRLEN_P
(
&
str_
p
)));
smart_str_appends
(
&
command
,
" "
);
}
// store command to tags
...
...
@@ -1357,6 +1362,7 @@ static void request_init() {
generate_context
();
add_assoc_long
(
&
SKYWALKING_G
(
UpstreamSegment
),
"application_instance"
,
application_instance
);
add_assoc_stringl
(
&
SKYWALKING_G
(
UpstreamSegment
),
"uuid"
,
application_uuid
,
strlen
(
application_uuid
));
add_assoc_long
(
&
SKYWALKING_G
(
UpstreamSegment
),
"pid"
,
getppid
());
add_assoc_long
(
&
SKYWALKING_G
(
UpstreamSegment
),
"application_id"
,
application_id
);
add_assoc_long
(
&
SKYWALKING_G
(
UpstreamSegment
),
"version"
,
SKYWALKING_G
(
version
));
...
...
@@ -1529,9 +1535,10 @@ static int sky_register() {
p
=
strtok
(
NULL
,
","
);
}
if
(
ids
[
0
]
!=
NULL
&&
ids
[
1
]
!=
NULL
)
{
if
(
ids
[
0
]
!=
NULL
&&
ids
[
1
]
!=
NULL
&&
ids
[
2
]
!=
NULL
)
{
application_id
=
atoi
(
ids
[
0
]);
application_instance
=
atoi
(
ids
[
1
]);
strncpy
(
application_uuid
,
ids
[
2
],
sizeof
application_uuid
-
1
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录