[htrace] 02/02: Merge tag 'upstream/3.0.4'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository htrace.

commit 3737d4885642271b783f5949c75a1d4d4916203a
Merge: 1394c1e 362a824
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 29 10:37:23 2015 +0100

    Merge tag 'upstream/3.0.4'
    
    Upstream version 3.0.4

 .gitignore                                         |    9 +
 LICENSE.txt                                        |  202 ++++
 README.md                                          |  212 ++++
 bin/gen_thrift.sh                                  |   30 +
 htrace-core/pom.xml                                |   80 ++
 .../main/java/org/htrace/HTraceConfiguration.java  |   84 ++
 .../src/main/java/org/htrace/NullScope.java        |   34 +
 htrace-core/src/main/java/org/htrace/Sampler.java  |   54 +
 htrace-core/src/main/java/org/htrace/Span.java     |  116 +++
 .../src/main/java/org/htrace/SpanReceiver.java     |   42 +
 .../main/java/org/htrace/TimelineAnnotation.java   |   40 +
 htrace-core/src/main/java/org/htrace/Trace.java    |  208 ++++
 .../src/main/java/org/htrace/TraceInfo.java        |   38 +
 .../src/main/java/org/htrace/TraceScope.java       |   82 ++
 .../src/main/java/org/htrace/TraceTree.java        |   95 ++
 htrace-core/src/main/java/org/htrace/Tracer.java   |  125 +++
 .../main/java/org/htrace/impl/AlwaysSampler.java   |   32 +
 .../main/java/org/htrace/impl/CountSampler.java    |   41 +
 .../org/htrace/impl/LocalFileSpanReceiver.java     |  137 +++
 .../src/main/java/org/htrace/impl/MilliSpan.java   |  161 +++
 .../main/java/org/htrace/impl/NeverSampler.java    |   33 +
 .../java/org/htrace/impl/POJOSpanReceiver.java     |   58 ++
 .../java/org/htrace/impl/ProbabilitySampler.java   |   36 +
 .../org/htrace/impl/StandardOutSpanReceiver.java   |   42 +
 .../java/org/htrace/impl/TrueIfTracingSampler.java |   37 +
 .../java/org/htrace/wrappers/TraceCallable.java    |   69 ++
 .../org/htrace/wrappers/TraceExecutorService.java  |  118 +++
 .../main/java/org/htrace/wrappers/TraceProxy.java  |   70 ++
 .../java/org/htrace/wrappers/TraceRunnable.java    |   64 ++
 .../src/test/java/org/htrace/TestCountSampler.java |   40 +
 .../src/test/java/org/htrace/TestHTrace.java       |  113 ++
 .../java/org/htrace/TestHTraceConfiguration.java   |   62 ++
 .../src/test/java/org/htrace/TestSampler.java      |   49 +
 .../src/test/java/org/htrace/TraceCreator.java     |  157 +++
 htrace-zipkin/pom.xml                              |  102 ++
 .../java/com/twitter/zipkin/gen/Annotation.java    |  687 +++++++++++++
 .../com/twitter/zipkin/gen/AnnotationType.java     |   60 ++
 .../com/twitter/zipkin/gen/BinaryAnnotation.java   |  721 +++++++++++++
 .../main/java/com/twitter/zipkin/gen/Endpoint.java |  578 +++++++++++
 .../main/java/com/twitter/zipkin/gen/LogEntry.java |  486 +++++++++
 .../java/com/twitter/zipkin/gen/ResultCode.java    |   45 +
 .../main/java/com/twitter/zipkin/gen/Scribe.java   |  957 +++++++++++++++++
 .../src/main/java/com/twitter/zipkin/gen/Span.java | 1079 ++++++++++++++++++++
 .../twitter/zipkin/gen/zipkinCoreConstants.java    |   43 +
 .../java/org/htrace/impl/ZipkinSpanReceiver.java   |  362 +++++++
 .../org/htrace/zipkin/HTraceToZipkinConverter.java |  194 ++++
 htrace-zipkin/src/main/thrift/scribe.thrift        |   31 +
 htrace-zipkin/src/main/thrift/zipkinCore.thrift    |   58 ++
 .../org/htrace/TestHTraceSpanToZipkinSpan.java     |  132 +++
 pom.xml                                            |  198 ++++
 tools/README.txt                                   |    5 +
 tools/graphDrawer.py                               |   62 ++
 52 files changed, 8570 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/htrace.git