Commit Graph

38232 Commits

Author SHA1 Message Date
Andy Wilkinson 9ff411e6af Upgrade to Mockito 4.6.1
Closes gh-31332
2022-06-10 13:44:21 +01:00
Andy Wilkinson d4be484d27 Upgrade to AssertJ 3.23.1
Closes gh-31331
2022-06-10 13:44:21 +01:00
Andy Wilkinson 228be786ca Polish 2022-06-10 13:44:21 +01:00
Moritz Halbritter 3799170c4d Disable metrics and tracing in web endpoints integration tests
See gh-31308
2022-06-10 14:25:12 +02:00
Moritz Halbritter 486b3073ce Add tracing in integration tests paragraph to the documentation
See gh-31308
2022-06-10 14:25:12 +02:00
Moritz Halbritter 8fab9f290c Back off tracing auto-configurations if tracing is disabled
See gh-31308
2022-06-10 14:25:12 +02:00
Moritz Halbritter b019ff6102 Wavefront sender configuration is no longer an auto-configuration
It's now a regular configuration class which is imported from
the Wavefront metrics and tracing auto-configurations
2022-06-10 14:25:12 +02:00
Moritz Halbritter 943e9033c0 Add @ConditionalOnEnabledTracing condition
See gh-31308
2022-06-10 14:25:12 +02:00
Moritz Halbritter b250d8a1e4 Add @AutoConfigureObservability annotation
This annotation is read by ObservabilityContextCustomizerFactory, which
then sets test properties depending on the annotation attributes.

@AutoConfigureMetrics is deprecated, to support backwards compatability
it's now meta-annotated with @AutoConfigureObservability

See gh-31308
2022-06-10 14:25:12 +02:00
Andy Wilkinson 36f01eb40b Fix compilation error with Tomcat 10
There's no setter for the max header size in Tomcat 10 as it's now
inherited from the underlying HTTP 1.1 protocol. The test that
was merged forwards from 2.7.x is retained to verify that this is
the case.

See gh-31330
2022-06-10 12:40:40 +01:00
Andy Wilkinson b6ebf4a7db Merge branch '2.7.x'
Closes gh-31330
2022-06-10 11:36:11 +01:00
Andy Wilkinson 7f584a95a6 Merge branch '2.6.x' into 2.7.x
Closes gh-31329
2022-06-10 11:35:54 +01:00
Andy Wilkinson e02803d341 Configure max HTTP header size when using HTTP2 with Tomcat
Closes gh-31322
2022-06-10 11:32:57 +01:00
Moritz Halbritter 41e9867bc4 Register all ObservationHandler, regardless which context they use
Closes #31272
2022-06-10 10:12:35 +02:00
Andy Wilkinson 193aa4fc34 Merge branch '2.7.x' 2022-06-09 20:56:10 +01:00
Andy Wilkinson 29cd148e05 Start building against Spring Framework 5.3.1 snapshots
See gh-31319
2022-06-09 20:55:14 +01:00
Andy Wilkinson 85887b5411 Merge branch '2.6.x' into 2.7.x 2022-06-09 20:54:08 +01:00
Andy Wilkinson ed897fc922 Start building against Spring Framework 5.3.21 snapshots
See gh-31318
2022-06-09 19:37:50 +01:00
Moritz Halbritter d1647cf68c Don't back off on user-supplied SpanHandlers
Instead the auto-configuration now backs off only on ZipkinSpanHandler.

