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 2019/05/16 16:33:57 UTC

[skywalking] branch new-topo updated (3409817 -> c673511)

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

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


    from 3409817  Merge branch 'master' into new-topo
     add 3c52a32  Miss copy response code in mesh analysis. (#2684)
     add 3ffb43d  Let the check style bind to maven process-sources life cycle. (#2683)
     add b76839f  Update docker building tool (#2677)
     add 6fff2a8  Remove the unused method. & Modify doc. (#2692)
     add 4eb5def  Manage models in one place. (#2695)
     add c673511  Merge branch 'master' into new-topo

No new revisions were added by this update.

Summary of changes:
 Makefile                                           |  95 +++++++
 .../agent/core/conf/SnifferConfigInitializer.java  |   2 +-
 .../agent/core/plugin/PluginResourcesResolver.java |  22 --
 docker/Makefile                                    |  31 --
 docker/README.md                                   |  12 -
 docker/config/alarm-settings.yml                   |  72 -----
 docker/config/application.yml                      | 117 --------
 docker/config/component-libraries.yml              | 311 ---------------------
 docker/config/datasource-settings.properties       |  31 --
 docker/config/log4j2.xml                           |  37 ---
 docker/docker-compose.yml                          |  13 +-
 docker/oap/{Dockerfile => Dockerfile.oap}          |   8 +-
 docker/oap/docker-entrypoint.sh                    | 226 ++++++++++++++-
 docker/ui/{Dockerfile => Dockerfile.ui}            |   6 +-
 docker/ui/docker-entrypoint.sh                     |   9 +-
 docs/en/guides/How-to-build.md                     |  29 ++
 .../oap/server/core/CoreModuleProvider.java        |   2 +-
 .../core/analysis/StreamAnnotationListener.java    |   7 +-
 .../analysis/worker/MetricsStreamProcessor.java    |  28 +-
 .../analysis/worker/RecordStreamProcessor.java     |   9 +-
 .../core/analysis/worker/TopNStreamProcessor.java  |   9 +-
 .../register/worker/InventoryStreamProcessor.java  |   8 +-
 .../server/core/storage/model/IModelSetter.java    |   6 +-
 .../oap/server/core/storage/model/Model.java       |  42 ++-
 .../server/core/storage/model/ModelInstaller.java  |  27 +-
 .../{annotation => model}/StorageModels.java       |  24 +-
 .../core/storage/ttl/DataTTLKeeperTimer.java       |  75 +----
 .../ttl/DayTTLCalculator.java}                     |  12 +-
 .../ttl/HourTTLCalculator.java}                    |  22 +-
 .../ttl/MinuteTTLCalculator.java}                  |  22 +-
 .../ttl/MonthTTLCalculator.java}                   |  17 +-
 .../ttl/SecondTTLCalculator.java}                  |  22 +-
 .../ttl/TTLCalculator.java}                        |  12 +-
 .../receiver/mesh/TelemetryDataDispatcher.java     |   4 +
 .../plugin/jdbc/mysql/MySQLTableInstaller.java     |   4 +-
 pom.xml                                            |  24 +-
 36 files changed, 552 insertions(+), 845 deletions(-)
 create mode 100644 Makefile
 delete mode 100644 docker/Makefile
 delete mode 100644 docker/README.md
 delete mode 100644 docker/config/alarm-settings.yml
 delete mode 100644 docker/config/application.yml
 delete mode 100644 docker/config/component-libraries.yml
 delete mode 100644 docker/config/datasource-settings.properties
 delete mode 100644 docker/config/log4j2.xml
 rename docker/oap/{Dockerfile => Dockerfile.oap} (89%)
 rename docker/ui/{Dockerfile => Dockerfile.ui} (90%)
 rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{annotation => model}/StorageModels.java (78%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{cluster/ServiceRegisterException.java => storage/ttl/DayTTLCalculator.java} (68%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{analysis/data/EndOfBatchContext.java => storage/ttl/HourTTLCalculator.java} (68%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{analysis/data/EndOfBatchContext.java => storage/ttl/MinuteTTLCalculator.java} (67%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{query/entity/Alarms.java => storage/ttl/MonthTTLCalculator.java} (68%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{analysis/data/EndOfBatchContext.java => storage/ttl/SecondTTLCalculator.java} (68%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{analysis/data/DataCache.java => storage/ttl/TTLCalculator.java} (78%)