Merge pull request #457 from wangzlei/master

fix fatal error: concurrent map iteration and map write
aws · Mar 12, 2024 · 8d69381 · 8d69381
2 parents a0604c5 + 3be6b09
commit 8d69381
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/instrumentation/awsv2/awsv2.go b/instrumentation/awsv2/awsv2.go
@@ -67,6 +67,9 @@ func deserializeMiddleware(stack *middleware.Stack) error {
 			return out, metadata, err
 		}
 
+		// Lock subseg before updating
+		subseg.Lock()
+
 		subseg.GetHTTP().GetResponse().ContentLength = int(resp.ContentLength)
 		requestID, ok := v2Middleware.GetRequestIDMetadata(metadata)
 
@@ -77,6 +80,8 @@ func deserializeMiddleware(stack *middleware.Stack) error {
 			subseg.GetAWS()[xray.ExtendedRequestIDKey] = extendedRequestID
 		}
 
+		subseg.Unlock()
+
 		xray.HttpCaptureResponse(subseg, resp.StatusCode)
 		return out, metadata, err
 	}),