You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zipkin.apache.org by ab...@apache.org on 2019/04/22 08:04:59 UTC

[incubator-zipkin-website] branch asf-site updated: Automatic site generation from ac30061

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

abesto pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 339d065  Automatic site generation from ac30061
339d065 is described below

commit 339d065b306579a7fa10ca8493e401c0ea13bdb0
Author: jenkins <bu...@apache.org>
AuthorDate: Mon Apr 22 08:04:53 2019 +0000

    Automatic site generation from ac30061
---
 Jenkinsfile                                        |  35 ++-
 README.md                                          |   4 +-
 docker-compose.yml                                 |   9 +
 index.html                                         |  11 +-
 pages/architecture.html                            |  12 +-
 pages/community.html                               |  10 +-
 pages/data_model.html                              |   8 +-
 pages/extensions_choices.html                      | 295 +++++++++++++++++++++
 pages/instrumenting.html                           |  10 +-
 pages/quickstart.html                              |   8 +-
 ...entations.html => tracers_instrumentation.html} |  85 +++++-
 11 files changed, 464 insertions(+), 23 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4068696..bdde5ca 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,6 +14,12 @@ pipeline {
 
 	stages {
 		stage('SCM Checkout') {
+			when {
+				anyOf {
+					branch 'master'
+					changeRequest target: 'master'
+				}
+			}
 			steps {
 				deleteDir()
 				checkout scm
@@ -21,6 +27,12 @@ pipeline {
 		}
 
 		stage('Check environment') {
+			when {
+				anyOf {
+					branch 'master'
+					changeRequest target: 'master'
+				}
+			}
 			steps {
 				sh 'env'
 				sh 'pwd'
@@ -33,6 +45,12 @@ pipeline {
 		}
 
 		stage('Install Jekyll') {
+			when {
+				anyOf {
+					branch 'master'
+					changeRequest target: 'master'
+				}
+			}
 			steps {
 				sh '''
 				. "${rvm_path}/scripts/rvm"
@@ -44,6 +62,12 @@ pipeline {
 		}
 
 		stage('Build site') {
+			when {
+				anyOf {
+					branch 'master'
+					changeRequest target: 'master'
+				}
+			}
 			steps {
 				sh '''
 				. "${rvm_path}/scripts/rvm"
@@ -55,6 +79,13 @@ pipeline {
 		}
 
 		stage('Publish') {
+			when {
+				branch 'master'
+			}
+			environment {
+				// GH Personal access token @abesto
+				GITUSER = credentials('2d27b827-20c2-4173-ac84-f3abc308fc88')
+			}
 			steps {
 				sh '''
 				set -xeuo pipefail
@@ -66,7 +97,7 @@ pipeline {
 				mv _site "${builddir}/"
 				ls -lR "${builddir}/_site/"
 
-				git fetch origin
+				git fetch origin asf-site:asf-site
 				git reset --hard
 				git checkout asf-site
 				git log -3
@@ -81,8 +112,8 @@ pipeline {
 				if [ -z "$(git status --porcelain)" ]; then
 					echo 'No changes to commit/push'
 				else
+					git config --local credential.helper "!p() { echo username=\\$GITUSER_USR; echo password=\\$GITUSER_PSW; }; p"
 					git commit -m "$commitmsg"
-					git pull --rebase
 					git log asf-site -3
 					git push origin asf-site
 				fi
diff --git a/README.md b/README.md
index 4fde567..c69eb1b 100644
--- a/README.md
+++ b/README.md
@@ -89,8 +89,8 @@ The rest of the repository contains scaffolding; here's a list to give you a
 basic idea of what's what:
 
  * [`_data`](_data) contains lists of things that are rendered into various
-   parts of the page. For instance the list of existing tracers is defined here
-   in a structured way.
+   parts of the page. For instance the list of tracers and instrumentation
+   is defined here in a structured way.
  * [`_includes`](_includes) contains HTML snippets that are shared by some or
    all pages.
  * [`_layouts`](_layouts) contains the basic HTML shared by all pages - and
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..396d9b7
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,9 @@
+version: '3'
+services:
+  jekyll:
+    image: jekyll/jekyll:latest
+    command: jekyll serve --watch --force_polling --verbose
+    ports:
+      - 4000:4000
+    volumes:
+      - .:/srv/jekyll
\ No newline at end of file
diff --git a/index.html b/index.html
index 3e1bf14..dafa373 100644
--- a/index.html
+++ b/index.html
@@ -74,7 +74,13 @@
       
         
           
-            <a class="sidebar-nav-item" href="/pages/existing_instrumentations.html">Existing instrumentations</a>
+            <a class="sidebar-nav-item" href="/pages/tracers_instrumentation.html">Tracers and Instrumentation</a>
+          
+        
+      
+        
+          
+            <a class="sidebar-nav-item" href="/pages/extensions_choices.html">Server extensions and choices</a>
           
         
       
@@ -131,7 +137,8 @@ Zipkin’s design is based on the
 
 <ul>
   <li>To try out Zipkin, check out our <a href="/pages/quickstart">Quickstart guide</a></li>
-  <li>See if your platform has an <a href="/pages/existing_instrumentations">existing instrumentation library</a></li>
+  <li>See if your platform has a <a href="/pages/tracers_instrumentation">tracer or instrumentation library</a></li>
+  <li>See if a <a href="/pages/extensions_choices">server extension or alternative</a> is relevant to your site.</li>
   <li>Join the <a href="https://gitter.im/openzipkin/zipkin">Zipkin Gitter chat channel</a></li>
   <li>The source code is on GitHub as <a href="https://github.com/openzipkin/zipkin/">openzipkin/zipkin</a></li>
   <li>Issues are also tracked on <a href="https://github.com/openzipkin/zipkin/issues">GitHub</a></li>
diff --git a/pages/architecture.html b/pages/architecture.html
index 575c876..be3443b 100644
--- a/pages/architecture.html
+++ b/pages/architecture.html
@@ -74,7 +74,13 @@
       
         
           
-            <a class="sidebar-nav-item" href="/pages/existing_instrumentations.html">Existing instrumentations</a>
+            <a class="sidebar-nav-item" href="/pages/tracers_instrumentation.html">Tracers and Instrumentation</a>
+          
+        
+      
+        
+          
+            <a class="sidebar-nav-item" href="/pages/extensions_choices.html">Server extensions and choices</a>
           
         
       
@@ -143,8 +149,8 @@ the API to provide data to the UI.</p>
 
 <p><img src="/public/img/architecture-1.png" alt="Zipkin architecture" /></p>
 
-<p>To see if an instrumentation library already exists for your platform, see the
-list of <a href="/pages/existing_instrumentations">existing instrumentations</a>.</p>
+<p>To see if a tracer or instrumentation library already exists for your platform, see
+<a href="/pages/tracers_instrumentation">our list</a>.</p>
 
 <h2 id="example-flow">Example flow</h2>
 
diff --git a/pages/community.html b/pages/community.html
index 78e1755..6d7ee1a 100644
--- a/pages/community.html
+++ b/pages/community.html
@@ -74,7 +74,13 @@
       
         
           
-            <a class="sidebar-nav-item" href="/pages/existing_instrumentations.html">Existing instrumentations</a>
+            <a class="sidebar-nav-item" href="/pages/tracers_instrumentation.html">Tracers and Instrumentation</a>
+          
+        
+      
+        
+          
+            <a class="sidebar-nav-item" href="/pages/extensions_choices.html">Server extensions and choices</a>
           
         
       
@@ -129,7 +135,7 @@ Zipkin code, docs, specs and support. It includes github projects, this web site
 <h3 id="keeping-up-to-date">Keeping up to date</h3>
 <p>Follow <a href="https://twitter.com/zipkinproject">@zipkinproject</a> on Twitter for news
 including release announcements and community events. You can also ask on <a href="https://gitter.im/openzipkin/zipkin">gitter</a> about something specific. If you are working on code, you can also
-follow projects like the <a href="https://github.com/openzipkin/zipkin">server</a> or an <a href="https://zipkin.io/pages/existing_instrumentations.html">instrumentation</a> you use.</p>
+follow projects like the <a href="https://github.com/openzipkin/zipkin">server</a> or an <a href="https://zipkin.io/pages/tracers_instrumentation.html">instrumentation</a> you use.</p>
 
 <h3 id="being-an-active-part-of-the-community">Being an active part of the community</h3>
 <p>OpenZipkin is primarily volunteers, and there are a lot of ways to help. Once you
diff --git a/pages/data_model.html b/pages/data_model.html
index c9f0583..fef5f14 100644
--- a/pages/data_model.html
+++ b/pages/data_model.html
@@ -74,7 +74,13 @@
       
         
           
-            <a class="sidebar-nav-item" href="/pages/existing_instrumentations.html">Existing instrumentations</a>
+            <a class="sidebar-nav-item" href="/pages/tracers_instrumentation.html">Tracers and Instrumentation</a>
+          
+        
+      
+        
+          
+            <a class="sidebar-nav-item" href="/pages/extensions_choices.html">Server extensions and choices</a>
           
         
       
diff --git a/pages/extensions_choices.html b/pages/extensions_choices.html
new file mode 100644
index 0000000..7fc2576
--- /dev/null
+++ b/pages/extensions_choices.html
@@ -0,0 +1,295 @@
+<!DOCTYPE html>
+<html lang="en-us">
+
+  <head>
+  <link href="http://gmpg.org/xfn/11" rel="profile">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+
+  <!-- Enable responsiveness on mobile devices-->
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
+
+  <title>
+    
+      Server extensions and choices &middot; OpenZipkin
+    
+  </title>
+
+  <!-- CSS -->
+  <link rel="stylesheet" href="/public/css/poole.css">
+  <link rel="stylesheet" href="/public/css/syntax.css">
+  <link rel="stylesheet" href="/public/css/hyde.css">
+  <link rel="stylesheet" href="/public/css/zipkin.css">
+  <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=PT+Sans:400,400italic,700|Abril+Fatface">
+
+  <!-- Icons -->
+  <link rel="shortcut icon" href="/public/favicon.ico">
+</head>
+
+
+  <body class="theme-base-0d">
+
+    <div class="sidebar">
+  <div class="container sidebar-sticky">
+    <div class="sidebar-about">
+      <a href="">
+        <img alt="OpenZipkin logo" src="/public/img/zipkin-logo-200x119.jpg"
+             class="sidebar-logo">
+      </a>
+      
+      <a href="https://github.com/openzipkin/zipkin" target="_blank" title="openzipkin/zipkin">
+        <img class="sidebar-social-icon" alt="openzipkin/zipkin" src="/public/img/GitHub-Mark-Light-32px.png">
+      </a>
+      
+      <a href="https://twitter.com/zipkinproject" target="_blank" title="@zipkinproject">
+        <img class="sidebar-social-icon" alt="@zipkinproject" src="/public/img/TwitterLogo_white.png">
+      </a>
+      
+      <a href="https://gitter.im/openzipkin/zipkin/" target="_blank" title="openzipkin/zipkin">
+        <img class="sidebar-social-icon" alt="openzipkin/zipkin" src="/public/img/gitter.png">
+      </a>
+      
+    </div>
+
+    <nav class="sidebar-nav">
+      
+      
+        
+          
+            <a class="sidebar-nav-item" href="/">Home</a>
+          
+        
+      
+        
+          
+            <a class="sidebar-nav-item" href="/pages/quickstart.html">Quickstart</a>
+          
+        
+      
+        
+          
+            <a class="sidebar-nav-item" href="/pages/architecture.html">Architecture</a>
+          
+        
+      
+        
+          
+            <a class="sidebar-nav-item" href="/pages/tracers_instrumentation.html">Tracers and Instrumentation</a>
+          
+        
+      
+        
+          
+            <a class="sidebar-nav-item active" href="/pages/extensions_choices.html">Server extensions and choices</a>
+          
+        
+      
+        
+          
+            <a class="sidebar-nav-item" href="/pages/community.html">Zipkin Community</a>
+          
+        
+      
+        
+          
+            <a class="sidebar-nav-item" href="/pages/data_model.html">Data Model</a>
+          
+        
+      
+        
+          
+            <a class="sidebar-nav-item" href="/pages/instrumenting.html">Instrumenting a library</a>
+          
+        
+      
+    </nav>
+    <nav>
+      <span>Apache Links</span>
+      <a class="sidebar-nav-item" href="http://www.apache.org/">Apache Software Foundation</a>
+      <a class="sidebar-nav-item" href="http://www.apache.org/licenses/">License</a>
+      <a class="sidebar-nav-item" href="http://www.apache.org/events/current-event">Events</a>
+      <a class="sidebar-nav-item" href="http://www.apache.org/foundation/thanks">Thanks</a>
+      <a class="sidebar-nav-item" href="http://www.apache.org/security">Security</a>
+      <a class="sidebar-nav-item" href="http://www.apache.org/foundation/sponsorship">Sponsor Apache</a>
+    </nav>
+  </div>
+</div>
+
+
+    <div class="content container">
+      <div class="page">
+  <h1 class="page-title">
+      
+       Server extensions and choices
+      
+  </h1>
+  <h2 id="server-extensions">Server extensions</h2>
+<p>Zipkin server bundles extension for span collection and storage. By default spans can be collected over http, Kafka or RabbitMQ transports and stored in-memory or in MySQL, Cassandra or Elasticsearch.</p>
+
+<p>The following modules add storage or transport extensions to the default server build.
+Please refer to their individual documentation for setup and configuration guides.</p>
+
+<h3 id="openzipkin-supported">OpenZipkin supported</h3>
+
+<p>The following extensions are supported by the OpenZipkin team and are hosted at
+the <a href="https://github.com/openzipkin/">OpenZipkin GitHub</a> group. You can reach out to
+the team on <a href="https://gitter.im/openzipkin/zipkin/">Zipkin Gitter</a> chat.</p>
+
+<table class="wide-table">
+  <thead>
+    <tr>
+      <th style="text-align: left">Type</th>
+      <th style="text-align: left">Module</th>
+      <th style="text-align: left">Related product</th>
+      <th style="text-align: left">Other notes</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td style="text-align: left">Collector</td>
+      <td style="text-align: left"><a href="https://github.com/openzipkin/zipkin-aws/tree/master/autoconfigure/collector-sqs">zipkin-aws collector-sqs</a></td>
+      <td style="text-align: left"><a href="https://aws.amazon.com/sqs/">AWS SQS</a></td>
+      <td style="text-align: left"> </td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Collector</td>
+      <td style="text-align: left"><a href="https://github.com/openzipkin/zipkin-aws/tree/master/autoconfigure/collector-kinesis">zipkin-aws collector-kinesis</a></td>
+      <td style="text-align: left"><a href="https://aws.amazon.com/kinesis/">AWS Kinesis</a></td>
+      <td style="text-align: left"> </td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Storage</td>
+      <td style="text-align: left"><a href="https://github.com/openzipkin/zipkin-aws/tree/master/autoconfigure/storage-elasticsearch-aws">zipkin-aws storage-elasticsearch-aws</a></td>
+      <td style="text-align: left"><a href="https://aws.amazon.com/elasticsearch-service/">AWS Elasticsearch Service</a></td>
+      <td style="text-align: left"> </td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Storage</td>
+      <td style="text-align: left"><a href="https://github.com/openzipkin/zipkin-aws/tree/master/autoconfigure/storage-xray">zipkin-aws storage-xray</a></td>
+      <td style="text-align: left"><a href="https://aws.amazon.com/xray/">AWS X-Ray</a></td>
+      <td style="text-align: left">only supports sending to an XRay UDP daemon</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Storage</td>
+      <td style="text-align: left"><a href="https://github.com/openzipkin/zipkin-gcp/tree/master/autoconfigure/storage-stackdriver">zipkin-gcp storage-stackdriver</a></td>
+      <td style="text-align: left"><a href="https://cloud.google.com/stackdriver/">GCP Stackdriver</a></td>
+      <td style="text-align: left">only supports sending to an Stackdriver</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Collector</td>
+      <td style="text-align: left"><a href="https://github.com/openzipkin/zipkin/tree/master/zipkin-autoconfigure/collector-kafka08">zipkin-collector kafka08</a></td>
+      <td style="text-align: left"><a href="https://kafka.apache.org/">Apache kafka</a></td>
+      <td style="text-align: left">Only use this for Legacy Kafka 0.8-0.9 The default server includes support for Kafka 0.10+</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Collector</td>
+      <td style="text-align: left"><a href="https://github.com/openzipkin/zipkin/tree/master/zipkin-autoconfigure/collector-scribe">zipkin-collector scribe</a></td>
+      <td style="text-align: left"><a href="https://github.com/facebookarchive/scribe">Scribe</a></td>
+      <td style="text-align: left"> </td>
+    </tr>
+  </tbody>
+</table>
+
+<h3 id="community-supported">Community supported</h3>
+
+<table class="wide-table">
+  <thead>
+    <tr>
+      <th style="text-align: left">Type</th>
+      <th style="text-align: left">Module</th>
+      <th style="text-align: left">Related product</th>
+      <th style="text-align: left">Other notes</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td style="text-align: left">Storage</td>
+      <td style="text-align: left"><a href="https://github.com/scouter-project/zipkin-scouter">zipkin-scouter storage-scouter</a></td>
+      <td style="text-align: left"><a href="https://github.com/scouter-project/scouter">Scouter APM</a></td>
+      <td style="text-align: left">only supports sending to an Scouter</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Storage</td>
+      <td style="text-align: left"><a href="https://github.com/jeqo/zipkin-storage-kafka">zipkin-storage-kafka</a></td>
+      <td style="text-align: left"><a href="https://kafka.apache.org/">Apache kafka</a></td>
+      <td style="text-align: left">Supports aggregation and indexing of tracing data via Kafka Streams State Store.</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Reporter</td>
+      <td style="text-align: left"><a href="https://github.com/ExpediaDotCom/spring-cloud-sleuth-haystack-reporter">spring-cloud-sleuth-haystack-reporter</a></td>
+      <td style="text-align: left"><a href="https://github.com/ExpediaDotCom/haystack">Haystack</a></td>
+      <td style="text-align: left">Supports sending data to Haystack, a resilient, scalable tracing and analysis system.</td>
+    </tr>
+  </tbody>
+</table>
+
+<h2 id="alternative-servers">Alternative servers</h2>
+
+<p>The OpenZipkin team publish apis, data formats, and shared libraries that allow alternate backends to process the
+same data sent to the default Zipkin server.</p>
+
+<h3 id="community-supported-1">Community supported</h3>
+
+<p>Listed below are alternative backends that accept Zipkin format. Some use the same code as Zipkin on the same endpoints while others are on alternative endpoints or partially support features. In any case, the following aim to allow existing zipkin clients to use backends the OpenZipkin team does not support. Hence, direct questions to their respective communities.</p>
+
+<ul>
+  <li><a href="https://github.com/apache/incubator-skywalking">Apache SkyWalking</a>
+    <ul>
+      <li>When <a href="https://github.com/apache/incubator-skywalking/blob/master/docs/en/setup/backend/backend-receivers.md">zipkin-receiver</a> is enabled, Skywalking exposes the same HTTP POST endpoints Zipkin does
+        <ul>
+          <li>http port 9411 accepts <code class="highlighter-rouge">/api/v1/spans</code> (thrift, json) and <code class="highlighter-rouge">/api/v2/spans</code> (json, proto) POST requests.</li>
+          <li>this extension uses the same encoding library and same endpoints as Zipkin does.</li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li><a href="https://github.com/jaegertracing/jaeger">Jaeger</a>
+    <ul>
+      <li>When <code class="highlighter-rouge">COLLECTOR_ZIPKIN_HTTP_PORT=9411</code> is set, Jaeger exposes a partial implementation of Zipkin’s HTTP POST endpoints
+        <ul>
+          <li>http port 9411 accepts <code class="highlighter-rouge">/api/v1/spans</code> (thrift, json) and <code class="highlighter-rouge">/api/v2/spans</code> (json, but not proto) POST requests.</li>
+        </ul>
+      </li>
+      <li>When <code class="highlighter-rouge">SPAN_STORAGE_TYPE=kafka</code> and <code class="highlighter-rouge">zipkin-thrift</code>, Jaeger reads Zipkin v1 thrift encoded span messages from a Kafka topic.
+        <ul>
+          <li>Note: The above is a <a href="https://github.com/openzipkin/zipkin/tree/master/zipkin-collector/kafka#legacy-encoding">deprecated practice</a> in Zipkin. Most instrumentation bundle multiple spans per message in v2 format.</li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li><a href="https://github.com/HotelsDotCom/pitchfork">Pitchfork</a>
+    <ul>
+      <li>Pitchfork exposes the same HTTP POST endpoints Zipkin does
+        <ul>
+          <li>http port 9411 accepts <code class="highlighter-rouge">/api/v1/spans</code> (thrift, json) and <code class="highlighter-rouge">/api/v2/spans</code> (json, proto) POST requests.</li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+</ul>
+
+<p>Did we miss a server extension or alternative? Please open a pull-request to
+<a href="https://github.com/openzipkin/openzipkin.github.io">openzipkin.github.io</a>.</p>
+
+
+</div>
+
+    </div>
+
+    <footer class="content container">
+      <p class="disclaimer">
+        <strong>Disclaimer</strong><br/>
+        Apache Zipkin (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored
+        by Incubator. Incubation is required of all newly accepted projects until a further review indicates that the
+        infrastructure, communications, and decision making process have stabilized in a manner consistent with other
+        successful ASF projects. While incubation status is not necessarily a reflection of the completeness or
+        stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
+      </p>
+      <p class="notice">
+        &copy; 2019, the Apache Software Foundation, Apache Zipkin, Zipkin, Apache, the Apache
+        feather Logo, and the Apache Zipkin project logo are either registered trademarks or trademarks of the Apache
+        Software Foundation.
+      </p>
+    </footer>
+  </body>
+</html>
diff --git a/pages/instrumenting.html b/pages/instrumenting.html
index cdea1fd..a83357b 100644
--- a/pages/instrumenting.html
+++ b/pages/instrumenting.html
@@ -74,7 +74,13 @@
       
         
           
-            <a class="sidebar-nav-item" href="/pages/existing_instrumentations.html">Existing instrumentations</a>
+            <a class="sidebar-nav-item" href="/pages/tracers_instrumentation.html">Tracers and Instrumentation</a>
+          
+        
+      
+        
+          
+            <a class="sidebar-nav-item" href="/pages/extensions_choices.html">Server extensions and choices</a>
           
         
       
@@ -118,7 +124,7 @@
       
   </h1>
   <p class="message">This is an advanced topic. Before reading further, you may want to check whether
-an instrumentation library for your platform <a href="/pages/existing_instrumentations">already exists</a>. If not and if you want to take on creating an instrumentation library, first things first; jump on
+an instrumentation library for your platform <a href="/pages/tracers_instrumentation">already exists</a>. If not and if you want to take on creating an instrumentation library, first things first; jump on
 <a href="https://gitter.im/openzipkin/zipkin">Zipkin Gitter chat channel</a> and let us know. We’ll be extremely
 happy to help you along the way.</p>
 
diff --git a/pages/quickstart.html b/pages/quickstart.html
index ec6e6ea..42d6737 100644
--- a/pages/quickstart.html
+++ b/pages/quickstart.html
@@ -74,7 +74,13 @@
       
         
           
-            <a class="sidebar-nav-item" href="/pages/existing_instrumentations.html">Existing instrumentations</a>
+            <a class="sidebar-nav-item" href="/pages/tracers_instrumentation.html">Tracers and Instrumentation</a>
+          
+        
+      
+        
+          
+            <a class="sidebar-nav-item" href="/pages/extensions_choices.html">Server extensions and choices</a>
           
         
       
diff --git a/pages/existing_instrumentations.html b/pages/tracers_instrumentation.html
similarity index 84%
rename from pages/existing_instrumentations.html
rename to pages/tracers_instrumentation.html
index 80bbf30..2cbe3dc 100644
--- a/pages/existing_instrumentations.html
+++ b/pages/tracers_instrumentation.html
@@ -11,7 +11,7 @@
 
   <title>
     
-      Existing instrumentations &middot; OpenZipkin
+      Tracers and Instrumentation &middot; OpenZipkin
     
   </title>
 
@@ -74,7 +74,13 @@
       
         
           
-            <a class="sidebar-nav-item active" href="/pages/existing_instrumentations.html">Existing instrumentations</a>
+            <a class="sidebar-nav-item active" href="/pages/tracers_instrumentation.html">Tracers and Instrumentation</a>
+          
+        
+      
+        
+          
+            <a class="sidebar-nav-item" href="/pages/extensions_choices.html">Server extensions and choices</a>
           
         
       
@@ -114,7 +120,7 @@
       <div class="page">
   <h1 class="page-title">
       
-       Existing instrumentations
+       Tracers and Instrumentation
       
   </h1>
   <p>Tracing information is collected on each host using the instrumented libraries
@@ -126,11 +132,11 @@ together into spans.</p>
 Please refer to their individual documentation for setup and configuration
 guides.</p>
 
-<h3 id="openzipkin-libraries">OpenZipkin libraries</h3>
+<h3 id="openzipkin-supported">OpenZipkin supported</h3>
 
-<p>The following libraries are supported by the OpenZipkin authors and are hosted at
+<p>The following libraries are supported by the OpenZipkin team and are hosted at
 the <a href="https://github.com/openzipkin/">OpenZipkin GitHub</a> group. You can reach out to
-the authors at the <a href="https://gitter.im/openzipkin/zipkin/">Zipkin Gitter</a> chat.</p>
+the team on <a href="https://gitter.im/openzipkin/zipkin/">Zipkin Gitter</a> chat.</p>
 
 <table class="wide-table">
   <thead>
@@ -211,7 +217,7 @@ the authors at the <a href="https://gitter.im/openzipkin/zipkin/">Zipkin Gitter<
   </tbody>
 </table>
 
-<h3 id="community-libraries">Community libraries</h3>
+<h3 id="community-supported">Community supported</h3>
 
 <table class="wide-table">
   <thead>
@@ -227,6 +233,15 @@ the authors at the <a href="https://gitter.im/openzipkin/zipkin/">Zipkin Gitter<
   </thead>
   <tbody>
     <tr>
+      <td style="text-align: left">C++,Python</td>
+      <td style="text-align: left"><a href="https://github.com/Dudi119/cppKin">cppkin</a></td>
+      <td style="text-align: left">Any</td>
+      <td style="text-align: left">Http (B3), Thrift</td>
+      <td style="text-align: left">Http, Scribe</td>
+      <td style="text-align: left">Yes</td>
+      <td style="text-align: left">cpp version also available in windows.</td>
+    </tr>
+    <tr>
       <td style="text-align: left">C,C++</td>
       <td style="text-align: left"><a href="https://github.com/flier/zipkin-cpp">zipkin-cpp</a></td>
       <td style="text-align: left">gRPC</td>
@@ -283,7 +298,7 @@ the authors at the <a href="https://gitter.im/openzipkin/zipkin/">Zipkin Gitter<
     <tr>
       <td style="text-align: left">Java</td>
       <td style="text-align: left"><a href="https://github.com/thelastpickle/cassandra-zipkin-tracing">cassandra-zipkin-tracing</a></td>
-      <td style="text-align: left"><a href="http://cassandra.apache.org">Apache Cassandra</a></td>
+      <td style="text-align: left"><a href="https://cassandra.apache.org">Apache Cassandra</a></td>
       <td style="text-align: left">CQL (B3)</td>
       <td style="text-align: left">Http, Kafka, Scribe</td>
       <td style="text-align: left">Yes</td>
@@ -408,6 +423,15 @@ the authors at the <a href="https://gitter.im/openzipkin/zipkin/">Zipkin Gitter<
     </tr>
     <tr>
       <td style="text-align: left">Scala</td>
+      <td style="text-align: left"><a href="https://github.com/kamon-io/kamon-zipkin">kamon-zipkin</a></td>
+      <td style="text-align: left"><a href="https://doc.akka.io/docs/akka/current/index.html">akka</a>, <a href="https://doc.akka.io/docs/akka-http/current/index.html">akka-http</a>,</td>
+      <td style="text-align: left">Http (B3)</td>
+      <td style="text-align: left">Http</td>
+      <td style="text-align: left">Yes</td>
+      <td style="text-align: left">Toolkit for tracing and monitoring for jvm based applications</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Scala</td>
       <td style="text-align: left"><a href="https://github.com/levkhomich/akka-tracing">akka-tracing</a></td>
       <td style="text-align: left"><a href="https://akka.io">Akka</a>, <a href="https://spray.io">Spray</a>, <a href="https://www.playframework.com">Play</a></td>
       <td style="text-align: left">Http (B3), Thrift</td>
@@ -460,6 +484,51 @@ the authors at the <a href="https://gitter.im/openzipkin/zipkin/">Zipkin Gitter<
       <td style="text-align: left">Yes</td>
       <td style="text-align: left">Zipkin V2 client with OpenTracing API</td>
     </tr>
+    <tr>
+      <td style="text-align: left">Java</td>
+      <td style="text-align: left"><a href="https://github.com/sysco-middleware/kafka-interceptor-zipkin">kafka-interceptor-zipkin</a></td>
+      <td style="text-align: left"><a href="https://kafka.apache.org">Apache Kafka</a></td>
+      <td style="text-align: left">B3</td>
+      <td style="text-align: left">Http, Kafka</td>
+      <td style="text-align: left">Yes</td>
+      <td style="text-align: left">Java 8+, meant to be used for off-the-shelf components like Kafka Connectors, KSQL or Kafka REST Proxy. Instrumentation for Kafka Clients and Kafka Streams are included as Brave instrumentation.</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Go</td>
+      <td style="text-align: left"><a href="https://github.com/jcchavezs/zipkin-instrumentation-sql">zipkin-instrumentation-sql</a></td>
+      <td style="text-align: left">Any</td>
+      <td style="text-align: left"> </td>
+      <td style="text-align: left"> </td>
+      <td style="text-align: left"> </td>
+      <td style="text-align: left">SQL Wrapper for golang database/sql</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">PHP</td>
+      <td style="text-align: left"><a href="https://github.com/jcchavezs/zipkin-instrumentation-symfony">zipkin-instrumentation-symfony</a></td>
+      <td style="text-align: left"><a href="https://symfony.com/">Symfony</a></td>
+      <td style="text-align: left">B3</td>
+      <td style="text-align: left">http, log file</td>
+      <td style="text-align: left">Yes</td>
+      <td style="text-align: left">A Zipkin integration for Symfony applications</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">PHP</td>
+      <td style="text-align: left"><a href="https://github.com/jcchavezs/zipkin-instrumentation-doctrine">zipkin-instrumentation-doctrine</a></td>
+      <td style="text-align: left"><a href="https://www.doctrine-project.org/">Doctrine</a></td>
+      <td style="text-align: left"> </td>
+      <td style="text-align: left"> </td>
+      <td style="text-align: left"> </td>
+      <td style="text-align: left">Zipkin instrumentation for Doctrine ORM</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">PHP</td>
+      <td style="text-align: left"><a href="https://github.com/jcchavezs/zipkin-instrumentation-guzzle">zipkin-instrumentation-guzzle</a></td>
+      <td style="text-align: left"><a href="http://docs.guzzlephp.org">Guzzle</a></td>
+      <td style="text-align: left"> </td>
+      <td style="text-align: left"> </td>
+      <td style="text-align: left"> </td>
+      <td style="text-align: left">Zipkin instrumentation for Guzzle HTTP Client</td>
+    </tr>
   </tbody>
 </table>