Update config.yaml

Author: chenzhiguo

deploy/all-cr.yaml

@@ -304,7 +304,6 @@ data:
           enabled: ${CONFIG_FLOW_CONTROL_ENABLED:false}
           localhost: ${CONFIG_LOCALHOST_ENABLED:false}
           virtualthread: ${CONFIG_VIRTUAL_THREAD_ENABLED:false}
-          circuitbreaklog: ${CONFIG_CIRCUIT_BREAK_LOG_ENABLED:false}
         failover:
           enabled: ${CONFIG_FAILOVER_ENABLED:false}
           db: ${CONFIG_FAILOVER_DB_ENABLED:${CONFIG_FAILOVER_ENABLED:false}}
@@ -324,8 +323,6 @@ data:
         classloader:
           enabled: ${CONFIG_CLASSLOADER_ENABLED:true}
           springboot: true
-        counter:
-          enabled: true
       governance:
         initializeTimeout: ${CONFIG_POLICY_INITIALIZE_TIMEOUT:10000}
         shutdownWaitTime: ${CONFIG_SHUTDOWN_WAIT_TIME:10000}
@@ -354,6 +351,7 @@ data:
             cleanInterval: 30000
             expireTime: 60000
             autoHalfOpenEnabled: ${CONFIG_CIRCUIT_BREAKER_AUTO_HALF_OPEN_ENABLED:false}
