Skip to content

Commit

Permalink
Catch general exception in OltpExporter (#1634)
Browse files Browse the repository at this point in the history
* Catch general exception in OltpExporter

* Corrected typo
  • Loading branch information
utpilla authored Nov 30, 2020
1 parent fcc0b56 commit 1630fb3
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,15 @@ public void FailedToReachCollector(Exception ex)
}
}

[NonEvent]
public void ExportMethodException(Exception ex)
{
if (Log.IsEnabled(EventLevel.Error, (EventKeywords)(-1)))
{
this.ExportMethodException(ex.ToInvariantString());
}
}

[Event(1, Message = "Exporter failed to convert SpanData content into gRPC proto definition. Data will not be sent. Exception: {0}", Level = EventLevel.Error)]
public void FailedToConvertToProtoDefinitionError(string ex)
{
Expand All @@ -60,5 +69,11 @@ public void CouldNotTranslateActivity(string className, string methodName)
{
this.WriteEvent(3, className, methodName);
}

[Event(4, Message = "Unknown error in export method: {0}", Level = EventLevel.Error)]
public void ExportMethodException(string ex)
{
this.WriteEvent(4, ex);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@ public override ExportResult Export(in Batch<Activity> activityBatch)

return ExportResult.Failure;
}
catch (Exception ex)
{
OpenTelemetryProtocolExporterEventSource.Log.ExportMethodException(ex);

return ExportResult.Failure;
}
finally
{
request.Return();
Expand Down

0 comments on commit 1630fb3

Please sign in to comment.