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 2021/02/27 06:51:11 UTC
[skywalking] branch master updated (258962c -> 0e1d5c3)
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 258962c removed a duplicate file (#6458)
add 0e1d5c3 Make Zipkin trace query available (#6454)
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 7 +-
README.md | 2 +-
docs/en/setup/backend/backend-receivers.md | 67 +---
docs/en/setup/backend/backend-storage.md | 38 +-
docs/en/setup/backend/configuration-vocabulary.md | 3 -
oap-server/pom.xml | 6 -
.../src/main/resources/application.yml | 27 ++
.../server/core/storage/query/ITraceQueryDAO.java | 2 +-
.../jaeger-receiver-plugin/pom.xml | 47 ---
.../server/receiver/jaeger/JaegerGRPCHandler.java | 114 ------
.../receiver/jaeger/JaegerReceiverConfig.java | 34 --
.../receiver/jaeger/JaegerReceiverModule.java | 37 --
.../receiver/jaeger/JaegerReceiverProvider.java | 107 -----
...ywalking.oap.server.library.module.ModuleDefine | 20 -
...alking.oap.server.library.module.ModuleProvider | 19 -
oap-server/server-receiver-plugin/pom.xml | 1 -
.../src/main/proto/jaeger/collector.proto | 66 ----
.../src/main/proto/jaeger/model.proto | 160 --------
.../zipkin-receiver-plugin/pom.xml | 16 +-
.../receiver/zipkin/ZipkinReceiverConfig.java | 3 -
.../receiver/zipkin/ZipkinReceiverProvider.java | 21 +-
.../zipkin/analysis/Receiver2AnalysisBridge.java | 40 --
.../zipkin/analysis/ZipkinSkyWalkingTransfer.java | 33 --
.../zipkin/analysis/cache/CacheFactory.java | 42 --
.../receiver/zipkin/analysis/cache/ISpanCache.java | 25 --
.../analysis/cache/caffeine/CaffeineSpanCache.java | 92 -----
.../zipkin/analysis/data/SkyWalkingTrace.java | 33 --
.../receiver/zipkin/analysis/data/ZipkinTrace.java | 56 ---
.../zipkin/analysis/transform/SegmentBuilder.java | 437 ---------------------
.../zipkin/analysis/transform/SegmentListener.java | 25 --
.../transform/Zipkin2SkyWalkingTransfer.java | 48 ---
.../receiver/zipkin/handler/SpanProcessor.java | 20 +-
.../zipkin/handler/SpanV1JettyHandler.java | 17 +-
.../zipkin/handler/SpanV2JettyHandler.java | 16 +-
.../server/receiver/zipkin/trace/SpanForward.java | 62 +--
.../transform/SpringSleuthSegmentBuilderTest.java | 117 ------
oap-server/server-starter-es7/pom.xml | 5 +
oap-server/server-starter/pom.xml | 15 -
oap-server/server-storage-plugin/pom.xml | 3 +-
.../storage-jaeger-plugin/pom.xml | 42 --
.../server/storage/plugin/jaeger/JaegerSpan.java | 78 ----
.../storage/plugin/jaeger/JaegerSpanRecord.java | 156 --------
.../plugin/jaeger/JaegerSpanRecordDispatcher.java | 48 ---
.../JaegerStorageModuleElasticsearchProvider.java | 45 ---
.../elasticsearch/JaegerTraceQueryEsDAO.java | 309 ---------------
...alking.oap.server.library.module.ModuleProvider | 19 -
.../pom.xml | 12 +-
.../server/storage/plugin/zipkin/ZipkinSpan.java | 5 +
.../storage/plugin/zipkin/ZipkinSpanRecord.java | 8 +
.../plugin/zipkin/ZipkinSpanRecordDispatcher.java | 1 +
.../ZipkinStorageModuleElasticsearchProvider.java | 8 +-
.../elasticsearch/ZipkinTraceQueryEs7DAO.java} | 66 ++--
...alking.oap.server.library.module.ModuleProvider | 0
.../known-oap-backend-dependencies-es7.txt | 1 +
.../known-oap-backend-dependencies.txt | 2 -
55 files changed, 180 insertions(+), 2503 deletions(-)
delete mode 100644 oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml
delete mode 100644 oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerGRPCHandler.java
delete mode 100644 oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverConfig.java
delete mode 100644 oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverModule.java
delete mode 100644 oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverProvider.java
delete mode 100644 oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
delete mode 100644 oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
delete mode 100755 oap-server/server-receiver-plugin/receiver-proto/src/main/proto/jaeger/collector.proto
delete mode 100755 oap-server/server-receiver-plugin/receiver-proto/src/main/proto/jaeger/model.proto
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/Receiver2AnalysisBridge.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/ZipkinSkyWalkingTransfer.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/cache/CacheFactory.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/cache/ISpanCache.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/cache/caffeine/CaffeineSpanCache.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/data/SkyWalkingTrace.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/data/ZipkinTrace.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/SegmentBuilder.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/SegmentListener.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/Zipkin2SkyWalkingTransfer.java
delete mode 100644 oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/SpringSleuthSegmentBuilderTest.java
delete mode 100644 oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml
delete mode 100644 oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/JaegerSpan.java
delete mode 100644 oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/JaegerSpanRecord.java
delete mode 100644 oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/JaegerSpanRecordDispatcher.java
delete mode 100644 oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/elasticsearch/JaegerStorageModuleElasticsearchProvider.java
delete mode 100644 oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/elasticsearch/JaegerTraceQueryEsDAO.java
delete mode 100755 oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
rename oap-server/server-storage-plugin/{storage-zipkin-plugin => storage-zipkin-elasticsearch7-plugin}/pom.xml (77%)
rename oap-server/server-storage-plugin/{storage-zipkin-plugin => storage-zipkin-elasticsearch7-plugin}/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpan.java (94%)
rename oap-server/server-storage-plugin/{storage-zipkin-plugin => storage-zipkin-elasticsearch7-plugin}/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpanRecord.java (95%)
rename oap-server/server-storage-plugin/{storage-zipkin-plugin => storage-zipkin-elasticsearch7-plugin}/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpanRecordDispatcher.java (97%)
rename oap-server/server-storage-plugin/{storage-zipkin-plugin => storage-zipkin-elasticsearch7-plugin}/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/elasticsearch/ZipkinStorageModuleElasticsearchProvider.java (87%)
rename oap-server/server-storage-plugin/{storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/elasticsearch/ZipkinTraceQueryEsDAO.java => storage-zipkin-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/elasticsearch/ZipkinTraceQueryEs7DAO.java} (79%)
rename oap-server/server-storage-plugin/{storage-zipkin-plugin => storage-zipkin-elasticsearch7-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (100%)