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
476fe6ed
Commit
476fe6ed
authored
Nov 28, 2018
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stop configuring metrics if hibernate is not available
Closes gh-15317
parent
5f145ac4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
1 deletion
+18
-1
HibernateMetricsAutoConfiguration.java
...re/metrics/orm/jpa/HibernateMetricsAutoConfiguration.java
+3
-1
HibernateMetricsAutoConfigurationTests.java
...trics/orm/jpa/HibernateMetricsAutoConfigurationTests.java
+15
-0
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfiguration.java
View file @
476fe6ed
...
...
@@ -23,6 +23,7 @@ import javax.persistence.EntityManagerFactory;
import
io.micrometer.core.instrument.MeterRegistry
;
import
io.micrometer.core.instrument.binder.jpa.HibernateMetrics
;
import
org.hibernate.SessionFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration
;
...
...
@@ -46,7 +47,8 @@ import org.springframework.util.StringUtils;
@Configuration
@AutoConfigureAfter
({
MetricsAutoConfiguration
.
class
,
HibernateJpaAutoConfiguration
.
class
,
SimpleMetricsExportAutoConfiguration
.
class
})
@ConditionalOnClass
({
EntityManagerFactory
.
class
,
MeterRegistry
.
class
})
@ConditionalOnClass
({
EntityManagerFactory
.
class
,
SessionFactory
.
class
,
MeterRegistry
.
class
})
@ConditionalOnBean
({
EntityManagerFactory
.
class
,
MeterRegistry
.
class
})
public
class
HibernateMetricsAutoConfiguration
{
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java
View file @
476fe6ed
...
...
@@ -37,6 +37,7 @@ import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
;
import
org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
;
import
org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder
;
import
org.springframework.boot.test.context.FilteredClassLoader
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
...
...
@@ -53,6 +54,7 @@ import static org.mockito.Mockito.mock;
* Tests for {@link HibernateMetricsAutoConfiguration}.
*
* @author Rui Figueira
* @author Stephane Nicoll
*/
public
class
HibernateMetricsAutoConfigurationTests
{
...
...
@@ -137,6 +139,19 @@ public class HibernateMetricsAutoConfigurationTests {
});
}
@Test
public
void
entityManagerFactoryInstrumentationIsDisabledIfHibernateIsNotAvailable
()
{
this
.
contextRunner
.
withClassLoader
(
new
FilteredClassLoader
(
SessionFactory
.
class
))
.
withUserConfiguration
(
NonHibernateEntityManagerFactoryConfiguration
.
class
)
.
run
((
context
)
->
{
assertThat
(
context
)
.
doesNotHaveBean
(
HibernateMetricsAutoConfiguration
.
class
);
MeterRegistry
registry
=
context
.
getBean
(
MeterRegistry
.
class
);
assertThat
(
registry
.
find
(
"hibernate.statements"
).
meter
()).
isNull
();
});
}
@Configuration
static
class
BaseConfiguration
{
...
...
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