From 17fc38aa9843e0f26bb3e98eb0b7a909f94128f6 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Wed, 20 Mar 2019 15:50:22 -0500 Subject: [PATCH] URL Cleanup This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # HTTP URLs that Could Not Be Fixed These URLs were unable to be fixed. Please review them to see if they can be manually resolved. * [ ] http://ajaxian.com/archives/100-line-ajax-wrapper (200) with 1 occurrences could not be migrated: ([https](https://ajaxian.com/archives/100-line-ajax-wrapper) result ConnectTimeoutException). * [ ] http://dubbo.io/ (200) with 1 occurrences could not be migrated: ([https](https://dubbo.io/) result SSLHandshakeException). # Fixed URLs ## Fixed But Review Recommended These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * [ ] http://jaubourg.net/2010/07/loading-script-as-onclick-handler-of.html (AnnotatedConnectException) with 1 occurrences migrated to: https://jaubourg.net/2010/07/loading-script-as-onclick-handler-of.html ([https](https://jaubourg.net/2010/07/loading-script-as-onclick-handler-of.html) result AnnotatedConnectException). * [ ] http://192.168.99.100:9411/ (ConnectTimeoutException) with 2 occurrences migrated to: https://192.168.99.100:9411/ ([https](https://192.168.99.100:9411/) result ConnectTimeoutException). * [ ] http://host.com:9999/ticker/12/basd (ConnectTimeoutException) with 1 occurrences migrated to: https://host.com:9999/ticker/12/basd ([https](https://host.com:9999/ticker/12/basd) result ConnectTimeoutException). * [ ] http://www.w3.org/TR/DOM-Level-2-Events/events.html (ReadTimeoutException) with 1 occurrences migrated to: https://www.w3.org/TR/DOM-Level-2-Events/events.html ([https](https://www.w3.org/TR/DOM-Level-2-Events/events.html) result SSLException). * [ ] http://abc (UnknownHostException) with 1 occurrences migrated to: https://abc ([https](https://abc) result UnknownHostException). * [ ] http://asdasd:111/asd (UnknownHostException) with 1 occurrences migrated to: https://asdasd:111/asd ([https](https://asdasd:111/asd) result UnknownHostException). * [ ] http://compose.docker.io/ (UnknownHostException) with 1 occurrences migrated to: https://compose.docker.io/ ([https](https://compose.docker.io/) result UnknownHostException). * [ ] http://exceptionservice/ (UnknownHostException) with 2 occurrences migrated to: https://exceptionservice/ ([https](https://exceptionservice/) result UnknownHostException). * [ ] http://foo (UnknownHostException) with 2 occurrences migrated to: https://foo ([https](https://foo) result UnknownHostException). * [ ] http://foo/ (UnknownHostException) with 1 occurrences migrated to: https://foo/ ([https](https://foo/) result UnknownHostException). * [ ] http://fooservice/ (UnknownHostException) with 1 occurrences migrated to: https://fooservice/ ([https](https://fooservice/) result UnknownHostException). * [ ] http://fooservice/nonExistent (UnknownHostException) with 1 occurrences migrated to: https://fooservice/nonExistent ([https](https://fooservice/nonExistent) result UnknownHostException). * [ ] http://fooservice/noresponse (UnknownHostException) with 1 occurrences migrated to: https://fooservice/noresponse ([https](https://fooservice/noresponse) result UnknownHostException). * [ ] http://fooservice/notrace (UnknownHostException) with 9 occurrences migrated to: https://fooservice/notrace ([https](https://fooservice/notrace) result UnknownHostException). * [ ] http://fooservice/traceid (UnknownHostException) with 1 occurrences migrated to: https://fooservice/traceid ([https](https://fooservice/traceid) result UnknownHostException). * [ ] http://non.existing.url (UnknownHostException) with 1 occurrences migrated to: https://non.existing.url ([https](https://non.existing.url) result UnknownHostException). * [ ] http://some/address (UnknownHostException) with 1 occurrences migrated to: https://some/address ([https](https://some/address) result UnknownHostException). * [ ] http://zipkin/ (UnknownHostException) with 1 occurrences migrated to: https://zipkin/ ([https](https://zipkin/) result UnknownHostException). * [ ] http://zipkin/call (UnknownHostException) with 1 occurrences migrated to: https://zipkin/call ([https](https://zipkin/call) result UnknownHostException). * [ ] http://zipkin/hi2 (UnknownHostException) with 1 occurrences migrated to: https://zipkin/hi2 ([https](https://zipkin/hi2) result UnknownHostException). * [ ] http://zipkinserver/ (UnknownHostException) with 2 occurrences migrated to: https://zipkinserver/ ([https](https://zipkinserver/) result UnknownHostException). * [ ] http://www.erg.abdn.ac.uk/~gerrit/dccp/notes/ccid2/rto_estimator/ (301) with 1 occurrences migrated to: https://erg.abdn.ac.uk/~gerrit/dccp/notes/ccid2/rto_estimator/ ([https](https://www.erg.abdn.ac.uk/~gerrit/dccp/notes/ccid2/rto_estimator/) result 404). * [ ] http://www.puppycrawl.com/dtds/suppressions_1_1.dtd (404) with 1 occurrences migrated to: https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ([https](https://www.puppycrawl.com/dtds/suppressions_1_1.dtd) result 404). * [ ] http://zipkin.io/pages/existing_instrumentations.html (301) with 1 occurrences migrated to: https://zipkin.io/pages/existing_instrumentations.html ([https](https://zipkin.io/pages/existing_instrumentations.html) result 404). ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://asciidoctor.org with 1 occurrences migrated to: https://asciidoctor.org ([https](https://asciidoctor.org) result 200). * [ ] http://bugs.jquery.com/ticket/1450 with 2 occurrences migrated to: https://bugs.jquery.com/ticket/1450 ([https](https://bugs.jquery.com/ticket/1450) result 200). * [ ] http://bugs.jquery.com/ticket/5280 with 1 occurrences migrated to: https://bugs.jquery.com/ticket/5280 ([https](https://bugs.jquery.com/ticket/5280) result 200). * [ ] http://cloud.spring.io with 2 occurrences migrated to: https://cloud.spring.io ([https](https://cloud.spring.io) result 200). * [ ] http://cloud.spring.io/spring-cloud-static/Dalston.SR4/multi/multi__span_data_as_messages.html with 1 occurrences migrated to: https://cloud.spring.io/spring-cloud-static/Dalston.SR4/multi/multi__span_data_as_messages.html ([https](https://cloud.spring.io/spring-cloud-static/Dalston.SR4/multi/multi__span_data_as_messages.html) result 200). * [ ] http://docssleuth-service1.cfapps.io/start with 1 occurrences migrated to: https://docssleuth-service1.cfapps.io/start ([https](https://docssleuth-service1.cfapps.io/start) result 200). * [ ] http://en.wikipedia.org/wiki/Mapping_of_Unicode_characters with 1 occurrences migrated to: https://en.wikipedia.org/wiki/Mapping_of_Unicode_characters ([https](https://en.wikipedia.org/wiki/Mapping_of_Unicode_characters) result 200). * [ ] http://hacks.mozilla.org/2009/07/cross-site-xmlhttprequest-with-cors/ with 1 occurrences migrated to: https://hacks.mozilla.org/2009/07/cross-site-xmlhttprequest-with-cors/ ([https](https://hacks.mozilla.org/2009/07/cross-site-xmlhttprequest-with-cors/) result 200). * [ ] http://opentracing.io/ with 3 occurrences migrated to: https://opentracing.io/ ([https](https://opentracing.io/) result 200). * [ ] http://projects.spring.io/spring-integration/ with 1 occurrences migrated to: https://projects.spring.io/spring-integration/ ([https](https://projects.spring.io/spring-integration/) result 200). * [ ] http://stackoverflow.com/questions/12817946/generate-a-random-bitset-with-n-1s with 1 occurrences migrated to: https://stackoverflow.com/questions/12817946/generate-a-random-bitset-with-n-1s ([https](https://stackoverflow.com/questions/12817946/generate-a-random-bitset-with-n-1s) result 200). * [ ] http://stackoverflow.com/questions/1641507/detect-browser-support-for-cross-domain-xmlhttprequests with 1 occurrences migrated to: https://stackoverflow.com/questions/1641507/detect-browser-support-for-cross-domain-xmlhttprequests ([https](https://stackoverflow.com/questions/1641507/detect-browser-support-for-cross-domain-xmlhttprequests) result 200). * [ ] http://stevesouders.com/misc/test-postmessage.php with 2 occurrences migrated to: https://stevesouders.com/misc/test-postmessage.php ([https](https://stevesouders.com/misc/test-postmessage.php) result 200). * [ ] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html with 2 occurrences migrated to: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html ([https](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) result 200). * [ ] http://wiki.whatwg.org/wiki/Dynamic_Script_Execution_Order with 1 occurrences migrated to: https://wiki.whatwg.org/wiki/Dynamic_Script_Execution_Order ([https](https://wiki.whatwg.org/wiki/Dynamic_Script_Execution_Order) result 200). * [ ] http://www.splunk.com/ with 2 occurrences migrated to: https://www.splunk.com/ ([https](https://www.splunk.com/) result 200). * [ ] http://docs.spring.io/spring-hateoas/docs/current/reference/html/ with 1 occurrences migrated to: https://docs.spring.io/spring-hateoas/docs/current/reference/html/ ([https](https://docs.spring.io/spring-hateoas/docs/current/reference/html/) result 301). * [ ] http://htrace.incubator.apache.org/ with 2 occurrences migrated to: https://htrace.incubator.apache.org/ ([https](https://htrace.incubator.apache.org/) result 301). * [ ] http://msdn.microsoft.com/en-us/library/cc197015 with 1 occurrences migrated to: https://msdn.microsoft.com/en-us/library/cc197015 ([https](https://msdn.microsoft.com/en-us/library/cc197015) result 301). * [ ] http://msdn.microsoft.com/en-us/library/cc288060 with 1 occurrences migrated to: https://msdn.microsoft.com/en-us/library/cc288060 ([https](https://msdn.microsoft.com/en-us/library/cc288060) result 301). * [ ] http://plugins.jetbrains.com/plugin/6546 with 2 occurrences migrated to: https://plugins.jetbrains.com/plugin/6546 ([https](https://plugins.jetbrains.com/plugin/6546) result 301). * [ ] http://research.google.com/pubs/pub36356.html with 5 occurrences migrated to: https://research.google.com/pubs/pub36356.html ([https](https://research.google.com/pubs/pub36356.html) result 301). * [ ] http://docsbrewing-zipkin-server.cfapps.io/ with 1 occurrences migrated to: https://docsbrewing-zipkin-server.cfapps.io/ ([https](https://docsbrewing-zipkin-server.cfapps.io/) result 302). * [ ] http://docssleuth-zipkin-server.cfapps.io/ with 5 occurrences migrated to: https://docssleuth-zipkin-server.cfapps.io/ ([https](https://docssleuth-zipkin-server.cfapps.io/) result 302). * [ ] http://docssleuth-zipkin-server.cfapps.io/dependency with 4 occurrences migrated to: https://docssleuth-zipkin-server.cfapps.io/dependency ([https](https://docssleuth-zipkin-server.cfapps.io/dependency) result 302). * [ ] http://eclipse.org with 1 occurrences migrated to: https://eclipse.org ([https](https://eclipse.org) result 302). * [ ] http://eclipse.org/m2e/ with 2 occurrences migrated to: https://eclipse.org/m2e/ ([https](https://eclipse.org/m2e/) result 302). * [ ] http://www.springsource.com/developer/sts with 1 occurrences migrated to: https://www.springsource.com/developer/sts ([https](https://www.springsource.com/developer/sts) result 302). # Ignored These URLs were intentionally ignored. * http://127.0.0.1 with 1 occurrences * http://localhost with 70 occurrences * http://localhost/?foo=bar with 4 occurrences * http://localhost:3379 with 1 occurrences * http://localhost:3380 with 2 occurrences * http://localhost:3380/async with 1 occurrences * http://localhost:3380/call with 1 occurrences * http://localhost:3381 with 1 occurrences * http://localhost:80/abc with 1 occurrences * http://localhost:8080/ with 1 occurrences * http://localhost:9411 with 1 occurrences * http://localhost:9411/ with 1 occurrences * http://localhost:9978 with 1 occurrences * http://localhost:9978/hello/mikesarver with 1 occurrences * http://localhost:9987/unknown with 1 occurrences * http://localhost:9988/sleuth/test-not-ok with 1 occurrences * http://localhost:9998 with 1 occurrences * http://localhost:9998/sleuth/test-not-ok with 1 occurrences * http://localhost:9998/sleuth/test-ok with 1 occurrences --- .github/CONTRIBUTING.md | 4 +-- README.adoc | 34 +++++++++---------- asciidoctor.css | 2 +- docs/src/main/asciidoc/README.adoc | 2 +- docs/src/main/asciidoc/features.adoc | 2 +- docs/src/main/asciidoc/intro.adoc | 14 ++++---- docs/src/main/asciidoc/sagan-index.adoc | 2 +- .../main/asciidoc/spring-cloud-sleuth.adoc | 22 ++++++------ .../sampler/ProbabilityBasedSampler.java | 2 +- .../WebClientDiscoveryExceptionTests.java | 2 +- .../exception/WebClientExceptionTests.java | 2 +- .../client/feign/TracingFeignClientTests.java | 6 ++-- .../feign/issues/issue502/Issue502Tests.java | 2 +- .../client/integration/WebClientTests.java | 26 +++++++------- .../main/java/sample/SampleController.java | 4 +-- .../src/main/resources/static/sockjs-0.3.4.js | 34 +++++++++---------- .../src/main/resources/application.yml | 2 +- .../sleuth/zipkin2/ZipkinProperties.java | 2 +- .../zipkin2/ZipkinDiscoveryClientTests.java | 2 +- 19 files changed, 83 insertions(+), 83 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8560ad2a7..eb9a16ae6 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -28,7 +28,7 @@ added after the original pull request but before a merge. you can import formatter settings using the `eclipse-code-formatter.xml` file from the [Spring Cloud Build](https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml) project. If using IntelliJ, you can use the - [Eclipse Code Formatter Plugin](http://plugins.jetbrains.com/plugin/6546) to import the same file. + [Eclipse Code Formatter Plugin](https://plugins.jetbrains.com/plugin/6546) to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is for. @@ -40,6 +40,6 @@ added after the original pull request but before a merge. * A few unit tests would help a lot as well -- someone has to do it. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). -* When writing a commit message please follow [these conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html), +* When writing a commit message please follow [these conventions](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html), if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). diff --git a/README.adoc b/README.adoc index 3b3ffb77e..17c8b518a 100644 --- a/README.adoc +++ b/README.adoc @@ -17,7 +17,7 @@ image::https://badges.gitter.im/spring-cloud/spring-cloud-sleuth.svg[Gitter, lin == Spring Cloud Sleuth -Spring Cloud Sleuth is a distributed tracing tool for Spring Cloud. It borrows from http://research.google.com/pubs/pub36356.html[Dapper], https://github.com/openzipkin/zipkin[Zipkin], and http://htrace.incubator.apache.org/[HTrace]. +Spring Cloud Sleuth is a distributed tracing tool for Spring Cloud. It borrows from https://research.google.com/pubs/pub36356.html[Dapper], https://github.com/openzipkin/zipkin[Zipkin], and https://htrace.incubator.apache.org/[HTrace]. === Quick Start @@ -53,11 +53,11 @@ IMPORTANT: If you use Zipkin, configure the probability of spans exported by set == Introduction -Spring Cloud Sleuth implements a distributed tracing solution for http://cloud.spring.io[Spring Cloud]. +Spring Cloud Sleuth implements a distributed tracing solution for https://cloud.spring.io[Spring Cloud]. === Terminology -Spring Cloud Sleuth borrows http://research.google.com/pubs/pub36356.html[Dapper's] terminology. +Spring Cloud Sleuth borrows https://research.google.com/pubs/pub36356.html[Dapper's] terminology. *Span*: The basic unit of work. For example, sending an RPC is a new span, as is sending a response to an RPC. Spans are identified by a unique 64-bit ID for the span and another 64-bit ID for the trace the span is a part of. @@ -175,8 +175,8 @@ However, if you want to use the legacy Sleuth approaches, you can set the `sprin .Click the Pivotal Web Services icon to see it live! [caption="Click the Pivotal Web Services icon to see it live!"] -image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-sleuth/{branch}/docs/src/main/asciidoc/images/pws.png["Zipkin deployed on Pivotal Web Services", link="http://docssleuth-zipkin-server.cfapps.io/", width=150, height=74] -http://docssleuth-zipkin-server.cfapps.io/[Click here to see it live!] +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-sleuth/{branch}/docs/src/main/asciidoc/images/pws.png["Zipkin deployed on Pivotal Web Services", link="https://docssleuth-zipkin-server.cfapps.io/", width=150, height=74] +https://docssleuth-zipkin-server.cfapps.io/[Click here to see it live!] The dependency graph in Zipkin should resemble the following image: @@ -184,8 +184,8 @@ image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-sleuth/{branc .Click the Pivotal Web Services icon to see it live! [caption="Click the Pivotal Web Services icon to see it live!"] -image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-sleuth/{branch}/docs/src/main/asciidoc/images/pws.png["Zipkin deployed on Pivotal Web Services", link="http://docssleuth-zipkin-server.cfapps.io/dependency", width=150, height=74] -http://docssleuth-zipkin-server.cfapps.io/dependency[Click here to see it live!] +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-sleuth/{branch}/docs/src/main/asciidoc/images/pws.png["Zipkin deployed on Pivotal Web Services", link="https://docssleuth-zipkin-server.cfapps.io/dependency", width=150, height=74] +https://docssleuth-zipkin-server.cfapps.io/dependency[Click here to see it live!] ==== Log correlation @@ -200,7 +200,7 @@ service4.log:2016-02-26 11:15:48.134 INFO [service4,2485ec27856c56f4,1b1845262f service2.log:2016-02-26 11:15:48.156 INFO [service2,2485ec27856c56f4,9aa10ee6fbde75fa,true] 68059 --- [nio-8082-exec-1] i.s.c.sleuth.docs.service2.Application : Got response from service4 [Hello from service4] service1.log:2016-02-26 11:15:48.182 INFO [service1,2485ec27856c56f4,2485ec27856c56f4,true] 68058 --- [nio-8081-exec-1] i.s.c.sleuth.docs.service1.Application : Got response from service2 [Hello from service2, response from service3 [Hello from service3] and from service4 [Hello from service4]] -If you use a log aggregating tool (such as https://www.elastic.co/products/kibana[Kibana], http://www.splunk.com/[Splunk], and others), you can order the events that took place. +If you use a log aggregating tool (such as https://www.elastic.co/products/kibana[Kibana], https://www.splunk.com/[Splunk], and others), you can order the events that took place. An example from Kibana would resemble the following image: image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-sleuth/{branch}/docs/src/main/asciidoc/images/kibana.png[Log correlation with Kibana] @@ -623,7 +623,7 @@ You can configure the location of the service by setting `spring.zipkin.baseUrl` CAUTION: `spring-cloud-sleuth-stream` is deprecated and should no longer be used. -* Spring Cloud Sleuth is http://opentracing.io/[OpenTracing] compatible. +* Spring Cloud Sleuth is https://opentracing.io/[OpenTracing] compatible. IMPORTANT: If you use Zipkin, configure the probability of spans exported by setting `spring.sleuth.sampler.probability` (default: 0.1, which is 10 percent). Otherwise, you might think that Sleuth is not working be cause it omits some spans. @@ -673,7 +673,7 @@ credentials and you already have those. The projects that require middleware generally include a `docker-compose.yml`, so consider using -http://compose.docker.io/[Docker Compose] to run the middeware servers +https://compose.docker.io/[Docker Compose] to run the middeware servers in Docker containers. See the README in the https://github.com/spring-cloud-samples/scripts[scripts demo repository] for specific instructions about the common cases of mongo, @@ -695,13 +695,13 @@ a modified file in the correct place. Just commit it and push the change. === Working with the code If you don't have an IDE preference we would recommend that you use -http://www.springsource.com/developer/sts[Spring Tools Suite] or -http://eclipse.org[Eclipse] when working with the code. We use the -http://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools +https://www.springsource.com/developer/sts[Spring Tools Suite] or +https://eclipse.org[Eclipse] when working with the code. We use the +https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better. ==== Importing into eclipse with m2eclipse -We recommend the http://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with +We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with eclipse. If you don't already have m2eclipse installed it is available from the "eclipse marketplace". @@ -764,7 +764,7 @@ added after the original pull request but before a merge. `eclipse-code-formatter.xml` file from the https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring Cloud Build] project. If using IntelliJ, you can use the - http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter + https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is @@ -777,7 +777,7 @@ added after the original pull request but before a merge. * A few unit tests would help a lot as well -- someone has to do it. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). -* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], +* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). @@ -848,7 +848,7 @@ If you need to suppress some rules (e.g. line length needs to be longer), then i + "https://www.puppycrawl.com/dtds/suppressions_1_1.dtd"> diff --git a/asciidoctor.css b/asciidoctor.css index 0960919db..1a73b758f 100644 --- a/asciidoctor.css +++ b/asciidoctor.css @@ -14,7 +14,7 @@ * limitations under the License. */ -/* Asciidoctor default stylesheet | MIT License | http://asciidoctor.org */ +/* Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */ /* Remove the comments around the @import statement below when using this as a custom stylesheet */ /*@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic|Noto+Serif:400,400italic,700,700italic|Droid+Sans+Mono:400";*/ article, aside, details, figcaption, figure, footer, header, hgroup, main, nav, section, summary { diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 49495a245..289505692 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -11,7 +11,7 @@ image::https://badges.gitter.im/spring-cloud/spring-cloud-sleuth.svg[Gitter, lin == Spring Cloud Sleuth -Spring Cloud Sleuth is a distributed tracing tool for Spring Cloud. It borrows from http://research.google.com/pubs/pub36356.html[Dapper], https://github.com/openzipkin/zipkin[Zipkin], and http://htrace.incubator.apache.org/[HTrace]. +Spring Cloud Sleuth is a distributed tracing tool for Spring Cloud. It borrows from https://research.google.com/pubs/pub36356.html[Dapper], https://github.com/openzipkin/zipkin[Zipkin], and https://htrace.incubator.apache.org/[HTrace]. === Quick Start diff --git a/docs/src/main/asciidoc/features.adoc b/docs/src/main/asciidoc/features.adoc index ef38e4201..ee230bd37 100644 --- a/docs/src/main/asciidoc/features.adoc +++ b/docs/src/main/asciidoc/features.adoc @@ -48,7 +48,7 @@ You can configure the location of the service by setting `spring.zipkin.baseUrl` CAUTION: `spring-cloud-sleuth-stream` is deprecated and should no longer be used. -* Spring Cloud Sleuth is http://opentracing.io/[OpenTracing] compatible. +* Spring Cloud Sleuth is https://opentracing.io/[OpenTracing] compatible. IMPORTANT: If you use Zipkin, configure the probability of spans exported by setting `spring.sleuth.sampler.probability` (default: 0.1, which is 10 percent). Otherwise, you might think that Sleuth is not working be cause it omits some spans. diff --git a/docs/src/main/asciidoc/intro.adoc b/docs/src/main/asciidoc/intro.adoc index 99b73157b..d0912de77 100644 --- a/docs/src/main/asciidoc/intro.adoc +++ b/docs/src/main/asciidoc/intro.adoc @@ -2,11 +2,11 @@ == Introduction -Spring Cloud Sleuth implements a distributed tracing solution for http://cloud.spring.io[Spring Cloud]. +Spring Cloud Sleuth implements a distributed tracing solution for https://cloud.spring.io[Spring Cloud]. === Terminology -Spring Cloud Sleuth borrows http://research.google.com/pubs/pub36356.html[Dapper's] terminology. +Spring Cloud Sleuth borrows https://research.google.com/pubs/pub36356.html[Dapper's] terminology. *Span*: The basic unit of work. For example, sending an RPC is a new span, as is sending a response to an RPC. Spans are identified by a unique 64-bit ID for the span and another 64-bit ID for the trace the span is a part of. @@ -124,8 +124,8 @@ However, if you want to use the legacy Sleuth approaches, you can set the `sprin .Click the Pivotal Web Services icon to see it live! [caption="Click the Pivotal Web Services icon to see it live!"] -image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-sleuth/{branch}/docs/src/main/asciidoc/images/pws.png["Zipkin deployed on Pivotal Web Services", link="http://docssleuth-zipkin-server.cfapps.io/", width=150, height=74] -http://docssleuth-zipkin-server.cfapps.io/[Click here to see it live!] +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-sleuth/{branch}/docs/src/main/asciidoc/images/pws.png["Zipkin deployed on Pivotal Web Services", link="https://docssleuth-zipkin-server.cfapps.io/", width=150, height=74] +https://docssleuth-zipkin-server.cfapps.io/[Click here to see it live!] The dependency graph in Zipkin should resemble the following image: @@ -133,8 +133,8 @@ image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-sleuth/{branc .Click the Pivotal Web Services icon to see it live! [caption="Click the Pivotal Web Services icon to see it live!"] -image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-sleuth/{branch}/docs/src/main/asciidoc/images/pws.png["Zipkin deployed on Pivotal Web Services", link="http://docssleuth-zipkin-server.cfapps.io/dependency", width=150, height=74] -http://docssleuth-zipkin-server.cfapps.io/dependency[Click here to see it live!] +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-sleuth/{branch}/docs/src/main/asciidoc/images/pws.png["Zipkin deployed on Pivotal Web Services", link="https://docssleuth-zipkin-server.cfapps.io/dependency", width=150, height=74] +https://docssleuth-zipkin-server.cfapps.io/dependency[Click here to see it live!] ==== Log correlation @@ -149,7 +149,7 @@ service4.log:2016-02-26 11:15:48.134 INFO [service4,2485ec27856c56f4,1b1845262f service2.log:2016-02-26 11:15:48.156 INFO [service2,2485ec27856c56f4,9aa10ee6fbde75fa,true] 68059 --- [nio-8082-exec-1] i.s.c.sleuth.docs.service2.Application : Got response from service4 [Hello from service4] service1.log:2016-02-26 11:15:48.182 INFO [service1,2485ec27856c56f4,2485ec27856c56f4,true] 68058 --- [nio-8081-exec-1] i.s.c.sleuth.docs.service1.Application : Got response from service2 [Hello from service2, response from service3 [Hello from service3] and from service4 [Hello from service4]] -If you use a log aggregating tool (such as https://www.elastic.co/products/kibana[Kibana], http://www.splunk.com/[Splunk], and others), you can order the events that took place. +If you use a log aggregating tool (such as https://www.elastic.co/products/kibana[Kibana], https://www.splunk.com/[Splunk], and others), you can order the events that took place. An example from Kibana would resemble the following image: image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-sleuth/{branch}/docs/src/main/asciidoc/images/kibana.png[Log correlation with Kibana] diff --git a/docs/src/main/asciidoc/sagan-index.adoc b/docs/src/main/asciidoc/sagan-index.adoc index 977ae8e63..2c4b64d55 100644 --- a/docs/src/main/asciidoc/sagan-index.adoc +++ b/docs/src/main/asciidoc/sagan-index.adoc @@ -1,4 +1,4 @@ -Spring Cloud Sleuth implements a distributed tracing solution for Spring Cloud, borrowing heavily from http://research.google.com/pubs/pub36356.html[Dapper], https://github.com/openzipkin/zipkin[Zipkin] and HTrace. For most users Sleuth should be invisible, and all your interactions with external systems should be instrumented automatically. You can capture data simply in logs, or by sending it to a remote collector service. +Spring Cloud Sleuth implements a distributed tracing solution for Spring Cloud, borrowing heavily from https://research.google.com/pubs/pub36356.html[Dapper], https://github.com/openzipkin/zipkin[Zipkin] and HTrace. For most users Sleuth should be invisible, and all your interactions with external systems should be instrumented automatically. You can capture data simply in logs, or by sending it to a remote collector service. ## Features diff --git a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc index 10c7c30b4..387b40897 100644 --- a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc +++ b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc @@ -161,7 +161,7 @@ void userCode() { ==== RPC tracing -TIP: Check for https://github.com/openzipkin/brave/tree/master/instrumentation[instrumentation written here] and http://zipkin.io/pages/existing_instrumentations.html[Zipkin's list] before rolling your own RPC instrumentation. +TIP: Check for https://github.com/openzipkin/brave/tree/master/instrumentation[instrumentation written here] and https://zipkin.io/pages/existing_instrumentations.html[Zipkin's list] before rolling your own RPC instrumentation. RPC tracing is often done automatically by interceptors. Behind the scenes, they add tags and events that relate to their role in an RPC operation. @@ -925,14 +925,14 @@ You can configure the URL by setting the `spring.zipkin.baseUrl` property, as fo [source,yaml] ---- -spring.zipkin.baseUrl: http://192.168.99.100:9411/ +spring.zipkin.baseUrl: https://192.168.99.100:9411/ ---- If you want to find Zipkin through service discovery, you can pass the Zipkin's service ID inside the URL, as shown in the following example for `zipkinserver` service ID: [source,yaml] ---- -spring.zipkin.baseUrl: http://zipkinserver/ +spring.zipkin.baseUrl: https://zipkinserver/ ---- To disable this feature just set `spring.zipkin.discoveryClientEnabled` to `false. @@ -994,13 +994,13 @@ IMPORTANT: We recommend using Zipkin's native support for message-based span sen Starting from the Edgware release, the Zipkin Stream server is deprecated. In the Finchley release, it got removed. -If for some reason you need to create the deprecated Stream Zipkin server, see the http://cloud.spring.io/spring-cloud-static/Dalston.SR4/multi/multi__span_data_as_messages.html#_zipkin_consumer[Dalston Documentation]. +If for some reason you need to create the deprecated Stream Zipkin server, see the https://cloud.spring.io/spring-cloud-static/Dalston.SR4/multi/multi__span_data_as_messages.html#_zipkin_consumer[Dalston Documentation]. == Integrations === OpenTracing -Spring Cloud Sleuth is compatible with http://opentracing.io/[OpenTracing]. +Spring Cloud Sleuth is compatible with https://opentracing.io/[OpenTracing]. If you have OpenTracing on the classpath, we automatically register the OpenTracing `Tracer` bean. If you wish to disable this, set `spring.sleuth.opentracing.enabled` to `false` @@ -1173,7 +1173,7 @@ If you create a `WebClient` instance with a `new` keyword, the instrumentation ==== Traverson -If you use the http://docs.spring.io/spring-hateoas/docs/current/reference/html/#client.traverson[Traverson] library, you can inject a `RestTemplate` as a bean into your Traverson object. +If you use the https://docs.spring.io/spring-hateoas/docs/current/reference/html/#client.traverson[Traverson] library, you can inject a `RestTemplate` as a bean into your Traverson object. Since `RestTemplate` is already intercepted, you get full support for tracing in your client. The following pseudo code shows how to do that: @@ -1181,7 +1181,7 @@ shows how to do that: ---- @Autowired RestTemplate restTemplate; -Traverson traverson = new Traverson(URI.create("http://some/address"), +Traverson traverson = new Traverson(URI.create("https://some/address"), MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON_UTF8).setRestOperations(restTemplate); // use Traverson ---- @@ -1328,7 +1328,7 @@ Features from this section can be disabled by setting the `spring.sleuth.messagi ==== Spring Integration and Spring Cloud Stream -Spring Cloud Sleuth integrates with http://projects.spring.io/spring-integration/[Spring Integration]. +Spring Cloud Sleuth integrates with https://projects.spring.io/spring-integration/[Spring Integration]. It creates spans for publish and subscribe events. To disable Spring Integration instrumentation, set `spring.sleuth.integration.enabled` to `false`. @@ -1378,8 +1378,8 @@ To disable Zuul support, set the `spring.sleuth.zuul.enabled` property to `false You can see the running examples deployed in the https://run.pivotal.io/[Pivotal Web Services]. Check them out at the following links: -* http://docssleuth-zipkin-server.cfapps.io/[Zipkin for apps presented in the samples to the top]. First make -a request to http://docssleuth-service1.cfapps.io/start[Service 1] and then check out the trace in Zipkin. -* http://docsbrewing-zipkin-server.cfapps.io/[Zipkin for Brewery on PWS], its https://github.com/spring-cloud-samples/brewery[Github Code]. +* https://docssleuth-zipkin-server.cfapps.io/[Zipkin for apps presented in the samples to the top]. First make +a request to https://docssleuth-service1.cfapps.io/start[Service 1] and then check out the trace in Zipkin. +* https://docsbrewing-zipkin-server.cfapps.io/[Zipkin for Brewery on PWS], its https://github.com/spring-cloud-samples/brewery[Github Code]. Ensure that you've picked the lookback period of 7 days. If there are no traces, go to https://docsbrewing-presenting.cfapps.io/[Presenting application] and order some beers. Then check Zipkin for traces. diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/ProbabilityBasedSampler.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/ProbabilityBasedSampler.java index 94c911e5c..d9420a10c 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/ProbabilityBasedSampler.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/ProbabilityBasedSampler.java @@ -60,7 +60,7 @@ public class ProbabilityBasedSampler extends Sampler { /** * Reservoir sampling algorithm borrowed from Stack Overflow. * - * http://stackoverflow.com/questions/12817946/generate-a-random-bitset-with-n-1s + * https://stackoverflow.com/questions/12817946/generate-a-random-bitset-with-n-1s * @param size size of the bit set * @param cardinality cardinality of the bit set * @param rnd random generator diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/discoveryexception/WebClientDiscoveryExceptionTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/discoveryexception/WebClientDiscoveryExceptionTests.java index bb2c88b97..42eca1269 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/discoveryexception/WebClientDiscoveryExceptionTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/discoveryexception/WebClientDiscoveryExceptionTests.java @@ -111,7 +111,7 @@ public class WebClientDiscoveryExceptionTests { @Test public void testTemplate() throws Exception { shouldCloseSpanUponException((ResponseEntityProvider) (tests) -> tests.template - .getForEntity("http://exceptionservice/", Map.class)); + .getForEntity("https://exceptionservice/", Map.class)); } @FeignClient("exceptionservice") diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/exception/WebClientExceptionTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/exception/WebClientExceptionTests.java index d07638ed5..0a5cf193c 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/exception/WebClientExceptionTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/exception/WebClientExceptionTests.java @@ -124,7 +124,7 @@ public class WebClientExceptionTests { (ResponseEntityProvider) (tests) -> tests.testFeignInterfaceWithException .shouldFailToConnect(), (ResponseEntityProvider) (tests) -> tests.template - .getForEntity("http://exceptionservice/", Map.class) }; + .getForEntity("https://exceptionservice/", Map.class) }; } @FeignClient("exceptionservice") diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignClientTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignClientTests.java index 5b03cce80..433935dfb 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignClientTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignClientTests.java @@ -80,7 +80,7 @@ public class TracingFeignClientTests { try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(span.start())) { this.traceFeignClient .execute( - Request.create("GET", "http://foo", new HashMap<>(), + Request.create("GET", "https://foo", new HashMap<>(), "".getBytes(), Charset.defaultCharset()), new Request.Options()); } @@ -101,7 +101,7 @@ public class TracingFeignClientTests { try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(span.start())) { this.traceFeignClient .execute( - Request.create("GET", "http://foo", new HashMap<>(), + Request.create("GET", "https://foo", new HashMap<>(), "".getBytes(), Charset.defaultCharset()), new Request.Options()); BDDAssertions.fail("Exception should have been thrown"); @@ -122,7 +122,7 @@ public class TracingFeignClientTests { public void should_shorten_the_span_name() throws IOException { this.traceFeignClient .execute( - Request.create("GET", "http://foo/" + bigName(), new HashMap<>(), + Request.create("GET", "https://foo/" + bigName(), new HashMap<>(), "".getBytes(), Charset.defaultCharset()), new Request.Options()); diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/issues/issue502/Issue502Tests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/issues/issue502/Issue502Tests.java index a848aaf05..16fb6d610 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/issues/issue502/Issue502Tests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/issues/issue502/Issue502Tests.java @@ -46,7 +46,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import static org.assertj.core.api.BDDAssertions.then; -@FeignClient(name = "foo", url = "http://non.existing.url") +@FeignClient(name = "foo", url = "https://non.existing.url") interface MyNameRemote { @RequestMapping(value = "/", method = RequestMethod.GET) diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java index dffaf1142..6587f6b2b 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java @@ -208,21 +208,21 @@ public class WebClientTests { (ResponseEntityProvider) (tests) -> tests.testFeignInterface.getNoTrace(), (ResponseEntityProvider) (tests) -> tests.testFeignInterface.getNoTrace(), (ResponseEntityProvider) (tests) -> tests.template - .getForEntity("http://fooservice/notrace", String.class), + .getForEntity("https://fooservice/notrace", String.class), (ResponseEntityProvider) (tests) -> tests.template - .getForEntity("http://fooservice/notrace", String.class), + .getForEntity("https://fooservice/notrace", String.class), (ResponseEntityProvider) (tests) -> tests.template - .getForEntity("http://fooservice/notrace", String.class), + .getForEntity("https://fooservice/notrace", String.class), (ResponseEntityProvider) (tests) -> tests.template - .getForEntity("http://fooservice/notrace", String.class), + .getForEntity("https://fooservice/notrace", String.class), (ResponseEntityProvider) (tests) -> tests.template - .getForEntity("http://fooservice/notrace", String.class), + .getForEntity("https://fooservice/notrace", String.class), (ResponseEntityProvider) (tests) -> tests.template - .getForEntity("http://fooservice/notrace", String.class), + .getForEntity("https://fooservice/notrace", String.class), (ResponseEntityProvider) (tests) -> tests.template - .getForEntity("http://fooservice/notrace", String.class), + .getForEntity("https://fooservice/notrace", String.class), (ResponseEntityProvider) (tests) -> tests.template - .getForEntity("http://fooservice/notrace", String.class) }; + .getForEntity("https://fooservice/notrace", String.class) }; } @Test @@ -251,7 +251,7 @@ public class WebClientTests { return new Object[] { (ResponseEntityProvider) (tests) -> tests.testFeignInterface.headers(), (ResponseEntityProvider) (tests) -> tests.template - .getForEntity("http://fooservice/", Map.class) }; + .getForEntity("https://fooservice/", Map.class) }; } @Test @@ -407,7 +407,7 @@ public class WebClientTests { return new Object[] { (ResponseEntityProvider) (tests) -> tests.testFeignInterface.headers(), (ResponseEntityProvider) (tests) -> tests.template - .getForEntity("http://fooservice/traceid", String.class) }; + .getForEntity("https://fooservice/traceid", String.class) }; } @Test @@ -432,13 +432,13 @@ public class WebClientTests { (ResponseEntityProvider) (tests) -> tests.testFeignInterface .noResponseBody(), (ResponseEntityProvider) (tests) -> tests.template - .getForEntity("http://fooservice/noresponse", String.class) }; + .getForEntity("https://fooservice/noresponse", String.class) }; } @Test public void shouldCloseSpanWhenErrorControllerGetsCalled() { try { - this.template.getForEntity("http://fooservice/nonExistent", String.class); + this.template.getForEntity("https://fooservice/nonExistent", String.class); fail("An exception should be thrown"); } catch (HttpClientErrorException e) { @@ -465,7 +465,7 @@ public class WebClientTests { @Test public void shouldNotExecuteErrorControllerWhenUrlIsFound() { - this.template.getForEntity("http://fooservice/notrace", String.class); + this.template.getForEntity("https://fooservice/notrace", String.class); then(this.tracer.currentSpan()).isNull(); then(this.testErrorController.getSpan()).isNull(); diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/src/main/java/sample/SampleController.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/src/main/java/sample/SampleController.java index c2270fc7c..ac4f29c74 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/src/main/java/sample/SampleController.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/src/main/java/sample/SampleController.java @@ -38,13 +38,13 @@ public class SampleController { @RequestMapping("/") public String hi() throws InterruptedException { Thread.sleep(this.random.nextInt(1000)); - String s = this.restTemplate.getForObject("http://zipkin/hi2", String.class); + String s = this.restTemplate.getForObject("https://zipkin/hi2", String.class); return "hi/" + s; } @RequestMapping("/call") public String traced() { - String s = this.restTemplate.getForObject("http://zipkin/call", String.class); + String s = this.restTemplate.getForObject("https://zipkin/call", String.class); return "call/" + s; } diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/src/main/resources/static/sockjs-0.3.4.js b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/src/main/resources/static/sockjs-0.3.4.js index a0ca78ab7..aeb61de65 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/src/main/resources/static/sockjs-0.3.4.js +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/src/main/resources/static/sockjs-0.3.4.js @@ -119,7 +119,7 @@ SockJS = (function () { */ /* Simplified implementation of DOM2 EventTarget. - * http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-EventTarget + * https://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-EventTarget */ var REventTarget = function () { }; @@ -289,7 +289,7 @@ SockJS = (function () { return (p + utils.random_number(max)).slice(-t); }; -// Assuming that url looks like: http://asdasd:111/asd +// Assuming that url looks like: https://asdasd:111/asd utils.getOrigin = function (url) { url += '/'; var parts = url.split('/').slice(0, 3); @@ -342,7 +342,7 @@ SockJS = (function () { return code === 1000 || (code >= 3000 && code <= 4999); }; -// See: http://www.erg.abdn.ac.uk/~gerrit/dccp/notes/ccid2/rto_estimator/ +// See: https://erg.abdn.ac.uk/~gerrit/dccp/notes/ccid2/rto_estimator/ // and RFC 2988. utils.countRTO = function (rtt) { var rto; @@ -383,7 +383,7 @@ SockJS = (function () { throw new Error('Only basic urls are supported in SockJS'); } - // '//abc' --> 'http://abc' + // '//abc' --> 'https://abc' if (url.indexOf('//') === 0) { url = dl.protocol + url; } @@ -593,7 +593,7 @@ SockJS = (function () { // Quote string, also taking care of unicode characters that browsers // often break. Especially, take care of unicode surrogates: -// http://en.wikipedia.org/wiki/Mapping_of_Unicode_characters#Surrogates +// https://en.wikipedia.org/wiki/Mapping_of_Unicode_characters#Surrogates utils.quote = function (string) { var quoted = JSONQuote(string); @@ -722,7 +722,7 @@ SockJS = (function () { _window.addEventListener(event, listener, false); } else { // IE quirks. - // According to: http://stevesouders.com/misc/test-postmessage.php + // According to: https://stevesouders.com/misc/test-postmessage.php // the message gets delivered only to 'document', not 'window'. _document.attachEvent("on" + event, listener); // I get 'window' for ie8. @@ -943,7 +943,7 @@ SockJS = (function () { } // Explorer tends to keep connection open, even after the - // tab gets closed: http://bugs.jquery.com/ticket/5280 + // tab gets closed: https://bugs.jquery.com/ticket/5280 that.unload_ref = utils.unload_add(function () { that._cleanup(true); }); @@ -981,7 +981,7 @@ SockJS = (function () { } catch (x) { } ; - // IE returns 1223 for 204: http://bugs.jquery.com/ticket/1450 + // IE returns 1223 for 204: https://bugs.jquery.com/ticket/1450 if (status === 1223) status = 204; // IE does return readystate == 3 for 404 answers. @@ -991,7 +991,7 @@ SockJS = (function () { break; case 4: var status = x.status; - // IE returns 1223 for 204: http://bugs.jquery.com/ticket/1450 + // IE returns 1223 for 204: https://bugs.jquery.com/ticket/1450 if (status === 1223) status = 204; that.emit('finish', status, x.responseText); @@ -1049,7 +1049,7 @@ SockJS = (function () { // References: // http://ajaxian.com/archives/100-line-ajax-wrapper -// http://msdn.microsoft.com/en-us/library/cc288060(v=VS.85).aspx +// https://msdn.microsoft.com/en-us/library/cc288060(v=VS.85).aspx var XDRObject = utils.XDRObject = function (method, url, payload) { var that = this; utils.delay(function () { @@ -1692,9 +1692,9 @@ SockJS = (function () { // script object. Later, onreadystatechange, manually execute this // code. FF and Chrome doesn't work with 'event' and 'htmlFor' // set. For reference see: - // http://jaubourg.net/2010/07/loading-script-as-onclick-handler-of.html + // https://jaubourg.net/2010/07/loading-script-as-onclick-handler-of.html // Also, read on that about script ordering: - // http://wiki.whatwg.org/wiki/Dynamic_Script_Execution_Order + // https://wiki.whatwg.org/wiki/Dynamic_Script_Execution_Order if (typeof script.async === 'undefined' && _document.attachEvent) { // According to mozilla docs, in recent browsers script.async defaults // to 'true', so we may use it to detect a good browser: @@ -1895,8 +1895,8 @@ SockJS = (function () { // According to: -// http://stackoverflow.com/questions/1641507/detect-browser-support-for-cross-domain-xmlhttprequests -// http://hacks.mozilla.org/2009/07/cross-site-xmlhttprequest-with-cors/ +// https://stackoverflow.com/questions/1641507/detect-browser-support-for-cross-domain-xmlhttprequests +// https://hacks.mozilla.org/2009/07/cross-site-xmlhttprequest-with-cors/ // xdr-streaming @@ -1949,8 +1949,8 @@ SockJS = (function () { // remote domain. New browsers, have capabilities to communicate with // cross domain iframe, using postMessage(). In IE it was implemented // from IE 8+, but of course, IE got some details wrong: -// http://msdn.microsoft.com/en-us/library/cc197015(v=VS.85).aspx -// http://stevesouders.com/misc/test-postmessage.php +// https://msdn.microsoft.com/en-us/library/cc197015(v=VS.85).aspx +// https://stevesouders.com/misc/test-postmessage.php var IframeTransport = function () { }; @@ -2123,7 +2123,7 @@ SockJS = (function () { // alert('test ticker'); // facade = new FacadeJS(); - // facade._transport = new FacadeJS['w-iframe-xhr-polling'](facade, 'http://host.com:9999/ticker/12/basd'); + // facade._transport = new FacadeJS['w-iframe-xhr-polling'](facade, 'https://host.com:9999/ticker/12/basd'); utils.attachMessage(onMessage); diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/resources/application.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/resources/application.yml index cd002ef5f..14d50dcf0 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/resources/application.yml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/resources/application.yml @@ -7,7 +7,7 @@ spring: name: testsleuthzipkin #zipkin: # Uncomment to send to zipkin, replacing 192.168.99.100 with your zipkin IP address - # baseUrl: http://192.168.99.100:9411/ + # baseUrl: https://192.168.99.100:9411/ sleuth: sampler: probability: 1.0 diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinProperties.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinProperties.java index ed28963bf..d0bd1cb80 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinProperties.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinProperties.java @@ -32,7 +32,7 @@ public class ZipkinProperties { /** * URL of the zipkin query server instance. You can also provide the service id of the * Zipkin server if Zipkin's registered in service discovery (e.g. - * http://zipkinserver/). + * https://zipkinserver/). */ private String baseUrl = "http://localhost:9411/"; diff --git a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinDiscoveryClientTests.java b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinDiscoveryClientTests.java index 19174700c..3e044cb7a 100644 --- a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinDiscoveryClientTests.java +++ b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinDiscoveryClientTests.java @@ -43,7 +43,7 @@ import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringRunner.class) @SpringBootTest(classes = ZipkinDiscoveryClientTests.Config.class, properties = { - "spring.zipkin.baseUrl=http://zipkin/", "spring.zipkin.sender.type=web" // override + "spring.zipkin.baseUrl=https://zipkin/", "spring.zipkin.sender.type=web" // override // default // priority // which