574 Commits

Author SHA1 Message Date
Andy Wilkinson
2216b78f1e Merge branch '2.0.x' 2018-10-08 15:53:09 +01:00
Andy Wilkinson
d3b3c8c64e Honour management.metrics.web.server.auto-time-requests with WebFlux
Closes gh-13895
2018-10-08 15:52:50 +01:00
Stephane Nicoll
7da3396555 Merge branch '2.0.x' 2018-10-08 10:45:49 +02:00
dreis2211
55ec016bac Remove unused fields in tests
Closes gh-14707
2018-10-08 10:40:04 +02:00
Phillip Webb
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
David J. M. Karlsen
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
Stephane Nicoll
35752a54d2 Adapt to latest change in Micrometer 1.1 2018-10-05 23:42:16 +02:00
Phillip Webb
01b8667dd7 Update copyright year for changed files 2018-10-05 13:40:07 -07:00
Andy Wilkinson
72e2313fe8 Polish "Auto-configure Micrometer's Jersey 2 server instrumentation"
Closes gh-12482
2018-10-05 16:40:57 +01:00
Michael Weirauch
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
Stephane Nicoll
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
Stephane Nicoll
91b4dc2f69 Polish "Add reactive health indicator for Couchbase"
Closes gh-13926
2018-10-05 13:57:31 +02:00
Mikalai Lushchytski
20ff0d97e4 Add reactive health indicator for Couchbase
See gh-13926
2018-10-05 13:57:17 +02:00
Andy Wilkinson
c9da881322 Polish "Drop support for "all" from management.metrics.distribution.sla"
Closes gh-14684
2018-10-05 09:25:10 +01:00
artsiom
ccb964e886 Drop support for "all" from management.metrics.distribution.sla
See gh-14684
2018-10-05 09:22:43 +01:00
Andy Wilkinson
ef7c2bc6ea Merge branch '2.0.x' 2018-10-05 08:37:45 +01:00
Andy Wilkinson
e7f100d5d7 Improve test coverage of PropertiesMeterFilter
Closes gh-14689
2018-10-05 08:37:19 +01:00
Stephane Nicoll
5d0e812afe Merge branch '2.0.x' 2018-10-04 15:53:26 +02:00
Stephane Nicoll
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
Phillip Webb
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
Johnny Lim
1e756db966 Use Commons Logging for OnlyOnceLoggingDenyMeterFilter
Closes gh-14637
2018-09-30 17:47:18 -04:00
Johnny Lim
698bbd6a9e Polish
Closes gh-14597
2018-09-26 11:45:21 -04:00
Hanope
e5ed5ebf8b Fix "Query Parameters" section name
Closes gh-14600
2018-09-25 14:24:34 -04:00
Stephane Nicoll
5765ed00e8 Polish 2018-09-24 10:53:22 +02:00
Andy Wilkinson
6e00d13d68 Polish 2018-09-23 15:53:14 +01:00
Andy Wilkinson
4c3e2d10d1 Auto-configure Micrometer's Elastic registry
Closes gh-14523
2018-09-23 15:52:29 +01:00
Andy Wilkinson
95ecbc736b Update example for disk space health indicator to use DataSize
See gh-14549
2018-09-23 12:05:57 +01:00
Stephane Nicoll
47f9379305 Adapt to changes in latest Micrometer snapshot
See gh-14522
2018-09-22 20:02:28 +02:00
Andy Wilkinson
977f8b4479 Auto-configure Micrometer's Kafka consumer metrics
Closes gh-14525
2018-09-21 19:56:29 +01:00
Stephane Nicoll
cbae22f0c9 Polish "Migrate size properties to DataSize"
Closes gh-14549
2018-09-21 16:27:28 +02:00
Andy Wilkinson
258c4838b1 Auto-configure Micrometer's Log4j2 metrics
Closes gh-14524
2018-09-21 14:45:20 +01:00
Andy Wilkinson
fe75f966ff Auto-configure Micrometer's Dynatrace meter registry
Closes gh-14522
2018-09-21 13:11:33 +01:00
Andy Wilkinson
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
Andy Wilkinson
cc6cf880cf Stop using ObjectProvider<List> and ObjectProvider<Collection>
Closes gh-14467
2018-09-20 13:19:40 +01:00
Phillip Webb
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
Madhura Bhave
6c1915e81f Merge branch '2.0.x' 2018-09-11 17:03:38 -07:00
Madhura Bhave
7af6665a0e Ignore management.server.port for war
Fixes gh-14148
2018-09-11 16:56:03 -07:00
Stephane Nicoll
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
Stephane Nicoll
45ef926a90 Merge branch '2.0.x' 2018-09-06 12:18:12 +02:00
Stephane Nicoll
ff8b8c55c6 Remove reference to "management.metrics.binders.integration.enabled"
Closes gh-14319
2018-09-06 12:17:57 +02:00
Phillip Webb
c3de4c84f2 Polish 2018-09-05 12:54:20 -07:00
Madhura Bhave
f0d7533e0b Merge branch '2.0.x' 2018-09-04 17:09:52 -07:00
Madhura Bhave
9c82d5c382 Make ApplicationContextServerWebExchangeMatcher and subclasses thread-safe
Fixes gh-14161
2018-09-04 17:06:24 -07:00
Andy Wilkinson
8ee4775820 Polish 2018-09-04 20:46:35 +01:00
Stephane Nicoll
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
Stephane Nicoll
3d732e86f4 Merge branch '2.0.x' 2018-09-04 08:52:35 +02:00
Johnny Lim
ca57e58ee5 Polish
See gh-14293
2018-09-04 08:52:13 +02:00
Stephane Nicoll
4634811c7c Polish 2018-08-31 14:45:17 +02:00
Stephane Nicoll
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
Stephane Nicoll
6c26315cd1 Merge branch '2.0.x' 2018-08-30 13:08:42 +02:00