1. 07 Apr, 2021 9 commits
  2. 06 Apr, 2021 20 commits
  3. 05 Apr, 2021 4 commits
    • Phillip Webb's avatar
      Support profile specific ConfigData imports · 5774ea3f
      Phillip Webb authored
      Update the `ConfigData` import support to allow individual property
      sources to be imported with a higher precedence than profile specific
      imports.
      
      Prior to this commit, imported sources would always have a higher
      precedence than the file that imported them, but a lower precedence
      than any profile-specific variant of the same file.
      
      For example, given an `application.properties` that imports `myconfig`,
      the contributor tree would be as follows:
      
      	ROOT
      	 +- `application.properties`
      	 |    +- myconfig
      	 +- `application-<profile>.properties`
      
      The precedence would be:
      
      	1) `application-<profile>.properties`
      	2) myconfig
      	3) `application.properties`
      
      This works well for most situations, but can be confusing if import is
      for a profile-specific property source. For example:
      
      	ROOT
      	 +- `application.properties`
      	 |    +- myconfig
      	 |    +- myconfig-<profile>
      	 +- `application-<profile>.properties`
      
      Results in the order precedence of:
      
      	1) `application-<profile>.properties`
      	2) myconfig-<profile>
      	3) myconfig
      	4) `application.properties`
      
      This means that whilst `myconfig` overrides `application.properties`,
      `myconfig-profile` does not override `application-<profile>.properties`.
      
      For this specific situation, the preferable order would be:
      
      	1) myconfig-<profile>
      	2) `application-<profile>.properties`
      	3) myconfig
      	4) `application.properties`
      
      To support this alternative ordering a new `PROFILE_SPECIFIC` config
      data option has been added. Additionally, options may now be specified
      on a per-source basis by using the `PropertySourceOptions` interface.
      
      Fixes gh-25766
      5774ea3f
    • Stephane Nicoll's avatar
      Merge branch '2.4.x' · d578e20b
      Stephane Nicoll authored
      Closes gh-25883
      d578e20b
    • Stephane Nicoll's avatar
      Merge pull request #25882 from shakuzen · f289f922
      Stephane Nicoll authored
      * pr/25882:
        Polish HealthIndicators table in docs
      
      Closes gh-25882
      f289f922
    • Tommy Ludwig's avatar
      Polish HealthIndicators table in docs · 3746385f
      Tommy Ludwig authored
      `=======` was showing up in the header of the table, which should not
      be there.
      
      See gh-25882
      3746385f
  4. 04 Apr, 2021 4 commits
  5. 01 Apr, 2021 3 commits
    • Brian Clozel's avatar
      Allow to manually tag request metrics with exceptions · 72a1eb63
      Brian Clozel authored
      Prior to this commit, some exceptions handled at the controller or
      handler function level would:
      
      * not bubble up to the Spring Boot error handling support
      * not be tagged as part of the request metrics
      
      This situation is inconsistent because in general, exceptions handled at
      the controller level can be considered as expected behavior.
      Also, depending on how the exception is handled, the request metrics
      might not be tagged with the exception.
      This will be reconsidered in gh-23795.
      
      This commit prepares a transition to the new situation. Developers can
      now opt-in and set the handled exception as a request attribute. This
      well-known attribute will be later read by the metrics support and used
      for tagging the request metrics with the exception provided.
      
      This mechanism is automatically used by the error handling support in
      Spring Boot.
      
      Closes gh-24028
      72a1eb63
    • Andy Wilkinson's avatar
      Merge branch '2.4.x' · 66e9619d
      Andy Wilkinson authored
      Closes gh-25870
      66e9619d
    • Andy Wilkinson's avatar
      Merge branch '2.3.x' into 2.4.x · 0005263f
      Andy Wilkinson authored
      Closes gh-25869
      0005263f