htwkmooc/poseidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Concurrent Map Write

Browse Source 
when handling the Sentry Debug Messages asynchronously.
This commit is contained in:
Maximilian Paß
2023-03-21 20:15:29 +00:00
parent f4b0354afe
commit c3e5afaad0
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/nomad/sentry_debug_writer.go
View File

@ -7,6 +7,7 @@ import (
"io" "io"
"regexp" "regexp"
"strconv" "strconv"
"sync"
"time" "time"
) )
@ -27,9 +28,10 @@ var (
// For matches, it creates a Sentry Span. Otherwise, the data will be forwarded to the Target. // For matches, it creates a Sentry Span. Otherwise, the data will be forwarded to the Target.
// The passed context Ctx should contain the Sentry data. // The passed context Ctx should contain the Sentry data.
type SentryDebugWriter struct { type SentryDebugWriter struct {
Target io.Writer Target io.Writer
Ctx context.Context Ctx context.Context
lastSpan *sentry.Span lastSpan *sentry.Span
lastSpanLock sync.Mutex
} }
func NewSentryDebugWriter(target io.Writer, ctx context.Context) *SentryDebugWriter { func NewSentryDebugWriter(target io.Writer, ctx context.Context) *SentryDebugWriter {
@ -78,6 +80,8 @@ func (s *SentryDebugWriter) Write(p []byte) (n int, err error) {
func (s *SentryDebugWriter) Close(exitCode int) { func (s *SentryDebugWriter) Close(exitCode int) {
if s.lastSpan != nil { if s.lastSpan != nil {
s.lastSpanLock.Lock()
defer s.lastSpanLock.Unlock()
s.lastSpan.Op = "nomad.execute.disconnect" s.lastSpan.Op = "nomad.execute.disconnect"
s.lastSpan.SetTag("exit_code", strconv.Itoa(exitCode)) s.lastSpan.SetTag("exit_code", strconv.Itoa(exitCode))
s.lastSpan.Finish() s.lastSpan.Finish()
@ -93,6 +97,8 @@ func (s *SentryDebugWriter) handleTimeDebugMessage(match map[string][]byte) {
return return
} }
s.lastSpanLock.Lock()
defer s.lastSpanLock.Unlock()
if s.lastSpan != nil { if s.lastSpan != nil {
s.lastSpan.EndTime = time.UnixMilli(timestamp) s.lastSpan.EndTime = time.UnixMilli(timestamp)
s.lastSpan.SetData("latency", time.Since(time.UnixMilli(timestamp)).String()) s.lastSpan.SetData("latency", time.Since(time.UnixMilli(timestamp)).String())