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/02/19 10:01:19 UTC

[skywalking] branch master updated (6185351 -> 29da573)

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

wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from 6185351  fix profile analyze missed data (#4378)
     add 29da573  Provide influxdb as a new storage plugin (#4239)

No new revisions were added by this update.

Summary of changes:
 .github/workflows/e2e.yaml                         |  40 ++-
 dist-material/application.yml                      |  25 ++
 dist-material/release-docs/LICENSE                 |   6 +-
 dist-material/release-docs/NOTICE                  |  11 +-
 .../LICENSE-dayjs => LICENSE-influxdb-java.txt}    |   7 +-
 docker/oap-es7/docker-entrypoint.sh                |  31 ++
 docker/oap/docker-entrypoint.sh                    |  31 ++
 docs/en/setup/backend/backend-storage.md           |  34 ++
 oap-server/server-bootstrap/pom.xml                |   5 +
 .../src/main/resources/application.yml             |  25 ++
 .../oap/server/core/analysis/TimeBucket.java       | 109 ++++++
 oap-server/server-storage-plugin/pom.xml           |   1 +
 .../storage-influxdb-plugin}/pom.xml               |  26 +-
 .../storage/plugin/influxdb/InfluxClient.java      | 191 ++++++++++
 .../plugin/influxdb/InfluxModelConstants.java}     |   9 +-
 .../plugin/influxdb/InfluxStorageConfig.java}      |  21 +-
 .../plugin/influxdb/InfluxStorageProvider.java}    | 140 ++++----
 .../storage/plugin/influxdb/base/BatchDAO.java     |  60 ++++
 .../plugin/influxdb/base/HistoryDeleteDAO.java}    |  49 +--
 .../plugin/influxdb/base/InfluxInsertRequest.java  |  80 +++++
 .../plugin/influxdb/base/InfluxStorageDAO.java}    |  23 +-
 .../storage/plugin/influxdb/base/MetricsDAO.java   | 106 ++++++
 .../plugin/influxdb/base/NoneStreamDAO.java        |  57 +++
 .../storage/plugin/influxdb/base/RecordDAO.java}   |  26 +-
 .../plugin/influxdb/installer/H2Installer.java     |  44 +++
 .../influxdb/installer/MetaTableDefine.java}       |  26 +-
 .../plugin/influxdb/installer/MySQLInstaller.java  |  43 +++
 .../plugin/influxdb/query/AggregationQuery.java    | 154 ++++++++
 .../storage/plugin/influxdb/query/AlarmQuery.java  | 116 ++++++
 .../storage/plugin/influxdb/query/LogQuery.java    | 153 ++++++++
 .../plugin/influxdb/query/MetricsQuery.java        | 304 ++++++++++++++++
 .../plugin/influxdb/query/ProfileTaskLogQuery.java |  98 +++++
 .../plugin/influxdb/query/ProfileTaskQuery.java    | 131 +++++++
 .../influxdb/query/ProfileThreadSnapshotQuery.java | 165 +++++++++
 .../plugin/influxdb/query/TopNRecordsQuery.java    |  94 +++++
 .../plugin/influxdb/query/TopologyQuery.java       | 257 ++++++++++++++
 .../storage/plugin/influxdb/query/TraceQuery.java  | 218 ++++++++++++
 ...alking.oap.server.library.module.ModuleProvider |   2 +-
 .../src/docker/rc.d/rc0-prepare.sh                 |   2 -
 .../e2e-cluster/e2e-cluster-test-runner/pom.xml    | 394 ++++++++++++++-------
 .../src/docker/clusterize.awk                      |  29 +-
 .../src/docker/rc.d/rc0-prepare.sh                 |   9 +-
 test/e2e/{e2e-mysql => e2e-influxdb}/pom.xml       |  36 +-
 .../e2e/e2e-influxdb/src/docker}/application.yml   |  64 ++--
 .../e2e-influxdb/src/docker/rc.d/rc0-prepare.sh    |  15 +-
 .../src/docker/rc.d/rc1-startup.sh                 |   0
 .../e2e/sample/client/SampleClientApplication.java |   0
 .../e2e/sample/client/TestController.java          |   0
 .../apache/skywalking/e2e/sample/client/User.java  |   0
 .../skywalking/e2e/sample/client/UserRepo.java     |   0
 .../src/main/resources/application.yml             |   0
 .../skywalking/e2e/SampleVerificationITCase.java   | 154 ++++----
 ...king.e2e.SampleVerificationITCase.endpoints.yml |   0
 ...king.e2e.SampleVerificationITCase.instances.yml |   0
 ...ampleVerificationITCase.serviceInstanceTopo.yml |   0
 ...lking.e2e.SampleVerificationITCase.services.yml |   0
 ...kywalking.e2e.SampleVerificationITCase.topo.yml |   0
 ...walking.e2e.SampleVerificationITCase.traces.yml |   0
 .../e2e-profile/e2e-profile-test-runner/pom.xml    |  77 +++-
 .../src/docker/adapt_storage.awk                   |   4 +-
 .../e2e-ttl-es/src/docker/rc.d/rc0-prepare.sh      |   2 -
 .../{e2e-ttl-es => e2e-ttl-influxdb}/pom.xml       |  50 +--
 .../src/docker/influx_storage.awk}                 |  18 +-
 .../src/docker/rc.d/rc0-prepare.sh                 |   6 +-
 .../src/docker/rc.d/rc1-startup.sh                 |  15 +-
 .../src/docker/ttl_official_analysis.oal           |   0
 .../apache/skywalking/e2e/StorageTTLITCase.java    | 153 +++++---
 test/e2e/e2e-ttl/pom.xml                           |   1 +
 test/e2e/pom.xml                                   |   2 +
 .../known-oap-backend-dependencies-es7.txt         |   5 +
 .../known-oap-backend-dependencies.txt             |   5 +
 71 files changed, 3432 insertions(+), 527 deletions(-)
 copy dist-material/release-docs/licenses/{ui-licenses/LICENSE-dayjs => LICENSE-influxdb-java.txt} (93%)
 copy {apm-application-toolkit/apm-toolkit-opentracing => oap-server/server-storage-plugin/storage-influxdb-plugin}/pom.xml (68%)
 create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/InfluxClient.java
 copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Query.java => server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/InfluxModelConstants.java} (78%)
 copy oap-server/server-storage-plugin/{storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLStorageConfig.java => storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/InfluxStorageConfig.java} (70%)
 copy oap-server/server-storage-plugin/{storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLStorageProvider.java => storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/InfluxStorageProvider.java} (57%)
 create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/base/BatchDAO.java
 copy oap-server/server-storage-plugin/{storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java => storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/base/HistoryDeleteDAO.java} (57%)
 create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/base/InfluxInsertRequest.java
 copy oap-server/server-storage-plugin/{storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2StorageDAO.java => storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/base/InfluxStorageDAO.java} (72%)
 create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/base/MetricsDAO.java
 create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/base/NoneStreamDAO.java
 copy oap-server/server-storage-plugin/{storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RecordDAO.java => storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/base/RecordDAO.java} (54%)
 create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/installer/H2Installer.java
 copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRecordDAO.java => server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/installer/MetaTableDefine.java} (56%)
 create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/installer/MySQLInstaller.java
 create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AggregationQuery.java
 create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AlarmQuery.java
 create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/LogQuery.java
 create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetricsQuery.java
 create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/ProfileTaskLogQuery.java
 create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/ProfileTaskQuery.java
 create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/ProfileThreadSnapshotQuery.java
 create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopNRecordsQuery.java
 create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopologyQuery.java
 create mode 100644 oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TraceQuery.java
 copy oap-server/{exporter => server-storage-plugin/storage-influxdb-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (90%)
 copy test/e2e/{e2e-mysql => e2e-influxdb}/pom.xml (87%)
 copy {oap-server/server-bootstrap/src/main/resources => test/e2e/e2e-influxdb/src/docker}/application.yml (80%)
 mode change 100755 => 100644
 copy dist-material/bin/startup.sh => test/e2e/e2e-influxdb/src/docker/rc.d/rc0-prepare.sh (75%)
 mode change 100644 => 100755
 copy test/e2e/{e2e-single-service => e2e-influxdb}/src/docker/rc.d/rc1-startup.sh (100%)
 copy test/e2e/{e2e-single-service => e2e-influxdb}/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java (100%)
 copy test/e2e/{e2e-single-service => e2e-influxdb}/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java (100%)
 copy test/e2e/{e2e-single-service => e2e-influxdb}/src/main/java/org/apache/skywalking/e2e/sample/client/User.java (100%)
 copy test/e2e/{e2e-single-service => e2e-influxdb}/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java (100%)
 copy test/e2e/{e2e-single-service => e2e-influxdb}/src/main/resources/application.yml (100%)
 copy test/e2e/{e2e-mysql => e2e-influxdb}/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java (70%)
 copy test/e2e/{e2e-single-service => e2e-influxdb}/src/test/resources/expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.endpoints.yml (100%)
 copy test/e2e/{e2e-single-service => e2e-influxdb}/src/test/resources/expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.instances.yml (100%)
 copy test/e2e/{e2e-single-service => e2e-influxdb}/src/test/resources/expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.serviceInstanceTopo.yml (100%)
 copy test/e2e/{e2e-single-service => e2e-influxdb}/src/test/resources/expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.services.yml (100%)
 copy test/e2e/{e2e-single-service => e2e-influxdb}/src/test/resources/expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.topo.yml (100%)
 copy test/e2e/{e2e-single-service => e2e-influxdb}/src/test/resources/expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.traces.yml (100%)
 copy test/e2e/e2e-ttl/{e2e-ttl-es => e2e-ttl-influxdb}/pom.xml (79%)
 copy test/e2e/e2e-ttl/{e2e-ttl-es/src/docker/es_storage.awk => e2e-ttl-influxdb/src/docker/influx_storage.awk} (76%)
 copy test/e2e/e2e-ttl/{e2e-ttl-es => e2e-ttl-influxdb}/src/docker/rc.d/rc0-prepare.sh (86%)
 copy test/e2e/e2e-ttl/{e2e-ttl-es => e2e-ttl-influxdb}/src/docker/rc.d/rc1-startup.sh (77%)
 copy test/e2e/e2e-ttl/{e2e-ttl-es => e2e-ttl-influxdb}/src/docker/ttl_official_analysis.oal (100%)
 copy test/e2e/e2e-ttl/{e2e-ttl-es => e2e-ttl-influxdb}/src/test/java/org/apache/skywalking/e2e/StorageTTLITCase.java (61%)