root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity
39,134 Commits 24 Branches 372 Tags 283 MiB
Commit Graph

1814 Commits

Author SHA1 Message Date
Andy Wilkinson 08d37b7fb6 Merge branch '2.7.x' 
Closes gh-31694
 2022-07-12 14:29:49 +01:00
Andy Wilkinson 1c2b0ae705 Merge branch '2.6.x' into 2.7.x 
Closes gh-31693
 2022-07-12 14:28:10 +01:00
Andy Wilkinson 7c55639167 Depend on log4j-api directly rather than via Elastic's transitives 
Closes gh-31692
 2022-07-12 14:27:56 +01:00
Andy Wilkinson 99fabfa934 Revert "Remove spring-aspects dependency following fix in Data JPA" 
This reverts commit cd6c7cd6c9.

The fix in Spring Data JPA is incomplete so we need to reinstate the
workaround.
 2022-07-12 10:46:06 +01:00
Andy Wilkinson cd6c7cd6c9 Remove spring-aspects dependency following fix in Data JPA 
The recent changes in Spring Data JPA [1] mean that we no longer need
a dependency on spring-aspects for Data JPA's hint registration to
succeed.

5821272112
 2022-07-12 10:08:32 +01:00
Andy Wilkinson 9b113272d1 Reinstate support for Hibernate Metrics 
Closes gh-31675
 2022-07-12 09:36:54 +01:00
Oliver Drotbohm b10c57551c Upgrade to Hibernate 6.1.1.Final 
This commit makes the following potentially breaking changes:

- Dependency management for modules that do not exist in Hibernate
  6.1 has been removed.
- Hibernate's modules are now in the org.hibernate.orm group. Users
  not using the starter or using modules that are not in the starter
  will have to update their build configuration accordingly.
- spring.jpa.hibernate.use-new-id-generator-mappings has been removed
  as Hibernate no longer supports switching back to the old ID
  generator mappings.

Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>

Closes gh-31674
 2022-07-12 09:36:34 +01:00
Andy Wilkinson acd8d05315 Update copyright date of changed file 2022-07-08 18:13:45 +01:00
Andy Wilkinson efc5391496 Adapt to deprecations in Framework's scheduling APIs 
See gh-31241
 2022-07-08 17:53:55 +01:00
Moritz Halbritter 8639552405 Start building against Micrometer Tracing 1.0.0-M6 snapshots 
See gh-31657
 2022-07-08 14:01:13 +02:00
Andy Wilkinson 2821629d54 Remove unchecked raw casts that are now redundant 
Closes gh-31326
 2022-07-08 12:52:59 +01:00
Andy Wilkinson 7f00378eaf Polish "Start building against Spring Data 2022.0.0-M5 snapshots" 
See gh-31582
 2022-07-07 16:32:13 +01:00
Andy Wilkinson 19b7e012f3 Upgrade to Prometheus Client 0.16.0 
Closes gh-31597
 2022-07-07 14:34:17 +01:00
Andy Wilkinson e9136e023b Adapt to trailing slashes no longer being matched by default 
See gh-31563
 2022-07-07 14:16:20 +01:00
Moritz Halbritter 04391275c1 Make MeterRegistry lazy in TimerObservationHandlerObservationRegistryCustomizer 
Closes gh-31580
 2022-07-06 14:18:53 +02:00
dreis2211 458f989cf3 Use switch expressions where appropriate 
See gh-31527
 2022-06-24 16:19:28 +01:00
Andy Wilkinson 631b1e0d76 Merge branch '2.7.x' 
Closes gh-31526
 2022-06-24 13:10:10 +01:00
Andy Wilkinson 1e08f545d0 Merge branch '2.6.x' into 2.7.x 
Closes gh-31525
 2022-06-24 13:05:06 +01:00
Andy Wilkinson f49b16c645 Upgrade to Spring Java Format 0.0.34 
Closes gh-31524
 2022-06-24 12:57:52 +01:00
