Merge remote-tracking branch 'origin/master'

call-back-service/pom.xml

@@ -98,7 +98,12 @@
             <artifactId>apollo-client</artifactId>
             <version>1.4.0</version>
         </dependency>
-
+        <!-- promtheus  -->
+        <dependency>
+            <groupId>io.prometheus</groupId>
+            <artifactId>simpleclient_spring_boot</artifactId>
+            <version>0.6.0</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

call-back-service/src/main/java/cn/freemud/ApiApplication.java

@@ -14,6 +14,8 @@ package cn.freemud;
 
 import cn.freemud.utils.LogTreadLocal;
 import feign.RequestInterceptor;
+import io.prometheus.client.spring.boot.EnablePrometheusEndpoint;
+import io.prometheus.client.spring.boot.EnableSpringBootMetricsCollector;
 import org.jasypt.encryption.StringEncryptor;
 import org.jasypt.encryption.pbe.PooledPBEStringEncryptor;
 import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
@@ -43,6 +45,8 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 @EnableAspectJAutoProxy
 @ComponentScan({"cn.freemud","com.freemud"})
 @EnableFeignClients
+@EnablePrometheusEndpoint
+@EnableSpringBootMetricsCollector
 @EnableAutoConfiguration
 public class ApiApplication {
     public static void main(String[] args) {

call-back-service/src/main/resources/application.properties

@@ -8,4 +8,15 @@ app.id=SHOP_OPEN_STORE
 apollo.meta=http://212.129.229.203
 env=dev
 apollo.bootstrap.enabled=true
-apollo.bootstrap.namespaces=micro_progeram_commons,i_callback_service
+apollo.bootstrap.namespaces=micro_progeram_commons,i_callback_service
\ No newline at end of file
+
+endpoints.metrics.enabled=true
+endpoints.health.sensitive=false
+endpoints.health.enabled=true
+management.endpoint.health.show-details=always
+management.endpoints.web.base-path=/
+management.endpoints.web.exposure.include=prometheus,info,health,shutdown
+management.metrics.tags.application=${spring.application.name}
+management.endpoint.shutdown.enabled=true
+management.security.enabled=false
+management.health.rabbit.enabled=false
\ No newline at end of file

order-application-service/pom.xml

@@ -337,6 +337,13 @@
             <artifactId>apm-toolkit-logback-1.x</artifactId>
         </dependency>
 
+        <!-- promtheus  -->
+        <dependency>
+            <groupId>io.prometheus</groupId>
+            <artifactId>simpleclient_spring_boot</artifactId>
+            <version>0.6.0</version>
+        </dependency>
+
     </dependencies>
     <build>
         <plugins>

order-application-service/src/main/java/cn/freemud/OrderApplication.java

@@ -15,6 +15,8 @@ package cn.freemud;
 import cn.freemud.core.db.DataSourcesConfig;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import feign.RequestInterceptor;
+import io.prometheus.client.spring.boot.EnablePrometheusEndpoint;
+import io.prometheus.client.spring.boot.EnableSpringBootMetricsCollector;
 import org.jasypt.encryption.StringEncryptor;
 import org.jasypt.encryption.pbe.PooledPBEStringEncryptor;
 import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
@@ -43,6 +45,8 @@ import tk.mybatis.spring.annotation.MapperScan;
 @MapperScan({"cn.freemud.*.dao","com.freemud.sdk.api.assortment.orderdistributor.mapper","com.freemud.api.assortment.datamanager.manager",
                 "com.freemud.api.assortment.datamanager.queue.dao","com.freemud.api.assortment.datamanager.rbac.dao","com.freemud.api.assortment.datamanager.queue.entity"})
 @EnableFeignClients({"cn.freemud.service.thirdparty","com.freemud.sdk.api.assortment.message"})
+@EnablePrometheusEndpoint
+@EnableSpringBootMetricsCollector
 @EnableAutoConfiguration
 public class OrderApplication {
     public static void main(String[] args) {

order-application-service/src/main/resources/application.properties

@@ -12,4 +12,15 @@ apollo.bootstrap.enabled=true
 apollo.bootstrap.namespaces=micro_progeram_commons,order_service
 
 eureka.client.enabled=false
-#-Dapollo.configService=http://172.81.231.147
+#-Dapollo.configService=http://172.81.231.147
\ No newline at end of file
+
+endpoints.metrics.enabled=true
+endpoints.health.sensitive=false
+endpoints.health.enabled=true
+management.endpoint.health.show-details=always
+management.endpoints.web.base-path=/
+management.endpoints.web.exposure.include=prometheus,info,health,shutdown
+management.metrics.tags.application=${spring.application.name}
+management.endpoint.shutdown.enabled=true
+management.security.enabled=false
+management.health.rabbit.enabled=false
\ No newline at end of file

shopping-cart-application-service/pom.xml

@@ -290,6 +290,24 @@
             <groupId>org.apache.skywalking</groupId>
             <artifactId>apm-toolkit-logback-1.x</artifactId>
         </dependency>
+
+        <!-- promtheus  -->
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-spring-legacy</artifactId>
+        </dependency>
+
+        <!-- promtheus  -->
+        <dependency>
+            <groupId>io.prometheus</groupId>
+            <artifactId>simpleclient_spring_boot</artifactId>
+            <version>0.6.0</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

shopping-cart-application-service/src/main/java/cn/freemud/ShoppingCartApplication.java

@@ -15,6 +15,8 @@ package cn.freemud;
 import cn.freemud.core.db.DataSourcesConfig;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import feign.RequestInterceptor;
+import io.prometheus.client.spring.boot.EnablePrometheusEndpoint;
+import io.prometheus.client.spring.boot.EnableSpringBootMetricsCollector;
 import org.jasypt.encryption.StringEncryptor;
 import org.jasypt.encryption.pbe.PooledPBEStringEncryptor;
 import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
@@ -46,6 +48,8 @@ import tk.mybatis.spring.annotation.MapperScan;
         "com.freemud.api.assortment.datamanager.manager"})
 @EnableFeignClients
 @EnableAsync
+@EnablePrometheusEndpoint
+@EnableSpringBootMetricsCollector
 public class ShoppingCartApplication {
     public static void main(String[] args) {
         SpringApplication.run(ShoppingCartApplication.class, args);

shopping-cart-application-service/src/main/resources/application.properties

@@ -11,8 +11,16 @@ apollo.cluster=local
 apollo.bootstrap.enabled=true
 apollo.bootstrap.namespaces=micro_progeram_commons,shopping_cart
 
-management.endpoints.web.exposure.include=health,info,env,metrics,prometheus
-management.health.rabbit.enabled=false
-management.endpoints.web.base-path=/
+
+endpoints.metrics.enabled=true
+endpoints.health.sensitive=false
+endpoints.health.enabled=true
 management.endpoint.health.show-details=always
-management.metrics.tags.application=${spring.application.name}
+management.endpoints.web.base-path=/
\ No newline at end of file
+management.endpoints.web.exposure.include=prometheus,info,health,shutdown
+management.metrics.tags.application=${spring.application.name}
+management.endpoint.shutdown.enabled=true
+management.security.enabled=false
+management.health.rabbit.enabled=false
+
+