Commit Graph

2082 Commits

Author SHA1 Message Date
Phillip Webb
a0b999c8b4 Merge branch '2.7.x' into 3.0.x
Closes gh-37965
2023-10-19 20:55:51 -07:00
Phillip Webb
abdad1cabe Constently use assertThatExceptionOf... assertions
Closes gh-37964
2023-10-19 20:17:26 -07:00
Andy Wilkinson
f780cc6d03 Merge branch '2.7.x' into 3.0.x
Closes gh-37837
2023-10-12 11:38:32 +01:00
Andy Wilkinson
11311dbf6d Register task executor metrics when using lazy init
Fixes gh-37832
2023-10-12 11:19:33 +01:00
Andy Wilkinson
781ac2ece2 Merge branch '2.7.x' into 3.0.x
Closes gh-37828
2023-10-11 15:02:36 +01:00
Andy Wilkinson
7907358875 Start building against Micrometer Tracing 1.0.11 snapshots
See gh-37679
2023-10-04 09:52:49 +01:00
Andy Wilkinson
931584f8af Merge branch '2.7.x' into 3.0.x
Closes gh-37659
2023-10-03 10:28:51 +01:00
Johnny Lim
c9932bb73a Use AssertJ's fail, not JUnit's
This commit also updates Checkstyle to prevent use of JUnit's
assertions from being reintroduced.

See gh-37655
2023-10-03 10:11:12 +01:00
Phillip Webb
78c3512e32 Polish 2023-09-20 17:11:54 -07:00
Stephane Nicoll
7df79432eb Polish "Upgrade to Micrometer Tracing 1.0.10"
See gh-37345
2023-09-12 15:10:19 +02:00
Moritz Halbritter
bbc10856ee Merge branch '2.7.x' into 3.0.x
Closes gh-37252
2023-09-08 11:17:25 +02:00
Johnny Lim
5f9bc721d3 Add default value metadata for management.metrics.export.signalfx.published-histogram-type
See gh-37210
2023-09-08 11:04:26 +02:00
Scott Frederick
1e85bf7ca8 Fix mapping of consumed types to propagators
Fixes gh-37161
2023-09-01 14:40:01 -05:00
Moritz Halbritter
61739bd917 Prevent propagation for local fields when using W3C propagation
Closes gh-37109
2023-08-31 11:50:05 +02:00
Andy Wilkinson
e106828fc8 Merge branch '2.7.x' into 3.0.x
Closes gh-36566
2023-07-25 14:59:44 +01:00
Andy Wilkinson
5c6a9122cb Polish "Test Micrometer config to property exposure"
See gh-33743
2023-07-25 14:43:14 +01:00
Mirko Sobeck
19e70055a5 Test Micrometer config to property exposure
See gh-33743
2023-07-25 14:37:25 +01:00
Andy Wilkinson
d290d05f63 Add missing Stackdriver metric-type-prefix property
Closes gh-36499
2023-07-25 13:01:59 +01:00
Andy Wilkinson
45624c0a78 Merge branch '2.7.x' into 3.0.x
Closes gh-36555
2023-07-25 12:53:11 +01:00
Andy Wilkinson
aae8665db1 Add missing management.metrics.export.wavefront properties
Closes gh-36498
2023-07-25 12:35:58 +01:00
Andy Wilkinson
826bad5820 Merge branch '2.7.x' into 3.0.x
Closes gh-36552
2023-07-25 12:08:19 +01:00
Andy Wilkinson
a6c19dae07 Add missing management.metrics.export.signalfx properties
Closes gh-36497
2023-07-25 11:35:57 +01:00
Andy Wilkinson
2db45e9ba3 Merge branch '2.7.x' into 3.0.x
Closes gh-36525
2023-07-24 14:34:50 +01:00
Andy Wilkinson
a5d5908c27 Add missing management.metrics.export.atlas properties
Closes gh-36496
2023-07-24 14:34:11 +01:00
Stephane Nicoll
750096b9c2 Polish "Allow custom ExemplarSampler to be used"
See gh-35619
2023-07-17 15:46:48 +02:00
Johnny Goncalves
94b17ecd26 Allow custom ExemplarSampler to be used
See gh-35619
2023-07-17 15:44:05 +02:00
Jonatan Ivanov
58cfdbfa2d Add missing OTel Span attributes
OTel semantic conventions mandate certain resource attributes to present
on exported spans. This commits make sure that the attribute we add are
merged with the defaults, rather than replacing them.

See gh-36155
2023-07-17 15:00:51 +02:00
Andy Wilkinson
cc80bb78fe Merge branch '2.7.x' into 3.0.x
Closes gh-36275
2023-07-07 12:06:51 +01:00
Andy Wilkinson
52f732920b Support multiple health groups with an additional path with Jersey
This commit knowingly makes breaking API changes to
JerseyHealthEndpointAdditionalPathResourceFactory. We considered
other options but they all had the potential to be backwards
incompatible in one way or another. Faced with that situation we
concluded that the likelihood of anyone using the modified API
directly is small enough to warrant making the breaking changes.
If it becomes apparent that we have misjudged things we can revisit
the changes in the future.

Closes gh-36250
2023-07-07 11:21:56 +01:00
Andy Wilkinson
2fae5de245 Merge branch '2.7.x' into 3.0.x
Closes gh-36043
2023-06-23 15:50:02 +01:00
Andy Wilkinson
d2966e1cbf Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
See gh-35915
2023-06-23 12:38:12 +01:00
ThomazPassarelli
f9da30faf1 Replace calls to verifyComplete() to avoid indefinite blocking
See gh-35915
2023-06-23 12:16:26 +01:00
Phillip Webb
9db3c5a2f7 Polish 2023-06-22 00:24:39 -07:00
Moritz Halbritter
975e2d110c Polish CompositePropagationFactory
Remove shaded Guava import
2023-06-19 21:03:05 +02:00
Phillip Webb
48e13af8c4 Merge branch '2.7.x' into 3.0.x 2023-06-16 14:34:54 -07:00
Phillip Webb
b8d2c279ee Update copyright year of changed files 2023-06-16 14:32:43 -07:00
Phillip Webb
9b72cc41ab Polish 'Add support for multiple tracing propagation formats'
See gh-35611
2023-06-16 13:43:46 -07:00
Moritz Halbritter
8cd8d21720 Add support for multiple tracing propagation formats
See gh-35611
2023-06-15 13:37:33 +02:00
Andy Wilkinson
4694e20628 Merge branch '2.7.x' into 3.0.x 2023-06-14 18:19:43 +01:00
Andy Wilkinson
7d07c0d09c Polish configuration related to predictive test selection
Most notably, this commit splits the tests that use Spring REST Docs
out into a separate task for which predictive test selection is
disabled. This allows it to be cached and use Gradle's built-in
up-to-date checking, thereby avoiding the generation of new snippets
and the need to then run the asciidoctor and asciidoctorPdf tasks.

It also updates spring-boot-smoke-test-junit-vintage to disable
predictive test selection so that we can continue to assert that
the some tests were executed.

See gh-35869
2023-06-14 18:15:04 +01:00
Moritz Halbritter
85720a5d90 Merge branch '2.7.x' into 3.0.x
Closes gh-35765
2023-06-07 08:57:38 +02:00
Bernardo Bulgarelli
51afaa79a7 Add @AliasFor annotation to EndpointCloudFoundryExtension
See gh-35716
2023-06-07 08:45:57 +02:00
Christoph Dreis
b2b5728995 Remove unnecessary exclude from spring-restdocs-mockmvc
See gh-35568
2023-05-22 16:31:22 +02:00
Johnny Lim
1b5fc89b43 Polish
See gh-35576
2023-05-22 16:17:05 +02:00
Phillip Webb
4072588c29 Polish "Fix invalid Zipkin Reporter back-off behavior"
See gh-35455
2023-05-17 16:38:03 -07:00
ryosuke-hasebe
903e19854d Fix invalid Zipkin Reporter back-off behavior
Update `ReporterConfiguration` so that `spanReporter` back off
if a `Reporter` bean is defined. Prior to this commit, only
`AsyncReporter` beans would be considered.

See gh-35455
2023-05-17 16:36:19 -07:00
Phillip Webb
4e305cc209 Merge branch '2.7.x' into 3.0.x 2023-05-15 22:20:32 -07:00
Phillip Webb
a75cd014fc Merge branch '2.6.x' into 2.7.x 2023-05-15 22:20:23 -07:00
Phillip Webb
95d1cb9884 Merge branch '2.5.x' into 2.6.x 2023-05-15 22:20:11 -07:00
Phillip Webb
8316a96515 Polish 2023-05-15 22:19:06 -07:00