diff --git a/content/docs/1.14/deployment.md b/content/docs/1.14/deployment.md index a0956416..45f32891 100644 --- a/content/docs/1.14/deployment.md +++ b/content/docs/1.14/deployment.md @@ -131,7 +131,7 @@ Port | Protocol | Function 14267 | TChannel | used by **jaeger-agent** to send spans in jaeger.thrift format 14250 | gRPC | used by **jaeger-agent** to send spans in model.proto format 14268 | HTTP | can accept spans directly from clients in jaeger.thrift format over binary thrift protocol -9411 | HTTP | can accept Zipkin spans in JSON or Thrift (disabled by default) +9411 | HTTP | can accept Zipkin spans in Thrift, JSON and Proto (disabled by default) 14269 | HTTP | Healthcheck at `/` and metrics at `/metrics` diff --git a/content/docs/next-release/deployment.md b/content/docs/next-release/deployment.md index a0956416..45f32891 100644 --- a/content/docs/next-release/deployment.md +++ b/content/docs/next-release/deployment.md @@ -131,7 +131,7 @@ Port | Protocol | Function 14267 | TChannel | used by **jaeger-agent** to send spans in jaeger.thrift format 14250 | gRPC | used by **jaeger-agent** to send spans in model.proto format 14268 | HTTP | can accept spans directly from clients in jaeger.thrift format over binary thrift protocol -9411 | HTTP | can accept Zipkin spans in JSON or Thrift (disabled by default) +9411 | HTTP | can accept Zipkin spans in Thrift, JSON and Proto (disabled by default) 14269 | HTTP | Healthcheck at `/` and metrics at `/metrics` diff --git a/content/docs/next-release/getting-started.md b/content/docs/next-release/getting-started.md index 4caee965..db49a6b7 100644 --- a/content/docs/next-release/getting-started.md +++ b/content/docs/next-release/getting-started.md @@ -119,11 +119,11 @@ Then navigate to `http://localhost:8080`. ## Migrating from Zipkin -Collector service exposes Zipkin compatible REST API `/api/v1/spans` which accepts both Thrift and JSON. Also there is `/api/v2/spans` for JSON only. +Collector service exposes Zipkin compatible REST API `/api/v1/spans` which accepts both Thrift and JSON. Also there is `/api/v2/spans` for JSON and Proto. By default it's disabled. It can be enabled with `--collector.zipkin.http-port=9411`. -Zipkin Thrift IDL file can be found in [jaegertracing/jaeger-idl](https://github.com/jaegertracing/jaeger-idl/blob/master/thrift/zipkincore.thrift). -It's compatible with [openzipkin/zipkin-api](https://github.com/openzipkin/zipkin-api/blob/master/thrift/zipkinCore.thrift) +Zipkin [Thrift](https://github.com/jaegertracing/jaeger-idl/blob/master/thrift/zipkincore.thrift) IDL and Zipkin [Proto](https://github.com/jaegertracing/jaeger-idl/blob/master/proto/zipkin.proto) IDL files can be found in [jaegertracing/jaeger-idl](https://github.com/jaegertracing/jaeger-idl) repository. +They're compatible with [openzipkin/zipkin-api](https://github.com/openzipkin/zipkin-api) [Thrift](https://github.com/openzipkin/zipkin-api/blob/master/thrift/zipkinCore.thrift) and [Proto](https://github.com/openzipkin/zipkin-api/blob/master/zipkin.proto). [hotrod-tutorial]: https://medium.com/@YuriShkuro/take-opentracing-for-a-hotrod-ride-f6e3141f7941 [download]: ../../../download/