Skip to content

fix: fix for nil pointer #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blue4209211 merged 1 commit into from
Aug 5, 2024
Merged

fix: fix for nil pointer #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions flags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
5 changes: 4 additions & 1 deletion tracing/tracing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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),
)),
Expand Down