[skywalking] branch master updated: [CI] Update PHP Agent (#8054)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 7aa0ba7  [CI] Update PHP Agent (#8054)
7aa0ba7 is described below

commit 7aa0ba70483b621d40452b0b2f53423f59f039e5
Author: 何延龙 <ya...@gmail.com>
AuthorDate: Tue Nov 2 19:59:16 2021 +0800

    [CI] Update PHP Agent (#8054)
---
 test/e2e-v2/cases/php/docker-compose.yml                        | 4 +---
 test/e2e-v2/cases/php/expected/dependency-services-php.yml      | 2 +-
 test/e2e-v2/cases/php/expected/dependency-services-provider.yml | 2 +-
 test/e2e-v2/cases/php/expected/service-instance-php.yml         | 8 ++++----
 test/e2e-v2/cases/php/expected/trace-info-detail.yml            | 5 +++--
 test/e2e-v2/cases/php/php.ini                                   | 7 ++++++-
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/test/e2e-v2/cases/php/docker-compose.yml b/test/e2e-v2/cases/php/docker-compose.yml
index 1452d6a..eb921cf 100644
--- a/test/e2e-v2/cases/php/docker-compose.yml
+++ b/test/e2e-v2/cases/php/docker-compose.yml
@@ -24,13 +24,11 @@ services:
       - 12800
 
   php:
-    image: skyapm/skywalking-php:v3.3.2
+    image: skyapm/skywalking-php:v4.2.0-8.0-fpm-alpine
     networks:
       - e2e
     ports:
       - 8080
-    environment:
-      - SW_AGENT_COLLECTOR_BACKEND_SERVICES=oap:11800
     depends_on:
       provider:
         condition: service_started
diff --git a/test/e2e-v2/cases/php/expected/dependency-services-php.yml b/test/e2e-v2/cases/php/expected/dependency-services-php.yml
index a8938a9..cdbe878 100644
--- a/test/e2e-v2/cases/php/expected/dependency-services-php.yml
+++ b/test/e2e-v2/cases/php/expected/dependency-services-php.yml
@@ -25,7 +25,7 @@ nodes:
   isreal: true
 - id: {{ b64enc "php" }}.1
   name: php
-  type: http
+  type: PHP
   isreal: true
 {{- end }}
 calls:
diff --git a/test/e2e-v2/cases/php/expected/dependency-services-provider.yml b/test/e2e-v2/cases/php/expected/dependency-services-provider.yml
index fd2f901..378c93a 100644
--- a/test/e2e-v2/cases/php/expected/dependency-services-provider.yml
+++ b/test/e2e-v2/cases/php/expected/dependency-services-provider.yml
@@ -25,7 +25,7 @@ nodes:
   isreal: false
 - id: {{ b64enc "php" }}.1
   name: php
-  type: http
+  type: PHP
   isreal: true
 {{- end }}
 calls:
diff --git a/test/e2e-v2/cases/php/expected/service-instance-php.yml b/test/e2e-v2/cases/php/expected/service-instance-php.yml
index 0f3f376..52a1343 100644
--- a/test/e2e-v2/cases/php/expected/service-instance-php.yml
+++ b/test/e2e-v2/cases/php/expected/service-instance-php.yml
@@ -16,12 +16,12 @@
 # under the License. shadow
 
 {{- contains .}}
-- id: {{ notEmpty .id }}
-  name: {{ notEmpty .name }}
+- id: {{ b64enc "php" }}.1_{{ b64enc "php-instance" }}
+  name: php-instance
   attributes:
   {{- contains .attributes }}
   - name: os_name
-    value: linux
+    value: {{ notEmpty .value }}
   - name: host_name
     value: {{ notEmpty .value }}
   - name: process_no
@@ -30,5 +30,5 @@
     value: {{ notEmpty .value }}
   {{- end}}
   language: PHP
-  instanceuuid: {{ notEmpty .instanceuuid }}
+  instanceuuid: {{ b64enc "php" }}.1_{{ b64enc "php-instance" }}
 {{- end}}
diff --git a/test/e2e-v2/cases/php/expected/trace-info-detail.yml b/test/e2e-v2/cases/php/expected/trace-info-detail.yml
index a551a06..1315e4b 100644
--- a/test/e2e-v2/cases/php/expected/trace-info-detail.yml
+++ b/test/e2e-v2/cases/php/expected/trace-info-detail.yml
@@ -27,7 +27,7 @@ spans:
     endpointname: /php/info
     type: Entry
     peer: {{ notEmpty .peer }}
-    component: http
+    component: PHP
     iserror: false
     layer: Http
     tags:
@@ -48,7 +48,7 @@ spans:
     endpointname: /info
     type: Exit
     peer: provider:9090
-    component: HttpClient
+    component: cURL
     iserror: false
     layer: Http
     tags:
@@ -87,3 +87,4 @@ spans:
       {{- end }}
     logs: []
   {{- end }}
+
diff --git a/test/e2e-v2/cases/php/php.ini b/test/e2e-v2/cases/php/php.ini
index f5b61b1..2fbef153 100644
--- a/test/e2e-v2/cases/php/php.ini
+++ b/test/e2e-v2/cases/php/php.ini
@@ -13,9 +13,14 @@
 ; See the License for the specific language governing permissions and
 ; limitations under the License.
 
+
 [skywalking]
 extension=skywalking.so
 skywalking.app_code = php
 skywalking.enable = 1
 skywalking.version = 8
-skywalking.sock_path = /tmp/sky-agent.sock
+skywalking.grpc = oap:11800
+skywalking.error_handler_enable = 0
+skywalking.sample_n_per_3_secs = -1
+skywalking.instance_name = "php-instance"
+