Feature #TASK_QT-18250 omni设置优化

dist/aarch64/package_dir/bin/agentctl

@@ -134,6 +134,7 @@ startAgent() {
   if [ -f "${AGENT_BIN_DIR}/${AGENT_PROC}" ]; then
     export DISABLE_E2E_TRACING=false
     export DISABLE_STACK_TRACING=true
+    export RUN_IN_OMNIAGENT=true
     export SEND=1
     local params="--listen=0.0.0.0:8123"
 #    if [ -f "/etc/chaosd/pki/ca.crt" ] && [ -f "/etc/chaosd/pki/chaosd.crt" ] && [ -f "/etc/chaosd/pki/chaosd.key" ]; then

dist/x86_64/package_dir/bin/agentctl

@@ -134,6 +134,7 @@ startAgent() {
   if [ -f "${AGENT_BIN_DIR}/${AGENT_PROC}" ]; then
     export DISABLE_E2E_TRACING=false
     export DISABLE_STACK_TRACING=true
+    export RUN_IN_OMNIAGENT=true
     export SEND=1
     local params="--listen=0.0.0.0:8123"
 #    if [ -f "/etc/chaosd/pki/ca.crt" ] && [ -f "/etc/chaosd/pki/chaosd.crt" ] && [ -f "/etc/chaosd/pki/chaosd.key" ]; then

flags/flags.go

@@ -39,10 +39,10 @@ var (
 	DisableL7Tracing  = kingpin.Flag("disable-l7-tracing", "Disable L7 tracing").Default("false").Envar("DISABLE_L7_TRACING").Bool()
 
 	ExternalNetworksWhitelist = kingpin.
-					Flag("track-public-network", "Allow track connections to the specified IP networks, all private networks are allowed by default (e.g., Y.Y.Y.Y/mask)").
-					Envar("TRACK_PUBLIC_NETWORK").
-					Default("0.0.0.0/0").
-					Strings()
+		Flag("track-public-network", "Allow track connections to the specified IP networks, all private networks are allowed by default (e.g., Y.Y.Y.Y/mask)").
+		Envar("TRACK_PUBLIC_NETWORK").
+		Default("0.0.0.0/0").
+		Strings()
 	EphemeralPortRange = kingpin.Flag("ephemeral-port-range", "Destination and Listen TCP ports from this range will be skipped").Default("").Envar("EPHEMERAL_PORT_RANGE").String()
 
 	Provider          = kingpin.Flag("provider", "`provider` label for `node_cloud_info` metric").Envar("PROVIDER").String()
@@ -128,7 +128,7 @@ func init() {
 	// set ServerPrefix
 	// set ConfigServer
 	// set DataServer
-	if *CommonIni != "" {
+	if *RunInOmniagent {
 		iniData, err := ini.Load(*CommonIni)
 		if err == nil && iniData != nil {
 			*ServerPrefix = "/apm"

node/apm_host_info.go

@@ -14,16 +14,18 @@ import (
 )
 
 func NewNodeInfo(name, kv, version string) (*NodeInfoT, error) {
-	ni, err := newNodeInfoFromCommonIni(name, kv, version)
-	if err != nil {
-		klog.Errorf("Failed to create node info from common ini: %v", err)
-	} else {
+	if *flags.RunInOmniagent {
 		klog.Infof("run in omniagent.")
-		*flags.RunInOmniagent = true
-		return ni, err
+		ni, err := newNodeInfoFromCommonIni(name, kv, version)
+		if err != nil {
+			klog.Errorf("Failed to create node info from common ini: %v", err)
+			return nil, err
+		}
+		return ni, nil
 	}
 
 	var ip string
+	var err error
 	if *flags.RunInContainer {
 		klog.Infof("run in container.")
 		ip, err = kube.GetNodeIpByCore(name)