Merge remote-tracking branch 'origin/develop' into develop

kustomization/base/configMap.yaml

@@ -5,3 +5,5 @@ metadata:
   namespace: default
 data:
   SPRING_PROFILES_ACTIVE: default
+  SW_AGENT_COLLECTOR_BACKEND_SERVICES: "default-oap.default:11800"
+  SW_AGENT_NAME: ims

kustomization/base/deployment.yaml

@@ -14,6 +14,7 @@ spec:
     metadata:
       labels:
         app: ims
+        swck-java-agent-injected: 'true'
     spec:
       containers:
         - name: ims
@@ -33,6 +34,16 @@ spec:
                 configMapKeyRef:
                   name: ims-map
                   key: SPRING_PROFILES_ACTIVE
+            - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+              valueFrom:
+                configMapKeyRef:
+                  name: ims-map
+                  key: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+            - name: SW_AGENT_NAME
+              valueFrom:
+                configMapKeyRef:
+                  name: ims-map
+                  key: SW_AGENT_NAME
       volumes:
         - name: log-of-app
           hostPath:

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 614d4cd45ce2d0d352b2d900d6d24dbf1dc24e7b
+  newTag: 8bff5c2a71746eddf05ed36273439bf90d398706