Commit Graph

1771 Commits

Author SHA1 Message Date
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
Andy Wilkinson 6d15e6d4ef Adapt to breaking API changes in latest Micrometer snapshots
See gh-30800
2022-04-27 10:33:25 +01:00
Moritz Halbritter 85a4c94dea Merge branch '2.7.x' 2022-04-25 15:32:08 +02:00
Moritz Halbritter b406971094 Remove hyphen from asserting-party
spring.security.saml2.relyingparty.registration.*.asserting-party.* is
now named spring.security.saml2.relyingparty.registration.*.assertingparty.*

Closes gh-30785
2022-04-25 15:26:38 +02:00
Moritz Halbritter afdb651b04 Auto-configure TracingObservationHandler for HTTP server and clients
- Auto-configures HttpServerTracingObservationHandler and
  HttpClientTracingObservationHandler into Micrometer Tracing. Both
  handlers are ordered before the DefaultTracingObservationHandler,
  which is only used as a fallback.
- The HttpServerHandler and HttpClientHandler implementations are
  auto-configured in the Brave and OpenTelemetry auto-configurations.

Closes gh-30784
2022-04-25 14:33:09 +02:00
Phillip Webb c7374fd415 Update copyright year of changed files 2022-04-20 15:30:20 -07:00
Phillip Webb 7a6ca8ce25 Merge branch '2.7.x' 2022-04-20 15:30:01 -07:00
Phillip Webb dd5696b59b Update copyright year of changed files 2022-04-20 15:26:30 -07:00
Phillip Webb 36f1249fc6 Polish 2022-04-20 15:26:15 -07:00
Moritz Halbritter bb4bccde6c Remove deprecated 'identityprovider' property
Closes gh-30751
2022-04-20 09:11:56 +02:00
Moritz Halbritter 1950d06585 Merge branch '2.7.x' 2022-04-20 08:26:35 +02:00
Moritz Halbritter 6c400daa48 Rename 'identityprovider' property to 'asserting-party'
Rename spring.security.saml2.relyingparty.registration.*.identity-provider.*
to spring.security.saml2.relyingparty.registration.*.asserting-party.*

The old property names are still supported, but will lead to a warning
in the logs.

Closes gh-30642
2022-04-20 08:25:58 +02:00
Stephane Nicoll 2d663f2e94 Upgrade to Spring Data 2021.2.0-RC1
Closes gh-30610
2022-04-20 08:05:15 +02:00
Stephane Nicoll b41d4d4f2a Merge branch '2.7.x' 2022-04-19 09:45:42 +02:00
Stephane Nicoll 69045e4eaf Polish "Allow disabling the Dynatrace instruments"
See gh-30637
2022-04-19 09:43:05 +02:00
Georg Pirklbauer 7a05faf079 Allow disabling the Dynatrace instruments
Since Micrometer version 1.9.0, the Dynatrace registry uses specialized
instruments by default, which ensures data is exported in an optimal
format. By using this new flag, users can switch back to the previous
behavior, which uses the original instruments from Micrometer.

See gh-30637
2022-04-19 09:38:37 +02:00
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