[incubator-skywalking] branch webapp/proxy updated (565e708 -> 3813b9a)

[ha...@apache.org]

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

hanahmily pushed a change to branch webapp/proxy
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.


    from 565e708  Merge branch 'master' into webapp/proxy
     add a9489b7  H2 storage (#1712)
     add 0c6a784  Modify webapp for v6 (#1829)
     add 3813b9a  Merge branch 'master' into webapp/proxy

No new revisions were added by this update.

Summary of changes:
 apm-dist/release-docs/LICENSE                      |   2 +-
 .../network/trace/component/ComponentsDefine.java  |   2 +-
 .../jdbc/h2/define/DriverInstrumentation.java      |   2 +-
 .../h2/define/JdbcConnectionInstrumentation.java   |   2 +-
 .../h2/define/JdbcXAConnectionInstrumentation.java |   4 +-
 oap-server/pom.xml                                 |   6 +
 .../oap/server/core/query/TraceQueryService.java   |   1 +
 .../oap/server/core/query/entity/IntValues.java    |  19 +-
 .../server/core/query/entity/Thermodynamic.java    |  23 +-
 .../register/worker/RegisterPersistentWorker.java  |   8 +-
 .../oap/server/core/source/ServiceRelation.java    |  16 ++
 ...lder.java => DownSamplingModelNameBuilder.java} |   4 +-
 .../oap/server/core/storage/StorageException.java  |   4 +
 .../server/core/storage/model/ModelInstaller.java  |   2 +-
 oap-server/server-library/library-client/pom.xml   |   4 +-
 .../oap/server/library/client/h2/H2Client.java     | 113 --------
 .../server/library/client/h2/H2ClientConfig.java   |  53 ----
 .../library/client/h2/H2ClientException.java       |  35 ---
 .../library/client/jdbc/JDBCClientException.java   |  15 +-
 .../client/jdbc/hikaricp/JDBCHikariCPClient.java   | 128 +++++++++
 .../client/shardingjdbc/ShardingjdbcClient.java    | 150 -----------
 .../shardingjdbc/ShardingjdbcClientConfig.java     |  73 -----
 .../shardingjdbc/ShardingjdbcClientException.java  |  35 ---
 .../src/main/resources/query-protocol              |   2 +-
 .../register/provider/RegisterModuleProvider.java  |  11 +
 oap-server/server-starter/pom.xml                  |   2 +-
 .../src/main/assembly/application.yml              |  22 +-
 .../src/main/resources/application.yml             |   4 +
 .../server-starter/src/main/resources/log4j2.xml   |   7 +-
 oap-server/server-storage-plugin/pom.xml           |   2 +-
 .../cache/EndpointInventoryCacheEsDAO.java         |   4 +-
 .../cache/NetworkAddressInventoryCacheEsDAO.java   |   2 +-
 .../elasticsearch/query/AggregationQueryEsDAO.java |  12 +-
 .../elasticsearch/query/MetricQueryEsDAO.java      |  31 +--
 .../elasticsearch/query/TopologyQueryEsDAO.java    |  46 ++--
 .../storage-h2-plugin/pom.xml                      |  33 ---
 .../pom.xml                                        |   9 +-
 .../server/storage/plugin/jdbc/SQLBuilder.java}    |  37 ++-
 .../server/storage/plugin/jdbc/SQLExecutor.java    |  31 ++-
 .../server/storage/plugin/jdbc/TableMetaInfo.java  |  19 +-
 .../plugin/jdbc/h2/H2RegisterLockInstaller.java}   |  29 +-
 .../storage/plugin/jdbc/h2/H2StorageConfig.java}   |  18 +-
 .../storage/plugin/jdbc/h2/H2StorageProvider.java  | 143 ++++++++++
 .../plugin/jdbc/h2/dao/H2AggregationQueryDAO.java  | 127 +++++++++
 .../plugin/jdbc/h2/dao/H2AlarmQueryDAO.java}       |  20 +-
 .../storage/plugin/jdbc/h2/dao/H2BatchDAO.java     |  63 +++++
 .../jdbc/h2/dao/H2EndpointInventoryCacheDAO.java   |  52 ++++
 .../plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java     |  14 +-
 .../storage/plugin/jdbc/h2/dao/H2IndicatorDAO.java |  51 ++++
 .../plugin/jdbc/h2/dao/H2MetadataQueryDAO.java     | 300 +++++++++++++++++++++
 .../plugin/jdbc/h2/dao/H2MetricQueryDAO.java       | 240 +++++++++++++++++
 .../h2/dao/H2NetworkAddressInventoryCacheDAO.java  |  52 ++++
 .../storage/plugin/jdbc/h2/dao/H2RecordDAO.java    |  43 +++
 .../storage/plugin/jdbc/h2/dao/H2RegisterDAO.java  |  89 ++++++
 .../plugin/jdbc/h2/dao/H2RegisterLockDAO.java}     |  17 +-
 .../storage/plugin/jdbc/h2/dao/H2SQLExecutor.java  | 169 ++++++++++++
 .../h2/dao/H2ServiceInstanceInventoryCacheDAO.java |  61 +++++
 .../jdbc/h2/dao/H2ServiceInventoryCacheDAO.java    |  96 +++++++
 .../storage/plugin/jdbc/h2/dao/H2StorageDAO.java}  |  25 +-
 .../plugin/jdbc/h2/dao/H2TableInstaller.java       | 115 ++++++++
 .../plugin/jdbc/h2/dao/H2TopologyQueryDAO.java     | 156 +++++++++++
 .../plugin/jdbc/h2/dao/H2TraceQueryDAO.java        | 173 ++++++++++++
 ...alking.oap.server.library.module.ModuleProvider |   2 +-
 skywalking-ui                                      |   2 +-
 64 files changed, 2353 insertions(+), 679 deletions(-)
 rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{DownsampleingModelNameBuilder.java => DownSamplingModelNameBuilder.java} (94%)
 delete mode 100644 oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/h2/H2Client.java
 delete mode 100644 oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/h2/H2ClientConfig.java
 delete mode 100644 oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/h2/H2ClientException.java
 copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigNotFoundException.java => oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/jdbc/JDBCClientException.java (77%)
 create mode 100644 oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/jdbc/hikaricp/JDBCHikariCPClient.java
 delete mode 100644 oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/shardingjdbc/ShardingjdbcClient.java
 delete mode 100644 oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/shardingjdbc/ShardingjdbcClientConfig.java
 delete mode 100644 oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/shardingjdbc/ShardingjdbcClientException.java
 delete mode 100644 oap-server/server-storage-plugin/storage-h2-plugin/pom.xml
 copy oap-server/server-storage-plugin/{storage-elasticsearch-plugin => storage-jdbc-hikaricp-plugin}/pom.xml (86%)
 copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/expression/BinaryMatchExpression.java => server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/SQLBuilder.java} (56%)
 copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/ParallelGCModule.java => oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/SQLExecutor.java (56%)
 copy apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/TextMapContext.java => oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/TableMetaInfo.java (67%)
 copy oap-server/{server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/TimestampUtils.java => server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/H2RegisterLockInstaller.java} (54%)
 copy oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryConfig.java => server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/H2StorageConfig.java} (74%)
 create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/H2StorageProvider.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/H2AggregationQueryDAO.java
 copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IAlarmQueryDAO.java => server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java} (63%)
 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/H2BatchDAO.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/H2EndpointInventoryCacheDAO.java
 copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/NoSupportedCPUAccessor.java => oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java (70%)
 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/H2IndicatorDAO.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/H2MetadataQueryDAO.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/H2MetricQueryDAO.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/H2NetworkAddressInventoryCacheDAO.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/H2RecordDAO.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/H2RegisterDAO.java
 copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRegisterLockDAO.java => server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RegisterLockDAO.java} (64%)
 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/H2SQLExecutor.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/H2ServiceInstanceInventoryCacheDAO.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/H2ServiceInventoryCacheDAO.java
 copy oap-server/server-storage-plugin/{storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsDAO.java => storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2StorageDAO.java} (60%)
 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/H2TableInstaller.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/H2TopologyQueryDAO.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/H2TraceQueryDAO.java
 copy oap-server/{server-core => server-storage-plugin/storage-jdbc-hikaricp-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (91%)