Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
305a6b30
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 1 年多
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
305a6b30
编写于
6月 05, 2020
作者:
何
何延龙
提交者:
GitHub
6月 05, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[PHP-E2E] Support v8 (#4862)
上级
fa8a65c2
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
52 addition
and
55 deletion
+52
-55
.github/workflows/e2e.php.yaml
.github/workflows/e2e.php.yaml
+2
-3
test/e2e/e2e-test/docker/php/docker-compose.yml
test/e2e/e2e-test/docker/php/docker-compose.yml
+3
-3
test/e2e/e2e-test/docker/php/index.php
test/e2e/e2e-test/docker/php/index.php
+1
-1
test/e2e/e2e-test/docker/php/php-shadow.ini
test/e2e/e2e-test/docker/php/php-shadow.ini
+1
-1
test/e2e/e2e-test/docker/php/php.ini
test/e2e/e2e-test/docker/php/php.ini
+1
-1
test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/PHPE2E.java
...-test/src/test/java/org/apache/skywalking/e2e/PHPE2E.java
+2
-9
test/e2e/e2e-test/src/test/resources/expected/php/instances.yml
...2e/e2e-test/src/test/resources/expected/php/instances.yml
+4
-4
test/e2e/e2e-test/src/test/resources/expected/php/serviceInstanceTopo.yml
...t/src/test/resources/expected/php/serviceInstanceTopo.yml
+13
-12
test/e2e/e2e-test/src/test/resources/expected/php/services.yml
...e2e/e2e-test/src/test/resources/expected/php/services.yml
+4
-4
test/e2e/e2e-test/src/test/resources/expected/php/shadowInstances.yml
...-test/src/test/resources/expected/php/shadowInstances.yml
+4
-4
test/e2e/e2e-test/src/test/resources/expected/php/topo.yml
test/e2e/e2e-test/src/test/resources/expected/php/topo.yml
+17
-13
未找到文件。
.github/workflows/e2e.php.yaml
浏览文件 @
305a6b30
...
...
@@ -41,9 +41,8 @@ jobs:
run
:
make docker
-
name
:
Copy dist package
run
:
cp -R dist test/e2e/
# TODO, PHP hasn't followed the v3 protocol
# - name: PHP
# run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.PHPE2E
-
name
:
PHP
run
:
./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.PHPE2E
-
uses
:
actions/upload-artifact@v1
if
:
failure()
with
:
...
...
test/e2e/e2e-test/docker/php/docker-compose.yml
浏览文件 @
305a6b30
...
...
@@ -22,7 +22,7 @@ services:
service
:
oap
php-shadow
:
image
:
skyapm/skywalking-php:v3.
2.8
image
:
skyapm/skywalking-php:v3.
3.2
networks
:
-
e2e
expose
:
...
...
@@ -37,7 +37,7 @@ services:
-
./php-shadow.ini:/usr/local/etc/php/conf.d/ext-skywalking.ini
php
:
image
:
skyapm/skywalking-php:v3.
2.8
image
:
skyapm/skywalking-php:v3.
3.2
networks
:
-
e2e
expose
:
...
...
@@ -55,7 +55,7 @@ services:
ui
:
extends
:
file
:
../
../
base-compose.yml
file
:
../base-compose.yml
service
:
ui
depends_on
:
php
:
...
...
test/e2e/e2e-test/docker/php/index.php
浏览文件 @
305a6b30
...
...
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
usleep
(
2
00000
);
usleep
(
5
00000
);
$uri
=
$_SERVER
[
'REQUEST_URI'
];
if
(
$uri
==
'/php/info'
)
{
...
...
test/e2e/e2e-test/docker/php/php-shadow.ini
浏览文件 @
305a6b30
...
...
@@ -17,5 +17,5 @@
extension
=
skywalking.so
skywalking.app_code
=
php-shadow
skywalking.enable
=
1
skywalking.version
=
6
skywalking.version
=
8
skywalking.sock_path
=
/tmp/sky-agent.sock
\ No newline at end of file
test/e2e/e2e-test/docker/php/php.ini
浏览文件 @
305a6b30
...
...
@@ -17,5 +17,5 @@
extension
=
skywalking.so
skywalking.app_code
=
php
skywalking.enable
=
1
skywalking.version
=
6
skywalking.version
=
8
skywalking.sock_path
=
/tmp/sky-agent.sock
\ No newline at end of file
test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/PHPE2E.java
浏览文件 @
305a6b30
...
...
@@ -19,7 +19,6 @@
package
org.apache.skywalking.e2e
;
import
java.util.List
;
import
java.net.URL
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.skywalking.e2e.annotation.ContainerHostAndPort
;
import
org.apache.skywalking.e2e.annotation.DockerCompose
;
...
...
@@ -90,12 +89,6 @@ public class PHPE2E extends SkyWalkingTestAdapter {
@BeforeAll
public
void
setUp
()
throws
Exception
{
URL
url
=
new
URL
(
"http"
,
phpHostPort
.
host
(),
phpHostPort
.
port
(),
"/init"
);
restTemplate
.
getForObject
(
url
.
toURI
(),
String
.
class
);
Thread
.
sleep
(
1000
);
url
=
new
URL
(
"http"
,
phpShadowHostPort
.
host
(),
phpShadowHostPort
.
port
(),
"/init-shadow"
);
restTemplate
.
getForObject
(
url
.
toURI
(),
String
.
class
);
Thread
.
sleep
(
1000
);
queryClient
(
swWebappHostPort
);
trafficController
(
phpHostPort
,
"/php/info"
);
...
...
@@ -156,8 +149,8 @@ public class PHPE2E extends SkyWalkingTestAdapter {
new
ServiceInstanceTopologyQuery
().
stepByMinute
()
.
start
(
startTime
.
minusDays
(
1
))
.
end
(
now
())
.
clientServiceId
(
"1"
)
.
serverServiceId
(
"
2
"
));
.
clientServiceId
(
"
cGhw.
1"
)
.
serverServiceId
(
"
cGhwLXNoYWRvdw==.1
"
));
LOGGER
.
info
(
"topology: {}"
,
topology
);
...
...
test/e2e/e2e-test/src/test/resources/expected/php/instances.yml
浏览文件 @
305a6b30
...
...
@@ -14,14 +14,14 @@
# limitations under the License.
instances
:
-
key
:
2
-
key
:
not
null
label
:
not
null
attributes
:
-
name
:
OS N
ame
-
name
:
os_n
ame
value
:
not
null
-
name
:
hostname
-
name
:
host
_
name
value
:
not
null
-
name
:
Process No.
-
name
:
process_no
value
:
gt
0
-
name
:
ipv4s
value
:
not
null
test/e2e/e2e-test/src/test/resources/expected/php/serviceInstanceTopo.yml
浏览文件 @
305a6b30
...
...
@@ -14,21 +14,22 @@
# limitations under the License.
nodes
:
-
id
:
1
name
:
User
type
:
USER
serviceId
:
1
serviceName
:
User
isReal
:
false
-
id
:
2
-
id
:
not
null
name
:
not
null
serviceId
:
2
serviceId
:
cGhwLXNoYWRvdw==.1
serviceName
:
php-shadow
#type: USER
isReal
:
true
-
id
:
not
null
name
:
not
null
serviceId
:
cGhw.1
serviceName
:
php
type
:
not
null
#type: USER
isReal
:
true
calls
:
-
id
:
1_2
source
:
1
-
id
:
not
null
source
:
not
null
detectPoints
:
-
CLIENT
-
SERVER
target
:
2
target
:
not
null
test/e2e/e2e-test/src/test/resources/expected/php/services.yml
浏览文件 @
305a6b30
...
...
@@ -14,7 +14,7 @@
# limitations under the License.
services
:
-
key
:
gt
0
label
:
"
php"
-
key
:
gt
0
label
:
"
php-shadow"
\ No newline at end of file
-
key
:
cGhwLXNoYWRvdw==.1
label
:
"
php-shadow"
-
key
:
cGhw.1
label
:
"
php"
\ No newline at end of file
test/e2e/e2e-test/src/test/resources/expected/php/shadowInstances.yml
浏览文件 @
305a6b30
...
...
@@ -14,14 +14,14 @@
# limitations under the License.
instances
:
-
key
:
3
-
key
:
not
null
label
:
not
null
attributes
:
-
name
:
OS N
ame
-
name
:
os_n
ame
value
:
not
null
-
name
:
hostname
-
name
:
host
_
name
value
:
not
null
-
name
:
Process No.
-
name
:
process_no
value
:
gt
0
-
name
:
ipv4s
value
:
not
null
test/e2e/e2e-test/src/test/resources/expected/php/topo.yml
浏览文件 @
305a6b30
...
...
@@ -13,28 +13,32 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# VXNlcg== user
# cGhwLXNoYWRvdw== php-shadow
# cGhw php
nodes
:
-
id
:
1
-
id
:
VXNlcg==.0
name
:
User
type
:
USER
isReal
:
false
-
id
:
2
name
:
php
type
:
HttpClient
isReal
:
true
-
id
:
3
-
id
:
cGhwLXNoYWRvdw==.1
name
:
php-shadow
type
:
HttpClient
type
:
http
isReal
:
true
-
id
:
cGhw.1
name
:
php
type
:
http
isReal
:
true
calls
:
-
id
:
1_2
source
:
1
-
id
:
VXNlcg==.0-cGhw.1
source
:
VXNlcg==.0
detectPoints
:
-
SERVER
target
:
2
-
id
:
2_3
source
:
2
target
:
cGhw.1
-
id
:
cGhw.1-cGhwLXNoYWRvdw==.1
source
:
cGhw.1
detectPoints
:
-
CLIENT
-
SERVER
target
:
3
\ No newline at end of file
target
:
cGhwLXNoYWRvdw==.1
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录