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

pre-define map capacities #197

Merged
merged 1 commit into from
Oct 17, 2022
Merged

pre-define map capacities #197

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
39 changes: 24 additions & 15 deletions libhoney.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,9 +538,10 @@ func Flush() {
// Contrary to its name, SendNow does not block and send data
// immediately, but only enqueues to be sent asynchronously.
// It is equivalent to:
// ev := libhoney.NewEvent()
// ev.Add(data)
// ev.Send()
//
// ev := libhoney.NewEvent()
// ev.Add(data)
// ev.Send()
//
// Deprecated: SendNow is deprecated and may be removed in a future major release.
func SendNow(data interface{}) error {
Expand Down Expand Up @@ -844,8 +845,8 @@ func (e *Event) SendPresampled() (err error) {
e.sendLock.Lock()
defer e.sendLock.Unlock()

e.fieldHolder.lock.RLock()
defer e.fieldHolder.lock.RUnlock()
e.lock.RLock()
defer e.lock.RUnlock()
if len(e.data) == 0 {
return errors.New("No metrics added to event. Won't send empty event.")
}
Expand Down Expand Up @@ -922,9 +923,10 @@ func (b *Builder) AddDynamicField(name string, fn func() interface{}) error {
// Contrary to its name, SendNow does not block and send data
// immediately, but only enqueues to be sent asynchronously.
// It is equivalent to:
// ev := builder.NewEvent()
// ev.Add(data)
// ev.Send()
//
// ev := builder.NewEvent()
// ev.Add(data)
// ev.Send()
//
// Deprecated: SendNow is deprecated and may be removed in a future major release.
func (b *Builder) SendNow(data interface{}) error {
Expand All @@ -947,18 +949,23 @@ func (b *Builder) NewEvent() *Event {
Timestamp: time.Now(),
client: b.client,
}
e.data = make(map[string]interface{})

// Set up locks
b.lock.RLock()
defer b.lock.RUnlock()
b.dynFieldsLock.RLock()
defer b.dynFieldsLock.RUnlock()
e.lock.Lock()
defer e.lock.Unlock()

e.data = make(map[string]interface{}, len(b.data)+len(b.dynFields))
for k, v := range b.data {
e.data[k] = v
}
// create dynamic metrics
b.dynFieldsLock.RLock()
defer b.dynFieldsLock.RUnlock()

// create dynamic metrics.
for _, dynField := range b.dynFields {
e.AddField(dynField.name, dynField.fn())
// Perform the data mutation while locked.
e.data[dynField.name] = dynField.fn()
}
return e
}
Expand All @@ -973,12 +980,14 @@ func (b *Builder) Clone() *Builder {
APIHost: b.APIHost,
client: b.client,
}
newB.data = make(map[string]interface{})

b.lock.RLock()
defer b.lock.RUnlock()
newB.data = make(map[string]interface{}, len(b.data))
for k, v := range b.data {
newB.data[k] = v
}

// copy dynamic metric generators
b.dynFieldsLock.RLock()
defer b.dynFieldsLock.RUnlock()
Expand Down