Commit Graph

3107 Commits

Author SHA1 Message Date
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
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
Marcin Grzejszczak
17ba1b18d5 Adds Cassandra support (#1974)
Co-authored-by: Mark Paluch <mpaluch@vmware.com>
2021-06-10 15:46:04 +02:00
Marcin Grzejszczak
209ce7d8ec Merge remote-tracking branch 'origin/main' into 3.1.x 2021-06-10 10:13:49 +02:00
Marcin Grzejszczak
3e88132665 Making tests less brittle 2021-06-09 17:51:03 +02:00
Marcin Grzejszczak
4fcc7cc32e Adds Spring Session support (#1961)
* Adds Spring Session support

* Changes following the review
2021-06-09 16:11:23 +02:00
robotmrv
81322756a4 simplify ON_EACH reactor instrumentation (#1969)
* simplify ON_EACH reactor instrumentation

remove custom Publisher decorators that
were mostly copy of reactor-core Lift Publishers
and use new LIFTER Scannable Attribute instead

* change constant scope

* add note about test constant origin
2021-06-08 13:23:59 +02:00
Marcin Grzejszczak
821bc3abd4 Merge branch 'main' into 3.1.x 2021-06-07 14:31:57 +02:00
Marcin Grzejszczak
988c85fc5b Polish 2021-06-07 14:25:18 +02:00
Marcin Grzejszczak
6bca07075f Fixed brave redis setup
fixes gh-1971
2021-06-07 14:14:19 +02:00
buildmaster
2d627f4d06 Bumping versions 2021-05-28 17:29:12 +00:00
Marcin Grzejszczak
6a094db84e Changed the logging defaults 2021-05-28 14:10:43 +02:00
buildmaster
60ede50f2a Bumping versions to 3.0.4-SNAPSHOT after release 2021-05-27 21:49:30 +00:00
buildmaster
58eb56d796 Going back to snapshots 2021-05-27 21:49:30 +00:00
buildmaster
c8da912f85 Update SNAPSHOT to 3.0.3 2021-05-27 21:44:52 +00:00
buildmaster
fba72d5923 Bumping versions 2021-05-27 17:29:07 +00:00
Marcin Grzejszczak
b255974c00 Fixed autoconfiguration ordering 2021-05-27 15:38:23 +02:00
Marcin Grzejszczak
e12f70d4f6 Made tests less brittle 2021-05-27 14:41:11 +02:00
Marcin Grzejszczak
d15ee050a6 Updated config props 2021-05-27 14:08:12 +02:00
Marcin Grzejszczak
685fb727b5 Polish 2021-05-27 14:05:39 +02:00
Marcin Grzejszczak
8991b4d3cd Moved tests to common 2021-05-27 13:41:44 +02:00
buildmaster
e478f2eb11 Bumping versions to 3.0.4-SNAPSHOT after release 2021-05-27 09:05:42 +00:00