+            loggingEnabled: ${CONFIG_CIRCUIT_BREAKER_LOGGING_ENABLED:${CONFIG_CIRCUIT_BREAK_LOG_ENABLED:true}
           monitor:
             forwardEnabled: ${CONFIG_MONITOR_FORWARD_TRAFFIC_ENABLED:true}
             rejectEnabled: true
@@ -524,14 +522,16 @@ data:
           command:
             manage: ${CONFIG_REDIS_MANAGE_COMMANDS:ACL,AUTH,AUTH2,HELLO,PING,QUIT,SELECT,SWAPDB,DBSIZE,FLUSHDB,FLUSHALL,TIME,CONFIG,INFO,SHUTDOWN,MONITOR,SLAVEOF,REPLICAOF,CLIENT,ASKING,READONLY,READWRITE,CLUSTER,SENTINEL,MODULE,LASTSAVE,SAVE,BGSAVE,BGREWRITEAOF,ROLE,FAILOVER,SLOWLOG,LOLWUT,COMMAND,RESET,LATENCY,WAIT,WAITAOF,MULTI,DISCARD,WATCH,UNWATCH}
             readonly: ${CONFIG_REDIS_READONLY_COMMANDS:GET,GETEX,GETDEL,GETBIT,GETRANGE,MGET,HGET,HMGET,HGETALL,HSTRLEN,HEXISTS,HLEN,HKEYS,HVALS,HRANDFIELD,EXISTS,TYPE,STRLEN,LLEN,LRANGE,LINDEX,LPOS,SCARD,SMEMBERS,SISMEMBER,SMISMEMBER,SRANDMEMBER,ZCARD,ZCOUNT,ZLEXCOUNT,ZRANGE,ZRANGEBYLEX,ZRANGEBYSCORE,ZRANK,ZREVRANGE,ZREVRANGEBYLEX,ZREVRANGEBYSCORE,ZREVRANK,ZSCORE,ZMSCORE,XLEN,XRANGE,XREVRANGE,XINFO,PFCOUNT,BITCOUNT,BITPOS,BITFIELD_RO,LCS,GEODIST,GEOHASH,GEOPOS,GEORADIUS_RO,GEOSEARCH,GEORADIUSBYMEMBER_RO}
-      counter:
-        gateway: true
-        service: true
+      exporter:
+        enabled: ${CONFIG_EXPORTER_ENABLED:true}
+        type: ${CONFIG_EXPORTER_TYPE:${CONFIG_COUNTER_EXPORTER_TYPE:otlp.grpc}}
+        endpoint: ${CONFIG_EXPORTER_ENDPOINT:${CONFIG_COUNTER_EXPORTER_ENDPOINT:http://otel-collector.joylive.svc:4317}}
+        timeout: 5000
         readerInterval: 1000
-        exporter:
-          type: ${CONFIG_COUNTER_EXPORTER_TYPE:otlp.grpc}
-          endpoint: ${CONFIG_COUNTER_EXPORTER_ENDPOINT:http://otel-collector.joylive.svc:4317}
-          timeout: 5000
+        traffic:
+          enabled: ${CONFIG_EXPORTER_TRAFFIC_ENABLED:true}
+          gatewayEnabled: true
+          serviceEnabled: true
     
   injector.yaml: |
     # Define the version, environment variables, and other information of joylive-injector injecting joylive-agent

deploy/joylive-injector/config/config.yaml

@@ -167,7 +167,6 @@ agent:
       enabled: ${CONFIG_FLOW_CONTROL_ENABLED:{{ .Values.agent.switch.flowcontrol }}}
       localhost: ${CONFIG_LOCALHOST_ENABLED:false}
       virtualthread: ${CONFIG_VIRTUAL_THREAD_ENABLED:false}
-      circuitbreaklog: ${CONFIG_CIRCUIT_BREAK_LOG_ENABLED:false}
     failover:
       enabled: ${CONFIG_FAILOVER_ENABLED:false}
       db: ${CONFIG_FAILOVER_DB_ENABLED:${CONFIG_FAILOVER_ENABLED:false}}
@@ -187,8 +186,6 @@ agent:
     classloader:
       enabled: ${CONFIG_CLASSLOADER_ENABLED:true}
       springboot: true
-    counter:
-      enabled: true
   governance:
     initializeTimeout: ${CONFIG_POLICY_INITIALIZE_TIMEOUT:10000}
     shutdownWaitTime: ${CONFIG_SHUTDOWN_WAIT_TIME:10000}
@@ -217,6 +214,7 @@ agent:
         cleanInterval: 30000
         expireTime: 60000
         autoHalfOpenEnabled: ${CONFIG_CIRCUIT_BREAKER_AUTO_HALF_OPEN_ENABLED:false}
+        loggingEnabled: ${CONFIG_CIRCUIT_BREAKER_LOGGING_ENABLED:${CONFIG_CIRCUIT_BREAK_LOG_ENABLED:true}
       monitor:
         forwardEnabled: ${CONFIG_MONITOR_FORWARD_TRAFFIC_ENABLED:true}
         rejectEnabled: true
@@ -387,11 +385,13 @@ agent:
       command:
         manage: ${CONFIG_REDIS_MANAGE_COMMANDS:ACL,AUTH,AUTH2,HELLO,PING,QUIT,SELECT,SWAPDB,DBSIZE,FLUSHDB,FLUSHALL,TIME,CONFIG,INFO,SHUTDOWN,MONITOR,SLAVEOF,REPLICAOF,CLIENT,ASKING,READONLY,READWRITE,CLUSTER,SENTINEL,MODULE,LASTSAVE,SAVE,BGSAVE,BGREWRITEAOF,ROLE,FAILOVER,SLOWLOG,LOLWUT,COMMAND,RESET,LATENCY,WAIT,WAITAOF,MULTI,DISCARD,WATCH,UNWATCH}
         readonly: ${CONFIG_REDIS_READONLY_COMMANDS:GET,GETEX,GETDEL,GETBIT,GETRANGE,MGET,HGET,HMGET,HGETALL,HSTRLEN,HEXISTS,HLEN,HKEYS,HVALS,HRANDFIELD,EXISTS,TYPE,STRLEN,LLEN,LRANGE,LINDEX,LPOS,SCARD,SMEMBERS,SISMEMBER,SMISMEMBER,SRANDMEMBER,ZCARD,ZCOUNT,ZLEXCOUNT,ZRANGE,ZRANGEBYLEX,ZRANGEBYSCORE,ZRANK,ZREVRANGE,ZREVRANGEBYLEX,ZREVRANGEBYSCORE,ZREVRANK,ZSCORE,ZMSCORE,XLEN,XRANGE,XREVRANGE,XINFO,PFCOUNT,BITCOUNT,BITPOS,BITFIELD_RO,LCS,GEODIST,GEOHASH,GEOPOS,GEORADIUS_RO,GEOSEARCH,GEORADIUSBYMEMBER_RO}
-  counter:
-    gateway: true
-    service: true
+  exporter:
+    enabled: ${CONFIG_EXPORTER_ENABLED:true}
+    type: ${CONFIG_EXPORTER_TYPE:${CONFIG_COUNTER_EXPORTER_TYPE:{{ .Values.agent.exporter.type }}}}
+    endpoint: ${CONFIG_EXPORTER_ENDPOINT:${CONFIG_COUNTER_EXPORTER_ENDPOINT:{{ .Values.agent.exporter.endpoint }}}}
+    timeout: 5000
     readerInterval: 1000
-    exporter:
-      type: ${CONFIG_COUNTER_EXPORTER_TYPE:{{ .Values.agent.exporter.type }}}
-      endpoint: ${CONFIG_COUNTER_EXPORTER_ENDPOINT:{{ .Values.agent.exporter.endpoint }}}
-      timeout: 5000
+    traffic:
+      enabled: ${CONFIG_EXPORTER_TRAFFIC_ENABLED:true}
+      gatewayEnabled: true
+      serviceEnabled: true