diff --git a/_data/tracers.yaml b/_data/tracers.yaml index d5194ebd3..316b4cd25 100644 --- a/_data/tracers.yaml +++ b/_data/tracers.yaml @@ -1,9 +1,5 @@ category: Tracers array: - - name: Zipkin - url: http://zipkin.io - icon: img/tracers/zipkin_small.png - - name: Lightstep url: http://lightstep.com icon: img/tracers/lightstep.png diff --git a/_docs/pages/quick-start.md b/_docs/pages/quick-start.md index 0ecc47a1f..a9f16887f 100755 --- a/_docs/pages/quick-start.md +++ b/_docs/pages/quick-start.md @@ -8,7 +8,7 @@ Both of these examples assume that Jaeger is running locally via Docker: $ docker run -d -p 5775:5775/udp -p 16686:16686 jaegertracing/all-in-one:latest ``` -These can be adapted to use Zipkin or any other OpenTracing-compatible Tracer easily by adjusting the initialization code to match the particular implementation. +These can be adapted to use other OpenTracing-compatible Tracer easily by adjusting the initialization code to match the particular implementation. ### Java diff --git a/_docs/pages/supported-tracers.md b/_docs/pages/supported-tracers.md index fed4907b3..bce3f640f 100644 --- a/_docs/pages/supported-tracers.md +++ b/_docs/pages/supported-tracers.md @@ -1,10 +1,5 @@ # Supported Tracer Implementations -## Zipkin - -[Zipkin](http://zipkin.io/) supports OpenTracing in various languages via community contributions. There is an experimental [bridge from Brave (Zipkin Java) instrumentation to OpenTracing](https://github.com/openzipkin/brave-opentracing), a [Javascript implementation](https://github.com/costacruise/zipkin-javascript-opentracing) and a [Go implementation zipkin-go-opentracing](https://github.com/openzipkin/zipkin-go-opentracing). Some of Jaeger's client libraries (see below) can be configured to be compatible with Zipkin backend and wire format. - - ## CNCF Jaeger [Jaeger \\ˈyā-gər\\](http://jaegertracing.io) is a distributed tracing system, originally open sourced by [Uber Technologies](https://eng.uber.com/distributed-tracing/). It provides distributed context propagation, distributed transaction monitoring, root cause analysis, service dependency analysis, and performance / latency optimization. Built with OpenTracing support from inception, Jaeger includes OpenTracing client libraries in several languages, including [Java](https://github.com/uber/jaeger-client-java), [Go](https://github.com/uber/jaeger-client-go), [Python](https://github.com/uber/jaeger-client-python), [Node.js](https://github.com/uber/jaeger-client-node), and [C++](https://github.com/jaegertracing/cpp-client). It is a [Cloud Native Computing Foundation](https://www.cncf.io/) member project. diff --git a/_includes/bash-window.html b/_includes/bash-window.html index 819d6c7f1..02c43d629 100644 --- a/_includes/bash-window.html +++ b/_includes/bash-window.html @@ -8,8 +8,8 @@
-# Start Zipkin locally -$ docker run -d -p 9411:9411 openzipkin/zipkin +# Start Jaeger locally +$ docker run -d -p 5775:5775/udp -p 16686:16686 jaegertracing/all-in-one:latest $ export DOCKER_IP=`docker-machine ip $(docker-machine active)` $ cd $GOPATH/src @@ -18,9 +18,9 @@ $ cd github.com/opentracing-contrib/examples/go $ go run ./trivial.go $DOCKER_IP -# Visualize the tracing instrumentation in Zipkin by +# Visualize the tracing instrumentation in Jaeger by # clicking on "Find Traces" in the UI. -$ open http://$DOCKER_IP:9411/ +$ open http://$DOCKER_IP:16686/ # Read the source! $ vim trivial.go diff --git a/_sass/_components/_logo-bar.scss b/_sass/_components/_logo-bar.scss index cbe132532..038229a5c 100644 --- a/_sass/_components/_logo-bar.scss +++ b/_sass/_components/_logo-bar.scss @@ -85,7 +85,6 @@ $logo-bar-scale: 14px; margin-right: 10px; } - &[src*="zipkin_small.png"], &[src*="instana"] { max-height: $logo-bar-scale * 0.8; } @@ -139,7 +138,6 @@ $logo-bar-scale: 14px; max-height: $logo-bar-scale * 1.25; } - &[src*="zipkin_small.png"], &[src*="instana"] { max-height: $logo-bar-scale * 0.6; } diff --git a/_talks_and_videos/2016-10-15-an-introduction-to-distributed-tracing-and-zipkin.md b/_talks_and_videos/2016-10-15-an-introduction-to-distributed-tracing-and-zipkin.md deleted file mode 100644 index 940f657ec..000000000 --- a/_talks_and_videos/2016-10-15-an-introduction-to-distributed-tracing-and-zipkin.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "An Introduction to Distributed Tracing and Zipkin" -videoUrl: https://www.youtube.com/embed/_T4x5J0wOVQ -thumbnail: https://img.youtube.com/vi/_T4x5J0wOVQ/maxresdefault.jpg -layout: video -featured: false ---- - -Latency analysis is the act of blaming components for causing user perceptible delay. In today's world of microservices, this can be tricky as requests can fan out across polyglot components and even data-centers. This session will overview how to debug latency and better understand your production environment with Zipkin. You'll see a demo and leave knowing how to get started with distributed tracing. - diff --git a/img/tracers/zipkin.png b/img/tracers/zipkin.png deleted file mode 100644 index 38b31f7b0..000000000 Binary files a/img/tracers/zipkin.png and /dev/null differ diff --git a/img/tracers/zipkin_small.png b/img/tracers/zipkin_small.png deleted file mode 100644 index f74fc4143..000000000 Binary files a/img/tracers/zipkin_small.png and /dev/null differ