open-telemetry
/
opentelemetry-dotnet
mirror of https://github.com/open-telemetry/opentelemetry-dotnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor HttpWebRequestActivitySource (#5055)

This commit is contained in:
Vishwesh Bankwar 2023-11-17 12:07:00 -08:00 committed by GitHub
parent d3461964ca
commit 2a228f9234
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebRequestActivitySource.netfx.cs
View File

@ -204,8 +204,6 @@ internal static class HttpWebRequestActivitySource
activity.SetTag(SemanticConventions.AttributeHttpResponseStatusCode, TelemetryHelper.GetBoxedStatusCode(response.StatusCode));
}
activity.SetStatus(SpanHelper.ResolveSpanStatusForHttpStatusCode(activity.Kind, (int)response.StatusCode));
try
{
TracingOptions.EnrichWithHttpWebResponse?.Invoke(activity, response);
@ -243,45 +241,15 @@ internal static class HttpWebRequestActivitySource
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static void AddExceptionTags(Exception exception, Activity activity, out HttpStatusCode? statusCode, out Version protocolVersion)
private static void AddExceptionEvent(Exception exception, Activity activity)
{
Debug.Assert(activity != null, "Activity must not be null");
statusCode = null;
protocolVersion = null;
if (!activity.IsAllDataRequested)
{
return;
}
ActivityStatusCode status;
if (exception is WebException wexc && wexc.Response is HttpWebResponse response)
{
statusCode = response.StatusCode;
protocolVersion = response.ProtocolVersion;
if (tracingEmitOldAttributes)
{
activity.SetTag(SemanticConventions.AttributeHttpStatusCode, (int)statusCode);
}
if (tracingEmitNewAttributes)
{
activity.SetTag(SemanticConventions.AttributeNetworkProtocolVersion, HttpTagHelper.GetProtocolVersionString(protocolVersion));
activity.SetTag(SemanticConventions.AttributeHttpResponseStatusCode, (int)statusCode);
}
status = SpanHelper.ResolveSpanStatusForHttpStatusCode(activity.Kind, (int)statusCode);
}
else
{
status = ActivityStatusCode.Error;
}
activity.SetStatus(status);
if (TracingOptions.RecordException)
{
activity.RecordException(exception);
@ -401,6 +369,7 @@ internal static class HttpWebRequestActivitySource
HttpStatusCode? httpStatusCode = null;
string errorType = null;
Version protocolVersion = null;
ActivityStatusCode activityStatus = ActivityStatusCode.Unset;
// Activity may be null if we are not tracing in these cases:
// 1. No listeners
@ -417,14 +386,30 @@ internal static class HttpWebRequestActivitySource
if (result is Exception ex)
{
errorType = GetErrorType(ex);
if (activity != null)
{
AddExceptionTags(ex, activity, out httpStatusCode, out protocolVersion);
}
else if (ex is WebException wexc && wexc.Response is HttpWebResponse response)
if (ex is WebException wexc && wexc.Response is HttpWebResponse response)
{
httpStatusCode = response.StatusCode;
protocolVersion = response.ProtocolVersion;
activityStatus = SpanHelper.ResolveSpanStatusForHttpStatusCode(activity.Kind, (int)response.StatusCode);
if (activityStatus == ActivityStatusCode.Error)
{
// override the errorType to statusCode for failures.
errorType = TelemetryHelper.GetStatusCodeString(response.StatusCode);
}
if (activity != null)
{
AddResponseTags(response, activity);
AddExceptionEvent(ex, activity);
}
}
else
{
activityStatus = ActivityStatusCode.Error;
if (activity != null)
{
AddExceptionEvent(ex, activity);
}
}
}
else
@ -465,9 +450,11 @@ internal static class HttpWebRequestActivitySource
protocolVersion = response.ProtocolVersion;
}
if (SpanHelper.ResolveSpanStatusForHttpStatusCode(ActivityKind.Client, (int)httpStatusCode.Value) == ActivityStatusCode.Error)
activityStatus = SpanHelper.ResolveSpanStatusForHttpStatusCode(activity.Kind, (int)httpStatusCode.Value);
if (activityStatus == ActivityStatusCode.Error)
{
// override the errorType to statusCode for failures.
// set the errorType to statusCode for failures.
errorType = TelemetryHelper.GetStatusCodeString(httpStatusCode.Value);
}
}
@ -477,9 +464,13 @@ internal static class HttpWebRequestActivitySource
HttpInstrumentationEventSource.Log.FailedProcessResult(ex);
}
if (tracingEmitNewAttributes && errorType != null)
if (activity != null && activity.IsAllDataRequested)
{
activity?.SetTag(SemanticConventions.AttributeErrorType, errorType);
activity.SetStatus(activityStatus);
if (tracingEmitNewAttributes && errorType != null)
{
activity.SetTag(SemanticConventions.AttributeErrorType, errorType);
}
}
activity?.Stop();