Commit Graph

3127 Commits

Author SHA1 Message Date
Marcin Grzejszczak
1aaf0a8a26 Fixing gitattributes and line endings 2021-07-27 13:47:45 +02:00
buildmaster
362ed7420e Bumping versions 2021-07-24 17:33:55 +00:00
spencergibb
2957eef110 removes alt deployment repo 2021-07-23 13:01:05 -04:00
Marcin Grzejszczak
3970778bc5 Moved SingleSkipPattern to spring-cloud-sleuth-autoconfiguration; fixes gh-1991 2021-07-19 14:15:53 +02:00
buildmaster
44dd4d17eb Bumping versions 2021-07-17 17:34:57 +00:00
Marcin Grzejszczak
bbb23b66a2 Fixed missing async processing for TomcatValve; fixes gh-1998 2021-07-16 17:53:30 +02:00
Chintan Radia
7651e7c51f Fix traces actuator should return json by default (#1997)
Fixes gh-1996

Change order of TextOutputFormat enum and give `CONTENT_TYPE_OPENZIPKIN_JSON_V2`
highest ordinal value, so that it will be matched first by spring-boot-actuator
and in case of default Accept header JSON data will be returned.
2021-07-15 09:58:58 +02:00
buildmaster
a1a2e7fe50 Bumping versions 2021-07-14 17:34:23 +00:00
Marcin Grzejszczak
76d63ce44d Fixed broken build 2021-07-14 16:55:50 +02:00
Marcin Grzejszczak
c3287d9efb Merge remote-tracking branch 'origin/3.0.x' into main 2021-07-14 15:53:04 +02:00
Marcin Grzejszczak
42c8896e75 Modified tests 2021-07-14 15:52:15 +02:00
Marcin Grzejszczak
f7eb154eb8 Merge branch 'mvc-customize-handler-postHandle' of https://github.com/wuwen5/spring-cloud-sleuth into wuwen5-mvc-customize-handler-postHandle 2021-07-14 15:31:24 +02:00
Marcin Grzejszczak
dabd32b3ef Checkstyle fix 2021-07-14 15:27:32 +02:00
Chintan Radia
87fac14505 Fix startup failure when using VaultPropertySource + reactive (#1994)
Fixes gh-1990

When using `@ValuePropertySource` in reactive web app,
`KafkaSender` bean is getting created before `BeanPostProcessor` populate `@Value`
and as a result topic is passed as `null` in `KafkaSender.Builder` and it throws `NullPointerException`

To resolve this we are using `Environment` to get the property value instead on relying on `BeanPostProcessor`
to populate `@Value`
2021-07-13 10:14:21 -07:00
Marcin Grzejszczak
684669a32b Fixed wrong test 2021-07-13 12:23:43 +02:00
Marcin Grzejszczak
58fca4d12a Added missing @return description 2021-07-13 11:33:18 +02:00
Marcin Grzejszczak
151eb4d194 Moved the assertion logic as default in the interface 2021-07-13 10:29:23 +02:00
buildmaster
6d85f48298 Bumping versions 2021-07-12 17:43:40 +00:00
spencergibb
602749a8d1 Implements new methods and delegates them. 2021-07-09 14:55:27 -04:00
spencergibb
b5c4aa256d Updates to new spring cloud dependencies for 2021.0 2021-07-09 14:52:53 -04:00
spencergibb
a3288c112f Merge branch '3.1.x' 2021-07-09 14:44:13 -04:00
Oleg Zhurakousky
3793c58fe8 Add reactive Supplier test 2021-07-09 16:39:39 +02:00
Jonatan Ivanov
6ef9f4b99e fixing TestTracer 2021-07-06 16:26:53 -07:00
Jonatan Ivanov
b18819a414 Fixing CustomPropagationFactoryTests 2021-07-06 15:42:41 -07:00
Jonatan Ivanov
f94330a02e Merge branch 'main' into 3.1.x
# Conflicts:
#	benchmarks/pom.xml
#	pom.xml
#	spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceMessageHandler.java
2021-07-06 15:03:23 -07:00
Marcin Grzejszczak
8b61684168 Ensures that there are no issues with context setup when picking custom propagation type (#1989)
fixes gh-1987
2021-07-02 08:14:05 -07:00
Marcin Grzejszczak
e9d55a3af0 Added awaitility to benchmarks 2021-07-02 13:13:42 +02:00
wuwen
29dbf7ecd9 Spring MVC customize traced requests handler add postHandle method. 2021-07-02 00:39:44 +08:00
Oleg Zhurakousky
c896158804 GH-1975 Fix test after SCF change
Fix sleuth tests related to the change in SCF - c86890806e
2021-06-28 19:22:58 +02:00
Toshiaki Maki
4f6eb04527 Set spanId in TracingResponderRSocketProxy (#1986)
also respect traceIdHigh and debug flag in TracingMetadata
2021-06-28 10:38:46 +02:00
Marcin Grzejszczak
d353e66556 Removed an unused class 2021-06-24 17:49:57 +02:00
Andrew Flower
08b4c1368e Broaden caught exceptions (#1985)
Handle BeanCreationException instead of just BeanCurrentlyInCreationException.

This handles the case when a cyclic reference (causing a BeanCurrentlyInCreationException) occurs further down the line - when it is not the actuator of that references the in-creation HttpTracing bean, but a dependency of that actuator. In this case the exception that bubbles up here is an UnsatisfiedDependencyException, which is a BeanCreationException
2021-06-24 17:42:53 +02:00
Marcin Grzejszczak
340454b8bb Merge remote-tracking branch 'origin/3.1.x' into 3.1.x 2021-06-24 09:52:42 +02:00
Marcin Grzejszczak
4e93443842 Merge branch 'main' into 3.1.x 2021-06-24 09:49:06 +02:00
Marcin Grzejszczak
b876551a78 Fixing sc function (#1983)
- Removed an unnecessary child span; the parent span was never ended
- Added tests
2021-06-23 17:20:01 +02:00
buildmaster
e17ae7445a Bumping versions 2021-06-22 17:34:30 +00:00
buildmaster
900cb86545 Bumping versions 2021-06-18 17:28:30 +00:00
Chintan Radia
f7eb398917 Fix not able to override datasource-proxy log-level (#1976)
* Fix datasource-proxy log-level is not working

- Aligned default values of `Query` & `SlowQuery` in
  `TraceJdbcProperties.DataSourceProxyProperties`
  and `DataSourceProxyProperties`
- Add code to copy properties of `Query` and `SlowQuery` in
  `DataSourceProxyConfiguration`
- Add test case to check if `log-level` can be override or not.

Fixes gh-1973

* Disable query log listener by default

- By default `QueryLogListener` and `LoggingQueryLogListener`
  will be disabled, dev need to enable it by using properties
- By default `Slf4j` will be enlabled for query logging
  so by adding below property slow query logging will be enabled
  `spring.sleuth.jdbc.datasource-proxy.slow-query.enable-logging=true`
  this property will register `SLF4JSlowQueryListener`

* Add docs for how-to enable data-proxy query logs
2021-06-18 09:36:28 +02:00
Marcin Grzejszczak
7c4d8b1479 Adds support for Kotlin Coroutines (#1977)
* Added Kotlin Coroutine support
* Added docs, polished code and added one more case for reactor context
2021-06-18 07:30:49 +02:00
Oleg Zhurakousky
d1d70f0f01 Remove s-c-function version from instrumentation POM 2021-06-17 15:14:41 +02:00
Oleg Zhurakousky
a2c5190c33 Remove commented code 2021-06-17 14:35:55 +02:00
Oleg Zhurakousky
aa87398787 GH-1975 Add tracing support for Supplier function
This is an extension to SCF fix 293ccd7425
which allows Suppliers to generate initial tracing information

Resolves #1975
2021-06-17 14:32:31 +02:00
Marcin Grzejszczak
9392f186d1 Making simple span a real span 2021-06-17 10:15:31 +02:00
Marcin Grzejszczak
49b4cfe920 Added simple tracer 2021-06-17 09:58:31 +02:00
Marcin Grzejszczak
75b40bb884 Polished the docs 2021-06-16 12:52:42 +02:00
Marcin Grzejszczak
2493b176e5 Actuator endpoint with spans (#1964)
fixes #1879
2021-06-16 12:48:43 +02:00
Marcin Grzejszczak
87ff5ca92b Updating Build to 3.1.0-SNAPSHOT 2021-06-10 17:31:48 +02:00
Marcin Grzejszczak
5bc8a29fe1 Updating Build to 3.1.0 2021-06-10 17:31:23 +02:00
Marcin Grzejszczak
9b580e2672 Made tests less brittle 2021-06-10 17:17:39 +02:00
Marcin Grzejszczak
ca59f9429b Polish 2021-06-10 15:53:41 +02:00