SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,259 Commits 14 Branches 0 Tags
2.1.x
Commit Graph

437 Commits

Author SHA1 Message Date
Adrian Cole
a9128dcd32 Updates to Brave 5.12 and introduces SpanHandler (#1632) 
`SpanHandler` is the base type for the now deprecated `FinishedSpanHandler`.

Notable, it can not just handle things at the end of a recording, but also the
beginning.

For example, this permits set-once baggage without the HTTP abstraction:
```java
static final BaggageField EPOCH_SECONDS = BaggageField.create("epoch_seconds");

static final class RootOnlyBaggage extends SpanHandler {
  @Override
  public boolean begin(TraceContext context, MutableSpan span, @Nullable TraceContext parent) {
    if (EPOCH_SECONDS.getValue(context) == null) { // only set at the first span
      long epochSeconds = System.currentTimeMillis() / 1000;
      EPOCH_SECONDS.updateValue(context, String.valueOf(epochSeconds));
    }
    return true;
  }

  @Override public boolean end(TraceContext context, MutableSpan span, Cause cause) {
    Tags.BAGGAGE_FIELD.tag(EPOCH_SECONDS, context, span);
    return true;
  }
}
```

As the parent is available, it can also facilitate advanced tasks like counting
children, or summarizing entire local roots.

See https://github.com/openzipkin/brave/tree/master/brave/src/test/java/brave/features/handler
and https://github.com/openzipkin/brave/blob/master/brave/src/main/java/brave/handler/SpanHandler.java for more
 2020-05-17 21:20:09 +08:00
Adrian Cole
ef866d97f3 Moves responsibility to import SamplerAutoConfiguration to core 
Before, spring-cloud-sleuth-zipkin had to import `SamplerAutoConfiguration`
directly to unwind a sampler ordering problem caused by `TraceAutoConfiguration`
defining the default `Sampler` bean.

This fixes that by moving the default `Sampler` to where it belongs
(`SamplerAutoConfiguration`) and having `TraceAutoConfiguration` import
the sampling configuration directly as opposed to relying on auto-configuration
ordering. Finally it removes the mistake of setting `SamplerAutoConfiguration`
as auto-configuration in the first place.

The name `SamplerAutoConfiguration` was left alone because changing it would
interfere with 3rd party code that formerly imported it to correct this issue
in their non-zipkin setups.

Fixes #1618
 2020-04-22 19:25:00 +08:00
buildmaster
efda469d91 Bumping versions to 2.1.8.BUILD-SNAPSHOT after release 2020-01-31 22:16:43 +00:00
buildmaster
00af789f6d Going back to snapshots 2020-01-31 22:16:43 +00:00
buildmaster
c4c05354e5 Update SNAPSHOT to 2.1.7.RELEASE 2020-01-31 22:14:45 +00:00
buildmaster
22fce3694f Bumping versions to 2.1.7.BUILD-SNAPSHOT after release 2019-11-18 15:46:50 +00:00
buildmaster
f2af9fa8d1 Going back to snapshots 2019-11-18 15:46:50 +00:00
buildmaster
1fbfc67930 Update SNAPSHOT to 2.1.6.RELEASE 2019-11-18 15:45:34 +00:00
Marcin Grzejszczak
54068d24ce Bumping versions to 2.1.6.BUILD-SNAPSHOT after release 2019-10-31 12:39:24 +01:00
Marcin Grzejszczak
f993c6f131 Going back to snapshots 2019-10-31 12:39:23 +01:00
Marcin Grzejszczak
6a5cbbc519 Update SNAPSHOT to 2.1.5.RELEASE 2019-10-31 12:35:35 +01:00
Marcin Grzejszczak
759ac87481 Not using loadbalancer zipkin URI extractor when zipkin url contains a port 
fixes gh-1474
 2019-10-23 13:41:24 +02:00
Marcin Grzejszczak
028a79dc25 Bumping versions to 2.1.5.BUILD-SNAPSHOT after release 2019-09-27 13:56:35 +02:00
Marcin Grzejszczak
198843a917 Going back to snapshots 2019-09-27 13:56:35 +02:00
Marcin Grzejszczak
c9196fe177 Update SNAPSHOT to 2.1.4.RELEASE 2019-09-27 13:09:09 +02:00
Ryan Baxter
7ba1ec79eb Bumping versions 2019-09-10 17:08:12 -04:00
liaochuntao
c6f03191e8 Invalid property name resolution fix 
fixes gh-1376
 2019-07-02 08:51:49 +02:00
buildmaster
74c2b0b618 Bumping versions to 2.1.3.BUILD-SNAPSHOT after release 2019-06-20 21:26:50 +00:00
buildmaster
0a4e7b5d7b Going back to snapshots 2019-06-20 21:26:50 +00:00
buildmaster
cc0b3341a5 Update SNAPSHOT to 2.1.2.RELEASE 2019-06-20 21:25:35 +00:00
Adrian Cole
a5d8893baa Updates to latest Brave (#1373) 2019-06-15 23:49:26 +08:00
Spring Operator
e6c9351118 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).

# 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://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).

## 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://maven.apache.org/xsd/maven-4.0.0.xsd with 16 occurrences migrated to:
  https://maven.apache.org/xsd/maven-4.0.0.xsd ([https](https://maven.apache.org/xsd/maven-4.0.0.xsd) result 200).
* [ ] http://www.springframework.org/schema/beans/spring-beans.xsd with 1 occurrences migrated to:
  https://www.springframework.org/schema/beans/spring-beans.xsd ([https](https://www.springframework.org/schema/beans/spring-beans.xsd) result 200).
* [ ] http://www.springframework.org/schema/integration/spring-integration.xsd with 1 occurrences migrated to:
  https://www.springframework.org/schema/integration/spring-integration.xsd ([https](https://www.springframework.org/schema/integration/spring-integration.xsd) result 200).
* [ ] http://www.springframework.org/schema/task/spring-task.xsd with 1 occurrences migrated to:
  https://www.springframework.org/schema/task/spring-task.xsd ([https](https://www.springframework.org/schema/task/spring-task.xsd) result 200).

# Ignored
These URLs were intentionally ignored.

* http://maven.apache.org/POM/4.0.0 with 32 occurrences
* http://www.springframework.org/schema/beans with 2 occurrences
* http://www.springframework.org/schema/integration with 2 occurrences
* http://www.springframework.org/schema/task with 2 occurrences
* http://www.w3.org/2001/XMLSchema-instance with 17 occurrences
 2019-03-26 00:18:18 -05:00
Spring Operator
ac9774d8f7 URL Cleanup (#1279) 
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).

# Fixed URLs

## 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://www.apache.org/licenses/ with 1 occurrences migrated to:
  https://www.apache.org/licenses/ ([https](https://www.apache.org/licenses/) result 200).
* [ ] http://www.apache.org/licenses/LICENSE-2.0 with 338 occurrences migrated to:
  https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200).
 2019-03-22 09:56:20 +01:00
