[PHP-E2E] Support v8

.github/workflows/e2e.php.yaml

@@ -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

@@ -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

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-usleep(200000);
+usleep(500000);
 $uri = $_SERVER['REQUEST_URI'];
 
 if($uri == '/php/info') {

test/e2e/e2e-test/docker/php/php-shadow.ini

@@ -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

test/e2e/e2e-test/docker/php/php.ini

@@ -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

test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/PHPE2E.java

@@ -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 @@ void serviceInstances() throws Exception {
             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

@@ -14,14 +14,14 @@
 # limitations under the License.
 
 instances:
-  - key: 2
+  - key: not null
     label: not null
     attributes:
-      - name: OS Name
+      - name: os_name
         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

@@ -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

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 services:
-  - key: gt 0
-    label: "php"
-  - key: gt 0
-    label: "php-shadow"
+  - key: cGhwLXNoYWRvdw==.1
+    label: "php-shadow"
+  - key: cGhw.1
+    label: "php"

test/e2e/e2e-test/src/test/resources/expected/php/shadowInstances.yml

@@ -14,14 +14,14 @@
 # limitations under the License.
 
 instances:
-  - key: 3
+  - key: not null
     label: not null
     attributes:
-      - name: OS Name
+      - name: os_name
         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

@@ -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
+    target: cGhwLXNoYWRvdw==.1