60719bd982
Upgrade to Dropwizard Metrics 4.0.3
...
Closes gh-14428
2018-10-10 10:00:45 -07:00
2216b78f1e
Merge branch '2.0.x'
2018-10-08 15:53:09 +01:00
d3b3c8c64e
Honour management.metrics.web.server.auto-time-requests with WebFlux
...
Closes gh-13895
2018-10-08 15:52:50 +01:00
7da3396555
Merge branch '2.0.x'
2018-10-08 10:45:49 +02:00
55ec016bac
Remove unused fields in tests
...
Closes gh-14707
2018-10-08 10:40:04 +02:00
20ecf73cd1
Polish "Add Prometheus push gateway support"
...
Rework Prometheus push gateway support so that the central class can
be used outside of auto-configuration. The shutdown flags have also
been replaced with a single "shutdown-operation" property since it's
unlikely that both "push" and "delete" will be required.
It's also possible now to supply a `TaskScheduler` to the manager.
See gh-14353
2018-10-05 18:12:41 -07:00
4e71981f77
Add Prometheus push gateway support
...
Add support for Prometheus push gateway so that short lived processes
(for example batch jobs) can still submit metrics to Prometheus.
Closes gh-14353
2018-10-05 18:12:19 -07:00
35752a54d2
Adapt to latest change in Micrometer 1.1
2018-10-05 23:42:16 +02:00
01b8667dd7
Update copyright year for changed files
2018-10-05 13:40:07 -07:00
72e2313fe8
Polish "Auto-configure Micrometer's Jersey 2 server instrumentation"
...
Closes gh-12482
2018-10-05 16:40:57 +01:00
dd126faf5a
Auto-configure Micrometer's Jersey 2 server instrumentation
...
See gh-12482
Co-authored-by: Michael J. Simons <michael@simons.ac>
2018-10-05 16:07:10 +01:00
bdd8e53124
Improve filtering of actuator auto-configurations
...
This commit splits auto-configurations that require different
environments so that they can be filtered early.
Closes gh-12260
2018-10-05 14:57:17 +02:00
91b4dc2f69
Polish "Add reactive health indicator for Couchbase"
...
Closes gh-13926
2018-10-05 13:57:31 +02:00
20ff0d97e4
Add reactive health indicator for Couchbase
...
See gh-13926
2018-10-05 13:57:17 +02:00
c9da881322
Polish "Drop support for "all" from management.metrics.distribution.sla"
...
Closes gh-14684
2018-10-05 09:25:10 +01:00
ccb964e886
Drop support for "all" from management.metrics.distribution.sla
...
See gh-14684
2018-10-05 09:22:43 +01:00
ef7c2bc6ea
Merge branch '2.0.x'
2018-10-05 08:37:45 +01:00
e7f100d5d7
Improve test coverage of PropertiesMeterFilter
...
Closes gh-14689
2018-10-05 08:37:19 +01:00
5d0e812afe
Merge branch '2.0.x'
2018-10-04 15:53:26 +02:00
1b10d3fcbf
Fix missing metadata for nested POJO
...
This commit fixes missing descriptions and default values when
applicable for `management.server.ssl`, `server.compression`,
`server.http2`, `server.servlet.jsp`, `server.servlet.session` and
`server.ssl`.
Those nested namespace are managed by a POJO that is declared outside
of the module of the target @ConfigurationProperties type using it. As
a result, the annotation processor has no access to the source model and
can't extract the description and the default value, if any.
This commit migrates the misleading field-level Javadoc to manual meta
data for the time being.
Closes gh-14669
2018-10-04 15:49:04 +02:00
d76bba5e6f
Migrate from ExpectedException rule to AssertJ
...
Replace ExpectedException JUnit rules with AssertJ exception
assertions.
Closes gh-14336
2018-10-02 10:55:28 -07:00
1e756db966
Use Commons Logging for OnlyOnceLoggingDenyMeterFilter
...
Closes gh-14637
2018-09-30 17:47:18 -04:00
698bbd6a9e
Polish
...
Closes gh-14597
2018-09-26 11:45:21 -04:00
e5ed5ebf8b
Fix "Query Parameters" section name
...
Closes gh-14600
2018-09-25 14:24:34 -04:00
5765ed00e8
Polish
2018-09-24 10:53:22 +02:00
6e00d13d68
Polish
2018-09-23 15:53:14 +01:00
4c3e2d10d1
Auto-configure Micrometer's Elastic registry
...
Closes gh-14523
2018-09-23 15:52:29 +01:00
95ecbc736b
Update example for disk space health indicator to use DataSize
...
See gh-14549
2018-09-23 12:05:57 +01:00
47f9379305
Adapt to changes in latest Micrometer snapshot
...
See gh-14522
2018-09-22 20:02:28 +02:00
977f8b4479
Auto-configure Micrometer's Kafka consumer metrics
...
Closes gh-14525
2018-09-21 19:56:29 +01:00
cbae22f0c9
Polish "Migrate size properties to DataSize"
...
Closes gh-14549
2018-09-21 16:27:28 +02:00
258c4838b1
Auto-configure Micrometer's Log4j2 metrics
...
Closes gh-14524
2018-09-21 14:45:20 +01:00
fe75f966ff
Auto-configure Micrometer's Dynatrace meter registry
...
Closes gh-14522
2018-09-21 13:11:33 +01:00
426ff3ada7
Store ObjectProvider rather than their Streams to allow reuse
...
Generally speaking, methods on configuration classes will only be called once
and, therefore, it should be safe to hold a reference to a Stream for later
one-time usage. However, there are some scenarios in Spring Fu where functional
registration results in an attempt being made to use a Stream more than use.
This commit protects against multiple use by storing the ObjectProvider and
getting a new ordered Stream each time it's needed.
Closes gh-14467
2018-09-20 16:16:42 +01:00
cc6cf880cf
Stop using ObjectProvider<List> and ObjectProvider<Collection>
...
Closes gh-14467
2018-09-20 13:19:40 +01:00
bb19d5690c
Fix spring-boot-actuator-autoconfigure test logs
...
Add log4j to `spring-boot-actuator-autoconfigure` test scope so that
we get valid log output.
See gh-14148
2018-09-11 20:13:27 -07:00
6c1915e81f
Merge branch '2.0.x'
2018-09-11 17:03:38 -07:00
7af6665a0e
Ignore management.server.port for war
...
Fixes gh-14148
2018-09-11 16:56:03 -07:00
a170bfcc76
Deprecate micrometer meter's enabled flags
...
This commit deprecates the few 'enabled' flags that control whether
certain meter binders are registered in the context.
Metrics auto-configuration for the JVM, Logback and System-related
information have been moved to individual auto-configurations so that
they can be excluded rather than using the now deprecated flag.
This harmonizes our policy with regards to disabling behaviour,
especially since other similar auto-configurations do not have such
flag.
Closes gh-13408
2018-09-06 15:08:39 +02:00
45ef926a90
Merge branch '2.0.x'
2018-09-06 12:18:12 +02:00
ff8b8c55c6
Remove reference to "management.metrics.binders.integration.enabled"
...
Closes gh-14319
2018-09-06 12:17:57 +02:00
c3de4c84f2
Polish
2018-09-05 12:54:20 -07:00
f0d7533e0b
Merge branch '2.0.x'
2018-09-04 17:09:52 -07:00
9c82d5c382
Make ApplicationContextServerWebExchangeMatcher and subclasses thread-safe
...
Fixes gh-14161
2018-09-04 17:06:24 -07:00
8ee4775820
Polish
2018-09-04 20:46:35 +01:00
1ceb076035
Harmonize Metrics test
...
This commit harmonizes metrics test to rely on `MetricRun.simple()`
rather than configuring a simple `MeterRegistry` manually. Rather than
applying related auto-configurations automatically, `MetricsRun` only
enable the absolute minimum.
See gh-14255
2018-09-04 15:04:02 +02:00
3d732e86f4
Merge branch '2.0.x'
2018-09-04 08:52:35 +02:00
ca57e58ee5
Polish
...
See gh-14293
2018-09-04 08:52:13 +02:00
4634811c7c
Polish
2018-08-31 14:45:17 +02:00
7bee9dfc22
Harmonize HTTP client metrics
...
This commit harmonizes the auto-configurations for RestTemplate and
WebClient in a single `HttpClientMetricsAutoConfiguration`. Doing so
allows to give a better scope for the shared `MeterFilter`.
As a result`WebClientMetricsAutoConfiguration` has moved to the `client`
package.
Closes gh-14269
2018-08-31 14:45:03 +02:00
6c26315cd1
Merge branch '2.0.x'
2018-08-30 13:08:42 +02:00
0625443d27
Polish "Limit metrics collection of incoming requests"
...
Closes gh-14173
2018-08-30 12:59:07 +02:00
81a6701914
Limit metrics collection of incoming requests
...
See gh-14173
2018-08-30 12:26:06 +02:00
422a436df1
Polish some Collectors
...
See gh-13727
2018-08-27 18:09:02 +02:00
dd9209c7d9
Merge branch '2.0.x'
2018-08-22 10:48:35 +02:00
000cb94323
Polish "Fix String concatenation in a loop"
...
Closes gh-14153
2018-08-22 10:47:05 +02:00
43acc37587
Fix String concatenation in a loop
...
See gh-14153
2018-08-22 10:46:14 +02:00
f5d922c712
Upgrade to Spring Integration 5.1.0.M2
...
Upgrade to M2 broke a test that was looking for a particular bean that
is configured by Spring Integration (`HeaderChannelRegistry`).
It looks like INT-4517 is related to the regression as it registers the
bean too late for the auto-configuration to see it.
This commit changes the condition to a more central bean that is created
very early on.
Closes gh-14142
2018-08-21 09:56:19 +02:00
b60fbe5a1f
Merge branch '2.0.x'
2018-08-20 17:00:36 +02:00
b0d388830f
Polish test
2018-08-20 17:00:21 +02:00
644ab5f3e4
Align SessionsEndpoint with Spring Session API improvements
...
This commit aligns SessionsEndpoint with
FindByIndexNameSessionRepository API improvements that simplifies
retrieval of sessions by principal name.
Closes gh-14124
2018-08-18 11:27:35 +02:00
d724f154f4
Merge branch '2.0.x'
2018-08-16 15:45:20 -07:00
b93c2b9a9f
Allow actuator endpoints to be used with mvcMatchers
...
This commit changes AbstractWebMvcEndpointHandlerMapping to
be a MatchableHandlerMapping. Additionally, EndpointRequest,
now delegates to MvcRequestMatcher for Spring MVC applications.
For all other applications, AntPathRequestMatcher is used as
a delegate.
Closes gh-13962
2018-08-16 15:41:02 -07:00
101cc59b7d
Polish
...
Closes gh-14023
2018-08-09 09:32:10 +02:00
a12ca0a0dc
Merge branch '2.0.x'
2018-08-08 16:05:34 +02:00
a023bd030a
Add configurable timeout for Couchbase health indicator
...
This commit makes sure to use a configurable timeout to check if the
Couchbase cluster is up, rather than relying on the default that can be
quite long.
Closes gh-13879
2018-08-08 16:01:58 +02:00
14a9ec8711
Polish
2018-08-06 14:44:44 +02:00
e6b44189e0
Polish "Add global support for JMX unique names"
...
This commit ensures that the new "spring.jmx.unique-names" property
deprecates the Endpoint's specific property as they share the same goal.
If both are set with an incompatible value, an exception is thrown
inviting the user to update their configuration.
Closes gh-13990
2018-08-06 14:35:18 +02:00
624c1306fd
Merge branch '2.0.x'
2018-08-03 18:25:24 +02:00
737b4a275b
Polish
2018-08-03 18:24:59 +02:00
0e750f982b
Merge branch '2.0.x'
2018-08-03 09:25:15 +02:00
7b6b91aae7
Return null immediately when sla is null in convertSla()
...
Closes gh-13991
2018-08-03 09:23:22 +02:00
1b91c0ceb7
Merge branch '2.0.x'
2018-07-29 09:29:57 +01:00
0ec22c8bf9
Polish copyright date on changed files
2018-07-29 09:29:29 +01:00
80da9cf5eb
Merge branch '2.0.x'
2018-07-29 09:28:56 +01:00
aeb885192e
Polish ternary expressions
2018-07-29 09:24:46 +01:00
a6c9c92f2e
Merge branch '2.0.x'
2018-07-28 01:35:43 +01:00
e6a68b39a3
Fix checkstyle javadoc issues
...
Fix checkstyle issues in javadoc following the spring-javaformat
upgrade.
See gh-13932
2018-07-28 01:11:52 +01:00
7fc455654a
Fix checkstyle ternary issues
...
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.
See gh-13932
2018-07-28 01:11:52 +01:00
f2a9030788
Merge branch '2.0.x'
2018-07-27 12:23:51 -07:00
e753b530fa
EndpointRequest should match links with trailing slash
...
Fixes gh-13921
2018-07-27 12:23:27 -07:00
b5b60c2053
Merge branch '2.0.x'
2018-07-26 13:23:07 +01:00
9a9111af21
Support path discovery for main dispatcher servlet
...
Add an `DispatcherServletPath` interface which provides a much more
consistent way to discover the path of the main dispatcher servet.
Prior to this commit, auto-configurations would often make use of the
`ServerProperties` class to discover the dispatcher servlet path. This
mechanism isn't very explicit and also makes it hard for us to relocate
that property in Spring Boot 2.1.
This commit also reverts most of fddc9e9c7e
2018-07-26 11:35:12 +01:00
d37e717500
Polish
2018-07-26 11:35:12 +01:00
1e7aa7c4bc
Fix Spring Integration imports
2018-07-25 16:25:06 +02:00
af0aa11d15
Polish "Add reactive health indicator for Cassandra"
...
Closes gh-13864
2018-07-25 10:16:17 +02:00
61c41555c8
Add reactive health indicator for Cassandra
...
See gh-13864
2018-07-25 10:16:17 +02:00
6dc0cb4f67
Merge branch '2.0.x'
2018-07-24 09:33:22 +02:00
7176c54f5e
Polish "Add metric description and base unit to metrics endpoint"
...
Closes gh-13813
2018-07-24 09:32:22 +02:00
ab1f8cf77b
Add metric description and base unit to metrics endpoint
...
See gh-13813
2018-07-24 09:32:22 +02:00
ecb8da2536
Polish "Upgrade to Micrometer 1.0.6"
...
Closes gh-13819
2018-07-24 09:25:54 +02:00
f478911c54
Upgrade to Micrometer 1.0.6
...
See gh-13819
2018-07-24 09:12:06 +02:00
9b6a069903
Merge branch '2.0.x'
2018-07-17 16:54:43 -07:00
86ccb26c58
Polish EndpointRequest.RequestMatcherFactory.antPath()
...
Closes gh-13775
2018-07-17 16:53:33 -07:00
6a189cee06
Merge branch '2.0.x'
2018-07-17 19:26:08 +01:00
a57d0f0853
Reinstate order of WebMvcMetricsFilter
...
Closes gh-13781
2018-07-17 19:14:17 +01:00
070c26d6c3
Merge branch '2.0.x'
2018-07-17 12:03:58 +02:00
d6c7eff8f7
Add check for empty values for lookup
...
Closes gh-13419
2018-07-17 12:01:26 +02:00
58df752af4
Polish
...
See gh-13790
2018-07-17 10:25:38 +02:00
43091150d8
Merge branch '2.0.x'
2018-07-17 10:23:12 +02:00
f363fe7dd1
Polish
...
See gh-13790
2018-07-17 10:03:41 +02:00
ac1f2a5817
Polish
2018-07-14 08:45:34 +01:00
d1b8558430
Make /health and /info insecure by default
...
Closes gh-13722
2018-07-13 13:35:52 -07:00
fa171671b1
Merge branch '2.0.x'
2018-07-13 09:39:29 +02:00
e6ea28dec5
Polish
2018-07-13 09:36:37 +02:00
13202eb278
Prevent duplicate RequestMatcher in RequestMatcherFactory.antPath()
...
Closes gh-13706
2018-07-13 09:35:34 +02:00
f94ce495d8
Fix parameter order for RequestMatcherAssert.doesNotMatch()
...
Closes gh-13707
2018-07-10 11:36:47 -07:00
be837ccb4b
Use PropertySources.stream() where possible
...
Closes gh-13724
2018-07-10 15:35:03 +02:00
c1a81cfca0
Prohibit bean overriding by default and analyze override failures
...
Closes gh-13609
2018-07-10 12:28:18 +01:00
b87b23a44f
Fix parameter order for RequestMatcherAssert.doesNotMatch()
...
Closes gh-13707
2018-07-09 15:20:18 -07:00
60457f1d9a
Merge branch '2.0.x'
2018-07-09 13:22:14 +02:00
44b9aa168e
Polish "Improve description of Endpoint exclude"
...
Closes gh-13619
2018-07-09 13:20:43 +02:00
838e6cdbbb
Improve description of Endpoint exclude
...
See gh-13619
2018-07-09 13:12:13 +02:00
68a3c234be
Adapt to API changes in Reactor Netty
...
The following issue changed the SSL configuration API for both client
and server: https://github.com/reactor/reactor-netty/issues/370
2018-07-06 14:45:47 +02:00
fd624c20cf
Upgrade to Hikaricp 3.2.0
...
Closes gh-13695
2018-07-03 20:04:55 +01:00
b6b37c91bb
Upgrade to Flyway 5.1.3
...
Closes gh-13672
2018-07-03 17:30:48 +01:00
4eff07f6c0
Merge branch '2.0.x'
2018-06-28 12:49:34 -07:00
fddc9e9c7e
Support multiple paths in DispatcherServletPathProvider
...
Closes gh-13603
2018-06-28 12:36:58 -07:00
bb60edaca6
Polish
...
Closes gh-13534
2018-06-21 09:24:36 +02:00
d4d169277d
Merge branch '2.0.x'
2018-06-21 09:23:43 +02:00
b9ea0fd5a7
Polish
...
See gh-13534
2018-06-21 09:20:50 +02:00
9d3ba14686
Fix conditions for CachingConnectionFactory support
...
Closes gh-12161
2018-06-19 19:58:48 +02:00
defa171a32
Merge branch '2.0.x'
2018-06-18 13:41:36 +02:00
dd3bfdbe42
Use @ManagementContextConfiguration consistently
2018-06-18 13:28:30 +02:00
cb6c8f76e2
Configure X-Forwarded-* support with Reactor Netty
...
This commit configures the new X-Forwarded-* / Forwarded HTTP headers
support with Reactor Netty in its 0.8.0 version.
Closes gh-10900
2018-06-13 14:55:33 +02:00
c738b73c6f
Merge branch '2.0.x'
2018-06-13 09:29:36 +02:00
870d7fe16a
Use @SpringBootTest.properties in tests and samples
...
Closes gh-13453
2018-06-13 09:24:28 +02:00
6eaae608b5
Merge branch '2.0.x'
2018-06-06 10:49:46 -07:00
461202bc25
EndpointRequest uses empty servlet path if not available
...
Fixes gh-13399
2018-06-06 10:48:42 -07:00
0d63e7f592
Merge branch '2.0.x'
2018-06-06 09:30:46 +02:00
ba8a32fa4e
Replace commons-codec Base64 usage
...
See gh-13378
2018-06-06 09:19:17 +02:00
66be6c3396
Polish
2018-06-05 17:44:51 -07:00
83f7df920b
Merge branch '2.0.x'
2018-06-05 13:30:07 +02:00
bf56ec496d
Polish
2018-06-05 13:29:56 +02:00
47634f5587
Polish
2018-06-05 13:21:03 +02:00
1901008d6f
Merge branch '2.0.x'
2018-06-05 13:18:40 +02:00
fff06822dc
Polish
2018-06-05 13:15:38 +02:00
d84e2b90d7
Fix wrong usage of ManagementContextConfiguration
...
Closes gh-13366
2018-06-05 13:15:21 +02:00
3248400665
Merge branch '2.0.x'
2018-06-05 10:12:46 +02:00
b4f8361989
Make JMX metrics domain configurable
...
Closes gh-13356
2018-06-05 10:12:26 +02:00
ade1397ea2
Merge branch '2.0.x'
2018-06-04 17:28:54 -07:00
571c50e43f
Switch to functional web code to use static imports
...
Update the samples and tests to use the more idiomatic static import
style.
2018-06-04 17:27:34 -07:00
bd8106d77f
Upgrade to Spring Framework 5.1
...
As of Spring Framework 5.1, we're depending on the Reactor Californium
release train.
Reactor Netty is now at version 0.8 and changed its artifact
coordinates, package names and broke several APIs. Spring Framework is
now up-to-date with those changes and this commit does the same for
Spring Boot.
Note that in that process, the `NettyServerCustomizer` has been changed
since the former `HttpServerOptions.Builder` API is now gone from
Reactor Netty, and we're now relying on immutable server instances
instead of a stateful builder pattern.
See gh-13321
2018-06-04 18:59:17 +02:00
78b1a37d7d
Merge branch '2.0.x'
2018-06-01 17:58:03 +01:00
68cd27c47b
Do not require DataSourcePoolMetrics to auto-configure Hikari meters
...
Closes gh-13330
2018-06-01 17:55:43 +01:00
205b1c1327
Upgrade to Hazelcast 3.10.1
...
Closes gh-13322
2018-06-01 09:30:42 +02:00
5d5a14e4f7
Make MetricsProperties fields final if possible
...
Closes gh-13324
2018-06-01 09:29:34 +02:00
f06627c408
Allow CompositeHealthIndicator to be created with a Map as before
...
See gh-4965
2018-05-30 16:09:07 +02:00
de01e7aad4
Polish
...
See gh-13243
2018-05-28 09:46:40 +02:00
f91b53747a
Merge branch '2.0.x'
2018-05-28 09:41:41 +02:00
Phillip Webb
Andy Wilkinson
Stephane Nicoll
dreis2211
David J. M. Karlsen
Michael Weirauch
Mikalai Lushchytski
artsiom
Johnny Lim
Hanope
Madhura Bhave
Dmytro Nosan
Hiroaki Yoshida
Vedran Pavic
artsiom
Johannes Edmeier
Jon Schneider
Miguel Gomes
Brian Clozel