merge master, fix conflicts

dromara · Dec 16, 2023 · 1260ef6 · 1260ef6
2 parents edb2d21 + 9cab076
commit 1260ef6
Show file tree

Hide file tree

Showing 22 changed files with 133 additions and 98 deletions.
diff --git a/example/example-adapter/example-adapter-brpc/src/main/resources/application.yml b/example/example-adapter/example-adapter-brpc/src/main/resources/application.yml
@@ -35,12 +35,14 @@ starlight:
     enable: true
     port: 8777
 
+# 开启 SpringBoot Actuator Endpoint 暴露出DynamicTp指标接口
+# 开启 prometheus 指标采集端点
 management:
   endpoints:
     web:
       exposure:
-        include: '*'
+        include: '*'  # 测试使用，线上不要用*，按需开启
   prometheus:
     metrics:
       export:
-        enabled: true
+        enabled: true
diff --git a/...er/example-adapter-dubbo/example-adapter-alibaba-dubbo/src/main/resources/application.yml b/...er/example-adapter-dubbo/example-adapter-alibaba-dubbo/src/main/resources/application.yml
@@ -31,16 +31,6 @@ spring:
           maximumPoolSize: 200
           keepAliveTime: 60
 
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-  prometheus:
-    metrics:
-      export:
-        enabled: true
-
 dubbo:
   application:
     name: dynamic-tp-adapter-demo
@@ -51,3 +41,15 @@ dubbo:
   protocol:
     name: dubbo
     port: 20880
+
+# 开启 SpringBoot Actuator Endpoint 暴露出DynamicTp指标接口
+# 开启 prometheus 指标采集端点
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'   # 测试使用，线上不要用*，按需开启
+  prometheus:
+    metrics:
+      export:
+        enabled: true
diff --git a/...dapter-apache-dubbo/example-adapter-apache-dubbo-2.7.3/src/main/resources/application.yml b/...dapter-apache-dubbo/example-adapter-apache-dubbo-2.7.3/src/main/resources/application.yml
@@ -37,16 +37,6 @@ spring:
               platforms: [ ding,wechat ]           # 可选配置，不配置默认拿上层platforms配置的所以平台
               interval: 120                        # 报警间隔（单位：s）
 
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-  prometheus:
-    metrics:
-      export:
-        enabled: true
-
 dubbo:
   application:
     name: dynamic-tp-adapter-demo
@@ -57,3 +47,15 @@ dubbo:
   protocol:
     name: dubbo
     port: 20880
+
+# 开启 SpringBoot Actuator Endpoint 暴露出DynamicTp指标接口
+# 开启 prometheus 指标采集端点
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'   # 测试使用，线上不要用*，按需开启
+  prometheus:
+    metrics:
+      export:
+        enabled: true
diff --git a/...dapter-apache-dubbo/example-adapter-apache-dubbo-2.7.9/src/main/resources/application.yml b/...dapter-apache-dubbo/example-adapter-apache-dubbo-2.7.9/src/main/resources/application.yml
@@ -37,16 +37,6 @@ spring:
               platforms: [ ding,wechat ]           # 可选配置，不配置默认拿上层platforms配置的所以平台
               interval: 120                        # 报警间隔（单位：s）
 
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-  prometheus:
-    metrics:
-      export:
-        enabled: true
-
 dubbo:
   application:
     name: dynamic-tp-adapter-demo
@@ -57,3 +47,15 @@ dubbo:
   protocol:
     name: dubbo
     port: 20880
+
+# 开启 SpringBoot Actuator Endpoint 暴露出DynamicTp指标接口
+# 开启 prometheus 指标采集端点
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'   # 测试使用，线上不要用*，按需开启
+  prometheus:
+    metrics:
+      export:
+        enabled: true
diff --git a/...dapter-apache-dubbo/example-adapter-apache-dubbo-3.0.7/src/main/resources/application.yml b/...dapter-apache-dubbo/example-adapter-apache-dubbo-3.0.7/src/main/resources/application.yml
@@ -37,16 +37,6 @@ spring:
               platforms: [ ding,wechat ]           # 可选配置，不配置默认拿上层platforms配置的所以平台
               interval: 120                        # 报警间隔（单位：s）
 
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-  prometheus:
-    metrics:
-      export:
-        enabled: true
-
 dubbo:
   application:
     name: dynamic-tp-adapter-demo
