Commit Graph

31407 Commits

Author SHA1 Message Date
Andy Wilkinson 11b4a19dee Support OpenMetrics text format with Prometheus
Update `PrometheusScrapeEndpoint` so that it can produce both classic
Prometheus text output as well as Openmetrics output.

See gh-25564
2021-03-18 20:50:40 -07:00
Phillip Webb c81a0223cc Refine 'Allow operations to produce different output'
Refine the new `Producible` support so that it can also be used with
`@ReadOperation`, `@WriteOperation` and `@DeleteOperation` annotations.

This update allows the same enum to be used both as an argument and as
an indicator of the media-types that an operation may produce.

Closes gh-25738
2021-03-18 20:50:27 -07:00
Andy Wilkinson 1ec49cee8b Allow operations to produce different output
Update the actuator @Enpoint` infrastructure code so that operations
may inject enums that indicate the type of output to produce. A new
`Producible` interface can be implemented by any enum that indicates
the mime-type that an enum value produces.

The new `OperationArgumentResolver` provides a general strategy for
resolving operation arguments with `ProducibleOperationArgumentResolver`
providing support for `Producible` enums. Existing injection support has
been refactored to use the new resolver.

See gh-25738
2021-03-18 20:36:18 -07:00
Phillip Webb 663fd8ce5e Update copyright year of changed files 2021-03-18 14:49:52 -07:00
Phillip Webb 685b045c3d Polish 2021-03-18 14:49:52 -07:00
Phillip Webb bb38ee38a6 Fix package tangle and polish prefix support
Polish the prefix support introduced in commit a8592f36d4 and fix a
package tangle between `boot.context.properties.source` and `boot.env`.

The `Prefix` interface has now been moved into a new default method on
`OriginLookup`.

See gh-3450
2021-03-18 14:49:52 -07:00
Stephane Nicoll 2c0e0e0662 Merge branch '2.4.x' 2021-03-18 10:40:41 +01:00
Spring Buildmaster adb82c1d4e Next development version (v2.4.5-SNAPSHOT) 2021-03-18 08:55:52 +00:00
Stephane Nicoll 1111b3db98 Polish 2021-03-18 09:10:42 +01:00
Stephane Nicoll b132b96989 Merge branch '2.4.x' 2021-03-18 08:29:56 +01:00
Stephane Nicoll efcb5ee684 Upgrade to Spring Batch 4.3.2
Closes gh-25580
2021-03-18 08:29:43 +01:00
Stephane Nicoll 072c858d0e Upgrade to Spring Batch 4.3.2
Closes gh-25579
2021-03-18 08:28:36 +01:00
Stephane Nicoll 5dbe4dd89d Merge branch '2.4.x' 2021-03-18 08:16:55 +01:00
Stephane Nicoll eff3a4f1a6 Upgrade to Spring Kafka 2.7.0-RC1
Closes gh-25582
2021-03-18 08:14:09 +01:00
Stephane Nicoll cd81784772 Upgrade to Spring AMQP 2.3.6
Closes gh-25648
2021-03-18 07:56:42 +01:00
Stephane Nicoll 91619d6555 Upgrade to Spring Integration 5.5.0-M3
Closes gh-25577
2021-03-18 07:56:01 +01:00
Stephane Nicoll 8e35d6a5fc Upgrade to Spring Integration 5.4.5
Closes gh-25646
2021-03-18 07:55:06 +01:00
Phillip Webb 8ba45cc6b5 Allow DB migrations without DataSourceProperties
Update `FlywayAutoConfiguration`, `LiquibaseAutoConfiguration` and
`DataSourceInitializer` classes so that they no longer depend on
`DataSourceProperties`. DB migrations can now be performed against
a `@Bean` defined primary `DataSource` with an alternative
username/password.

This update also removed using fallback properties when a custom
connection `url` is defined with Flyway or Liquibase. We now assume
that `username`, `password` and `driver-class-name` will be provided
if the default values are unacceptable. Our previous logic was
particularly flawed if a custom URL caused a change of driver type.

Closes gh-25643
2021-03-17 17:05:04 -07:00
Phillip Webb 85f1e2c9b6 Refactor DataSourceBuilder and add derivedFrom
Refactor `DataSourceBuilder` to use direct property mappers rather than
the `Binder` and aliases. Supported DataSource types now include two-way
mappers which allows us to both get and set properties in a uniform way.

A new `derivedFrom` factory method has been added which allows a new
`DataSource` to be derived from an existing one. This update is
primarily to allow Flyway and Liquibase migrations to work against a
`@Bean` configured DataSource rather than assuming that the primary
DataSource was always created via auto-configuration.

See gh-25643
2021-03-17 17:00:44 -07:00
Phillip Webb 6e92daa0a0 Change Kafka cleanup.on-shutdown default to false
Align our property with the recently changed spring-kafka default.

Closes gh-25730
2021-03-17 16:38:46 -07:00
Andy Wilkinson d0d78a6caa Merge branch '2.4.x' 2021-03-17 18:40:58 +00:00
Andy Wilkinson 0d7a60f8cf Upgrade to Spring AMQP 2.3.6
Closes gh-25647
2021-03-17 18:27:16 +00:00
Andy Wilkinson 5005bd3ded Upgrade to Spring Kafka 2.6.7
Closes gh-25578
2021-03-17 18:26:44 +00:00
Andy Wilkinson af3aa234de Merge branch '2.4.x'
Closes gh-25728
2021-03-17 17:38:39 +00:00
Andy Wilkinson 2c2e2c8448 Merge branch '2.3.x' into 2.4.x
Closes gh-25727
2021-03-17 17:38:17 +00:00
Andy Wilkinson 4358d9bc39 Update CI to use Artifactory Resource 0.0.14
Closes gh-25698
2021-03-17 17:37:09 +00:00
Stephane Nicoll 54e7d7f060 Promote ConnectionFactoryBuilder to the "spring-boot" module
Closes gh-25492
2021-03-17 16:26:54 +00:00
Stephane Nicoll 9ba2cd3be7 Merge branch '2.4.x' 2021-03-17 16:03:06 +01:00
Stephane Nicoll 426fb49951 Merge branch '2.3.x' into 2.4.x 2021-03-17 16:02:53 +01:00
Stephane Nicoll b61e4bbe08 Merge pull request #25721 from shakuzen
* pr/25721:
  Polish "Support sending metrics to InfluxDB v2"
  Support sending metrics to InfluxDB v2

Closes gh-25721
2021-03-17 15:57:07 +01:00
Stephane Nicoll 8808d5e4c0 Polish "Support sending metrics to InfluxDB v2"
See gh-25721
2021-03-17 15:56:04 +01:00
Tommy Ludwig 8eb73bcf01 Support sending metrics to InfluxDB v2
See gh-25721
2021-03-17 15:14:43 +01:00
Stephane Nicoll 6f9352bda9 Fix description of management.metrics.export.influx.db
Closes gh-25723
2021-03-17 15:09:37 +01:00
Stephane Nicoll 91c3c7276b Merge branch '2.4.x'
Closes gh-25725
2021-03-17 15:08:47 +01:00
Stephane Nicoll 42994349fe Merge branch '2.3.x' into 2.4.x
Closes gh-25724
2021-03-17 15:08:32 +01:00
Stephane Nicoll 446e838b1b Fix description of management.metrics.export.influx.db
Closes gh-25723
2021-03-17 15:07:02 +01:00
Stephane Nicoll 070d5e7ab7 Merge branch '2.4.x' 2021-03-17 14:42:18 +01:00
Stephane Nicoll 2f1ee94321 Upgrade to Spring Data 2021.0.0-M5
Close gh-25548
2021-03-17 14:42:03 +01:00
Stephane Nicoll 83ae2df42f Upgrade to Lettuce 6.1.0.RC1
Closes gh-25722
2021-03-17 14:40:23 +01:00
Stephane Nicoll 606c871d4a Upgrade to Spring Data 2020.0.6
Closes gh-25547
2021-03-17 14:27:48 +01:00
Stephane Nicoll 052624ffb2 Upgrade to Lettuce 6.0.3.RELEASE
Closes gh-25720
2021-03-17 14:25:38 +01:00
Stephane Nicoll a8667daf52 Upgrade to Kotlin Coroutines 1.4.3
Closes gh-25719
2021-03-17 14:25:36 +01:00
Andy Wilkinson 67545cf4f1 Polish 2021-03-17 12:39:50 +00:00
Andy Wilkinson 7ef9ca02c1 Merge branch '2.4.x'
Closes gh-25718
2021-03-17 12:26:58 +00:00
Andy Wilkinson 758a2ee7ca Don't pass null exception translation result into jOOQ
Closes gh-25717
2021-03-17 12:25:50 +00:00
Andy Wilkinson 2adf3f836c Merge branch '2.4.x' 2021-03-17 12:25:24 +00:00
Andy Wilkinson c815195f13 Polish 2021-03-17 12:25:13 +00:00
Andy Wilkinson 36c72cb6ef Merge branch '2.4.x'
Closes gh-25716
2021-03-17 11:33:48 +00:00
Andy Wilkinson 5595fd4017 Merge branch '2.3.x' into 2.4.x
Closes gh-25715
2021-03-17 11:31:46 +00:00
Andy Wilkinson 0e0418546b Test spring-boot:build-image when repackage is also invoked
Closes gh-25714
2021-03-17 11:19:29 +00:00