Skip to content

fix: fix for node metadata init #58

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
mayankpande88 merged 1 commit into from
May 15, 2024
Merged

fix: fix for node metadata init #58

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: 0 additions & 1 deletion common/ip_resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,6 @@ func (resolver *K8sIPResolver) updateIpMapping() {
Region: region,
Zone: zone,
}
log.Printf("created pod workload %v", podWorkload)
resolver.storePodsIP(podIp.IP, &podWorkload)
}
return true
Expand Down
3 changes: 1 addition & 2 deletions containers/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,7 @@ type Container struct {
instanceMetadata *metadata.CloudMetadata
}

func NewContainer(id ContainerID, cg *cgroup.Cgroup, md *ContainerMetadata, hostConntrack *Conntrack, pid uint32, ip_resolver IPResolver) (*Container, error) {
instanceMetadata := metadata.GetInstanceMetadata()
func NewContainer(id ContainerID, cg *cgroup.Cgroup, md *ContainerMetadata, hostConntrack *Conntrack, pid uint32, ip_resolver IPResolver, instanceMetadata *metadata.CloudMetadata) (*Container, error) {
netNs, err := proc.GetNetNs(pid)
if err != nil {
return nil, err
Expand Down
15 changes: 9 additions & 6 deletions containers/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/coroot/coroot-node-agent/common"
"github.com/coroot/coroot-node-agent/ebpftracer"
"github.com/coroot/coroot-node-agent/flags"
"github.com/coroot/coroot-node-agent/node/metadata"
"github.com/coroot/coroot-node-agent/proc"
"github.com/prometheus/client_golang/prometheus"
"github.com/vishvananda/netns"
Expand Down Expand Up @@ -51,11 +52,12 @@ type Registry struct {
containersByCgroupId map[string]*Container
containersByPid map[uint32]*Container

processInfoCh chan<- ProcessInfo
ip_resolver IPResolver
processInfoCh chan<- ProcessInfo
ip_resolver IPResolver
instanceMetadata *metadata.CloudMetadata
}

func NewRegistry(reg prometheus.Registerer, kernelVersion string, processInfoCh chan<- ProcessInfo, ip_resolver *common.K8sIPResolver) (*Registry, error) {
func NewRegistry(reg prometheus.Registerer, kernelVersion string, processInfoCh chan<- ProcessInfo, ip_resolver *common.K8sIPResolver, md *metadata.CloudMetadata) (*Registry, error) {
ns, err := proc.GetSelfNetNs()
if err != nil {
return nil, err
Expand Down Expand Up @@ -109,8 +111,9 @@ func NewRegistry(reg prometheus.Registerer, kernelVersion string, processInfoCh

processInfoCh: processInfoCh,

tracer: ebpftracer.NewTracer(kernelVersion, *flags.DisableL7Tracing),
ip_resolver: ip_resolver,
tracer: ebpftracer.NewTracer(kernelVersion, *flags.DisableL7Tracing),
ip_resolver: ip_resolver,
instanceMetadata: md,
}

go r.handleEvents(r.events)
Expand Down Expand Up @@ -306,7 +309,7 @@ func (r *Registry) getOrCreateContainer(pid uint32) *Container {
r.containersByCgroupId[cg.Id] = c
return c
}
c, err := NewContainer(id, cg, md, r.hostConntrack, pid, r.ip_resolver)
c, err := NewContainer(id, cg, md, r.hostConntrack, pid, r.ip_resolver, r.instanceMetadata)
if err != nil {
klog.Warningf("failed to create container pid=%d cg=%s id=%s: %s", pid, cg.Id, id, err)
return nil
Expand Down
7 changes: 4 additions & 3 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/coroot/coroot-node-agent/flags"
"github.com/coroot/coroot-node-agent/logs"
"github.com/coroot/coroot-node-agent/node"
"github.com/coroot/coroot-node-agent/node/metadata"
"github.com/coroot/coroot-node-agent/profiling"
"github.com/coroot/coroot-node-agent/prom"
"github.com/coroot/coroot-node-agent/tracing"
Expand Down Expand Up @@ -155,14 +156,14 @@ func main() {
registerer := prometheus.WrapRegistererWith(prometheus.Labels{"machine_id": machineId}, registry)

registerer.MustRegister(info("node_agent_info", version))

if err := registerer.Register(node.NewCollector(hostname, kv)); err != nil {
md := metadata.GetInstanceMetadata()
if err := registerer.Register(node.NewCollector(hostname, kv, md)); err != nil {
klog.Exitln(err)
}

processInfoCh := profiling.Init(machineId, hostname)

cr, err := containers.NewRegistry(registerer, kv, processInfoCh, resolver)
cr, err := containers.NewRegistry(registerer, kv, processInfoCh, resolver, md)
if err != nil {
klog.Exitln(err)
}
Expand Down
3 changes: 1 addition & 2 deletions node/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,7 @@ type Collector struct {
instanceMetadata *metadata.CloudMetadata
}

func NewCollector(hostname, kernelVersion string) *Collector {
md := metadata.GetInstanceMetadata()
func NewCollector(hostname, kernelVersion string, md *metadata.CloudMetadata) *Collector {
klog.Infof("instance metadata: %+v", md)
return &Collector{
hostname: hostname,
Expand Down