From 115810e9ea8e3cc321d6c184a2343d941584e9f1 Mon Sep 17 00:00:00 2001 From: lihengming <89921218@qq.com> Date: Sun, 3 Dec 2017 17:02:36 +0800 Subject: [PATCH 1/4] add > spring boot actuator endpoints --- .../DruidDataSourceAutoConfigure.java | 43 ++++-------- .../actuator/ActuatorConfiguration.java | 69 +++++++++++++++++++ .../metadata/DruidDataSourcePoolMetadata.java | 20 +++++- 3 files changed, 100 insertions(+), 32 deletions(-) create mode 100644 druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/actuator/ActuatorConfiguration.java rename druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/{ => actuator}/metadata/DruidDataSourcePoolMetadata.java (59%) diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.java index 9dcc5bfb24..5b0bb1e53b 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.java @@ -15,62 +15,47 @@ */ package com.alibaba.druid.spring.boot.autoconfigure; +import javax.sql.DataSource; + import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.spring.boot.autoconfigure.metadata.DruidDataSourcePoolMetadata; +import com.alibaba.druid.spring.boot.autoconfigure.actuator.ActuatorConfiguration; import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; import com.alibaba.druid.spring.boot.autoconfigure.stat.DruidFilterConfiguration; import com.alibaba.druid.spring.boot.autoconfigure.stat.DruidSpringAopConfiguration; import com.alibaba.druid.spring.boot.autoconfigure.stat.DruidStatViewServletConfiguration; import com.alibaba.druid.spring.boot.autoconfigure.stat.DruidWebStatFilterConfiguration; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; -import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadata; -import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadataProvider; -import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadataProvidersConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; - -import javax.sql.DataSource; - /** * @author lihengming [89921218@qq.com] */ @Configuration -@ConditionalOnClass(com.alibaba.druid.pool.DruidDataSource.class) +@ConditionalOnClass(DruidDataSource.class) @AutoConfigureBefore(DataSourceAutoConfiguration.class) @EnableConfigurationProperties({DruidStatProperties.class, DataSourceProperties.class}) @Import({DruidSpringAopConfiguration.class, - DruidStatViewServletConfiguration.class, - DruidWebStatFilterConfiguration.class, - DruidFilterConfiguration.class}) + DruidStatViewServletConfiguration.class, + DruidWebStatFilterConfiguration.class, + DruidFilterConfiguration.class, + ActuatorConfiguration.class}) public class DruidDataSourceAutoConfigure { + private static final Logger LOGGER = LoggerFactory.getLogger(DruidDataSourceAutoConfigure.class); + @Bean @ConditionalOnMissingBean public DataSource dataSource() { + LOGGER.info("Init DruidDataSource"); return new DruidDataSourceWrapper(); } - - /** - * Register the {@link DataSourcePoolMetadataProvider} instances to support DataSource metrics. - * - * @see DataSourcePoolMetadataProvidersConfiguration - */ - @Bean - public DataSourcePoolMetadataProvider druidDataSourcePoolMetadataProvider() { - return new DataSourcePoolMetadataProvider() { - @Override - public DataSourcePoolMetadata getDataSourcePoolMetadata(DataSource dataSource) { - if (dataSource instanceof DruidDataSource) { - return new DruidDataSourcePoolMetadata((DruidDataSource) dataSource); - } - return null; - } - }; - } } diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/actuator/ActuatorConfiguration.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/actuator/ActuatorConfiguration.java new file mode 100644 index 0000000000..7dc3cddd79 --- /dev/null +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/actuator/ActuatorConfiguration.java @@ -0,0 +1,69 @@ +/* + * Copyright 1999-2017 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.spring.boot.autoconfigure.actuator; + +import javax.sql.DataSource; + +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.spring.boot.autoconfigure.actuator.endpoint.DruidDataSourceMvcEndpoint; +import com.alibaba.druid.spring.boot.autoconfigure.actuator.metadata.DruidDataSourcePoolMetadata; + +import org.springframework.boot.actuate.condition.ConditionalOnEnabledEndpoint; +import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; +import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadata; +import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadataProvider; +import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadataProvidersConfiguration; +import org.springframework.context.annotation.Bean; + +/** + * @author lihengming [89921218@qq.com] + * + * Spring Boot Actuator support. + */ +public class ActuatorConfiguration { + /** + * Register the {@link DataSourcePoolMetadataProvider} instances to support DataSource metrics. + * + * @see DataSourcePoolMetadataProvidersConfiguration + */ + @Bean + public DataSourcePoolMetadataProvider druidDataSourcePoolMetadataProvider() { + return new DataSourcePoolMetadataProvider() { + @Override + public DataSourcePoolMetadata getDataSourcePoolMetadata(DataSource dataSource) { + if (dataSource instanceof DruidDataSource) { + return new DruidDataSourcePoolMetadata((DruidDataSource)dataSource); + } + return null; + } + }; + } + + /** + * Register DruidDataSourceMvcEndpoint to support Spring Boot Actuator Endpoints. + * + * @see MvcEndpoint + */ + @Bean + @ConditionalOnMissingBean + @ConditionalOnWebApplication + @ConditionalOnEnabledEndpoint("druid") + public DruidDataSourceMvcEndpoint druidDataSourceMvcEndpoint() { + return new DruidDataSourceMvcEndpoint(); + } +} diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/metadata/DruidDataSourcePoolMetadata.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/actuator/metadata/DruidDataSourcePoolMetadata.java similarity index 59% rename from druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/metadata/DruidDataSourcePoolMetadata.java rename to druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/actuator/metadata/DruidDataSourcePoolMetadata.java index 4f553e3fd3..cb868f41fa 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/metadata/DruidDataSourcePoolMetadata.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/actuator/metadata/DruidDataSourcePoolMetadata.java @@ -1,12 +1,26 @@ -package com.alibaba.druid.spring.boot.autoconfigure.metadata; +/* + * Copyright 1999-2017 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.spring.boot.autoconfigure.actuator.metadata; import com.alibaba.druid.pool.DruidDataSource; + import org.springframework.boot.autoconfigure.jdbc.metadata.AbstractDataSourcePoolMetadata; import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadata; /** - * {@link DataSourcePoolMetadata} for a Druid DataSource. - * * @author lihengming [89921218@qq.com] */ public class DruidDataSourcePoolMetadata extends AbstractDataSourcePoolMetadata { From 5c2bbe600149af83ecd8858596d249fa9f7072dd Mon Sep 17 00:00:00 2001 From: lihengming <89921218@qq.com> Date: Sun, 3 Dec 2017 22:40:48 +0800 Subject: [PATCH 2/4] update > v1.1.6 --- druid-spring-boot-starter/README.md | 4 ++-- druid-spring-boot-starter/README_EN.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/druid-spring-boot-starter/README.md b/druid-spring-boot-starter/README.md index 7545029565..9ec3237d9d 100644 --- a/druid-spring-boot-starter/README.md +++ b/druid-spring-boot-starter/README.md @@ -12,12 +12,12 @@ Druid Spring Boot Starter 用于帮助你在Spring Boot项目中轻松集成Drui com.alibaba druid-spring-boot-starter - 1.1.5 + 1.1.6 ``` ```Gradle``` ```xml - compile 'com.alibaba:druid-spring-boot-starter:1.1.5' + compile 'com.alibaba:druid-spring-boot-starter:1.1.6' ``` 2. 添加配置 diff --git a/druid-spring-boot-starter/README_EN.md b/druid-spring-boot-starter/README_EN.md index b0a2456370..2c026d3ae2 100644 --- a/druid-spring-boot-starter/README_EN.md +++ b/druid-spring-boot-starter/README_EN.md @@ -12,12 +12,12 @@ Spring Boot with Druid support, help you simplify Druid config in Spring Boot. com.alibaba druid-spring-boot-starter - 1.1.5 + 1.1.6 ``` ```Gradle``` ```xml - compile 'com.alibaba:druid-spring-boot-starter:1.1.5' + compile 'com.alibaba:druid-spring-boot-starter:1.1.6' ``` 2. Add configuration properties. ```xml From 02b42bb2afcc292b6786faf9df12fcba672fdcbb Mon Sep 17 00:00:00 2001 From: lihengming <89921218@qq.com> Date: Sun, 3 Dec 2017 22:47:55 +0800 Subject: [PATCH 3/4] add > spring boot actuator endpoints --- druid-spring-boot-starter/pom.xml | 20 +++++++-- .../endpoint/DruidDataSourceMvcEndpoint.java | 44 +++++++++++++++++++ .../src/test/resources/application.properties | 7 +++ 3 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/actuator/endpoint/DruidDataSourceMvcEndpoint.java diff --git a/druid-spring-boot-starter/pom.xml b/druid-spring-boot-starter/pom.xml index 9a8dc857a4..1475541227 100644 --- a/druid-spring-boot-starter/pom.xml +++ b/druid-spring-boot-starter/pom.xml @@ -4,15 +4,15 @@ 4.0.0 com.alibaba druid-spring-boot-starter - 1.1.4 + 1.1.6 jar druid-spring-boot-starter Spring Boot with Druid support,help you simplify Druid config in Spring Boot. https://github.com/alibaba/druid - 1.1.4 - 1.5.6.RELEASE + 1.1.6 + 1.5.9.RELEASE @@ -44,6 +44,10 @@ druid ${druid.version} + + org.slf4j + slf4j-api + org.springframework.boot spring-boot-autoconfigure @@ -54,6 +58,16 @@ spring-boot-configuration-processor true + + org.springframework.boot + spring-boot-actuator + true + + + org.springframework + spring-webmvc + true + javax.servlet javax.servlet-api diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/actuator/endpoint/DruidDataSourceMvcEndpoint.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/actuator/endpoint/DruidDataSourceMvcEndpoint.java new file mode 100644 index 0000000000..054d303af9 --- /dev/null +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/actuator/endpoint/DruidDataSourceMvcEndpoint.java @@ -0,0 +1,44 @@ +/* + * Copyright 1999-2017 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.spring.boot.autoconfigure.actuator.endpoint; + +import com.alibaba.druid.stat.DruidStatManagerFacade; + +import org.springframework.boot.actuate.endpoint.mvc.AbstractMvcEndpoint; +import org.springframework.boot.actuate.endpoint.mvc.ActuatorMediaTypes; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @author lihengming [89921218@qq.com] + */ +@ConfigurationProperties(prefix = "endpoints.druid") +public class DruidDataSourceMvcEndpoint extends AbstractMvcEndpoint { + + public DruidDataSourceMvcEndpoint() { + super("/druid-endpoint", true); + } + + @ResponseBody + @GetMapping( produces = {ActuatorMediaTypes.APPLICATION_ACTUATOR_V1_JSON_VALUE, + MediaType.APPLICATION_JSON_VALUE}) + public Object invoke() { + return DruidStatManagerFacade.getInstance().getDataSourceStatDataList(); + } + +} \ No newline at end of file diff --git a/druid-spring-boot-starter/src/test/resources/application.properties b/druid-spring-boot-starter/src/test/resources/application.properties index 6f583300f2..2ebca26911 100644 --- a/druid-spring-boot-starter/src/test/resources/application.properties +++ b/druid-spring-boot-starter/src/test/resources/application.properties @@ -25,4 +25,11 @@ spring.jpa.hibernate.ddl-auto=create-drop # 更多配置属性见 DruidDataSource 内成员变量（只要有set方法便支持），或者根据IDE提示，或者查看官方文档 +# 启用endpoint，默认访问地址：/druid-endpoint，可以使用endpoints.druid.path=自定义终端地址 +endpoints.druid.enabled=true +# 默认需要安全认证才可以访问，可以用下面两种方法之一来禁用安全认证，详情见 Spring Boot 官方文档 +endpoints.druid.sensitive=true +# management.security.enabled=false + # 注：配置文件可以根据习惯更换为 .yml + From 75d5d33763a6dd1db7f2b0edc2c5b7fd6d33f6d3 Mon Sep 17 00:00:00 2001 From: lihengming <89921218@qq.com> Date: Sun, 3 Dec 2017 22:49:12 +0800 Subject: [PATCH 4/4] fix > config --- .../src/test/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/druid-spring-boot-starter/src/test/resources/application.properties b/druid-spring-boot-starter/src/test/resources/application.properties index 2ebca26911..93e8523549 100644 --- a/druid-spring-boot-starter/src/test/resources/application.properties +++ b/druid-spring-boot-starter/src/test/resources/application.properties @@ -28,7 +28,7 @@ spring.jpa.hibernate.ddl-auto=create-drop # 启用endpoint，默认访问地址：/druid-endpoint，可以使用endpoints.druid.path=自定义终端地址 endpoints.druid.enabled=true # 默认需要安全认证才可以访问，可以用下面两种方法之一来禁用安全认证，详情见 Spring Boot 官方文档 -endpoints.druid.sensitive=true +endpoints.druid.sensitive=false # management.security.enabled=false # 注：配置文件可以根据习惯更换为 .yml