-
Notifications
You must be signed in to change notification settings - Fork 862
Catch exceptions in flush timer and write to EventSource #696
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
Merged
MikeGoldsmith
merged 8 commits into
open-telemetry:master
from
gr8-toolkit:bugfix/#695_jaeger_unhandled_exception
May 25, 2020
Merged
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
4687dc0
Catch exceptions in flush timer and write to EventSource
Illia-M 7ae1ec3
Fix naming
Illia-M 6e116c1
Revert OpenTelemetryApiEventSource naming fix
Illia-M ccda96d
Remove whitespace changes
Illia-M d066ca4
Add missing header
Illia-M 7612cc5
Change error handling
Illia-M 1971379
Fix
Illia-M 1c7fd6e
Merge branch 'master' into bugfix/#695_jaeger_unhandled_exception
Illia-M 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
81 changes: 81 additions & 0 deletions
81
src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerExporterEventSource.cs
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| // <copyright file="JaegerExporterEventSource.cs" company="OpenTelemetry Authors"> | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // </copyright> | ||
|
|
||
| using System; | ||
| using System.Diagnostics.Tracing; | ||
| using System.Globalization; | ||
| using System.Threading; | ||
|
|
||
| namespace OpenTelemetry.Exporter.Jaeger.Implementation | ||
| { | ||
| /// <summary> | ||
| /// EventSource events emitted from the project. | ||
| /// </summary> | ||
| [EventSource(Name = "OpenTelemetry-Exporter-Jaeger")] | ||
| internal class JaegerExporterEventSource : EventSource | ||
| { | ||
| public static JaegerExporterEventSource Log = new JaegerExporterEventSource(); | ||
|
|
||
| [NonEvent] | ||
| public void FailedFlush(Exception ex) | ||
| { | ||
| if (this.IsEnabled(EventLevel.Error, EventKeywords.All)) | ||
| { | ||
| this.FailedFlush(ToInvariantString(ex)); | ||
| } | ||
| } | ||
|
|
||
| [NonEvent] | ||
| public void UnexpectedError(Exception ex) | ||
| { | ||
| if (this.IsEnabled(EventLevel.Error, EventKeywords.All)) | ||
| { | ||
| this.UnexpectedError(ToInvariantString(ex)); | ||
| } | ||
| } | ||
|
|
||
| [Event(1, Message = "Failed to send spans: '{0}'", Level = EventLevel.Error)] | ||
| public void FailedFlush(string exception) | ||
| { | ||
| this.WriteEvent(1, exception); | ||
| } | ||
|
|
||
| [Event(2, Message = "Error: '{0}'", Level = EventLevel.Error)] | ||
| public void UnexpectedError(string exception) | ||
| { | ||
| this.WriteEvent(1, exception); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Returns a culture-independent string representation of the given <paramref name="exception"/> object, | ||
| /// appropriate for diagnostics tracing. | ||
| /// </summary> | ||
| private static string ToInvariantString(Exception exception) | ||
| { | ||
| var originalUICulture = Thread.CurrentThread.CurrentUICulture; | ||
|
|
||
| try | ||
| { | ||
| Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture; | ||
| return exception.ToString(); | ||
| } | ||
| finally | ||
| { | ||
| Thread.CurrentThread.CurrentUICulture = originalUICulture; | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.