kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <kezhenxu94@apache.org>
Co-authored-by: zhang-wei <zhangwei24@apache.org>
This commit is contained in:
Fine0830 2021-10-09 19:06:39 +08:00 committed by GitHub
parent 615bac817e
commit 58ce0b4056
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/e2e-test/docker/browser/with-skywalking-client-js/Dockerfile.test-ui
View File

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

8
test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/browser/BrowserWithClientJSE2E.java
View File

@ -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,
};