[skywalking] branch master updated: test: update commitID for client-js (#7874)

[qiuxiafan]

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

qiuxiafan 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 58ce0b4  test: update commitID for client-js (#7874)
58ce0b4 is described below

commit 58ce0b4056869cd187658f231702e2f7344d6f7a
Author: Fine0830 <fine0...@outlook.com>
AuthorDate: Sat Oct 9 19:06:39 2021 +0800

    test: update commitID for client-js (#7874)
    
    * test: update commitID for client-js
    
    * fix: remove BROWSER_APP_PAGE_REDIRECT_AVG for e2e
    
    * fix: remove BROWSER_APP_PAGE_RES_AVG for e2e
    
    * fix: remove unused imports
    
    Co-authored-by: kezhenxu94 <kezhenx...@apache.org>
    Co-authored-by: zhang-wei <zhangwe...@apache.org>
---
 .../docker/browser/with-skywalking-client-js/Dockerfile.test-ui   | 2 +-
 .../org/apache/skywalking/e2e/browser/BrowserWithClientJSE2E.java | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/test/e2e/e2e-test/docker/browser/with-skywalking-client-js/Dockerfile.test-ui 
b/test/e2e/e2e-test/docker/browser/with-skywalking-client-js/Dockerfile.test-ui
index 1eeb4ca..6f3498f 100644
--- 
a/test/e2e/e2e-test/docker/browser/with-skywalking-client-js/Dockerfile.test-ui
+++ 
b/test/e2e/e2e-test/docker/browser/with-skywalking-client-js/Dockerfile.test-ui
@@ -16,7 +16,7 @@
 FROM node:10.23 AS builder
 
 ## download and build skywalking client js
-ARG CLIENT_JS_COMMIT_HASH=b8f9ba35acc3f9ee746710577adbbb645680b16e
+ARG CLIENT_JS_COMMIT_HASH=c2e31438f9beef7161c7b6f630694a501e774671
 ARG CLIENT_JS_CODE=${CLIENT_JS_COMMIT_HASH}.tar.gz
 ARG 
CLIENT_JS_CODE_URL=https://github.com/apache/skywalking-client-js/archive/${CLIENT_JS_CODE}
 
diff --git 
a/test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/browser/BrowserWithClientJSE2E.java
 
b/test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/browser/BrowserWithClientJSE2E.java
index 169d23a..48dd045 100644
--- 
a/test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/browser/BrowserWithClientJSE2E.java
+++ 
b/test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/browser/BrowserWithClientJSE2E.java
@@ -55,8 +55,6 @@ import static 
org.apache.skywalking.e2e.metrics.BrowserMetricsQuery.BROWSER_APP_
 import static 
org.apache.skywalking.e2e.metrics.BrowserMetricsQuery.BROWSER_APP_PAGE_LOAD_PAGE_AVG;
 import static 
org.apache.skywalking.e2e.metrics.BrowserMetricsQuery.BROWSER_APP_PAGE_LOAD_PAGE_PERCENTILE;
 import static 
org.apache.skywalking.e2e.metrics.BrowserMetricsQuery.BROWSER_APP_PAGE_PV;
-import static 
org.apache.skywalking.e2e.metrics.BrowserMetricsQuery.BROWSER_APP_PAGE_REDIRECT_AVG;
-import static 
org.apache.skywalking.e2e.metrics.BrowserMetricsQuery.BROWSER_APP_PAGE_RES_AVG;
 import static 
org.apache.skywalking.e2e.metrics.BrowserMetricsQuery.BROWSER_APP_PAGE_TTL_AVG;
 import static 
org.apache.skywalking.e2e.metrics.BrowserMetricsQuery.BROWSER_APP_PV;
 import static 
org.apache.skywalking.e2e.metrics.BrowserMetricsQuery.BROWSER_APP_SINGLE_VERSION_ERROR_SUM;
@@ -181,11 +179,13 @@ public class BrowserWithClientJSE2E extends 
SkyWalkingTestAdapter {
         BROWSER_APP_PAGE_PV,
         BROWSER_APP_PAGE_ERROR_SUM,
         BROWSER_APP_PAGE_JS_ERROR_SUM,
-        BROWSER_APP_PAGE_REDIRECT_AVG,
+        // If the current document and the document that is redirected to are 
not from the same origin, set redirectStart, redirectEnd to 0
+        // BROWSER_APP_PAGE_REDIRECT_AVG,
         BROWSER_APP_PAGE_DOM_ANALYSIS_AVG,
         BROWSER_APP_PAGE_DOM_READY_AVG,
         BROWSER_APP_PAGE_LOAD_PAGE_AVG,
-        BROWSER_APP_PAGE_RES_AVG,
+        // Represents a synchronized load resource in pages
+        // BROWSER_APP_PAGE_RES_AVG,
         BROWSER_APP_PAGE_TTL_AVG,
         };