Stephane Nicoll fe39598e81 Adapt to latest API change in Spring Framework 
See https://github.com/spring-projects/spring-framework/issues/28585
 2022-06-23 16:30:34 +02:00
Phillip Webb b85469a5a5 Merge branch '2.7.x' 
Closes gh-31502
 2022-06-22 16:33:42 -07:00
Phillip Webb d64f601dfd Merge branch '2.6.x' into 2.7.x 
Closes gh-31501
 2022-06-22 16:31:52 -07:00
Phillip Webb aed4c47adb Polish CompositeHandlerExceptionResolver 
See gh-31495
 2022-06-22 16:23:38 -07:00
Guirong Hu 3592292e4b Use ExceptionHandler when Spring MVC uses a different management port 
Update `CompositeHandlerExceptionResolver` to search for beans in
all contexts. Note that `BeanFactoryUtils.beansOfTypeIncludingAncestors`
cannot not be used since we need to pick up all beans, even if they
have the same name.

See gh-31495
 2022-06-22 16:13:26 -07:00
Moritz Halbritter bb6c56e5f0 Polish "Add WebClient based sender for Zipkin" 
See gh-30792
 2022-06-22 10:25:18 +02:00
StefanBratanov 12037bd131 Add WebClient based sender for Zipkin 
See gh-30792
 2022-06-22 09:58:05 +02:00
Moritz Halbritter bc931cb32c Revert "Polish EndpointRequest" 
This reverts commit 35997a30a3.
 2022-06-21 15:43:57 +02:00
Moritz Halbritter 35997a30a3 Polish EndpointRequest 
- Remove redundant cast
 2022-06-21 14:30:05 +02:00
Moritz Halbritter c8c552d95b Polish ObservationAutoConfiguration 
- Use a better name for the "only metrics, no tracing" case
 2022-06-21 11:32:27 +02:00
Moritz Halbritter 06cdc91c85 Polish ObservationAutoConfiguration 
- Use a better name for the "only metrics, no tracing" case
- Use more concrete return types
 2022-06-21 11:31:11 +02:00
dreis2211 5db04da275 Use pattern matching for instanceof where appropriate 
See gh-31475
 2022-06-20 17:55:36 +01:00
Johnny Lim 43c2f1c03c Polish AutoConfigureObservability changes 
See gh-31457
 2022-06-20 07:38:22 +02:00
Johnny Lim aab59c5f2e Static-import Mockito.mock() 
See gh-31443
 2022-06-19 10:31:28 +02:00
Phillip Webb 657fa3e64e Merge branch '2.7.x' 
Closes gh-31409
 2022-06-16 15:36:29 -07:00
Phillip Webb 7c91ebb1b0 Merge branch '2.6.x' into 2.7.x 
Closes gh-31408
 2022-06-16 15:36:00 -07:00
Phillip Webb ae6311ddda Prevent Logback from accidentally being used in Log4J2LoggingSystemTests 
Update `Log4J2LoggingSystemTests` to exclude Logback and include
'log4j-slf4j-impl'. The `ModifiedClassPathClassLoader` has also been
updated so that it no longer automatically excludes `log4j` artifacts,
instead we now use `@ClassPathExclusions` on the relevant tests.

Fixes gh-19365
 2022-06-16 15:35:32 -07:00
Phillip Webb 85dcbf6100 Merge branch '2.7.x' 
Closes gh-31385
 2022-06-14 09:38:36 -07:00
Phillip Webb e0947459b6 Merge branch '2.6.x' into 2.7.x 
Closes gh-31384
 2022-06-14 09:38:05 -07:00
Phillip Webb 9f8a262e6b Log a warning when a health indicator takes too long to run 
Update `HealthEndpointSupport` so that it logs a warning if a health
indicator takes too long to respond.