Closes gh-31273
2022-06-09 15:17:14 +02:00
Andy Wilkinson 91bb5aa222 Move auto-config of ReactiveElasticClient to elasticsearch pkg
Closes gh-28068
2022-06-09 11:42:09 +01:00
Stephane Nicoll db847e2a82 Merge branch '2.7.x' 2022-06-09 08:06:05 +02:00
Stephane Nicoll 79759f7270 Merge branch '2.6.x' into 2.7.x 2022-06-09 08:05:58 +02:00
Stephane Nicoll 7a15c495a3 Upgrade CI to Docker 20.10.17
Closes gh-31295
2022-06-09 08:05:27 +02:00
Stephane Nicoll c4bbbcd3e1 Upgrade Java 18 version in CI image
Closes gh-31299
2022-06-09 08:04:49 +02:00
Stephane Nicoll 1bf43fc238 Upgrade Java 17 version in CI image
Closes gh-31298
2022-06-09 08:04:23 +02:00
Stephane Nicoll a4599e22dd Upgrade Ubuntu version in CI images
Closes gh-31296
2022-06-09 08:03:53 +02:00
Stephane Nicoll 152766c07a Upgrade CI to Docker 20.10.17
Closes gh-31289
2022-06-09 08:02:07 +02:00
Stephane Nicoll d39f4efb05 Upgrade Java 18 version in CI image
Closes gh-31292
2022-06-09 08:01:32 +02:00
Stephane Nicoll a932555539 Upgrade Java 17 version in CI image
Closes gh-31284
2022-06-09 08:00:55 +02:00
Stephane Nicoll 1c85e1083a Upgrade Java 11 version in CI image
Closes gh-31285
2022-06-09 08:00:26 +02:00
Stephane Nicoll 87840c755b Upgrade Java 8 version in CI image
Closes gh-31286
2022-06-09 07:59:58 +02:00
Stephane Nicoll 1a8c1217ed Upgrade Ubuntu version in CI images
Closes gh-31288
2022-06-09 07:59:27 +02:00
Stephane Nicoll b028263663 Upgrade CI to Docker 20.10.17
Closes gh-31297
2022-06-09 07:58:28 +02:00
Stephane Nicoll f96f21c8a2 Upgrade Java 18 version in CI image
Closes gh-31294
2022-06-09 07:58:28 +02:00
Stephane Nicoll c07623e040 Upgrade Java 17 version in CI image
Closes gh-31290
2022-06-09 07:58:28 +02:00
Stephane Nicoll 4822c9b809 Upgrade Java 11 version in CI image
Closes gh-31293
2022-06-09 07:58:27 +02:00
Stephane Nicoll 976f1ac355 Upgrade Java 8 version in CI image
Closes gh-31291
2022-06-09 07:58:27 +02:00
Stephane Nicoll ea85dccd61 Upgrade Ubuntu version in CI images
Closes gh-31287
2022-06-09 07:58:27 +02:00
Phillip Webb c56783064d Support management contexts with AOT
Refactor child management configuration and add AOT generation support.
A new `ChildManagementContextInitializer` class now performs the child
context initialization and also handles AOT processing concerns.

Closes gh-31163
2022-06-08 19:24:46 -07:00
Phillip Webb a729f71cba Polish LogbackRuntimeHintsRegistrar 2022-06-08 19:24:45 -07:00
Phillip Webb e8f9386594 Add Runnable variant of TestPropertyValues.applyToSystemProperties
Closes gh-31303
2022-06-08 19:24:45 -07:00
Phillip Webb 11184aae8d Allow ApplicationContextRunner to return non-refreshed context
Add `AbstractApplicationContextRunner.prepare` which can be used to
test an `ApplicationContext` that has been prepared but not refreshed.

Closes gh-31302
2022-06-08 19:02:12 -07:00
Andy Wilkinson 46c262d3cc Merge branch '2.7.x'
Closes gh-31283
2022-06-08 19:24:49 +01:00
Andy Wilkinson 12eb7a8795 Merge branch '2.6.x' into 2.7.x
Closes gh-31282
2022-06-08 19:24:07 +01:00
Andy Wilkinson a651061e2c Remove SpringApplicationHierarchyTests
Closes gh-31281
2022-06-08 19:23:26 +01:00
Andy Wilkinson 62f40f2c38 Apply initializers and bean registrations before registering classes
Previously, classes were registered first which meant that their
conditions were evaluated before any initializers and bean
registrations were applied. This prevented the bean registrations and
initializers from affecting the outcome of the condition evaluation.

This commit inverts the ordering so that classes are not registerd,
and therefore their conditions are not evaluated, until after the
bean registrations and initializers have been applied.

Closes gh-31280
2022-06-08 18:45:54 +01:00
Stephane Nicoll e30391ca7a Use Application as target for generated code
Closes gh-31274
2022-06-08 14:51:17 +02:00
Andy Wilkinson ab93bc26c7 Merge branch '2.7.x'
Closes gh-31271
2022-06-08 12:18:36 +01:00
Andy Wilkinson a0fee42740 Merge branch '2.6.x' into 2.7.x
Closes gh-31270
2022-06-08 12:09:14 +01:00
Andy Wilkinson 4c23d2c45b Merge pull request #31267 from vpavic
* gh-31267:
  Polish "Update smoke tests to avoid conflicts with NAME environment variable"
  Update smoke tests to avoid conflicts with NAME environment variable

Closes gh-31267
2022-06-08 12:08:57 +01:00