@@ -57,3 +47,15 @@ dubbo:
   protocol:
     name: dubbo
     port: 20880
+
+# 开启 SpringBoot Actuator Endpoint 暴露出DynamicTp指标接口
+# 开启 prometheus 指标采集端点
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'   # 测试使用，线上不要用*，按需开启
+  prometheus:
+    metrics:
+      export:
+        enabled: true
diff --git a/example/example-adapter/example-adapter-grpc/src/main/resources/application.yml b/example/example-adapter/example-adapter-grpc/src/main/resources/application.yml
@@ -54,12 +54,14 @@ grpc:
       keepAliveWithoutCalls: true
       negotiationType: plaintext
 
+# 开启 SpringBoot Actuator Endpoint 暴露出DynamicTp指标接口
+# 开启 prometheus 指标采集端点
 management:
   endpoints:
     web:
       exposure:
-        include: '*'
+        include: '*'    # 测试使用，线上不要用*，按需开启
   prometheus:
     metrics:
       export:
-        enabled: true
+        enabled: true
diff --git a/example/example-adapter/example-adapter-hystrix/src/main/resources/application.yml b/example/example-adapter/example-adapter-hystrix/src/main/resources/application.yml
@@ -30,12 +30,14 @@ spring:
           maximumPoolSize: 200
           keepAliveTime: 60
 
+# 开启 SpringBoot Actuator Endpoint 暴露出DynamicTp指标接口
+# 开启 prometheus 指标采集端点
 management:
   endpoints:
     web:
       exposure:
-        include: '*'
+        include: '*'  # 测试使用，线上不要用*，按需开启
   prometheus:
     metrics:
       export:
-        enabled: true
+        enabled: true
diff --git a/example/example-adapter/example-adapter-motan/src/main/resources/application.yml b/example/example-adapter/example-adapter-motan/src/main/resources/application.yml
@@ -30,12 +30,14 @@ spring:
           maximumPoolSize: 200
           keepAliveTime: 60
 
+# 开启 SpringBoot Actuator Endpoint 暴露出DynamicTp指标接口
+# 开启 prometheus 指标采集端点
 management:
   endpoints:
     web:
       exposure:
-        include: '*'
+        include: '*'   # 测试使用，线上不要用*，按需开启
   prometheus:
     metrics:
       export:
-        enabled: true
+        enabled: true
diff --git a/example/example-adapter/example-adapter-okhttp3/src/main/resources/application.yml b/example/example-adapter/example-adapter-okhttp3/src/main/resources/application.yml
@@ -38,12 +38,14 @@ spring:
         runTimeout: 20
         queueTimeout: 10
 
+# 开启 SpringBoot Actuator Endpoint 暴露出DynamicTp指标接口
+# 开启 prometheus 指标采集端点
 management:
   endpoints:
     web:
       exposure:
-        include: '*'
+        include: '*'  # 测试使用，线上不要用*，按需开启
   prometheus:
     metrics:
       export:
-        enabled: true
+        enabled: true
diff --git a/example/example-adapter/example-adapter-rabbitmq/src/main/resources/application.yml b/example/example-adapter/example-adapter-rabbitmq/src/main/resources/application.yml
@@ -30,12 +30,14 @@ spring:
           #单位秒
           keepAliveTime: 60
 
+# 开启 SpringBoot Actuator Endpoint 暴露出DynamicTp指标接口
+# 开启 prometheus 指标采集端点
 management:
   endpoints:
     web:
       exposure:
-        include: '*'
+        include: '*'  # 测试使用，线上不要用*，按需开启
   prometheus:
     metrics:
       export:
-        enabled: true
+        enabled: true
diff --git a/example/example-adapter/example-adapter-rocketmq/src/main/resources/application.yml b/example/example-adapter/example-adapter-rocketmq/src/main/resources/application.yml
@@ -37,12 +37,14 @@ rocketmq:
   producer:
     group: test
 
+# 开启 SpringBoot Actuator Endpoint 暴露出DynamicTp指标接口
+# 开启 prometheus 指标采集端点
 management:
   endpoints:
     web:
       exposure:
-        include: '*'
+        include: '*'   # 测试使用，线上不要用*，按需开启
   prometheus:
     metrics:
       export:
