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
25520a9e
Commit
25520a9e
authored
Feb 13, 2018
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish “Auto-configure FileDescriptorMetrics”
Closes gh-12022
parent
a51fcd07
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
7 deletions
+13
-7
MetricsAutoConfiguration.java
...tuate/autoconfigure/metrics/MetricsAutoConfiguration.java
+1
-1
additional-spring-configuration-metadata.json
...es/META-INF/additional-spring-configuration-metadata.json
+7
-1
MetricsAutoConfigurationTests.java
.../autoconfigure/metrics/MetricsAutoConfigurationTests.java
+4
-5
appendix-application-properties.adoc
...cs/src/main/asciidoc/appendix-application-properties.adoc
+1
-0
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfiguration.java
View file @
25520a9e
...
...
@@ -128,7 +128,7 @@ public class MetricsAutoConfiguration {
}
@Bean
@ConditionalOnProperty
(
name
=
"management.metrics.binders.f
d
s.enabled"
,
matchIfMissing
=
true
)
@ConditionalOnProperty
(
name
=
"management.metrics.binders.f
ile
s.enabled"
,
matchIfMissing
=
true
)
@ConditionalOnMissingBean
public
FileDescriptorMetrics
fileDescriptorMetrics
()
{
return
new
FileDescriptorMetrics
();
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View file @
25520a9e
...
...
@@ -179,7 +179,13 @@
"name"
:
"management.info.git.mode"
,
"defaultValue"
:
"simple"
},
{
{
"name"
:
"management.metrics.binders.files.enabled"
,
"type"
:
"java.lang.Boolean"
,
"description"
:
"Whether to enable files metrics."
,
"defaultValue"
:
true
},
{
"name"
:
"management.metrics.binders.integration.enabled"
,
"type"
:
"java.lang.Boolean"
,
"description"
:
"Whether to enable Spring Integration metrics."
,
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationTests.java
View file @
25520a9e
...
...
@@ -213,20 +213,19 @@ public class MetricsAutoConfigurationTests {
@Test
public
void
autoConfiguresFileDescriptorMetrics
()
{
this
.
runner
.
run
(
(
context
)
->
assertThat
(
context
)
.
hasSingleBean
(
FileDescriptorMetrics
.
class
));
this
.
runner
.
run
((
context
)
->
assertThat
(
context
)
.
hasSingleBean
(
FileDescriptorMetrics
.
class
));
}
@Test
public
void
allowsFileDescriptorMetricsToBeDisabled
()
{
this
.
runner
.
withPropertyValues
(
"management.metrics.binders.f
d
s.enabled=false"
)
this
.
runner
.
withPropertyValues
(
"management.metrics.binders.f
ile
s.enabled=false"
)
.
run
((
context
)
->
assertThat
(
context
)
.
doesNotHaveBean
(
FileDescriptorMetrics
.
class
));
}
@Test
public
void
allowsCustomFileDescriptorToBeUsed
()
{
public
void
allowsCustomFileDescriptor
Metrics
ToBeUsed
()
{
this
.
runner
.
withUserConfiguration
(
CustomFileDescriptorMetricsConfiguration
.
class
)
.
run
((
context
)
->
assertThat
(
context
)
.
hasSingleBean
(
FileDescriptorMetrics
.
class
)
...
...
spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View file @
25520a9e
...
...
@@ -1295,6 +1295,7 @@ content into your application. Rather, pick only the properties that you need.
management.info.git.mode=simple # Mode to use to expose git information.
# METRICS
management.metrics.binders.files.enabled=true # Whether to enable files metrics.
management.metrics.binders.integration.enabled=true # Whether to enable Spring Integration metrics.
management.metrics.binders.jvm.enabled=true # Whether to enable JVM metrics.
management.metrics.binders.logback.enabled=true # Whether to enable Logback metrics.
...
...
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