-
Notifications
You must be signed in to change notification settings - Fork 462
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.
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
chore: modify LogExporter and TraceExporter interfaces to support returning failure #2381
Open
scottgerring
wants to merge
15
commits into
open-telemetry:main
Choose a base branch
from
scottgerring:chore/cleanup-shutdown
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
2c24988
chore: modify LogExporter and SpanExporter interfaces to support retu…
scottgerring 5b243a6
chore: address lints and comments
scottgerring 77d9a01
chore: address lint
scottgerring dc5d9b1
chore: Switch SpanExporter to use ShutdownResult
scottgerring 1b49188
chore: change logs exporter to use ShutdownResult
scottgerring a670a4e
lints
scottgerring 6440a73
Merge branch 'main' into chore/cleanup-shutdown
cijothomas 3c68efa
more error changes
scottgerring c2586ce
clippy
scottgerring a460184
Remove some stuff
scottgerring b1fff95
Merge main
scottgerring 0ad193f
clippy+fmt
scottgerring 4df322f
Merged
scottgerring 26bbdc4
Re-export ShutdownError from common location
scottgerring de49068
Catch missing errors
scottgerring File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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 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 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -148,8 +148,17 @@ impl InMemoryLogExporter { | |
/// ``` | ||
/// | ||
pub fn get_emitted_logs(&self) -> LogResult<Vec<LogDataWithResource>> { | ||
let logs_guard = self.logs.lock().map_err(LogError::from)?; | ||
let resource_guard = self.resource.lock().map_err(LogError::from)?; | ||
let logs_guard = self.logs.lock().map_err(|_| { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The mutex poisoned errors here are an implementation detail of So, I removed the automatic |
||
LogError::from( | ||
"InMemoryLogExporter: log buffer mutex poisoned trying to get_emitted_logs", | ||
) | ||
})?; | ||
let resource_guard = self.resource.lock().map_err(|_| { | ||
LogError::from( | ||
"InMemoryLogExporter: resource mutex poisoned trying to get_emitted_logs", | ||
) | ||
})?; | ||
|
||
let logs: Vec<LogDataWithResource> = logs_guard | ||
.iter() | ||
.map(|log_data| LogDataWithResource { | ||
|
@@ -173,8 +182,12 @@ impl InMemoryLogExporter { | |
/// ``` | ||
/// | ||
pub fn reset(&self) -> Result<(), LogError> { | ||
self.logs.lock().map(|mut logs_guard| logs_guard.clear())?; | ||
|
||
self.logs | ||
.lock() | ||
.map_err(|_| { | ||
LogError::from("InMemoryLogExporter: log buffer mutex poisoned trying to reset()") | ||
}) | ||
.map(|mut logs_guard| logs_guard.clear())?; | ||
Ok(()) | ||
} | ||
} | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed this as discussed