Skip to content

Commit

Permalink
fix ec2 scraper attribute drop without describeTags
Browse files Browse the repository at this point in the history
  • Loading branch information
akats7 committed Jan 19, 2024
1 parent 5a8567f commit 60b7b6f
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 5 deletions.
27 changes: 27 additions & 0 deletions .chloggen/update-ec2-scraper.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: 'bug_fix'

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: resourcedetectionprocessor

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Update to ec2 scraper so that core attributes are not dropped if describeTags returns an error (likely due to permissions)

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: []

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
10 changes: 5 additions & 5 deletions processor/resourcedetectionprocessor/internal/aws/ec2/ec2.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ func (d *Detector) Detect(ctx context.Context) (resource pcommon.Resource, schem
client := getHTTPClientSettings(ctx, d.logger)
tags, err := connectAndFetchEc2Tags(meta.Region, meta.InstanceID, d.tagKeyRegexes, client)
if err != nil {
return res, "", fmt.Errorf("failed fetching ec2 instance tags: %w", err)
}
for key, val := range tags {
res.Attributes().PutStr(tagPrefix+key, val)
d.logger.Warn("failed fetching ec2 instance tags", zap.Error(err))
} else {
for key, val := range tags {
res.Attributes().PutStr(tagPrefix+key, val)
}
}
}

return res, conventions.SchemaURL, nil
}

Expand Down

0 comments on commit 60b7b6f

Please sign in to comment.