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 03:56:47 UTC

[incubator-zipkin] branch use-okio-buffer updated (931b6fc -> 34ff6ed)

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

adriancole pushed a change to branch use-okio-buffer
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin.git.


 discard 931b6fc  Ensures we don't create big byte arrays
 discard 2f9a264  Implements span document deduplication
 discard 962cd66  Simplifies and allows access to body for later hashing
 discard 4139224  Uses okio/moshi natively in Elasticsearch everywhere
     add ad9fab1  Improve MiniTimeline (#2529)
     add 0940e30  Fixes license drift
     add 7a819ff  annotation query parsing improvements (#2572)
     add f419eae  Ports the scribe collector to armeria (#2563)
     add 4854ae5  Polishes scribe module (#2575)
     add d02aa67  Uses okio/moshi natively in Elasticsearch everywhere
     add 1a69c63  Simplifies and allows access to body for later hashing
     add f6b66aa  Implements span document deduplication
     add 34ff6ed  Ensures we don't create big byte arrays

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   (931b6fc)
            \
             N -- N -- N   refs/heads/use-okio-buffer (34ff6ed)

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 +-
 pom.xml                                            |    4 +
 zipkin-autoconfigure/collector-scribe/README.md    |    5 +-
 zipkin-autoconfigure/collector-scribe/pom.xml      |   70 +-
 ...ZipkinScribeCollectorAutoConfigurationTest.java |   54 +-
 zipkin-collector/scribe/pom.xml                    |   69 +-
 .../collector/scribe/NettyScribeServer.java        |   79 ++
 .../main/java/zipkin2/collector/scribe/Scribe.java |   58 --
 .../zipkin2/collector/scribe/ScribeCollector.java  |   42 +-
 .../collector/scribe/ScribeInboundHandler.java     |  215 ++++
 .../collector/scribe/ScribeSpanConsumer.java       |   49 +-
 .../collector/scribe/generated/LogEntry.java       |  482 +++++++++
 .../collector/scribe/generated/ResultCode.java     |   43 +
 .../zipkin2/collector/scribe/generated/Scribe.java | 1045 ++++++++++++++++++++
 .../collector/scribe/ITScribeCollector.java        |  105 ++
 .../collector/scribe/ScribeCollectorTest.java      |   16 +-
 .../collector/scribe/ScribeSpanConsumerTest.java   |  174 ++--
 zipkin-lens/package-lock.json                      |   31 +
 zipkin-lens/package.json                           |    1 +
 ...e-name-badge.scss => _mini-timeline-graph.scss} |    8 +-
 ...ini-timeline.scss => _mini-timeline-label.scss} |   21 +-
 zipkin-lens/scss/components/_mini-timeline.scss    |   36 -
 .../custom/{_vizceral.scss => _rc-slider.scss}     |    9 +-
 zipkin-lens/scss/main.scss                         |    4 +
 .../components/MiniTimeline/MiniTimelineGraph.js   |  187 ++++
 .../MiniTimelineGraph.test.js}                     |   22 +-
 .../components/MiniTimeline/MiniTimelineLabel.js   |   65 ++
 .../MiniTimeline/MiniTimelineLabel.test.js         |   42 +
 .../components/MiniTimeline/MiniTimelineSlider.js  |   78 ++
 .../MiniTimeline/MiniTimelineSlider.test.js        |   69 ++
 .../MiniTimelineTimeMarkers.js}                    |   40 +-
 .../MiniTimelineTimeMarkers.test.js}               |   21 +-
 zipkin-lens/src/components/MiniTimeline/index.js   |  257 +----
 .../src/components/MiniTimeline/index.test.js      |   89 ++
 .../MiniTimeline/util.js}                          |   23 +-
 .../src/components/MiniTimeline/util.test.js       |   44 +
 .../elasticsearch/ElasticsearchSpanConsumer.java   |   21 +-
 .../{HttpBulkIndexer.java => BulkCallBuilder.java} |   63 +-
 ...dexDocumentWriter.java => BulkIndexWriter.java} |   18 +-
 .../zipkin2/elasticsearch/InternalForTests.java    |   14 +-
 ...lkIndexerTest.java => BulkCallBuilderTest.java} |    4 +-
 ...entWriterTest.java => BulkIndexWriterTest.java} |   18 +-
 .../main/java/zipkin2/storage/QueryRequest.java    |   11 +-
 .../java/zipkin2/storage/QueryRequestTest.java     |   28 +
 45 files changed, 3020 insertions(+), 764 deletions(-)
 copy benchmarks/src/main/java/zipkin2/{internal/DelayLimiterBenchmarks.java => elasticsearch/internal/BulkRequestBenchmarks.java} (54%)
 create mode 100644 zipkin-collector/scribe/src/main/java/zipkin2/collector/scribe/NettyScribeServer.java
 delete mode 100644 zipkin-collector/scribe/src/main/java/zipkin2/collector/scribe/Scribe.java
 create mode 100644 zipkin-collector/scribe/src/main/java/zipkin2/collector/scribe/ScribeInboundHandler.java
 create mode 100644 zipkin-collector/scribe/src/main/java/zipkin2/collector/scribe/generated/LogEntry.java
 create mode 100644 zipkin-collector/scribe/src/main/java/zipkin2/collector/scribe/generated/ResultCode.java
 create mode 100644 zipkin-collector/scribe/src/main/java/zipkin2/collector/scribe/generated/Scribe.java
 create mode 100644 zipkin-collector/scribe/src/test/java/zipkin2/collector/scribe/ITScribeCollector.java
 copy zipkin-lens/scss/components/{_service-name-badge.scss => _mini-timeline-graph.scss} (86%)
 copy zipkin-lens/scss/components/{_mini-timeline.scss => _mini-timeline-label.scss} (76%)
 copy zipkin-lens/scss/custom/{_vizceral.scss => _rc-slider.scss} (91%)
 create mode 100644 zipkin-lens/src/components/MiniTimeline/MiniTimelineGraph.js
 copy zipkin-lens/src/components/{Browser/BrowserHeader.test.js => MiniTimeline/MiniTimelineGraph.test.js} (67%)
 create mode 100644 zipkin-lens/src/components/MiniTimeline/MiniTimelineLabel.js
 create mode 100644 zipkin-lens/src/components/MiniTimeline/MiniTimelineLabel.test.js
 create mode 100644 zipkin-lens/src/components/MiniTimeline/MiniTimelineSlider.js
 create mode 100644 zipkin-lens/src/components/MiniTimeline/MiniTimelineSlider.test.js
 copy zipkin-lens/src/components/{Browser/TraceSummary/TraceSummaryButtons.js => MiniTimeline/MiniTimelineTimeMarkers.js} (58%)
 copy zipkin-lens/src/components/{Browser/BrowserHeader.test.js => MiniTimeline/MiniTimelineTimeMarkers.test.js} (64%)
 create mode 100644 zipkin-lens/src/components/MiniTimeline/index.test.js
 copy zipkin-lens/src/{util/timestamp.js => components/MiniTimeline/util.js} (72%)
 create mode 100644 zipkin-lens/src/components/MiniTimeline/util.test.js
 rename zipkin-storage/elasticsearch/src/main/java/zipkin2/elasticsearch/internal/{HttpBulkIndexer.java => BulkCallBuilder.java} (67%)
 rename zipkin-storage/elasticsearch/src/main/java/zipkin2/elasticsearch/internal/{BulkIndexDocumentWriter.java => BulkIndexWriter.java} (92%)
 rename zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/internal/{HttpBulkIndexerTest.java => BulkCallBuilderTest.java} (95%)
 rename zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/internal/{BulkIndexDocumentWriterTest.java => BulkIndexWriterTest.java} (84%)