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

[CDS-305] Fix initialisation delay for metadata on ecsattributes processor #253

Merged
merged 3 commits into from
Jul 17, 2023
Merged

[CDS-305] Fix initialisation delay for metadata on ecsattributes processor #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a11d167
added initial syncmetadata call and error on initial call
daidokoro Jul 14, 2023
f281033
changelog
daidokoro Jul 14, 2023
d6053db
Update otel-agent/ecs-ec2/CHANGELOG.md
daidokoro Jul 17, 2023
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
3 changes: 3 additions & 0 deletions otel-agent/ecs-ec2/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## OpenTelemtry-Agent

### v0.0.29 / 2023-07-14
* [FIX] fixed issue with ecsattributes processor not initialising correctly

### v0.0.28 / 2023-07-05
* [UPGRADE] coralogixrepo/otel-coralogix-ecs-ec2 container version updated to 0.80.0
* [UPGRADE] added custom ecsattributes processor to the container
Expand Down
30 changes: 21 additions & 9 deletions otel-agent/ecs-ec2/ecsattributesprocessor/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,13 @@ func (m *metadataHandler) syncMetadata(ctx context.Context, endpoints map[string
func (m *metadataHandler) start() error {
cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
if err != nil {
m.logger.Sugar().Errorf("failed to intial docker API client: %ss", err)
m.logger.Sugar().Errorf("failed to intial docker API client: %w", err)
return err
}

// initial sync
if err := syncMetadata(context.Background(), m); err != nil {
m.logger.Sugar().Errorf("failed to sync metadata: %w", err)
return err
}

Expand All @@ -90,12 +96,18 @@ func (m *metadataHandler) start() error {
for {
select {
case <-ticker.C:
syncMetadata(ctx, m)
if err := syncMetadata(ctx, m); err != nil {
m.logger.Sugar().Errorf("failed to sync metadata: %w", err)
}

case event := <-dockerEvents:
if event.Type == events.ContainerEventType && event.Action == "create" {
m.logger.Debug("new container id detected, re-syncing metadata", zap.String("id", event.ID))
syncMetadata(ctx, m)
if !(event.Type == events.ContainerEventType && event.Action == "create") {
continue
}

m.logger.Debug("new container id detected, re-syncing metadata", zap.String("id", event.ID))
if err := syncMetadata(ctx, m); err != nil {
m.logger.Sugar().Errorf("failed to sync metadata: %w", err)
}

case err := <-errors:
Expand Down Expand Up @@ -168,19 +180,19 @@ func getEndpoints(ctx context.Context) (map[string][]string, error) {
return m, nil
}

func syncMetadata(ctx context.Context, m *metadataHandler) {
func syncMetadata(ctx context.Context, m *metadataHandler) error {
endpoints, err := m.endpoints(ctx)
if err != nil {
m.logger.Sugar().Errorf("failed to fetch metadata endpoints: %w", err)
return
return fmt.Errorf("failed to fetch metadata endpoints: %w", err)
}

m.Lock()
m.logger.Debug("updating endpoints", zap.String("processor", metadata.Type))
if err := m.syncMetadata(ctx, endpoints); err != nil {
m.logger.Sugar().Errorf("%s failed to update metadata endpoints: %w", metadata.Type, err)
return fmt.Errorf("%s failed to update metadata endpoints: %w", metadata.Type, err)
}

m.Unlock()
m.logger.Debug("number of containers with detected metadata endpoints", zap.Int("count", len(endpoints)))
return nil
}
Loading