Moritz Halbritter
b86937bb8e
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37156
2023-08-31 11:51:15 +02: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
ee9574d399
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36567
2023-07-25 15:04:30 +01: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
2766c4b648
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36559
2023-07-25 13:07:48 +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
22fa904590
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36556
2023-07-25 12:54:34 +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
5d1b2348e8
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36553
2023-07-25 12:08:43 +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
54323d1a95
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36526
2023-07-24 14:35:14 +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
7195d87e6c
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36429
2023-07-17 15:48:30 +02: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
Stephane Nicoll
588129318c
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36423
2023-07-17 15:06:00 +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
Stephane Nicoll
d2912c6442
Update copyright year of changed files
...
See gh-36306
2023-07-17 09:40:57 +02:00
Christoph Dreis
8321887d6a
Fix typos
...
See gh-36306
2023-07-17 09:40:16 +02:00
Andy Wilkinson
c4157bb515
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36276
2023-07-07 12:07:07 +01: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
3f7fe25cb9
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36044
2023-06-23 15:58:36 +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
31f218c4e0
Merge branch '3.0.x' into 3.1.x
2023-06-22 00:27:51 -07:00
Phillip Webb
9db3c5a2f7
Polish
2023-06-22 00:24:39 -07:00
Moritz Halbritter
cbbbecce37
Merge branch '3.0.x' into 3.1.x
2023-06-19 21:04:09 +02:00
Moritz Halbritter
975e2d110c
Polish CompositePropagationFactory
...
Remove shaded Guava import
2023-06-19 21:03:05 +02:00
Phillip Webb
5d6a507142
Merge branch '3.0.x' into 3.1.x
2023-06-16 14:35:23 -07: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
baddf4c857
Merge branch '3.0.x' into 3.1.x
2023-06-16 13:54:01 -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
be471c58fe
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35907
2023-06-15 13:49:57 +02:00
Moritz Halbritter
8cd8d21720
Add support for multiple tracing propagation formats
...
See gh-35611
2023-06-15 13:37:33 +02:00
Andy Wilkinson
9b88128e3b
Merge branch '3.0.x' into 3.1.x
2023-06-14 18:19:53 +01: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
28a3cee5a2
Merge branch '3.0.x'
...
Closes gh-35766
2023-06-07 08:57:54 +02: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
Moritz Halbritter
d841490f5f
Enable ZipkinProperties in ZipkinAutoConfiguration
...
Closes gh-35592
2023-05-23 09:22:39 +02:00
Stephane Nicoll
9643dbeed2
Merge branch '3.0.x'
...
Closes gh-35590
2023-05-22 16:31:55 +02:00