Commit Graph

2788 Commits

Author SHA1 Message Date
buildmaster
9feba73fc4 Bumping versions 2020-06-03 05:33:16 +00:00
Marcin Grzejszczak
dde56c766d Merge branch '2.2.x' 2020-06-02 11:05:13 +02:00
Marcin Grzejszczak
bcb16d5341 Updated gradle example 2020-06-02 11:04:42 +02:00
Marcin Grzejszczak
b54565d32e Updated bom for dependency management
fixes gh-1658
2020-06-02 11:00:25 +02:00
Marcin Grzejszczak
ba73aa03d4 Updated links 2020-06-01 14:42:30 +02:00
buildmaster
15a7a543d0 Bumping versions 2020-05-30 05:29:28 +00:00
buildmaster
93ea0d6b00 Going back to snapshots 2020-05-29 19:03:35 +00:00
buildmaster
640faa7c30 Update SNAPSHOT to 3.0.0-M2 2020-05-29 19:02:42 +00:00
buildmaster
2a29a23f95 Bumping versions 2020-05-29 05:29:12 +00:00
buildmaster
6b8dd82346 Bumping versions to 2.2.4.BUILD-SNAPSHOT after release 2020-05-28 20:00:54 +00:00
buildmaster
4b961dcdf3 Going back to snapshots 2020-05-28 20:00:54 +00:00
buildmaster
fdf4c647df Update SNAPSHOT to 2.2.3.RELEASE 2020-05-28 19:57:31 +00:00
spencergibb
edff02a6f8 Fixes aws version to snapshot 2020-05-28 15:40:28 -04:00
spencergibb
19f3748ca5 Updates versions to latest 2020-05-28 15:39:19 -04:00
spencergibb
27ff6c93fe Ignores .sdkmanrc 2020-05-28 15:39:03 -04:00
buildmaster
7ecf64a607 Bumping versions 2020-05-27 05:29:15 +00:00
Adrian Cole
18415d6877 Merge branch '2.2.x' 2020-05-26 19:47:01 +08:00
Adrian Cole
3685cc2d7c Fixes bug where we didn't fall back to current span (#1656) 2020-05-26 19:44:25 +08:00
Adrian Cole
32baa11183 Merge branch '2.2.x' 2020-05-26 14:54:31 +08:00
Adrian Cole
a6573bc2a5 Uses B3 single for non-remote spans (2.2.x) (#1655)
This makes sure there cannot be JMS problems related to use of
hyphenated headers unless someone overrides the `Propagation.Factory`.

To avoid this, we set non-remote spans to B3 single format as done on
the 3.x branch here:
https://github.com/spring-cloud/spring-cloud-sleuth/pull/1607/files#diff-db43b7e91bd69d063333c20b947c902bR83-R84
2020-05-26 14:42:27 +08:00
Marcin Grzejszczak
8752a7b8be Setting up repository for docs.spring.io migration 2020-05-25 14:40:16 +02:00
Marcin Grzejszczak
804f0cba7b Setting up repository for docs.spring.io migration 2020-05-25 13:42:59 +02:00
buildmaster
20280e896e Bumping versions 2020-05-23 05:29:13 +00:00
Marcin Grzejszczak
de399c8959 Merge branch '2.2.x' 2020-05-22 14:02:11 +02:00
Marcin Grzejszczak
473549f000 Removed / ignored flakey tests; fixes gh-1635; fixes gh-1652 2020-05-22 13:51:14 +02:00
Adrian Cole
ddea6860cb Merge branch '2.2.x' 2020-05-20 08:59:03 +08:00
Adrian Cole
d02493ca40 Reverts JmsTracingConfigurationTest test configuration
JmsTracingConfigurationTest flakes in Jenkins for some reason that appears
like either the test rule not being honored or tests run concurrently.
2020-05-20 08:30:01 +08:00
buildmaster
31c1bbbf9b Bumping versions 2020-05-19 05:31:39 +00:00
Adrian Cole
4ed3db9a27 Drops zipkin dependency from spring-cloud-sleuth-core (#1649)
There was emmense work to prepare for decoupling of spring-cloud-sleuth-core
from Zipkin. This included complete test conversion and deprecations between
2.2.x and 3.0.x.

This moves all Zipkin related code to spring-cloud-sleuth-zipkin, making the
primary data recording tool `SpanHandler` as opposed to `Reporter<zipkin2.Span>`

For example, Wavefront and soon Stackdriver can implement `SpanHandler` and
skip conversion into the Zipkin model first. `SpanHandler` also includes
begin and end hooks which allow data extensions to be developed.

see https://github.com/wavefrontHQ/wavefront-spring-boot
2020-05-19 08:22:54 +08:00
Adrian Cole
31fb3001c5 Merge branch '2.2.x' 2020-05-18 23:58:46 +08:00
Adrian Cole
03be784678 Ensures Zipkin handlers order last (after redacters etc) (#1648)
This is more prevention of a problem, then seeing one in practice.
Technically, a TracingCustomizer can order things backwards, and it hit
me in a test env (not sleuth).
2020-05-18 23:43:23 +08:00
Adrian Cole
e19e0ca169 Backports BaggagePropagation to 2.2.x (#1647)
This allows integrations of Sleuth to use the same approach for 2.2.x as 3.x:

If you have a custom base propagation format, override the `BaggagePropagation.Factory`
bean instead of `ExtraFieldsPropagation.Factory`

Note: one subtle difference 2.2.x to 3.x is the change in the primary inject format.

2.2.x is
```java
return BaggagePropagation.newFactoryBuilder(B3Propagation.newFactoryBuilder()
                         .injectFormat(B3Propagation.Format.MULTI).build());
```

3.0 is
```java
return BaggagePropagation.newFactoryBuilder(B3Propagation.newFactoryBuilder()
                         .injectFormat(B3Propagation.Format.SINGLE_NO_PARENT).build());
```
per #1607

See https://github.com/spring-cloud/spring-cloud-gcp/issues/2268
2020-05-18 23:08:08 +08:00
Adrian Cole
30bc36ea81 Last deprecation cleanup on master (3.x) (#1646) 2020-05-18 21:51:00 +08:00
Adrian Cole
453be43b5a bump 2020-05-18 21:13:23 +08:00
Adrian Cole
3da9de053e Merge branch '2.2.x' 2020-05-18 20:20:40 +08:00
Adrian Cole
40785d642a Removes Zipkin dependency from all tests (#1645)
Brave's SpanHandler can report natively in other formats which have different
constraints than Zipkin and often extensions to the data model.

This change ports all tests away from Zipkin's types so that it is more clear
what's actually recorded vs what's a side-effect of Zipkin conversion.

This removes `BlockingQueueSpanReporter` which was never released, also.
2020-05-18 17:02:29 +08:00
buildmaster
1f71925445 Bumping versions 2020-05-18 05:30:42 +00:00
Adrian Cole
58094e4d76 Merge branch '2.2.x' 2020-05-17 22:38:01 +08:00
Adrian Cole
a27d634645 Hides exposed configuration and properties types (#1642)
This completes #1638 by addressing deprecations on master (3.x)
2020-05-17 21:30:45 +08:00
Adrian Cole
99ce7cdd1c latest brave 2020-05-17 21:01:31 +08:00
Adrian Cole
d59de19e97 Merge branch '2.2.x' 2020-05-17 20:49:59 +08:00
Adrian Cole
048227806a undeprecate the entry-level zipkin things as they are documented 2020-05-17 20:48:03 +08:00
Adrian Cole
946486b20a Merge branch '2.2.x' 2020-05-17 18:54:30 +08:00
Adrian Cole
60bf5ce497 Rewrites async test to be less circuitous and more valid (#1641)
I had flakes on TraceAsyncIntegrationTests and it was hard to tell why
as there were so many problems with it. It used a normal list in async
setting, it unnecessarily created extra spans, it added a hook inside
the async method which if passed only told you it was in the middle of
an op, not the end of it. The method danced around making failure in
console almost impossible to decipher.

This took me a few hours to make just a normal test. Hopefully, the
others will keep passing as I can't afford time to redo all of them.
2020-05-17 14:21:30 +08:00
Adrian Cole
e9d12703c1 Pares back some deprecation after analyzing each file (#1640)
This puts specific comments in as to why certain files that seem like they
shouldn't be public are. Notably, this includes entrypoint autoconfiguration,
which are sometimes order sensitive. In other cases there are types that were
documented (notably the async package).

This also untangles a few configuration.
2020-05-17 08:38:08 +08:00
Adrian Cole
eca5ea6db0 Merge branch '2.2.x' 2020-05-16 16:31:42 +08:00
Adrian Cole
8ae5e13d31 Merge branch '2.2.x' 2020-05-16 15:15:37 +08:00
Adrian Cole
c1a83aa5bb Replaces deprecated note on Properties with TODO to hide them in 3.x (#1639)
I noticed we deleted many things without deprecation in 3.x and figured
deprecation was the right way. However, this doesn't work for auto-config
properties. This replaces deprecation with a TODO note to hide all the
types so that 4.x won't require guessing if someone externally is using
them directly or not.
2020-05-16 14:37:45 +08:00
Adrian Cole
b1d39ce291 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-16 14:01:38 +08:00
Adrian Cole
d4088dec9c Deprecates unnecessarily public types to ease burden (#1638)
Types like Properties and AutoConfiguration and internal utilities are
routinely marked public when they needn't be. This causes toil as we
have to preserve signatures even if they were made public by accident.

This deprecates the mass of types marked public to give some hope of
less undifferentiated toil in the future. Ideally, future change will
consider greatly if a type should be public or not as doing so haunts
maintainers.
2020-05-16 13:09:24 +08:00