You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/08/31 08:55:12 UTC
[skywalking] branch grpc-reload-crt updated (cca477e -> 4357c58)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch grpc-reload-crt
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from cca477e Update sslcontext
add 7ef8b3e Support Browser protocol at OAP (#4228)
add 4357c58 Merge branch 'master' into grpc-reload-crt
No new revisions were added by this update.
Summary of changes:
.github/workflows/e2e.js.yaml | 55 ++++
README.md | 2 +-
docs/README.md | 2 +
docs/en/concepts-and-designs/oal.md | 6 +
docs/en/concepts-and-designs/scope-definitions.md | 102 ++++++--
docs/en/guides/storage-extention.md | 1 +
docs/en/protocols/Browser-Protocol.md | 18 ++
docs/en/protocols/README.md | 6 +
docs/en/setup/backend/backend-receivers.md | 5 +
.../analyzer/provider/jvm/JVMSourceDispatcher.java | 5 +-
.../apache/skywalking/oal/rt/grammar/OALLexer.g4 | 10 +
.../apache/skywalking/oal/rt/grammar/OALParser.g4 | 6 +-
.../skywalking/oal/rt/parser/AnalysisResult.java | 6 +
.../skywalking/oal/rt/parser/DeepAnalysis.java | 19 +-
.../skywalking/oal/rt/parser/ScriptParserTest.java | 23 ++
oap-server/server-bootstrap/pom.xml | 7 +-
.../src/main/resources/application.yml | 4 +
.../src/main/resources/oal/browser.oal | 63 +++++
.../skywalking/oap/server/core/CoreModule.java | 2 +
.../oap/server/core/CoreModuleProvider.java | 2 +
.../server/core/analysis/DispatcherManager.java | 4 +-
.../oap/server/core/analysis/NodeType.java | 2 +
.../server/core/analysis/metrics/RateMetrics.java | 72 +++++
.../core/analysis/metrics/expression/InMatch.java | 1 -
.../manual/BrowserAppTrafficSourceDispatcher.java} | 31 +--
.../endpoint/BrowserAppPageTrafficDispatcher.java | 35 +++
.../manual/errorlog/BrowserErrorLogRecord.java | 132 ++++++++++
.../errorlog/BrowserErrorLogRecordDispatcher.java | 39 +++
.../BrowserAppSingleVersionTrafficDispatcher.java | 36 +++
.../service/BrowserAppTrafficDispatcher.java | 35 +++
.../core/browser/source/BrowserAppPagePerf.java | 54 ++++
.../core/browser/source/BrowserAppPageTraffic.java | 54 ++++
.../server/core/browser/source/BrowserAppPerf.java | 39 +++
.../core/browser/source/BrowserAppPerfSource.java | 47 ++++
.../source/BrowserAppSingleVersionPerf.java | 54 ++++
.../source/BrowserAppSingleVersionTraffic.java | 54 ++++
.../core/browser/source/BrowserAppTraffic.java | 39 +++
.../browser/source/BrowserAppTrafficCategory.java | 25 +-
.../browser/source/BrowserAppTrafficSource.java | 45 ++++
.../core/browser/source/BrowserErrorCategory.java | 49 ++++
.../core/browser/source/BrowserErrorLog.java | 66 +++++
.../server/core/query/BrowserLogQueryService.java | 65 +++++
.../query/input/BrowserErrorLogQueryCondition.java | 25 +-
.../server/core/query/type/BrowserErrorLog.java | 28 +-
.../server/core/query/type/BrowserErrorLogs.java} | 23 +-
.../oap/server/core/query/type/ErrorCategory.java | 20 +-
.../oap/server/core/source/DefaultScopeDefine.java | 9 +
.../oap/server/core/storage/StorageModule.java | 4 +-
.../core/storage/query/IBrowserLogQueryDAO.java | 68 +++++
.../skywalking/oap/server/core/CoreModuleTest.java | 2 +-
.../oap/query/graphql/GraphQLQueryProvider.java | 75 +++---
.../query/graphql/resolver/BrowserLogQuery.java | 59 +++++
.../src/main/resources/query-protocol | 2 +-
oap-server/server-receiver-plugin/pom.xml | 1 +
.../skywalking-browser-receiver-plugin/pom.xml | 38 +++
.../receiver/browser/module/BrowserModule.java} | 22 +-
.../browser/provider/BrowserModuleProvider.java | 107 ++++++++
.../browser/provider/BrowserOALDefine.java} | 23 +-
.../provider/BrowserServiceModuleConfig.java | 21 +-
.../handler/BrowserPerfServiceHandler.java | 144 ++++++++++
.../parser/errorlog/BrowserErrorLogDecorator.java | 99 +++++++
.../provider/parser/errorlog/ErrorLogAnalyzer.java | 67 +++++
.../errorlog/ErrorLogParserListenerManager.java} | 21 +-
.../listener/ErrorLogAnalysisListener.java} | 34 ++-
.../errorlog/listener/ErrorLogListenerFactory.java | 15 +-
.../errorlog/listener/ErrorLogRecordListener.java | 118 +++++++++
.../errorlog/listener/ErrorLogRecordSampler.java} | 34 ++-
.../MultiScopesErrorLogAnalysisListener.java | 83 ++++++
.../parser/errorlog/listener/SourceBuilder.java | 112 ++++++++
.../performance/BrowserPerfDataDecorator.java | 114 ++++++++
.../parser/performance/PerfDataAnalyzer.java | 67 +++++
.../PerfDataParserListenerManager.java} | 21 +-
.../MultiScopesPerfDataAnalysisListener.java | 109 ++++++++
.../listener/PerfDataAnalysisListener.java} | 34 ++-
.../listener/PerfDataListenerFactory.java | 19 +-
.../parser/performance/listener/SourceBuilder.java | 201 ++++++++++++++
...ywalking.oap.server.library.module.ModuleDefine | 19 ++
...alking.oap.server.library.module.ModuleProvider | 19 ++
.../StorageModuleElasticsearchProvider.java | 3 +
.../elasticsearch/query/BrowserLogQueryEsDAO.java | 99 +++++++
.../StorageModuleElasticsearch7Provider.java | 68 ++---
.../query/BrowserLogQueryEs7DAO.java | 98 +++++++
.../plugin/influxdb/InfluxStorageProvider.java | 11 +-
.../plugin/influxdb/query/BrowserLogQuery.java | 124 +++++++++
.../plugin/influxdb/query/MetadataQuery.java | 2 +-
.../storage/plugin/jdbc/h2/H2StorageProvider.java | 3 +
.../plugin/jdbc/h2/dao/H2BrowserLogQueryDAO.java | 125 +++++++++
.../plugin/jdbc/mysql/MySQLStorageProvider.java | 2 +
.../jdbc/mysql/MysqlBrowserLogQueryDAO.java} | 33 ++-
.../tool/profile/core/MockCoreModuleProvider.java | 2 +
.../apache/skywalking/e2e/SimpleQueryClient.java | 45 +++-
.../skywalking/e2e/browser/BrowserErrorLog.java} | 28 +-
.../e2e/browser/BrowserErrorLogMatcher.java | 94 +++++++
.../e2e/browser/BrowserErrorLogQuery.java | 33 ++-
.../skywalking/e2e/browser/BrowserErrorLogs.java} | 16 +-
.../e2e/browser/BrowserErrorLogsData.java} | 15 +-
.../e2e/browser/BrowserErrorLogsMatcher.java | 38 ++-
.../e2e/metrics/BrowserMetricsQuery.java | 112 ++++++++
.../skywalking/e2e/metrics/MetricsMatcher.java | 13 +-
.../org/apache/skywalking/e2e/utils/Times.java | 3 +-
.../src/main/resources/browser-error-logs.gql | 39 +++
.../src/main/resources/browser-services.gql | 31 +++
test/e2e/e2e-protocol/src/main/proto | 2 +-
.../docker/{profile => browser}/Dockerfile.h2 | 0
.../e2e-test/docker/browser/docker-compose.es6.yml | 44 ++++
.../e2e-test/docker/browser/docker-compose.es7.yml | 44 ++++
.../e2e-test/docker/browser/docker-compose.h2.yml | 45 ++++
.../docker/browser/docker-compose.influxdb.yml | 42 +++
.../docker/browser/docker-compose.mysql.yml | 47 ++++
test/e2e/e2e-test/docker/browser/download-mysql.sh | 26 ++
.../java/org/apache/skywalking/e2e/ClusterE2E.java | 4 +-
.../skywalking/e2e/base/SkyWalkingTestAdapter.java | 4 +-
.../apache/skywalking/e2e/browser/BrowserE2E.java | 290 +++++++++++++++++++++
.../test/resources/expected/browser/error-log.yml | 28 ++
.../test/resources/expected/browser/page-path.yml | 18 ++
.../test/resources/expected/browser/services.yml | 18 ++
.../test/resources/expected/browser/version.yml | 18 ++
test/e2e/pom.xml | 4 +
118 files changed, 4464 insertions(+), 386 deletions(-)
create mode 100644 .github/workflows/e2e.js.yaml
create mode 100644 docs/en/protocols/Browser-Protocol.md
create mode 100644 oap-server/server-bootstrap/src/main/resources/oal/browser.oal
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/RateMetrics.java
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{analysis/metrics/expression/InMatch.java => browser/manual/BrowserAppTrafficSourceDispatcher.java} (52%)
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/endpoint/BrowserAppPageTrafficDispatcher.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecord.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecordDispatcher.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/instance/BrowserAppSingleVersionTrafficDispatcher.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/service/BrowserAppTrafficDispatcher.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserAppPagePerf.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserAppPageTraffic.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserAppPerf.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserAppPerfSource.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserAppSingleVersionPerf.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserAppSingleVersionTraffic.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserAppTraffic.java
copy test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/utils/Times.java => oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserAppTrafficCategory.java (63%)
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserAppTrafficSource.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserErrorCategory.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserErrorLog.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/BrowserLogQueryService.java
copy test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/utils/Times.java => oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/BrowserErrorLogQueryCondition.java (56%)
copy test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/utils/Times.java => oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/BrowserErrorLog.java (57%)
copy oap-server/server-core/src/{test/java/org/apache/skywalking/oap/server/core/CoreModuleTest.java => main/java/org/apache/skywalking/oap/server/core/query/type/BrowserErrorLogs.java} (65%)
copy test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/utils/Times.java => oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/ErrorCategory.java (73%)
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IBrowserLogQueryDAO.java
create mode 100644 oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/BrowserLogQuery.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/pom.xml
copy oap-server/{server-core/src/test/java/org/apache/skywalking/oap/server/core/CoreModuleTest.java => server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/module/BrowserModule.java} (64%)
create mode 100644 oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/BrowserModuleProvider.java
copy oap-server/{server-core/src/test/java/org/apache/skywalking/oap/server/core/CoreModuleTest.java => server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/BrowserOALDefine.java} (58%)
copy test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/utils/Times.java => oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/BrowserServiceModuleConfig.java (62%)
create mode 100644 oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/handler/BrowserPerfServiceHandler.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/errorlog/BrowserErrorLogDecorator.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/errorlog/ErrorLogAnalyzer.java
copy oap-server/{server-core/src/test/java/org/apache/skywalking/oap/server/core/CoreModuleTest.java => server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/errorlog/ErrorLogParserListenerManager.java} (56%)
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/InMatch.java => server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/errorlog/listener/ErrorLogAnalysisListener.java} (53%)
copy test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/utils/Times.java => oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/errorlog/listener/ErrorLogListenerFactory.java (61%)
create mode 100644 oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/errorlog/listener/ErrorLogRecordListener.java
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/InMatch.java => server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/errorlog/listener/ErrorLogRecordSampler.java} (54%)
create mode 100644 oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/errorlog/listener/MultiScopesErrorLogAnalysisListener.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/errorlog/listener/SourceBuilder.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/performance/BrowserPerfDataDecorator.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/performance/PerfDataAnalyzer.java
copy oap-server/{server-core/src/test/java/org/apache/skywalking/oap/server/core/CoreModuleTest.java => server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/performance/PerfDataParserListenerManager.java} (56%)
create mode 100644 oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/performance/listener/MultiScopesPerfDataAnalysisListener.java
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/InMatch.java => server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/performance/listener/PerfDataAnalysisListener.java} (53%)
copy test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/utils/Times.java => oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/performance/listener/PerfDataListenerFactory.java (54%)
create mode 100644 oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/performance/listener/SourceBuilder.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
create mode 100644 oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/BrowserLogQueryEsDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/BrowserLogQueryEs7DAO.java
create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/BrowserLogQuery.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BrowserLogQueryDAO.java
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/InMatch.java => server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MysqlBrowserLogQueryDAO.java} (53%)
copy test/e2e/{e2e-test/src/test/java/org/apache/skywalking/e2e/utils/Times.java => e2e-data/src/main/java/org/apache/skywalking/e2e/browser/BrowserErrorLog.java} (57%)
create mode 100644 test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/browser/BrowserErrorLogMatcher.java
copy oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/CoreModuleTest.java => test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/browser/BrowserErrorLogQuery.java (54%)
copy test/e2e/{e2e-test/src/test/java/org/apache/skywalking/e2e/utils/Times.java => e2e-data/src/main/java/org/apache/skywalking/e2e/browser/BrowserErrorLogs.java} (73%)
copy test/e2e/{e2e-test/src/test/java/org/apache/skywalking/e2e/utils/Times.java => e2e-data/src/main/java/org/apache/skywalking/e2e/browser/BrowserErrorLogsData.java} (73%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/InMatch.java => test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/browser/BrowserErrorLogsMatcher.java (51%)
create mode 100644 test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/metrics/BrowserMetricsQuery.java
rename test/e2e/{e2e-test/src/test => e2e-data/src/main}/java/org/apache/skywalking/e2e/utils/Times.java (94%)
create mode 100644 test/e2e/e2e-data/src/main/resources/browser-error-logs.gql
create mode 100644 test/e2e/e2e-data/src/main/resources/browser-services.gql
copy test/e2e/e2e-test/docker/{profile => browser}/Dockerfile.h2 (100%)
create mode 100644 test/e2e/e2e-test/docker/browser/docker-compose.es6.yml
create mode 100644 test/e2e/e2e-test/docker/browser/docker-compose.es7.yml
create mode 100644 test/e2e/e2e-test/docker/browser/docker-compose.h2.yml
create mode 100644 test/e2e/e2e-test/docker/browser/docker-compose.influxdb.yml
create mode 100644 test/e2e/e2e-test/docker/browser/docker-compose.mysql.yml
create mode 100644 test/e2e/e2e-test/docker/browser/download-mysql.sh
create mode 100644 test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/browser/BrowserE2E.java
create mode 100644 test/e2e/e2e-test/src/test/resources/expected/browser/error-log.yml
create mode 100644 test/e2e/e2e-test/src/test/resources/expected/browser/page-path.yml
create mode 100644 test/e2e/e2e-test/src/test/resources/expected/browser/services.yml
create mode 100644 test/e2e/e2e-test/src/test/resources/expected/browser/version.yml