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

1649 Commits

Author SHA1 Message Date
Stephane Nicoll 8c68b33240 Polish "Start building against Micrometer 1.10.0 snapshots" 
See gh-30693
 2022-04-15 15:59:24 +02:00
Marcin Grzejszczak 87991d93a5 Start building against Micrometer 1.10.0 snapshots 
See gh-30693
 2022-04-15 14:16:16 +02:00
Moritz Halbritter 3860eb211a Implement auto-configurations for Brave and OpenTelemetry 
- Configure Zipkin
- Configure Wavefront
- Configure Brave
- Configure OpenTelemetry
- Configure Micrometer Tracing bridges for OpenTelemetry and Brave
- Create the ObservationHandler for tracing with Micrometer

Closes gh-30156
 2022-04-14 09:14:44 +02:00
Andy Wilkinson 3d5086a42d Merge branch '2.7.x' 2022-04-13 19:24:47 +01:00
Andy Wilkinson ff40c8b6f5 Use MeterBinders to bind DataSource metrics 
Closes gh-30282
 2022-04-13 19:24:06 +01:00
Moritz Halbritter 2c42be9392 Merge branch '2.7.x' 2022-04-13 15:00:27 +02:00
Moritz Halbritter 6c04241ad6 Merge branch '2.6.x' into 2.7.x 
Closes gh-30652
 2022-04-13 15:00:14 +02:00
Moritz Halbritter 9e98ccd8ab Merge branch '2.5.x' into 2.6.x 
Closes gh-30651
 2022-04-13 14:59:59 +02:00
Moritz Halbritter dfc0f21932 Fix language in WavefrontProperties 
Closes gh-30649
 2022-04-13 14:59:48 +02:00
Andy Wilkinson fe46392144 Merge branch '2.7.x' 2022-04-13 10:04:02 +01:00
Andy Wilkinson 27a936e466 Fix Elastic health indicator without RestHighLevelClient 
Closes gh-28496
 2022-04-13 10:02:47 +01:00
Andy Wilkinson d5a92ccb8b Merge branch '2.7.x' 2022-04-12 21:20:34 +01:00
Andy Wilkinson a7a71da9ef Polish "Bring back Elasticsearch RestClient auto-configuration" 
See gh-28496
 2022-04-12 21:13:05 +01:00
Filip Hrisafov eb3bf40bdb Bring back Elasticsearch RestClient auto-configuration 
Prior to this commit, Spring Boot would only auto-configure the
`RestHighLevelClient` and `RestClientBuilder` if the
`RestHighLevelClient` was present. This was done in 1d73d4ed.

This commit brings back the exposing of the `RestClient` bean in when
exposing the `RestHighLevelClient` or when the `RestHighLevelClient`
is not present. It allows for using the auto-configuration and its
customizers of the `RestClientBuilder` in a similar way as it is done
for the `RestTemplateBuilder` and the `WebClient.Builder`.

The presence of the `elasticsearch-rest-high-level-client` module is
now optional. This opens the door for potentially adding support for
the new Elasticsearch Java Client[1] that is based on the same
`RestClient`.

The health contributor and its configuration has also been updated to
only depend on the low-level RestClient.

See gh-28496

[1] https://github.com/elastic/elasticsearch-java
 2022-04-12 21:13:05 +01:00
Brian Clozel 77b7f2f1ce Switch to Spring Framework SNAPSHOTs 
See gh-30624
 2022-04-12 17:02:03 +02:00
Andy Wilkinson 44211564a4 Adapt to latest changes in Micrometer 2.0 snapshots 
See gh-29666
 2022-04-12 15:25:43 +01:00
Andy Wilkinson 6580f6c742 Align with latest changes in Micrometer 1.9 snapshots 
See gh-30605
 2022-04-12 11:47:34 +01:00
Andy Wilkinson b871a1e457 Merge branch '2.7.x' 2022-04-12 08:51:47 +01:00
Andy Wilkinson 48f8021d88 Migrate @Local*Port annotations to spring-boot-test 
Closes gh-29589
 2022-04-12 08:48:43 +01:00
Andy Wilkinson 8d18e5fc0e Merge branch '2.7.x' 2022-04-11 15:23:10 +01:00
Andy Wilkinson b8b903527a Update tag keys to comply with Micrometer recommendations 
Closes gh-30536
 2022-04-11 15:21:35 +01:00
Andy Wilkinson 136189c86f Merge branch '2.7.x' 2022-04-08 14:05:07 +01:00
Andy Wilkinson f209d77cb2 Merge branch '2.6.x' into 2.7.x 
Closes gh-30617
 2022-04-08 14:04:43 +01:00