buildmaster
3b4dc7b17a Bumping versions to 2.1.2.BUILD-SNAPSHOT after release 2019-03-05 20:06:52 +00:00
buildmaster
ce39889121 Going back to snapshots 2019-03-05 20:06:51 +00:00
buildmaster
cf138b8dcb Update SNAPSHOT to 2.1.1.RELEASE 2019-03-05 20:00:58 +00:00
Marcin Grzejszczak
f044c07f67 NPE guard for null response; fixes gh-1224 2019-02-28 15:28:42 +01:00
Marcin Grzejszczak
83545453ad Trying to make tests less brittle 2019-02-27 16:04:46 +01:00
Marcin Grzejszczak
b4174ffa82 Trying to make tests less brittle 2019-02-27 16:02:25 +01:00
Marcin Grzejszczak
1780641ee3 Removed the conditionality on a bena of KafkaProperties type; fixes gh-1209 2019-02-12 18:52:40 +01:00
Marcin Grzejszczak
2f7cf78614 Applied checkstyle 2019-02-07 16:41:59 +01:00
Marcin Grzejszczak
8c82c8aa9f Revert "Fixed the build" 
This reverts commit 3107d3f3
 2019-02-07 13:12:21 +01:00
Marcin Grzejszczak
3107d3f380 Fixed the build 2019-02-07 12:51:36 +01:00
Marcin Grzejszczak
8941ed8e2d Removed the jdk11 classloader workaround; fixes gh-1193 2019-01-25 13:07:11 +01:00
Tim Ysewyn
0bc500ee78 Fixed issue where the application would not start when zipkin is disabled (#1192) 2019-01-23 22:15:51 +01:00
buildmaster
4b3eae2453 Bumping versions to 2.1.1.BUILD-SNAPSHOT after release 2019-01-22 18:53:51 +00:00
buildmaster
dd96605d34 Going back to snapshots 2019-01-22 18:53:51 +00:00
buildmaster
4829876aec Update SNAPSHOT to 2.1.0.RELEASE 2019-01-22 18:51:05 +00:00
Marcin Grzejszczak
0397f1e0dd polish 2019-01-21 13:14:06 +01:00
Tim Ysewyn
e0dc599226 Fixed backwards compatibility condition because the auto configuration order changed (#1187) 2019-01-21 12:43:36 +01:00
Marcin Grzejszczak
909afc8f96 Fixed tests 2019-01-21 11:11:53 +01:00
Marcin Grzejszczak
ab44f141e4 Polish 2019-01-21 10:59:27 +01:00
Marcin Grzejszczak
eda5781643 Polish 2019-01-21 10:40:03 +01:00
Tim Ysewyn
490a1d8626 Updated access modifiers in ZipkinBackwardsCompatibilityAutoConfiguration 2019-01-16 22:08:50 +01:00
Tim Ysewyn
3b47f77627 Updated conditional for ZipkinBackwardsCompatibilityAutoConfiguration 2019-01-16 21:56:22 +01:00
Tim Ysewyn
453d942829 Adapted new configuration to support backwards compatibility in case another tracing system extends from spring-cloud-sleuth-zipkin (like spring-cloud-gcp-trace) 2019-01-16 21:46:28 +01:00
Tim Ysewyn
d8381b88c9 Create the restTemplateSender bean when there is no other bean named "zipkinSender" 2019-01-16 16:57:56 +01:00
Tim Ysewyn
8327ecbb4d Updated documentation 2019-01-16 12:42:37 +01:00
Tim Ysewyn
7c31475422 Updated ZipkinAutoConfiguration for backwards compatibility 2019-01-16 12:41:58 +01:00
Tim Ysewyn
14700ed27b Added @ConditionalOnMissingBean(name = REPORTER_BEAN_NAME) 2019-01-15 22:27:22 +01:00