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
Phillip Webb
25b0a4a67b
Merge branch '2.5.x' into 2.6.x
...
Fixes gh-35438
2023-05-15 22:12:57 -07:00
Andy Wilkinson
086b1e5f58
Stop WebFilterChainPostProcessor from causing eager init
...
Fixes gh-35437
2023-05-15 22:12:32 -07:00
Phillip Webb
ef1401fcc9
Fix formatting
2023-05-12 14:20:40 -07:00
Phillip Webb
27c8da66f1
Merge branch '2.5.x' into 2.6.x
...
Closes gh-35412
2023-05-12 13:27:46 -07:00
Madhura Bhave
307f3c3399
Use endpoint mappings in CloudFoundry integration
...
Closes gh-35411
2023-05-12 13:23:13 -07:00
Phillip Webb
92e420a098
Merge branch '2.7.x' into 3.0.x
2023-05-12 13:14:12 -07:00
Stephane Nicoll
1b4f9a7e9c
Remove GraphQL's tracing observation auto-configuration
...
This commit removes the auto-configuration for
PropagationWebGraphQlInterceptor as it has been deprecated with no
replacement.
See gh-35303
2023-05-05 12:07:12 +02:00
Stephane Nicoll
be29ab389a
Merge branch '2.7.x' into 3.0.x
2023-05-05 11:57:51 +02:00
Stephane Nicoll
eeefb2a1de
Polish
2023-05-05 11:55:46 +02:00
Andy Wilkinson
d6e3db9c36
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35170
2023-04-26 11:59:19 +01:00
Andy Wilkinson
472afafd4b
Stop WebFilterChainPostProcessor from causing eager init
...
Fixes gh-35163
2023-04-25 22:08:58 +01:00
Andy Wilkinson
32444fed4b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35086
2023-04-20 08:04:18 +01:00
Madhura Bhave
3522714c13
Use endpoint mappings in CloudFoundry integration
...
Closes gh-35085
2023-04-20 07:50:44 +01:00
Phillip Webb
7fea4c84b4
Update copyright year of changed files
2023-04-12 22:16:07 -07:00
Phillip Webb
3ba3558cff
Merge branch '2.7.x' into 3.0.x
2023-04-10 21:14:34 -07:00
Phillip Webb
3e9a136143
Polish gradle formatting
2023-04-10 21:14:09 -07:00
Phillip Webb
d442bfbeff
Polish
2023-04-10 16:22:11 -07:00
Stephane Nicoll
579364c2ec
Polish "Auto-configure observation for Spring-Batch"
...
See gh-34305
2023-04-05 16:12:49 +02:00
Mark Bonnekessel
5ad29db9c8
Auto-configure observation for Spring-Batch
...
See gh-34305
2023-04-05 15:53:19 +02:00
Moritz Halbritter
ecbc412c7c
Add property 'management.wavefront.trace-derived-custom-tag-keys'
...
Closes gh-34194
2023-03-01 13:35:17 +01:00
Moritz Halbritter
73ba797c02
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34417
2023-03-01 12:46:43 +01:00
Johnny Lim
956a579bc9
Polish "Add missing Micrometer PropertiesConfigAdapterTests"
...
See gh-34319
2023-03-01 12:45:55 +01:00
Tadaya Tsuyukubo
9854154c31
Specify @Order to the defaultTracingObservationHandler bean definition
...
See gh-34216
Signed-off-by: Tadaya Tsuyukubo <tadaya@ttddyy.net>
2023-02-24 12:25:59 +00:00
Phillip Webb
0b15962aca
Merge branch '2.7.x' into 3.0.x
2023-02-22 18:36:16 -08:00
Phillip Webb
c4de86c244
Merge branch '2.7.x' into 3.0.x
2023-02-21 23:17:57 -08:00
Phillip Webb
df5898a146
Reformat code following spring-javaformat upgrade
2023-02-21 22:53:27 -08:00