Fixes gh-31231
 2022-06-14 09:32:07 -07:00
Stephane Nicoll b536b209ab Refine assertions on exception messages 2022-06-14 18:20:27 +02:00
Moritz Halbritter 42e8f65b80 Move @ConditionalOnClass from methods to inner classes 
Closes gh-31353
 2022-06-13 13:41:58 +02:00
Stephane Nicoll 063e56dbff Polish 2022-06-13 09:44:02 +02:00
Andy Wilkinson d4be484d27 Upgrade to AssertJ 3.23.1 
Closes gh-31331
 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 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 41e9867bc4 Register all ObservationHandler, regardless which context they use 
Closes #31272
 2022-06-10 10:12:35 +02: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
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
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
izeye f720b65dfc Auto-configure JvmCompilationMetrics 
See gh-31151
 2022-05-27 10:18:13 +01:00
Andy Wilkinson 4bb5ba2bd0 Merge branch '2.7.x' 2022-05-26 18:26:52 +01:00
Andy Wilkinson 935d1264e0 Merge branch '2.6.x' into 2.7.x 2022-05-26 18:13:08 +01:00
Andy Wilkinson 3d203d0215 Polish 2022-05-26 17:30:39 +01:00
Andy Wilkinson 5dfa5adb75 Merge branch '2.7.x' 
Closes gh-31178
 2022-05-26 15:54:58 +01:00
Andy Wilkinson 455ee0ce22 Merge branch '2.6.x' into 2.7.x 
Closes gh-31177
 2022-05-26 15:53:38 +01:00
Andy Wilkinson ee45fd2fc8 Remove redundant throws declarations from internal APIs 
Closes gh-31176
 2022-05-26 15:47:35 +01:00
Andy Wilkinson b3a4982f31 Merge branch '2.6.x' into 2.7.x 
Closes gh-31174
 2022-05-26 14:01:23 +01:00
Andy Wilkinson cbf42dea14 Update deprecation messages to change removal version from 2.8 to 3.0 
Closes gh-30903
 2022-05-26 13:59:03 +01:00
Eddú Meléndez 154c84ffe2 Add package-info for o.s.b.a.a.metrics.graphql 
See gh-31140
 2022-05-25 13:30:29 +01:00
Andy Wilkinson f9db6ad237 Merge branch '2.7.x' 
Closes gh-31152
 2022-05-23 12:51:13 +01:00
Andy Wilkinson 24dc525127 Fix conditions on auto-configured WebMvcMetricsFilter 
Closes gh-31150
 2022-05-23 12:50:49 +01:00
Andy Wilkinson 96c2d08fc4 Remove support for Solr as it is not compatible with Jetty 11 
Closes gh-31054
 2022-05-18 11:33:55 +01:00
Phillip Webb f8a41d34aa Merge branch '2.7.x' 2022-05-17 22:22:08 -07:00
Stephane Nicoll cbf415b850 Merge branch '2.7.x' 2022-05-16 16:37:31 +02:00
Stephane Nicoll 285378e4f9 Merge branch '2.6.x' into 2.7.x 
Closes gh-31059
 2022-05-16 16:37:21 +02:00
Stephane Nicoll 18129a5938 Merge branch '2.5.x' into 2.6.x 
Closes gh-31058
 2022-05-16 16:37:07 +02:00
Stephane Nicoll 22d187a38c Polish "Add missing configuration properties for Statsd" 
See gh-30898
 2022-05-16 16:33:22 +02:00
izeye d90ef6afb3 Add missing configuration properties for Statsd 
See gh-30898
 2022-05-16 16:28:50 +02:00
izeye 3c7465cb35 Polish OtlpPropertiesConfigAdapterTests 
See gh-31057
 2022-05-16 16:09:34 +02:00
