Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
d84e2b90
Commit
d84e2b90
authored
Jun 05, 2018
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix wrong usage of ManagementContextConfiguration
Closes gh-13366
parent
b4f83619
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
PrometheusMetricsExportAutoConfiguration.java
.../prometheus/PrometheusMetricsExportAutoConfiguration.java
+1
-2
MappingsEndpointAutoConfiguration.java
...igure/web/mappings/MappingsEndpointAutoConfiguration.java
+1
-2
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfiguration.java
View file @
d84e2b90
...
@@ -25,7 +25,6 @@ import org.springframework.boot.actuate.autoconfigure.endpoint.condition.Conditi
...
@@ -25,7 +25,6 @@ import org.springframework.boot.actuate.autoconfigure.endpoint.condition.Conditi
import
org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration
;
import
org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration
;
import
org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration
;
import
org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration
;
import
org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration
;
import
org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration
;
import
org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration
;
import
org.springframework.boot.actuate.metrics.export.prometheus.PrometheusScrapeEndpoint
;
import
org.springframework.boot.actuate.metrics.export.prometheus.PrometheusScrapeEndpoint
;
import
org.springframework.boot.autoconfigure.AutoConfigureAfter
;
import
org.springframework.boot.autoconfigure.AutoConfigureAfter
;
import
org.springframework.boot.autoconfigure.AutoConfigureBefore
;
import
org.springframework.boot.autoconfigure.AutoConfigureBefore
;
...
@@ -74,7 +73,7 @@ public class PrometheusMetricsExportAutoConfiguration {
...
@@ -74,7 +73,7 @@ public class PrometheusMetricsExportAutoConfiguration {
return
new
CollectorRegistry
(
true
);
return
new
CollectorRegistry
(
true
);
}
}
@
ManagementContext
Configuration
@Configuration
public
static
class
PrometheusScrapeEndpointConfiguration
{
public
static
class
PrometheusScrapeEndpointConfiguration
{
@Bean
@Bean
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointAutoConfiguration.java
View file @
d84e2b90
...
@@ -21,7 +21,6 @@ import java.util.Collections;
...
@@ -21,7 +21,6 @@ import java.util.Collections;
import
org.springframework.beans.factory.ObjectProvider
;
import
org.springframework.beans.factory.ObjectProvider
;
import
org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint
;
import
org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint
;
import
org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration
;
import
org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider
;
import
org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider
;
import
org.springframework.boot.actuate.web.mappings.MappingsEndpoint
;
import
org.springframework.boot.actuate.web.mappings.MappingsEndpoint
;
import
org.springframework.boot.actuate.web.mappings.reactive.DispatcherHandlersMappingDescriptionProvider
;
import
org.springframework.boot.actuate.web.mappings.reactive.DispatcherHandlersMappingDescriptionProvider
;
...
@@ -45,7 +44,7 @@ import org.springframework.web.servlet.DispatcherServlet;
...
@@ -45,7 +44,7 @@ import org.springframework.web.servlet.DispatcherServlet;
* @author Andy Wilkinson
* @author Andy Wilkinson
* @since 2.0.0
* @since 2.0.0
*/
*/
@
ManagementContext
Configuration
@Configuration
public
class
MappingsEndpointAutoConfiguration
{
public
class
MappingsEndpointAutoConfiguration
{
@Bean
@Bean
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment