Start 1.3.7

Author: chenzhiguo

Makefile

@@ -1,5 +1,5 @@
 repo ?= hub.jdcloud.com/jmsf
-version:=1.2.1-$(shell git rev-parse --short HEAD)4
+version:=1.2.2-$(shell git rev-parse --short HEAD)4
 
 ifeq (,$(shell go env GOBIN))
 GOBIN=$(shell go env GOPATH)/bin

deploy/all-cr.yaml

@@ -96,8 +96,8 @@ data:
   bootstrap.properties: |
     app.name=${APPLICATION_NAME}
     app.service.name=${APPLICATION_SERVICE_NAME:${APPLICATION_NAME}}
-    app.service.namespace=${APPLICATION_SERVICE_NAMESPACE:default}
-    app.service.group=${APPLICATION_SERVICE_GROUP:default}
+    app.service.namespace=${APPLICATION_SERVICE_NAMESPACE}
+    app.service.group=${APPLICATION_SERVICE_GROUP}
     app.service.gateway=${APPLICATION_SERVICE_GATEWAY:NONE}
     app.service.weight=${APPLICATION_SERVICE_WEIGHT:100}
     app.service.warmupDuration=${APPLICATION_SERVICE_WARMUP_DURATION:}
@@ -135,7 +135,7 @@ data:
         retransformEnabled: true
         poolEnabled: true
         loggerEnabled: true
-        exporterEnabled: false
+        exporterEnabled: ${CONFIG_ENHANCE_EXPORTER_ENABLED:false}
         excludePrefixes: null
         excludeTypes: null
         excludeInterfaces: null
@@ -261,8 +261,7 @@ data:
         interval: 100
         timeout: 5000
       switch:
-        live:
-          enabled: ${CONFIG_LIVE_ENABLED:false}
+        govern:
           mq: ${CONFIG_LIVE_MQ_ENABLED:false}
           dubbo: true
           grpc: true
@@ -271,6 +270,8 @@ data:
           spring: true
           phevos: true
           rocketmq: true
+        live:
+          enabled: ${CONFIG_LIVE_ENABLED:false}
         lane:
           enabled: ${CONFIG_LANE_ENABLED:false}
         transmission:
@@ -299,6 +300,7 @@ data:
         service:
           localFirst: ${CONFIG_LOCAL_FIRST:true}
           localFirstMode: ${CONFIG_LOCAL_FIRST_MODE:CELL}
+          cellFailoverThresholds: ${CELL_FAILOVER_THRESHOLDS}
           serviceGroups: ${CONFIG_SERVICE_GROUPS:}
           serviceGroupOpen: ${CONFIG_SERVICE_GROUP_OPEN:true}
           responseException: ${CONFIG_RESPONSE_EXCEPTION:true}
@@ -421,7 +423,7 @@ data:
               - com.jd.live.agent.shaded.
               - org.apache.catalina.core.ContainerBase$
               - org.apache.catalina.core.StandardServer$$Lambda$
-        configcenter:
+        configCenter:
           type: ${CONFIG_CENTER_TYPE:nacos}
           address: ${CONFIG_CENTER_ADDRESS:}
           username: ${CONFIG_CENTER_USERNAME:${CONFIG_USERNAME:guest}}
@@ -528,7 +530,10 @@ data:
     
         <logger name="com.jd.live.agent.bootstrap.bytekit.advice.AdviceHandler" level="${logger.advice.level}"/>
     
-        <logger name="com.jd.live.agent.governance.invoke.filter.RouteFilterChain" level="${logger.route.level}"/>
+        <logger name="com.jd.live.agent.governance.invoke.filter.RouteFilterChain" level="${logger.route.level}"
+                additivity="false">
+            <appender-ref ref="CONSOLE_APPENDER"/>
+        </logger>
     
         <root level="${logger.level}">
             <appender-ref ref="${LIVE_LOG_APPENDER:-ROLLING_APPENDER}"/>
@@ -733,7 +738,7 @@ spec:
             - name: JOYLIVE_MATCH_ENV_LABELS
               value: x-live, x-service
           name: joylive-injector
-          image: ghcr.m.daocloud.io/jd-opensource/joylive-injector:v1.2.1
+          image: ghcr.m.daocloud.io/jd-opensource/joylive-injector:v1.2.2
           imagePullPolicy: Always
           args:
             - --cert=/etc/kubernetes/ssl/dac.pem

deploy/joylive-injector/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.3.6
+version: 1.3.7
 
 keywords:
   - joylive
@@ -26,4 +26,4 @@ home: https://github.com/jd-opensource/joylive-injector
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v1.2.1"
+appVersion: "v1.2.2"

deploy/joylive-injector/config/bootstrap.properties

@@ -1,7 +1,7 @@
 app.name=${APPLICATION_NAME}
 app.service.name=${APPLICATION_SERVICE_NAME:${APPLICATION_NAME}}
-app.service.namespace=${APPLICATION_SERVICE_NAMESPACE:default}
-app.service.group=${APPLICATION_SERVICE_GROUP:default}
+app.service.namespace=${APPLICATION_SERVICE_NAMESPACE}
+app.service.group=${APPLICATION_SERVICE_GROUP}
 app.service.gateway=${APPLICATION_SERVICE_GATEWAY:NONE}
 app.service.weight=${APPLICATION_SERVICE_WEIGHT:100}
 app.service.warmupDuration=${APPLICATION_SERVICE_WARMUP_DURATION:}

deploy/joylive-injector/config/config.yaml

@@ -4,7 +4,7 @@ agent:
     retransformEnabled: true
     poolEnabled: true
     loggerEnabled: true
-    exporterEnabled: false
+    exporterEnabled: ${CONFIG_ENHANCE_EXPORTER_ENABLED:false}
     excludePrefixes: null
     excludeTypes: null
     excludeInterfaces: null
@@ -130,8 +130,7 @@ agent:
     interval: 100
     timeout: 5000
   switch:
-    live:
-      enabled: ${CONFIG_LIVE_ENABLED:{{ .Values.agent.switch.live }}}
+    govern:
       mq: ${CONFIG_LIVE_MQ_ENABLED:false}
       dubbo: true
       grpc: true
@@ -140,6 +139,8 @@ agent:
       spring: true
       phevos: true
       rocketmq: true
+    live:
+      enabled: ${CONFIG_LIVE_ENABLED:{{ .Values.agent.switch.live }}}
     lane:
       enabled: ${CONFIG_LANE_ENABLED:{{ .Values.agent.switch.lane }}}
     transmission:
@@ -168,6 +169,7 @@ agent:
     service:
       localFirst: ${CONFIG_LOCAL_FIRST:true}
       localFirstMode: ${CONFIG_LOCAL_FIRST_MODE:{{ .Values.agent.governance.service.localFirstMode }}}
+      cellFailoverThresholds: ${CELL_FAILOVER_THRESHOLDS}
       serviceGroups: ${CONFIG_SERVICE_GROUPS:}
       serviceGroupOpen: ${CONFIG_SERVICE_GROUP_OPEN:true}
       responseException: ${CONFIG_RESPONSE_EXCEPTION:true}
@@ -290,7 +292,7 @@ agent:
           - com.jd.live.agent.shaded.
           - org.apache.catalina.core.ContainerBase$
           - org.apache.catalina.core.StandardServer$$Lambda$
-    configcenter:
+    configCenter:
       type: ${CONFIG_CENTER_TYPE:nacos}
       address: ${CONFIG_CENTER_ADDRESS:}
       username: ${CONFIG_CENTER_USERNAME:${CONFIG_USERNAME:guest}}

deploy/joylive-injector/config/logback.xml

@@ -52,7 +52,10 @@
 
     <logger name="com.jd.live.agent.bootstrap.bytekit.advice.AdviceHandler" level="${logger.advice.level}"/>
 
-    <logger name="com.jd.live.agent.governance.invoke.filter.RouteFilterChain" level="${logger.route.level}"/>
+    <logger name="com.jd.live.agent.governance.invoke.filter.RouteFilterChain" level="${logger.route.level}"
+            additivity="false">
+        <appender-ref ref="CONSOLE_APPENDER"/>
+    </logger>
 
     <root level="${logger.level}">
         <appender-ref ref="${LIVE_LOG_APPENDER:-ROLLING_APPENDER}"/>

deploy/joylive-injector/values.yaml

@@ -14,7 +14,7 @@ image:
   repository: ghcr.m.daocloud.io/jd-opensource/joylive-injector
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: v1.2.1
+  tag: v1.2.2
 
 configMapName: joylive-injector-config