Fix concurrency in emf exporter #2571
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Mar 7, 2021
Codecov Report
@@ Coverage Diff @@
## main #2571 +/- ##
==========================================
+ Coverage 91.31% 91.32% +0.01%
==========================================
Files 429 429
Lines 21457 21467 +10
==========================================
+ Hits 19593 19605 +12
+ Misses 1395 1394 -1
+ Partials 469 468 -1
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
bjrara
changed the title
|
Using channels could achieve the same goal, but we found it would make codes more complex to read to maintain the same semantics of the |
mxiamxia
approved these changes
Mar 9, 2021
Comment on lines
+77
to
+91
| if *logEvent.InputLogEvent.Timestamp == int64(0) { | ||
| logEvent.InputLogEvent.Timestamp = aws.Int64(logEvent.LogGeneratedTime.UnixNano() / int64(time.Millisecond)) | ||
| } | ||
| return logEvent | ||
| if len(*logEvent.InputLogEvent.Message) == 0 { | ||
| return errors.New("empty log event message") | ||
| } | ||
|
|
||
| //http:https://docs.aws.amazon.com/goto/SdkForGoV1/logs-2014-03-28/PutLogEvents | ||
| //* None of the log events in the batch can be more than 2 hours in the | ||
| //future. | ||
| //* None of the log events in the batch can be older than 14 days or the | ||
| //retention period of the log group. | ||
| currentTime := time.Now().UTC() | ||
| utcTime := time.Unix(0, *logEvent.InputLogEvent.Timestamp*int64(time.Millisecond)).UTC() | ||
| duration := currentTime.Sub(utcTime) |
There was a problem hiding this comment.
Thanks for putting all the data validation logic in one place.
anuraaga
approved these changes
Mar 9, 2021
This was referenced Mar 15, 2021
This was referenced Mar 15, 2021
kisieland
referenced
this pull request
in kisieland/opentelemetry-collector-contrib
Mar 16, 2021
…pp (#2571) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.35.0 to 1.36.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.35.0...v1.36.0) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
pmatyjasek-sumo
referenced
this pull request
in pmatyjasek-sumo/opentelemetry-collector-contrib
Apr 28, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why do we need it?
This PR fixes the concurrency issue described in aws-observability/aws-otel-collector#387, and does a code refactoring to
pusher.We add two locks, one for
logEventBatchinstance update and one forstreamTokenreplacement to ensure they're both goroutine safe. It also fixes an issue of deciding where a new logEvent should go to when the current batch could not meet the requirement before or after the new entry appending. In today's implementation, it is added to the old batch, and this PR changes it to be added to a newly created batch.