diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 565172183..8ed3d8f54 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -29,7 +29,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 @@ -42,6 +42,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 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). \ No newline at end of file diff --git a/README.adoc b/README.adoc index 88e194714..977fc8ece 100644 --- a/README.adoc +++ b/README.adoc @@ -49,11 +49,11 @@ IMPORTANT: If using Zipkin, configure the percentage of spans exported using `sp == 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. Span's are identified by a unique 64-bit ID for the span and another 64-bit ID for the trace the span @@ -157,7 +157,7 @@ As you can see you can easily see the reason for an error and the whole stacktra .Click Pivotal Web Services icon to see it live! [caption="Click 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] +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] The dependency graph in Zipkin would look like this: @@ -165,7 +165,7 @@ image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-sleuth/{branc .Click Pivotal Web Services icon to see it live! [caption="Click 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] +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] ==== Log correlation @@ -182,7 +182,7 @@ service2.log:2016-02-26 11:15:48.156 INFO [service2,2485ec27856c56f4,9aa10ee6fb 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're using a log aggregating tool like https://www.elastic.co/products/kibana[Kibana], -http://www.splunk.com/[Splunk] etc. you can order the events that took place. An example of +https://www.splunk.com/[Splunk] etc. you can order the events that took place. An example of Kibana would look like this: image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-sleuth/{branch}/docs/src/main/asciidoc/images/kibana.png[Log correlation with Kibana] @@ -608,7 +608,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, @@ -630,13 +630,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". @@ -697,7 +697,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 @@ -710,6 +710,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 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). \ No newline at end of file diff --git a/asciidoctor.css b/asciidoctor.css index 06d52e688..58c68541c 100644 --- a/asciidoctor.css +++ b/asciidoctor.css @@ -1,4 +1,4 @@ -/* 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{display:block} diff --git a/docs/src/main/asciidoc/intro.adoc b/docs/src/main/asciidoc/intro.adoc index af64c5dd2..bdca17799 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. Span's are identified by a unique 64-bit ID for the span and another 64-bit ID for the trace the span @@ -110,7 +110,7 @@ As you can see you can easily see the reason for an error and the whole stacktra .Click Pivotal Web Services icon to see it live! [caption="Click 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] +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] The dependency graph in Zipkin would look like this: @@ -118,7 +118,7 @@ image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-sleuth/{branc .Click Pivotal Web Services icon to see it live! [caption="Click 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] +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] ==== Log correlation @@ -135,7 +135,7 @@ service2.log:2016-02-26 11:15:48.156 INFO [service2,2485ec27856c56f4,9aa10ee6fb 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're using a log aggregating tool like https://www.elastic.co/products/kibana[Kibana], -http://www.splunk.com/[Splunk] etc. you can order the events that took place. An example of +https://www.splunk.com/[Splunk] etc. you can order the events that took place. An example of Kibana would look like this: 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/spring-cloud-sleuth.adoc b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc index 7fa86ed3b..e248f561a 100644 --- a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc +++ b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc @@ -525,7 +525,7 @@ property as follows: [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 via service discovery it's enough to pass the @@ -593,7 +593,7 @@ object, you will have to create a bean of `zipkin2.reporter.Sender` type. == Span Data as Messages You can accumulate and send span data over -http://cloud.spring.io/spring-cloud-stream[Spring Cloud Stream] by +https://cloud.spring.io/spring-cloud-stream[Spring Cloud Stream] by including the `spring-cloud-sleuth-stream` jar as a dependency, and adding a Channel Binder implementation (e.g. `spring-cloud-starter-stream-rabbit` for RabbitMQ or @@ -698,7 +698,7 @@ include::../../../../spring-cloud-sleuth-stream/src/test/java/org/springframewor == Metrics Currently Spring Cloud Sleuth registers very simple metrics related to spans. -It's using the http://docs.spring.io/spring-boot/docs/current/reference/html/production-ready-metrics.html#production-ready-recording-metrics[Spring Boot's metrics support] +It's using the https://docs.spring.io/spring-boot/docs/current/reference/html/production-ready-metrics.html#production-ready-recording-metrics[Spring Boot's metrics support] to calculate the number of accepted and dropped spans. Each time a span gets sent to Zipkin the number of accepted spans will increase. If there's an error then the number of dropped spans will get increased. @@ -828,7 +828,7 @@ include::../../../../spring-cloud-sleuth-core/src/test/java/org/springframework/ ==== Traverson -If you're using the http://docs.spring.io/spring-hateoas/docs/current/reference/html/#client.traverson[Traverson] library +If you're using the https://docs.spring.io/spring-hateoas/docs/current/reference/html/#client.traverson[Traverson] library it's enough for you to inject a `RestTemplate` as a bean into your Traverson object. Since `RestTemplate` is already intercepted, you will get full support of tracing in your client. Below you can find a pseudo code of how to do that: @@ -909,7 +909,7 @@ include::../../../../spring-cloud-sleuth-core/src/test/java/org/springframework/ === Messaging -Spring Cloud Sleuth integrates with http://projects.spring.io/spring-integration/[Spring Integration]. It creates spans for publish and +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. You can provide the `spring.sleuth.integration.patterns` pattern to explicitly @@ -960,5 +960,5 @@ class ReporterConfiguration { You can find the running examples deployed in the https://run.pivotal.io/[Pivotal Web Services]. Check them out in the following links: -- http://docssleuth-zipkin-server.cfapps.io/[Zipkin for apps presented in the samples to the top] -- http://docsbrewing-zipkin-server.cfapps.io/[Zipkin for Brewery on PWS], its https://github.com/spring-cloud-samples/brewery[Github Code] \ No newline at end of file +- https://docssleuth-zipkin-server.cfapps.io/[Zipkin for apps presented in the samples to the top] +- https://docsbrewing-zipkin-server.cfapps.io/[Zipkin for Brewery on PWS], its https://github.com/spring-cloud-samples/brewery[Github Code] \ No newline at end of file diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java index 10ac50815..adf852841 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java @@ -55,7 +55,7 @@ public class PercentageBasedSampler implements 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 */ static BitSet randomBitSet(int size, int cardinality, Random rnd) { BitSet result = new BitSet(size); diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/HttpServletRequestExtractorTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/HttpServletRequestExtractorTests.java index 01b701ae1..c3dcbecd6 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/HttpServletRequestExtractorTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/HttpServletRequestExtractorTests.java @@ -44,7 +44,7 @@ public class HttpServletRequestExtractorTests { @Before public void setup() { - BDDMockito.given(this.request.getRequestURI()).willReturn("http://foo.com"); + BDDMockito.given(this.request.getRequestURI()).willReturn("http://www.foo.com/"); BDDMockito.given(this.request.getContextPath()).willReturn("/"); } @@ -323,7 +323,7 @@ public class HttpServletRequestExtractorTests { .willReturn(Span.idToHex(10L)); BDDMockito.given(request.getHeader(Span.SPAN_ID_NAME)) .willReturn(Span.idToHex(20L)); - BDDMockito.given(request.getRequestURI()).willReturn("http://foo.com"); + BDDMockito.given(request.getRequestURI()).willReturn("http://www.foo.com/"); BDDMockito.given(request.getContextPath()).willReturn("/"); return request; } @@ -338,7 +338,7 @@ public class HttpServletRequestExtractorTests { .willReturn(Span.idToHex(20L)); BDDMockito.given(request.getHeader(Span.SAMPLED_NAME)) .willReturn(Span.SPAN_SAMPLED); - BDDMockito.given(request.getRequestURI()).willReturn("http://foo.com"); + BDDMockito.given(request.getRequestURI()).willReturn("http://www.foo.com/"); BDDMockito.given(request.getContextPath()).willReturn("/"); return request; } 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 f71905fd7..8104a7302 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 @@ -95,7 +95,7 @@ class Application { } @FeignClient(name="foo", - url="http://non.existing.url") + 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/zuul/TracePreZuulFilterTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/zuul/TracePreZuulFilterTests.java index fa1f8231a..7ba110074 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/zuul/TracePreZuulFilterTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/zuul/TracePreZuulFilterTests.java @@ -70,7 +70,7 @@ public class TracePreZuulFilterTests { public void setup() { MonitoringHelper.initMocks(); RequestContext requestContext = new RequestContext(); - BDDMockito.given(this.httpServletRequest.getRequestURI()).willReturn("http://foo.bar"); + BDDMockito.given(this.httpServletRequest.getRequestURI()).willReturn("https://foo.bar"); BDDMockito.given(this.httpServletRequest.getMethod()).willReturn("GET"); requestContext.setRequest(this.httpServletRequest); RequestContext.testSetCurrentContext(requestContext); 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 9f5b8f3de..76ed9bd71 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 @@ -1,4 +1,4 @@ -/* SockJS client, version 0.3.4, http://sockjs.org, MIT License +/* SockJS client, version 0.3.4, https://github.com/sockjs/sockjs-client, MIT License Copyright (c) 2011-2012 VMware, Inc. @@ -43,7 +43,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() {}; REventTarget.prototype.addEventListener = function (eventType, listener) { @@ -265,7 +265,7 @@ utils.userSetCode = function (code) { 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; @@ -424,7 +424,7 @@ var unroll_lookup = function(escapable) { // 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); @@ -552,7 +552,7 @@ utils.attachEvent = function(event, listener) { _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. @@ -752,7 +752,7 @@ AbstractXHRObject.prototype._start = function(method, url, payload, opts) { } // 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);}); try { that.xhr.open(method, url, true); @@ -785,7 +785,7 @@ AbstractXHRObject.prototype._start = function(method, url, payload, opts) { var status = x.status; var text = x.responseText; } 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. @@ -795,7 +795,7 @@ AbstractXHRObject.prototype._start = function(method, url, payload, opts) { 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); @@ -849,7 +849,7 @@ XHRLocalObject.prototype = new AbstractXHRObject(); // 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(){that._start(method, url, payload);}); @@ -1477,9 +1477,9 @@ var jsonPGenericReceiver = function(url, callback) { // 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: @@ -1678,8 +1678,8 @@ XhrStreamingTransport.need_body = true; // 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 @@ -1733,8 +1733,8 @@ XdrPollingTransport.roundTrips = 2; // preflight, ajax // 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() {}; @@ -1904,7 +1904,7 @@ SockJS.bootstrap_iframe = 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-websocket/src/main/resources/static/stomp.js b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/src/main/resources/static/stomp.js index 800e194ae..d50d8606c 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/src/main/resources/static/stomp.js +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/src/main/resources/static/stomp.js @@ -1,10 +1,10 @@ // Generated by CoffeeScript 1.7.1 /* - Stomp Over WebSocket http://www.jmesnil.net/stomp-websocket/doc/ | Apache License V2.0 + Stomp Over WebSocket http://jmesnil.net/stomp-websocket/doc/ | Apache License V2.0 Copyright (C) 2010-2013 [Jeff Mesnil](http://jmesnil.net/) - Copyright (C) 2012 [FuseSource, Inc.](http://fusesource.com) + Copyright (C) 2012 [FuseSource, Inc.](https://www.jboss.org/) */ (function() { 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 95be19997..2c03d9ffd 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: percentage: 1.0 diff --git a/spring-cloud-sleuth-zipkin-stream/README.md b/spring-cloud-sleuth-zipkin-stream/README.md index 7763014af..dd49a486e 100644 --- a/spring-cloud-sleuth-zipkin-stream/README.md +++ b/spring-cloud-sleuth-zipkin-stream/README.md @@ -7,7 +7,7 @@ See [our documentation](https://cloud.spring.io/spring-cloud-sleuth/single/sprin There are 3 parts to Zipkin: the instrumented client apps, the backend database and the Zipkin server. The database for this implementation is MySQL. -> There is a running instance on PWS: http://zipkin-web.cfapps.io. It is backed by a `zipkin-server` with a MySQL backend and RabbitMQ (Spring Cloud Stream) for span transport. +> There is a running instance on PWS: https://zipkin-web.cfapps.io. It is backed by a `zipkin-server` with a MySQL backend and RabbitMQ (Spring Cloud Stream) for span transport. ## Instrumenting Apps