You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zipkin.apache.org by ad...@apache.org on 2019/05/10 08:14:25 UTC
[incubator-zipkin] branch bundle-scribe updated (e131e6d -> dc95f95)
This is an automated email from the ASF dual-hosted git repository.
adriancole pushed a change to branch bundle-scribe
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin.git.
discard e131e6d README whisper
discard f0a561a Simplifies build by bundling Scribe (still disabled by default)
add 6125bce Update webpack configs
add d179243 Change suffix js -> jsx
add dde769d Small style fix. (#2578)
add 7e6c076 Implements deduplication in Elasticsearch (#2573)
add b3eefbe Adding storage-throttle module to address "over capacity" issues (#2502)
add ea6d92d Simplifies build by bundling Scribe (still disabled by default)
add 98efa0b README whisper
add dc95f95 fixes generated annotation problem
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (e131e6d)
\
N -- N -- N refs/heads/bundle-scribe (dc95f95)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
benchmarks/pom.xml | 7 +-
.../internal/BulkRequestBenchmarks.java} | 43 +-
.../test/java/zipkin2/collector/CollectorTest.java | 11 +
.../collector/scribe/ScribeInboundHandler.java | 2 +-
.../src/components/App/{index.js => App.jsx} | 0
.../components/App/{index.test.js => App.test.js} | 2 +-
.../src/components/App/{Layout.js => Layout.jsx} | 0
.../App/Sidebar/{index.js => Sidebar.jsx} | 0
.../App/Sidebar/{index.test.js => Sidebar.test.js} | 2 +-
...{SidebarPageOption.js => SidebarPageOption.jsx} | 0
zipkin-lens/src/components/App/Sidebar/index.js | 84 +---
zipkin-lens/src/components/App/index.js | 52 +--
.../components/Browser/{index.js => Browser.jsx} | 0
.../Browser/{index.test.js => Browser.test.js} | 2 +-
.../{BrowserHeader.js => BrowserHeader.jsx} | 0
.../{BrowserResults.js => BrowserResults.jsx} | 0
.../TraceSummary/{index.js => TraceSummary.jsx} | 0
.../{index.test.js => TraceSummary.test.js} | 2 +-
.../{TraceSummaryBar.js => TraceSummaryBar.jsx} | 0
...ceSummaryButtons.js => TraceSummaryButtons.jsx} | 0
...SummaryUpperBar.js => TraceSummaryUpperBar.jsx} | 0
.../src/components/Browser/TraceSummary/index.js | 103 +----
zipkin-lens/src/components/Browser/index.js | 57 +--
.../Common/{DatePicker.js => DatePicker.jsx} | 0
.../{LoadingOverlay.js => LoadingOverlay.jsx} | 0
.../{ServiceNameBadge.js => ServiceNameBadge.jsx} | 0
.../Dependencies/{index.js => Dependencies.jsx} | 0
.../{index.test.js => Dependencies.test.js} | 2 +-
...{DependenciesGraph.js => DependenciesGraph.jsx} | 0
...endenciesSidebar.js => DependenciesSidebar.jsx} | 0
.../{VizceralExt.js => VizceralExt.jsx} | 0
zipkin-lens/src/components/Dependencies/index.js | 213 +---------
.../DetailedTraceSummary/{index.js => index.jsx} | 0
...{ConditionDuration.js => ConditionDuration.jsx} | 0
.../{ConditionLimit.js => ConditionLimit.jsx} | 0
...{ConditionLookback.js => ConditionLookback.jsx} | 0
.../{ConditionName.js => ConditionName.jsx} | 0
.../{ConditionTags.js => ConditionTags.jsx} | 0
...lobalDropdownMenu.js => GlobalDropdownMenu.jsx} | 0
.../GlobalSearch/{index.js => GlobalSearch.jsx} | 0
.../{SearchCondition.js => SearchCondition.jsx} | 0
zipkin-lens/src/components/GlobalSearch/index.js | 439 +--------------------
.../MiniTimeline/{index.js => MiniTimeline.jsx} | 0
.../{index.test.js => MiniTimeline.test.js} | 2 +-
...{MiniTimelineGraph.js => MiniTimelineGraph.jsx} | 0
...{MiniTimelineLabel.js => MiniTimelineLabel.jsx} | 0
...iniTimelineSlider.js => MiniTimelineSlider.jsx} | 0
...eTimeMarkers.js => MiniTimelineTimeMarkers.jsx} | 0
zipkin-lens/src/components/MiniTimeline/index.js | 53 +--
.../components/Timeline/{index.js => Timeline.jsx} | 0
.../{TimelineHeader.js => TimelineHeader.jsx} | 0
.../Timeline/{TimelineSpan.js => TimelineSpan.jsx} | 0
.../{TimelineSpanData.js => TimelineSpanData.jsx} | 0
zipkin-lens/src/components/Timeline/index.js | 151 +------
.../components/TracePage/{index.js => index.jsx} | 0
.../components/TraceViewer/{index.js => index.jsx} | 0
zipkin-lens/webpack.dev.config.js | 4 +-
zipkin-lens/webpack.prod.config.js | 4 +-
zipkin-server/README.md | 10 +
zipkin-server/pom.xml | 23 +-
...ver.java => ConditionalOnThrottledStorage.java} | 26 +-
.../server/internal/ZipkinServerConfiguration.java | 44 +++
.../ZipkinElasticsearchStorageProperties.java | 15 +-
.../internal/throttle/ActuateThrottleMetrics.java | 49 +++
.../server/internal/throttle/ThrottledCall.java | 233 +++++++++++
.../throttle/ThrottledStorageComponent.java | 203 ++++++++++
.../throttle/ZipkinStorageThrottleProperties.java | 69 ++++
.../src/main/resources/zipkin-server-shared.yml | 5 +
.../elasticsearch/BasicAuthInterceptorTest.kt | 2 +-
.../server/internal/throttle/ThrottledCallTest.kt | 289 ++++++++++++++
.../throttle/ThrottledStorageComponentTest.kt | 51 +++
.../elasticsearch/ElasticsearchSpanConsumer.java | 151 ++-----
.../{HttpBulkIndexer.java => BulkCallBuilder.java} | 94 +++--
.../elasticsearch/internal/BulkIndexWriter.java | 178 +++++++++
.../elasticsearch/internal/client/HttpCall.java | 5 +
.../ElasticsearchSpanConsumerTest.java | 99 +----
.../zipkin2/elasticsearch/InternalForTests.java | 32 +-
.../integration/ITElasticsearchStorageV6.java | 3 -
.../integration/ITElasticsearchStorageV7.java | 5 -
...lkIndexerTest.java => BulkCallBuilderTest.java} | 4 +-
.../internal/BulkIndexWriterTest.java | 121 ++++++
.../main/java/zipkin2/storage/InMemoryStorage.java | 4 +
82 files changed, 1509 insertions(+), 1441 deletions(-)
copy benchmarks/src/main/java/zipkin2/{internal/DelayLimiterBenchmarks.java => elasticsearch/internal/BulkRequestBenchmarks.java} (54%)
copy zipkin-lens/src/components/App/{index.js => App.jsx} (100%)
rename zipkin-lens/src/components/App/{index.test.js => App.test.js} (98%)
rename zipkin-lens/src/components/App/{Layout.js => Layout.jsx} (100%)
copy zipkin-lens/src/components/App/Sidebar/{index.js => Sidebar.jsx} (100%)
rename zipkin-lens/src/components/App/Sidebar/{index.test.js => Sidebar.test.js} (98%)
rename zipkin-lens/src/components/App/Sidebar/{SidebarPageOption.js => SidebarPageOption.jsx} (100%)
copy zipkin-lens/src/components/Browser/{index.js => Browser.jsx} (100%)
rename zipkin-lens/src/components/Browser/{index.test.js => Browser.test.js} (98%)
rename zipkin-lens/src/components/Browser/{BrowserHeader.js => BrowserHeader.jsx} (100%)
rename zipkin-lens/src/components/Browser/{BrowserResults.js => BrowserResults.jsx} (100%)
copy zipkin-lens/src/components/Browser/TraceSummary/{index.js => TraceSummary.jsx} (100%)
rename zipkin-lens/src/components/Browser/TraceSummary/{index.test.js => TraceSummary.test.js} (97%)
rename zipkin-lens/src/components/Browser/TraceSummary/{TraceSummaryBar.js => TraceSummaryBar.jsx} (100%)
rename zipkin-lens/src/components/Browser/TraceSummary/{TraceSummaryButtons.js => TraceSummaryButtons.jsx} (100%)
rename zipkin-lens/src/components/Browser/TraceSummary/{TraceSummaryUpperBar.js => TraceSummaryUpperBar.jsx} (100%)
rename zipkin-lens/src/components/Common/{DatePicker.js => DatePicker.jsx} (100%)
rename zipkin-lens/src/components/Common/{LoadingOverlay.js => LoadingOverlay.jsx} (100%)
rename zipkin-lens/src/components/Common/{ServiceNameBadge.js => ServiceNameBadge.jsx} (100%)
copy zipkin-lens/src/components/Dependencies/{index.js => Dependencies.jsx} (100%)
rename zipkin-lens/src/components/Dependencies/{index.test.js => Dependencies.test.js} (98%)
rename zipkin-lens/src/components/Dependencies/{DependenciesGraph.js => DependenciesGraph.jsx} (100%)
rename zipkin-lens/src/components/Dependencies/{DependenciesSidebar.js => DependenciesSidebar.jsx} (100%)
rename zipkin-lens/src/components/Dependencies/{VizceralExt.js => VizceralExt.jsx} (100%)
rename zipkin-lens/src/components/DetailedTraceSummary/{index.js => index.jsx} (100%)
rename zipkin-lens/src/components/GlobalSearch/{ConditionDuration.js => ConditionDuration.jsx} (100%)
rename zipkin-lens/src/components/GlobalSearch/{ConditionLimit.js => ConditionLimit.jsx} (100%)
rename zipkin-lens/src/components/GlobalSearch/{ConditionLookback.js => ConditionLookback.jsx} (100%)
rename zipkin-lens/src/components/GlobalSearch/{ConditionName.js => ConditionName.jsx} (100%)
rename zipkin-lens/src/components/GlobalSearch/{ConditionTags.js => ConditionTags.jsx} (100%)
rename zipkin-lens/src/components/GlobalSearch/{GlobalDropdownMenu.js => GlobalDropdownMenu.jsx} (100%)
copy zipkin-lens/src/components/GlobalSearch/{index.js => GlobalSearch.jsx} (100%)
rename zipkin-lens/src/components/GlobalSearch/{SearchCondition.js => SearchCondition.jsx} (100%)
copy zipkin-lens/src/components/MiniTimeline/{index.js => MiniTimeline.jsx} (100%)
rename zipkin-lens/src/components/MiniTimeline/{index.test.js => MiniTimeline.test.js} (98%)
rename zipkin-lens/src/components/MiniTimeline/{MiniTimelineGraph.js => MiniTimelineGraph.jsx} (100%)
rename zipkin-lens/src/components/MiniTimeline/{MiniTimelineLabel.js => MiniTimelineLabel.jsx} (100%)
rename zipkin-lens/src/components/MiniTimeline/{MiniTimelineSlider.js => MiniTimelineSlider.jsx} (100%)
rename zipkin-lens/src/components/MiniTimeline/{MiniTimelineTimeMarkers.js => MiniTimelineTimeMarkers.jsx} (100%)
copy zipkin-lens/src/components/Timeline/{index.js => Timeline.jsx} (100%)
rename zipkin-lens/src/components/Timeline/{TimelineHeader.js => TimelineHeader.jsx} (100%)
rename zipkin-lens/src/components/Timeline/{TimelineSpan.js => TimelineSpan.jsx} (100%)
rename zipkin-lens/src/components/Timeline/{TimelineSpanData.js => TimelineSpanData.jsx} (100%)
rename zipkin-lens/src/components/TracePage/{index.js => index.jsx} (100%)
rename zipkin-lens/src/components/TraceViewer/{index.js => index.jsx} (100%)
copy zipkin-server/src/main/java/zipkin2/server/internal/{EnableZipkinServer.java => ConditionalOnThrottledStorage.java} (51%)
create mode 100644 zipkin-server/src/main/java/zipkin2/server/internal/throttle/ActuateThrottleMetrics.java
create mode 100644 zipkin-server/src/main/java/zipkin2/server/internal/throttle/ThrottledCall.java
create mode 100644 zipkin-server/src/main/java/zipkin2/server/internal/throttle/ThrottledStorageComponent.java
create mode 100644 zipkin-server/src/main/java/zipkin2/server/internal/throttle/ZipkinStorageThrottleProperties.java
create mode 100644 zipkin-server/src/test/kotlin/zipkin2/server/internal/throttle/ThrottledCallTest.kt
create mode 100644 zipkin-server/src/test/kotlin/zipkin2/server/internal/throttle/ThrottledStorageComponentTest.kt
rename zipkin-storage/elasticsearch/src/main/java/zipkin2/elasticsearch/internal/{HttpBulkIndexer.java => BulkCallBuilder.java} (51%)
create mode 100644 zipkin-storage/elasticsearch/src/main/java/zipkin2/elasticsearch/internal/BulkIndexWriter.java
rename zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/internal/{HttpBulkIndexerTest.java => BulkCallBuilderTest.java} (95%)
create mode 100644 zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/internal/BulkIndexWriterTest.java