-        enabled: true
+        enabled: true
diff --git a/example/example-adapter/example-adapter-webserver/src/main/resources/application.yml b/example/example-adapter/example-adapter-webserver/src/main/resources/application.yml
@@ -67,12 +67,14 @@ spring:
         runTimeout: 20
         queueTimeout: 10
 
+# 开启 SpringBoot Actuator Endpoint 暴露出DynamicTp指标接口
+# 开启 prometheus 指标采集端点
 management:
   endpoints:
     web:
       exposure:
-        include: '*'
+        include: '*'  # 测试使用，线上不要用*，按需开启
   prometheus:
     metrics:
       export:
-        enabled: true
+        enabled: true
diff --git a/example/example-apollo/src/main/resources/application.yml b/example/example-apollo/src/main/resources/application.yml
@@ -7,6 +7,18 @@ spring:
   profiles:
     active: dev
 
+apollo:
+  bootstrap:
+    enabled: true
+    eagerLoad:
+      enabled: true
+    namespaces: dynamic-tp-apollo-demo-dtp.yml,application
+  meta: http://81.68.181.139:8080
+app:
+  id: dynamic-tp-apollo-demo
+
+# 开启 SpringBoot Actuator Endpoint 暴露出DynamicTp指标接口
+# 开启 prometheus 指标采集端点
 management:
   endpoints:
     web:
@@ -16,13 +28,3 @@ management:
     metrics:
       export:
         enabled: true
-
-apollo:
-  bootstrap:
-    enabled: true
-    eagerLoad:
-      enabled: true
-    namespaces: dynamic-tp-apollo-demo-dtp.yml,application
-  meta: http://81.68.181.139:8080
-app:
-  id: dynamic-tp-apollo-demo
diff --git a/example/example-consul-cloud/src/main/resources/bootstrap.yml b/example/example-consul-cloud/src/main/resources/bootstrap.yml
@@ -1,16 +1,6 @@
 server:
   port: 9100
 
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'   # 测试使用，线上不要用*，按需开启
-  prometheus:
-    metrics:
-      export:
-        enabled: true
-
 spring:
   application:
     name: dynamic-tp-cloud-consul-demo
@@ -24,4 +14,16 @@ spring:
         enabled: true
         prefixes: config
         format: yaml
-        data-key: dynamic-tp-cloud-consul-demo-dtp
+        data-key: dynamic-tp-cloud-consul-demo-dtp
+
+# 开启 SpringBoot Actuator Endpoint 暴露出DynamicTp指标接口
+# 开启 prometheus 指标采集端点
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'   # 测试使用，线上不要用*，按需开启
+  prometheus:
+    metrics:
+      export:
+        enabled: true
diff --git a/example/example-etcd/src/main/resources/application.yml b/example/example-etcd/src/main/resources/application.yml
@@ -12,6 +12,8 @@ spring:
   application:
     name: dynamic-tp-etcd-demo
 
+# 开启 SpringBoot Actuator Endpoint 暴露出DynamicTp指标接口
+# 开启 prometheus 指标采集端点
 management:
   endpoints:
     web:
@@ -20,4 +22,4 @@ management:
   prometheus:
     metrics:
       export:
-        enabled: true
+        enabled: true
diff --git a/example/example-huawei-cloud/src/main/resources/bootstrap.yml b/example/example-huawei-cloud/src/main/resources/bootstrap.yml
@@ -19,6 +19,8 @@ spring:
         # 自定义配置，使用文本的key/value配置项作为yaml格式配置
         fileSource: application.yaml
 
+# 开启 SpringBoot Actuator Endpoint 暴露出DynamicTp指标接口
+# 开启 prometheus 指标采集端点
 management:
   endpoints:
     web:
@@ -27,4 +29,4 @@ management:
   prometheus:
     metrics:
       export:
-        enabled: true
+        enabled: true
diff --git a/example/example-nacos-cloud/src/main/resources/bootstrap.yml b/example/example-nacos-cloud/src/main/resources/bootstrap.yml
@@ -23,6 +23,8 @@ spring:
       host: ${redis:localhost}
       port: 6379
 
+# 开启 SpringBoot Actuator Endpoint 暴露出DynamicTp指标接口
+# 开启 prometheus 指标采集端点
 management:
   endpoints:
     web: