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-data-collect-protocol.git
The following commit(s) were added to refs/heads/master by this push:
new a2aaec5 Enhancement browser protocol (#18)
a2aaec5 is described below
commit a2aaec537073cd22ac62cec1b41d03ae9cf11124
Author: zhang-wei <pk...@outlook.com>
AuthorDate: Wed Feb 5 15:34:34 2020 +0800
Enhancement browser protocol (#18)
* update log field
* enhancement browser protocol
* remove stream
---
browser/BrowserPerf.proto | 63 +++++++++++++++++++++++++++--------------------
1 file changed, 36 insertions(+), 27 deletions(-)
diff --git a/browser/BrowserPerf.proto b/browser/BrowserPerf.proto
index ec3d011..2898b6c 100644
--- a/browser/BrowserPerf.proto
+++ b/browser/BrowserPerf.proto
@@ -25,36 +25,56 @@ import "common/common.proto";
// Collect performance raw data from browser.
service BrowserPerfService {
- rpc collect (stream BrowserPerfData) returns (Commands) {
+
+ // report once per page
+ rpc collectPerfData (BrowserPerfData) returns (Commands) {
+ }
+
+ // report one or more error logs for pages, could report multiple times.
+ rpc collectErrorLogs (stream BrowserErrorLog) returns (Commands) {
}
}
message BrowserPerfData {
+ int32 serviceId = 1;
+ // Service version in browser is the Instance concept in the backend.
+ int32 serviceVersionId = 2;
+ // Perf data time
+ int64 time = 3;
+ // Page path in browser is the endpoint concept in the backend
+ // Page path in the browser, mostly it is URI, without parameter
+ string pagePath = 4;
+ int32 pagePathId = 5;
+ // Unit of all time related field should be `ms`.
+ int32 redirectTime = 6;
+ int32 dnsTime = 7;
+ int32 reqTime = 8;
+ // analysis dom tree time
+ int32 domAnalysisTime = 9;
+ int32 domReadyTime = 10;
+ // page blank time
+ int32 blankTime = 11;
+}
+
+message BrowserErrorLog {
// UUID
string uniqueId = 1;
int32 serviceId = 2;
// Service version in browser is the Instance concept in the backend.
int32 serviceVersionId = 3;
- // Data time
+ // Error log time
int64 time = 4;
// Page path in browser is the endpoint concept in the backend
// Page path in the browser, mostly it is URI, without parameter
string pagePath = 5;
int32 pagePathId = 6;
- repeated BrowserErrorLog logs = 7;
- PerfDetail perfDetail = 8;
-}
-
-message BrowserErrorLog {
- ErrorCategory category = 1;
- string grade = 2;
- string message = 3;
- int32 line = 4;
- int32 col = 5;
- string stack = 6;
- string errorUrl = 7;
- // Error log time
- int64 time = 8;
+ ErrorCategory category = 7;
+ string grade = 8;
+ string message = 9;
+ int32 line = 10;
+ int32 col = 11;
+ string stack = 12;
+ string errorUrl = 13;
}
enum ErrorCategory {
@@ -66,14 +86,3 @@ enum ErrorCategory {
unknown = 5;
}
-message PerfDetail {
- // Unit of all time related field should be `ms`.
- int32 redirectTime = 1;
- int32 dnsTime = 2;
- int32 reqTime = 3;
- // analysis dom tree time
- int32 domAnalysisTime = 4;
- int32 domReadyTime = 5;
- // page blank time
- int32 blankTime = 6;
-}
\ No newline at end of file
