diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 901c14da7..78f0055f2 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -33,7 +33,7 @@ true 1.8 1.8 - 2.2.0.M6 + 2.2.0.BUILD-SNAPSHOT 5.7.0 diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index fe6c9ee79..e95a8dd13 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -63,6 +63,7 @@ |spring.zipkin.kafka.topic | zipkin | Name of the Kafka topic where spans should be sent to Zipkin. |spring.zipkin.locator.discovery.enabled | false | Enabling of locating the host name via service discovery. |spring.zipkin.message-timeout | 1 | Timeout in seconds before pending spans will be sent in batches to Zipkin. +|spring.zipkin.rabbitmq.addresses | | Addresses of the RabbitMQ brokers used to send spans to Zipkin |spring.zipkin.rabbitmq.queue | zipkin | Name of the RabbitMQ queue where spans should be sent to Zipkin. |spring.zipkin.sender.type | | Means of sending spans to Zipkin. |spring.zipkin.service.name | | The name of the service, from which the Span was sent via HTTP, that should appear in Zipkin.