Andy Wilkinson ed705cc78e Polish 2022-05-12 12:59:12 +01:00
Andy Wilkinson a496cb9298 Merge branch '2.7.x' 2022-05-12 12:52:46 +01:00
Andy Wilkinson 2669f8c343 Merge branch '2.6.x' into 2.7.x 
Closes gh-30997
 2022-05-12 12:47:52 +01:00
Andy Wilkinson 655ceefead Merge branch '2.5.x' into 2.6.x 
Closes gh-30996
 2022-05-12 12:47:38 +01:00
Andy Wilkinson 3f6fcac683 Polish "Extend documentation on Datadog metrics" 
See gh-30879
 2022-05-12 12:36:50 +01:00
Denis Washington 09db7e4001 Extend documentation on Datadog metrics 
- Document that an application key must be set to publish metadata
  for the exported metrics.

- Point out that using a non-US Datadog site (e.g., EU) requires
  changing the `uri` property.

See gh-30879
 2022-05-12 12:36:18 +01:00
Andy Wilkinson 48c948973d Polish 2022-05-12 12:12:22 +01:00
Andy Wilkinson d0e55643b1 Polish 
Closes gh-30993
 2022-05-12 12:11:51 +01:00
Andy Wilkinson c2a3652709 Merge branch '2.7.x' 2022-05-12 11:53:46 +01:00
Andy Wilkinson 7e88daf288 Update messages for APIs deprecated in 2.7 
In all likelihood there will not be a 2.9 release so this commit
updates the message for deprecations made in 2.7 to indicate that
removal will not occur until 3.0.

See gh-30903
 2022-05-12 11:12:09 +01:00
Andy Wilkinson 26405528c6 Polish "Add resourceAttributes property to OtlpProperties" 
See gh-30984
 2022-05-12 10:12:53 +01:00
Eddú Meléndez e3fce8439a Add resourceAttributes property to OtlpProperties 
See gh-30984
 2022-05-12 09:37:56 +01:00
Andy Wilkinson 541ab69aff Merge branch '2.7.x' 2022-05-03 15:18:20 +01:00
Andy Wilkinson 4cd850cfc0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30851
 2022-05-03 15:17:13 +01:00
Andy Wilkinson fa327a783d Merge branch '2.5.x' into 2.6.x 
Closes gh-30850
 2022-05-03 15:14:00 +01:00
Andy Wilkinson 4fd2e0c916 Polish "Fix typos" 
See gh-30773
 2022-05-03 14:09:53 +01:00
Andy Wilkinson f6d24dc1a8 Fix typos 
See gh-30773
 2022-05-03 14:09:37 +01:00
Eddú Meléndez f7a7e8cb89 Add auto-configuration for OtlpMeterRegistry 
See gh-30825
 2022-05-03 13:18:07 +01:00
izeye 9f2114170e Apply key values rename consistently 
See gh-30837
 2022-05-03 12:29:52 +01:00
izeye 77c3b6c899 Polish Micrometer tracing changes 
See gh-30833
 2022-05-03 11:39:31 +01:00
Andy Wilkinson 2cebbe10ce Merge branch '2.7.x' 2022-05-03 11:29:38 +01:00
Andy Wilkinson 61cd05f74b Merge branch '2.6.x' into 2.7.x 
Closes gh-30842
 2022-05-03 11:29:03 +01:00
Andy Wilkinson f1b5f36af8 Merge branch '2.5.x' into 2.6.x 
Closes gh-30841
 2022-05-03 11:28:53 +01:00
Andy Wilkinson f8e5a534a6 Polish "Polish InfluxMetricsExportAutoConfiguration" 
See gh-30824
 2022-05-03 09:50:51 +01:00
Eddú Meléndez b0d5364efa Polish InfluxMetricsExportAutoConfiguration 
See gh-30824
 2022-05-03 09:50:06 +01:00
Eddú Meléndez 6a65aa4a23 Auto-configure Micrometer's JvmInfoMetrics 
See gh-30832
 2022-04-29 11:04:50 +01:00