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
4ab43985
Commit
4ab43985
authored
Apr 03, 2018
by
Johnny Lim
Committed by
Stephane Nicoll
Apr 03, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove destroyMethod attribute in @Bean for MeterRegistry
Closes gh-12725
parent
35680191
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
10 additions
and
10 deletions
+10
-10
AtlasMetricsExportAutoConfigurationTests.java
...xport/atlas/AtlasMetricsExportAutoConfigurationTests.java
+1
-1
DatadogMetricsExportAutoConfigurationTests.java
...t/datadog/DatadogMetricsExportAutoConfigurationTests.java
+1
-1
GangliaMetricsExportAutoConfigurationTests.java
...t/ganglia/GangliaMetricsExportAutoConfigurationTests.java
+1
-1
GraphiteMetricsExportAutoConfigurationTests.java
...graphite/GraphiteMetricsExportAutoConfigurationTests.java
+1
-1
InfluxMetricsExportAutoConfigurationTests.java
...ort/influx/InfluxMetricsExportAutoConfigurationTests.java
+1
-1
JmxMetricsExportAutoConfigurationTests.java
...cs/export/jmx/JmxMetricsExportAutoConfigurationTests.java
+1
-1
NewRelicMetricsExportAutoConfigurationTests.java
...newrelic/NewRelicMetricsExportAutoConfigurationTests.java
+1
-1
SignalFxMetricsExportAutoConfigurationTests.java
...signalfx/SignalFxMetricsExportAutoConfigurationTests.java
+1
-1
StatsdMetricsExportAutoConfigurationTests.java
...ort/statsd/StatsdMetricsExportAutoConfigurationTests.java
+1
-1
WavefrontMetricsExportAutoConfigurationTests.java
...vefront/WavefrontMetricsExportAutoConfigurationTests.java
+1
-1
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfigurationTests.java
View file @
4ab43985
...
@@ -142,7 +142,7 @@ public class AtlasMetricsExportAutoConfigurationTests {
...
@@ -142,7 +142,7 @@ public class AtlasMetricsExportAutoConfigurationTests {
@Import
(
BaseConfiguration
.
class
)
@Import
(
BaseConfiguration
.
class
)
static
class
CustomRegistryConfiguration
{
static
class
CustomRegistryConfiguration
{
@Bean
(
destroyMethod
=
"stop"
)
@Bean
public
AtlasMeterRegistry
customRegistry
(
AtlasConfig
config
,
Clock
clock
)
{
public
AtlasMeterRegistry
customRegistry
(
AtlasConfig
config
,
Clock
clock
)
{
return
new
AtlasMeterRegistry
(
config
,
clock
);
return
new
AtlasMeterRegistry
(
config
,
clock
);
}
}
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfigurationTests.java
View file @
4ab43985
...
@@ -154,7 +154,7 @@ public class DatadogMetricsExportAutoConfigurationTests {
...
@@ -154,7 +154,7 @@ public class DatadogMetricsExportAutoConfigurationTests {
@Import
(
BaseConfiguration
.
class
)
@Import
(
BaseConfiguration
.
class
)
static
class
CustomRegistryConfiguration
{
static
class
CustomRegistryConfiguration
{
@Bean
(
destroyMethod
=
"stop"
)
@Bean
public
DatadogMeterRegistry
customRegistry
(
DatadogConfig
config
,
Clock
clock
)
{
public
DatadogMeterRegistry
customRegistry
(
DatadogConfig
config
,
Clock
clock
)
{
return
new
DatadogMeterRegistry
(
config
,
clock
);
return
new
DatadogMeterRegistry
(
config
,
clock
);
}
}
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfigurationTests.java
View file @
4ab43985
...
@@ -142,7 +142,7 @@ public class GangliaMetricsExportAutoConfigurationTests {
...
@@ -142,7 +142,7 @@ public class GangliaMetricsExportAutoConfigurationTests {
@Import
(
BaseConfiguration
.
class
)
@Import
(
BaseConfiguration
.
class
)
static
class
CustomRegistryConfiguration
{
static
class
CustomRegistryConfiguration
{
@Bean
(
destroyMethod
=
"stop"
)
@Bean
public
GangliaMeterRegistry
customRegistry
(
GangliaConfig
config
,
Clock
clock
)
{
public
GangliaMeterRegistry
customRegistry
(
GangliaConfig
config
,
Clock
clock
)
{
return
new
GangliaMeterRegistry
(
config
,
clock
);
return
new
GangliaMeterRegistry
(
config
,
clock
);
}
}
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfigurationTests.java
View file @
4ab43985
...
@@ -145,7 +145,7 @@ public class GraphiteMetricsExportAutoConfigurationTests {
...
@@ -145,7 +145,7 @@ public class GraphiteMetricsExportAutoConfigurationTests {
@Import
(
BaseConfiguration
.
class
)
@Import
(
BaseConfiguration
.
class
)
static
class
CustomRegistryConfiguration
{
static
class
CustomRegistryConfiguration
{
@Bean
(
destroyMethod
=
"stop"
)
@Bean
public
GraphiteMeterRegistry
customRegistry
(
GraphiteConfig
config
,
Clock
clock
)
{
public
GraphiteMeterRegistry
customRegistry
(
GraphiteConfig
config
,
Clock
clock
)
{
return
new
GraphiteMeterRegistry
(
config
,
clock
);
return
new
GraphiteMeterRegistry
(
config
,
clock
);
}
}
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfigurationTests.java
View file @
4ab43985
...
@@ -142,7 +142,7 @@ public class InfluxMetricsExportAutoConfigurationTests {
...
@@ -142,7 +142,7 @@ public class InfluxMetricsExportAutoConfigurationTests {
@Import
(
BaseConfiguration
.
class
)
@Import
(
BaseConfiguration
.
class
)
static
class
CustomRegistryConfiguration
{
static
class
CustomRegistryConfiguration
{
@Bean
(
destroyMethod
=
"stop"
)
@Bean
public
InfluxMeterRegistry
customRegistry
(
InfluxConfig
config
,
Clock
clock
)
{
public
InfluxMeterRegistry
customRegistry
(
InfluxConfig
config
,
Clock
clock
)
{
return
new
InfluxMeterRegistry
(
config
,
clock
);
return
new
InfluxMeterRegistry
(
config
,
clock
);
}
}
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxMetricsExportAutoConfigurationTests.java
View file @
4ab43985
...
@@ -158,7 +158,7 @@ public class JmxMetricsExportAutoConfigurationTests {
...
@@ -158,7 +158,7 @@ public class JmxMetricsExportAutoConfigurationTests {
@Import
(
BaseConfiguration
.
class
)
@Import
(
BaseConfiguration
.
class
)
static
class
CustomRegistryConfiguration
{
static
class
CustomRegistryConfiguration
{
@Bean
(
destroyMethod
=
"stop"
)
@Bean
public
JmxMeterRegistry
customRegistry
(
JmxConfig
config
,
Clock
clock
)
{
public
JmxMeterRegistry
customRegistry
(
JmxConfig
config
,
Clock
clock
)
{
return
new
JmxMeterRegistry
(
config
,
clock
);
return
new
JmxMeterRegistry
(
config
,
clock
);
}
}
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfigurationTests.java
View file @
4ab43985
...
@@ -172,7 +172,7 @@ public class NewRelicMetricsExportAutoConfigurationTests {
...
@@ -172,7 +172,7 @@ public class NewRelicMetricsExportAutoConfigurationTests {
@Import
(
BaseConfiguration
.
class
)
@Import
(
BaseConfiguration
.
class
)
static
class
CustomRegistryConfiguration
{
static
class
CustomRegistryConfiguration
{
@Bean
(
destroyMethod
=
"stop"
)
@Bean
public
NewRelicMeterRegistry
customRegistry
(
NewRelicConfig
config
,
Clock
clock
)
{
public
NewRelicMeterRegistry
customRegistry
(
NewRelicConfig
config
,
Clock
clock
)
{
return
new
NewRelicMeterRegistry
(
config
,
clock
);
return
new
NewRelicMeterRegistry
(
config
,
clock
);
}
}
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java
View file @
4ab43985
...
@@ -164,7 +164,7 @@ public class SignalFxMetricsExportAutoConfigurationTests {
...
@@ -164,7 +164,7 @@ public class SignalFxMetricsExportAutoConfigurationTests {
@Import
(
BaseConfiguration
.
class
)
@Import
(
BaseConfiguration
.
class
)
static
class
CustomRegistryConfiguration
{
static
class
CustomRegistryConfiguration
{
@Bean
(
destroyMethod
=
"stop"
)
@Bean
public
SignalFxMeterRegistry
customRegistry
(
SignalFxConfig
config
,
Clock
clock
)
{
public
SignalFxMeterRegistry
customRegistry
(
SignalFxConfig
config
,
Clock
clock
)
{
return
new
SignalFxMeterRegistry
(
config
,
clock
);
return
new
SignalFxMeterRegistry
(
config
,
clock
);
}
}
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdMetricsExportAutoConfigurationTests.java
View file @
4ab43985
...
@@ -160,7 +160,7 @@ public class StatsdMetricsExportAutoConfigurationTests {
...
@@ -160,7 +160,7 @@ public class StatsdMetricsExportAutoConfigurationTests {
@Import
(
BaseConfiguration
.
class
)
@Import
(
BaseConfiguration
.
class
)
static
class
CustomRegistryConfiguration
{
static
class
CustomRegistryConfiguration
{
@Bean
(
destroyMethod
=
"stop"
)
@Bean
public
StatsdMeterRegistry
customRegistry
(
StatsdConfig
config
,
Clock
clock
)
{
public
StatsdMeterRegistry
customRegistry
(
StatsdConfig
config
,
Clock
clock
)
{
return
new
StatsdMeterRegistry
(
config
,
clock
);
return
new
StatsdMeterRegistry
(
config
,
clock
);
}
}
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfigurationTests.java
View file @
4ab43985
...
@@ -146,7 +146,7 @@ public class WavefrontMetricsExportAutoConfigurationTests {
...
@@ -146,7 +146,7 @@ public class WavefrontMetricsExportAutoConfigurationTests {
@Import
(
BaseConfiguration
.
class
)
@Import
(
BaseConfiguration
.
class
)
static
class
CustomRegistryConfiguration
{
static
class
CustomRegistryConfiguration
{
@Bean
(
destroyMethod
=
"stop"
)
@Bean
public
WavefrontMeterRegistry
customRegistry
(
WavefrontConfig
config
,
public
WavefrontMeterRegistry
customRegistry
(
WavefrontConfig
config
,
Clock
clock
)
{
Clock
clock
)
{
return
new
WavefrontMeterRegistry
(
config
,
clock
);
return
new
WavefrontMeterRegistry
(
config
,
clock
);
...
...
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