Merge branch 'feature/monitor_master_1119' into 'master'

feat: [none] 生产统一接入监控体系

See merge request rays/pcloud-common-parent!156

pcloud-common-config/src/main/resources.perf/bootstrap.yml

@@ -2,6 +2,7 @@ spring:
   cloud:
     env: perf
     config:
+      name: ${spring.application.name:application},universe-monitor
       discovery:
         enabled: true
         service-id: cloud-config
@@ -25,8 +26,8 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxPoolPreparedStatementPerConnectionSize: 20
-    connectionPropertiesNew: config.decrypt=true;config.decrypt.key=${spring.datasource.publicKey}
-    filtersNew: config
+    connectionPropertiesNew: config.decrypt=true;config.decrypt.key=${spring.datasource.publicKey};druid.stat.slowSqlMillis=50
+    filtersNew: config,monitorStatFilter
   metrics:
     influx:
       uri: http://192.168.89.201:8086/write

pcloud-common-config/src/main/resources.prod/bootstrap.yml

@@ -2,6 +2,7 @@ spring:
   cloud:
     env: prod
     config:
+      name: ${spring.application.name:application},universe-monitor
       discovery:
         enabled: true
         service-id: cloud-config
@@ -25,8 +26,8 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxPoolPreparedStatementPerConnectionSize: 20
-    connectionPropertiesNew: config.decrypt=true;config.decrypt.key=${spring.datasource.publicKey}
-    filtersNew: config,stat
+    connectionPropertiesNew: config.decrypt=true;config.decrypt.key=${spring.datasource.publicKey};druid.stat.slowSqlMillis=50
+    filtersNew: config,monitorStatFilter
   metrics:
     influx:
       uri: http://192.168.89.200:8086/write

pcloud-common-config/src/main/resources.test/bootstrap.yml

@@ -2,6 +2,7 @@ spring:
   cloud:
     env: test
     config:
+      name: ${spring.application.name:application},universe-monitor
       discovery:
         enabled: true
         service-id: cloud-config
@@ -25,8 +26,8 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxPoolPreparedStatementPerConnectionSize: 20
-    connectionPropertiesNew: config.decrypt=true;config.decrypt.key=${spring.datasource.publicKey}
-    filtersNew: config
+    connectionPropertiesNew: config.decrypt=true;config.decrypt.key=${spring.datasource.publicKey};druid.stat.slowSqlMillis=50
+    filtersNew: config,monitorStatFilter
   metrics:
     influx:
       uri: http://192.168.89.200:8086/write

pcloud-common-config/src/main/resources.uat/bootstrap.yml

@@ -2,6 +2,7 @@ spring:
   cloud:
     env: uat
     config:
+      name: ${spring.application.name:application},universe-monitor
       discovery:
         enabled: true
         service-id: cloud-config
@@ -25,8 +26,8 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxPoolPreparedStatementPerConnectionSize: 20
-    connectionPropertiesNew: config.decrypt=true;config.decrypt.key=${spring.datasource.publicKey}
-    filtersNew: config        
+    connectionPropertiesNew: config.decrypt=true;config.decrypt.key=${spring.datasource.publicKey};druid.stat.slowSqlMillis=50
+    filtersNew: config,monitorStatFilter
   metrics:
     influx:
       uri: http://192.168.89.200:8086/write

pcloud-common-core/pom.xml

@@ -17,6 +17,10 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+		<universe-springcloud-monitor-starter.version>1.0.1-SNAPSHOT</universe-springcloud-monitor-starter.version>
+		<universe-dbmonitor-starter.version>1.0.1-SNAPSHOT</universe-dbmonitor-starter.version>
+		<universe-monitorlog-logback-starter.version>1.0.1-SNAPSHOT</universe-monitorlog-logback-starter.version>
 	</properties>
 
 	<dependencies>
@@ -31,6 +35,22 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>com.pcloud.universe</groupId>
+			<artifactId>universe-springcloud-monitor-starter</artifactId>
+			<version>${universe-springcloud-monitor-starter.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.pcloud.universe</groupId>
+			<artifactId>universe-dbmonitor-starter</artifactId>
+			<version>${universe-dbmonitor-starter.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.pcloud.universe</groupId>
+			<artifactId>universe-monitorlog-logback-starter</artifactId>
+			<version>${universe-monitorlog-logback-starter.version}</version>
+		</dependency>
+
 		<!-- Database connect Begin -->
 		<dependency>
 			<groupId>com.alibaba</groupId>

pcloud-common-core/src/main/java/com/pcloud/common/core/interceptor/GlobalWebMvcConfigurerAdapter.java

 package com.pcloud.common.core.interceptor;
 
+import com.pcloud.universe.monitor.provider.MonitorInterceptor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
@@ -16,8 +18,17 @@ import com.pcloud.common.core.interceptor.GlobalHandlerInterceptor;
 @Configuration
 public class GlobalWebMvcConfigurerAdapter extends WebMvcConfigurerAdapter {
 
+	@Value("${spring.application.name}")
+	private String appCode;
+
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
+
+		/**
+		 * 监控埋点日志拦截器，需要在第一个
+		 */
+		registry.addInterceptor(new MonitorInterceptor(appCode));
+
 		registry.addInterceptor(new GlobalHandlerInterceptor());
 	}