Andy Wilkinson d6731805b6 Merge branch '2.5.x' into 2.6.x 
Closes gh-30616
 2022-04-08 14:03:58 +01:00
Andy Wilkinson 70fa7e5e93 Make properties field final 
Closes gh-30615
 2022-04-08 14:03:29 +01:00
Stephane Nicoll 3e67ffd233 Merge branch '2.7.x' 2022-04-07 09:18:26 +02:00
Stephane Nicoll 245e602ae0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30573
 2022-04-07 09:18:17 +02:00
luozhenyu 09daad0a16 Add metadata for management.endpoint.health.probes.add-additional-paths 
See gh-30562
 2022-04-07 09:14:02 +02:00
Moritz Halbritter 5ab9112bbc Add auto-configuration for Micrometer 2.0.0 Observation API 
- Adds a ObservationRegistry bean
- Add support for ObservationRegistryCustomizers
- Enables timer creation for observations if micrometer-core is on
  the classpath
- Registers ObservationPredicate, GlobalTagsProvider and
  ObservationHandler on the MeterRegistry
- Applies grouping to the ObservationHandlers: MeterObservationHandler
  are added to a FirstMatchingCompositeObservationHandler
- If micrometer-tracing is on the classpath, the
  TracingObservationHandler are added to a
  FirstMatchingCompositeObservationHandler

Closes gh-29666
 2022-04-05 13:57:31 +02:00
Moritz Halbritter 9791318e55 Merge branch '2.7.x' 2022-04-04 13:49:05 +02:00
Jonatan Ivanov d0bc31a5e9 Add support for Prometheus Exemplars 
See gh-30472
 2022-04-04 13:35:38 +02:00
Moritz Halbritter be3523b1cd Move metric properties 
- Moved from 'management.metrics.export.<product>' to
  'management.<product>.metrics.export'
- The default enabled property moved from 'management.metrics.export.defaults.enabled'
  to 'management.defaults.metrics.export.enabled'

Closes gh-30381
 2022-03-28 08:24:03 +02:00
Moritz Halbritter 3af3b26f8e Merge branch '2.7.x' 2022-03-25 16:28:38 +01:00
Moritz Halbritter 018281f3d0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30441
 2022-03-25 16:28:24 +01:00
Moritz Halbritter cee51783fd Merge branch '2.5.x' into 2.6.x 
Closes gh-30440
 2022-03-25 16:28:07 +01:00
Moritz Halbritter 24e748d5cd Remove unnecessary entries in additional config metadata 
Add the 'enabled' fields directly to the classes instead.

Closes gh-30439
 2022-03-25 16:22:47 +01:00
Moritz Halbritter e431842668 Merge branch '2.7.x' 2022-03-25 14:56:49 +01:00
Moritz Halbritter 45f393b76b Merge branch '2.6.x' into 2.7.x 
Closes gh-30437
 2022-03-25 14:56:01 +01:00
Moritz Halbritter c003d5b533 Merge branch '2.5.x' into 2.6.x 
Closes gh-30436
 2022-03-25 14:55:31 +01:00
Moritz Halbritter 0ff8119a1b Sort entries in additional-spring-configuration metadata alphabetically 
Closes gh-30434
 2022-03-25 14:54:39 +01:00
Stephane Nicoll 2088381d4b Merge branch '2.7.x' 2022-03-21 10:06:56 +01:00
Jens Wilke 774f61fcb5 Add support for cache2k in memory caching 
See gh-28498
 2022-03-21 08:22:19 +01:00
Scott Frederick cabfb98a89 Merge branch '2.7.x' 2022-03-18 16:52:47 -05:00
Scott Frederick a14f3ed200 Use a ConfigurationProperties class for JMX properties 
Closes gh-30327
 2022-03-18 16:32:13 -05:00
Andy Wilkinson 997f7cbfce Merge branch '2.7.x' 2022-03-08 14:09:59 +00:00
Andy Wilkinson dfd4097436 Merge branch '2.6.x' into 2.7.x 
Closes gh-30101
 2022-03-08 14:09:47 +00:00
Andy Wilkinson 5b2cc74f71 Merge branch '2.5.x' into 2.6.x 
Closes gh-30100
 2022-03-08 14:09:35 +00:00
Andy Wilkinson 708e57eafb Register metrics for wrapped R2DBC ConnectionPools 
Closes gh-30090
 2022-03-08 13:55:34 +00:00
Moritz Halbritter 1793cee00f Start building against Micrometer 2.0.0-M3 
See gh-29753
 2022-03-04 11:03:22 +01:00
Andy Wilkinson bd0829a382 Merge branch '2.7.x' 2022-03-03 14:48:03 +00:00