Skip to content

Commit

Permalink
fix: avoid using internal empty attribute.Set pointer (open-telemetry…
Browse files Browse the repository at this point in the history
…#34903)

**Description:** <Describe what has changed.>
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->

Data race condition when using the internal empty `attribute.Set`
concurrently. Code changed to prevent using the internal attribute.Set
instance.


**Link to tracking Issue:** <Issue number if applicable>
open-telemetry#34882

**Testing:** <Describe what testing was performed and which tests were
added.>
Same tests, race condition failures should be fixed. 

**Documentation:** <Describe the documentation added.>
  • Loading branch information
rogercoll authored and f7o committed Sep 12, 2024
1 parent a6be70a commit 6779d16
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
27 changes: 27 additions & 0 deletions .chloggen/fix_set_data_race.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: geoipprocessor

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Avoid using internal empty attribute.Set pointer

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

# (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: []
2 changes: 1 addition & 1 deletion processor/geoipprocessor/geoip_processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func ipFromAttributes(attributes []attribute.Key, resource pcommon.Map) (net.IP,
// geoLocation fetches geolocation information for the given IP address using the configured providers.
// It returns a set of attributes containing the geolocation data, or an error if the location could not be determined.
func (g *geoIPProcessor) geoLocation(ctx context.Context, ip net.IP) (attribute.Set, error) {
allAttributes := attribute.EmptySet()
allAttributes := &attribute.Set{}
for _, provider := range g.providers {
geoAttributes, err := provider.Location(ctx, ip)
if err != nil {
Expand Down

0 comments on commit 6779d16

Please sign in to comment.