Sync docs from master to gh-pages

This commit is contained in:
Marcin Grzejszczak
2016-11-10 15:49:41 +01:00
parent cfd022145b
commit 326a37bf5a

View File

@@ -434,11 +434,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
<li><a href="#_log_correlation">Log correlation</a>
<ul class="sectlevel4">
<li><a href="#_json_logback_with_logstash">JSON Logback with Logstash</a></li>
<li><a href="#_propagating_span_context">Propagating Span Context</a>
<ul class="sectlevel5">
<li><a href="#_baggage_vs_span_tags">Baggage vs. Span Tags</a></li>
</ul>
</li>
<li><a href="#_propagating_span_context">Propagating Span Context</a>
<ul class="sectlevel4">
<li><a href="#_baggage_vs_span_tags">Baggage vs. Span Tags</a></li>
</ul>
</li>
</ul>
@@ -908,8 +908,9 @@ If you&#8217;re using a custom <code>logback-spring.xml</code> then you have to
</table>
</div>
</div>
<div class="sect4">
<h5 id="_propagating_span_context">Propagating Span Context</h5>
</div>
<div class="sect3">
<h4 id="_propagating_span_context">Propagating Span Context</h4>
<div class="paragraph">
<p>The span context is the state that must get propagated to any child Spans across process boundaries.
Part of the Span Context is the Baggage. The trace and span IDs are a required part of the span context.
@@ -935,7 +936,7 @@ to exceeding transport-level message or header capacity.
</table>
</div>
<div class="paragraph">
<p>Example of setting span:</p>
<p>Example of setting baggage on a span:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -943,8 +944,8 @@ to exceeding transport-level message or header capacity.
initialSpan.setBaggageItem("foo", "bar");</code></pre>
</div>
</div>
<div class="sect5">
<h6 id="_baggage_vs_span_tags">Baggage vs. Span Tags</h6>
<div class="sect4">
<h5 id="_baggage_vs_span_tags">Baggage vs. Span Tags</h5>
<div class="paragraph">
<p>Baggage travels with the trace (i.e. every child span contains the baggage of its parent). Zipkin has no knowledge of
baggage and will not even receive that information.</p>
@@ -970,7 +971,6 @@ tracer.addTag(baggageKey, baggageValue);</code></pre>
</div>
</div>
</div>
</div>
<div class="sect2">
<h3 id="_adding_to_the_project">Adding to the project</h3>
<div class="sect3">