From 5ef7b817d71c8517b6e5ef04b05aeb9993321732 Mon Sep 17 00:00:00 2001 From: Mayank Pande Date: Mon, 5 Aug 2024 16:44:35 +0530 Subject: [PATCH 1/3] fix: fix for nil pointer --- flags/flags.go | 1 + tracing/tracing.go | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/flags/flags.go b/flags/flags.go index 70c1c3d4..d0c0fc6d 100644 --- a/flags/flags.go +++ b/flags/flags.go @@ -24,6 +24,7 @@ var ( Provider = kingpin.Flag("provider", "`provider` label for `node_cloud_info` metric").Envar("PROVIDER").String() Region = kingpin.Flag("region", "`region` label for `node_cloud_info` metric").Envar("REGION").String() AvailabilityZone = kingpin.Flag("availability-zone", "`availability_zone` label for `node_cloud_info` metric").Envar("AVAILABILITY_ZONE").String() + AccountId = kingpin.Flag("account-id", "`account_id` label for `node_cloud_info` metric").Envar("ACCOUNT_ID").String() InstanceType = kingpin.Flag("instance-type", "`instance_type` label for `node_cloud_info` metric").Envar("INSTANCE_TYPE").String() InstanceLifeCycle = kingpin.Flag("instance-life-cycle", "`instance_life_cycle` label for `node_cloud_info` metric").Envar("INSTANCE_LIFE_CYCLE").String() LogPerSecond = kingpin.Flag("log-per-second", "The number of logs per second").Default("10.0").Envar("LOG_PER_SECOND").Float64() diff --git a/tracing/tracing.go b/tracing/tracing.go index dda0a525..d1874c7e 100644 --- a/tracing/tracing.go +++ b/tracing/tracing.go @@ -61,13 +61,16 @@ func Init(machineId, hostname, version string) { // if md is nil region := "" availabilityZone := "" + accountId := "" if md == nil { region = *flags.Region availabilityZone = *flags.AvailabilityZone + accountId = *flags.AccountId klog.Infoln("no cloud metadata available, using defaults") } else { region = md.Region availabilityZone = md.AvailabilityZone + accountId = md.AccountId } tracer = func(containerId string) trace.Tracer { provider := sdktrace.NewTracerProvider( @@ -78,7 +81,7 @@ func Init(machineId, hostname, version string) { semconv.HostID(machineId), semconv.ServiceName(common.ContainerIdToOtelServiceName(containerId)), semconv.ContainerID(containerId), - semconv.CloudAccountID(md.AccountId), + semconv.CloudAccountID(accountId), semconv.CloudRegion(region), semconv.CloudAvailabilityZone(availabilityZone), )), From fffcc3babc3b2472b81333b606d6c504e7315468 Mon Sep 17 00:00:00 2001 From: Mayank Pande Date: Thu, 2 Jan 2025 09:15:10 +0530 Subject: [PATCH 2/3] fix: fix for node agent failure --- containers/container.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/container.go b/containers/container.go index 20ac4003..3abc542f 100644 --- a/containers/container.go +++ b/containers/container.go @@ -174,7 +174,7 @@ func NewContainer(id ContainerID, cg *cgroup.Cgroup, md *ContainerMetadata, pid // %s -> pod name split := strings.Split(string(id), "/") - if len(split) != 3 { + if len(split) > 3 { return nil, fmt.Errorf("invalid container id %s", id) } namespace := split[1] From b63fc0e09ea6f6a90aa4559104e6262575e1e871 Mon Sep 17 00:00:00 2001 From: Mayank Pande Date: Thu, 2 Jan 2025 10:34:11 +0530 Subject: [PATCH 3/3] fix: fix for container id --- containers/container.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/containers/container.go b/containers/container.go index 3abc542f..b8cfacef 100644 --- a/containers/container.go +++ b/containers/container.go @@ -1,7 +1,6 @@ package containers import ( - "fmt" "io" "log" "os" @@ -174,9 +173,6 @@ func NewContainer(id ContainerID, cg *cgroup.Cgroup, md *ContainerMetadata, pid // %s -> pod name split := strings.Split(string(id), "/") - if len(split) > 3 { - return nil, fmt.Errorf("invalid container id %s", id) - } namespace := split[1] podName := split[2]