Skip to content
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

Jump to bottom

fix(agent): [ENG-16] Agent is exiting with error "BUG reconnection function is nil" #2504

Merged
merged 1 commit into from
Jul 18, 2023
Merged

fix(agent): [ENG-16] Agent is exiting with error "BUG reconnection function is nil" #2504

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
2 changes: 1 addition & 1 deletion agent/backend/diode/scrape.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const (

func (d *diodeBackend) createOtlpMqttExporter(ctx context.Context, cancelFunc context.CancelFunc) (exporter.Logs, error) {

bridgeService := otel.NewBridgeService(ctx, &d.policyRepo, d.agentTags)
bridgeService := otel.NewBridgeService(ctx, cancelFunc, &d.policyRepo, d.agentTags)
if d.mqttClient != nil {
cfg := otlpmqttexporter.CreateConfigClient(d.mqttClient, d.logTopic, d.version, bridgeService)
set := otlpmqttexporter.CreateDefaultSettings(d.logger)
Expand Down
10 changes: 5 additions & 5 deletions agent/backend/pktvisor/scrape.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,26 +37,26 @@ func (p *pktvisorBackend) scrapeMetrics(period uint) (map[string]interface{}, er

func (p *pktvisorBackend) createOtlpMqttExporter(ctx context.Context, cancelFunc context.CancelFunc) (exporter.Metrics, error) {

bridgeService := otel.NewBridgeService(ctx, &p.policyRepo, p.agentTags)
bridgeService := otel.NewBridgeService(ctx, cancelFunc, &p.policyRepo, p.agentTags)
if p.mqttClient != nil {
cfg := otlpmqttexporter.CreateConfigClient(p.mqttClient, p.otlpMetricsTopic, p.pktvisorVersion, bridgeService)
set := otlpmqttexporter.CreateDefaultSettings(p.logger)
// Create the OTLP metrics exporter that'll receive and verify the metrics produced.
exporter, err := otlpmqttexporter.CreateMetricsExporter(ctx, set, cfg)
metricsExporter, err := otlpmqttexporter.CreateMetricsExporter(ctx, set, cfg)
if err != nil {
return nil, err
}
return exporter, nil
return metricsExporter, nil
} else {
cfg := otlpmqttexporter.CreateConfig(p.mqttConfig.Address, p.mqttConfig.Id, p.mqttConfig.Key,
p.mqttConfig.ChannelID, p.pktvisorVersion, p.otlpMetricsTopic, bridgeService)
set := otlpmqttexporter.CreateDefaultSettings(p.logger)
// Create the OTLP metrics exporter that'll receive and verify the metrics produced.
exporter, err := otlpmqttexporter.CreateMetricsExporter(ctx, set, cfg)
metricsExporter, err := otlpmqttexporter.CreateMetricsExporter(ctx, set, cfg)
if err != nil {
return nil, err
}
return exporter, nil
return metricsExporter, nil
}

}
Expand Down
9 changes: 6 additions & 3 deletions agent/otel/bridgeservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ package otel

import (
"context"
"github.com/orb-community/orb/agent/policies"
"strings"

"github.com/orb-community/orb/agent/policies"
)

type AgentBridgeService interface {
Expand All @@ -21,13 +22,15 @@ var _ AgentBridgeService = (*BridgeService)(nil)

type BridgeService struct {
bridgeContext context.Context
cancelFunc context.CancelFunc
policyRepo policies.PolicyRepo
AgentTags map[string]string
}

func NewBridgeService(ctx context.Context, policyRepo *policies.PolicyRepo, agentTags map[string]string) *BridgeService {
func NewBridgeService(ctx context.Context, cancelFunc context.CancelFunc, policyRepo *policies.PolicyRepo, agentTags map[string]string) *BridgeService {
return &BridgeService{
bridgeContext: ctx,
cancelFunc: cancelFunc,
policyRepo: *policyRepo,
AgentTags: agentTags,
}
Expand All @@ -47,5 +50,5 @@ func (b *BridgeService) RetrieveAgentInfoByPolicyName(policyName string) (*Agent

func (b *BridgeService) NotifyAgentDisconnection(ctx context.Context, err error) {
ctx.Done()
b.bridgeContext.Done()
b.cancelFunc()
}
Loading