microsoft
/
ApplicationInsights-dotnet
зеркало из https://github.com/microsoft/ApplicationInsights-dotnet.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'lmolkova/fixExceptionTracking' of https://github.com/Microsoft/ApplicationInsights-dotnet into lmolkova/fixExceptionTracking

This commit is contained in:
Liudmila Molkova 2019-12-19 21:50:07 -08:00
Родитель 55a2366875 44ab9c89ef
Коммит 1ff33bc2e8
41 изменённых файлов: 304 добавлений и 353 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
BASE/Test/Microsoft.ApplicationInsights.Test/Shared/Extensibility/Implementation/OperationHolderTests.cs
Просмотреть файл

@ -56,7 +56,7 @@
var operation = new OperationHolder<DependencyTelemetry>(client, new DependencyTelemetry(), originalActivity);
var newActivity = new Activity("new").SetParentId("detached-parent").Start();
operation.Telemetry.Id = $"|{newActivity.TraceId.ToHexString()}.{newActivity.SpanId.ToHexString()}.";
operation.Telemetry.Id = newActivity.SpanId.ToHexString();
operation.Dispose();
Assert.AreEqual(Activity.Current, originalActivity);
@ -71,7 +71,7 @@
var operation = new OperationHolder<DependencyTelemetry>(client, new DependencyTelemetry(), null);
var newActivity = new Activity("new").SetParentId("detached-parent").Start();
operation.Telemetry.Id = $"|{newActivity.TraceId.ToHexString()}.{newActivity.SpanId.ToHexString()}.";
operation.Telemetry.Id = newActivity.SpanId.ToHexString();
operation.Dispose();
Assert.IsNull(Activity.Current);
@ -87,7 +87,7 @@
// child of original
var newActivity = new Activity("new").Start();
operation.Telemetry.Id = $"|{newActivity.TraceId.ToHexString()}.{newActivity.SpanId.ToHexString()}.";
operation.Telemetry.Id = newActivity.SpanId.ToHexString();
operation.Dispose();
Assert.AreEqual(Activity.Current, originalActivity);
}

7
BASE/Test/Microsoft.ApplicationInsights.Test/Shared/Extensibility/OperationCorrelationTelemetryInitializerTests.cs
Просмотреть файл

@ -70,8 +70,7 @@
// Validate
Assert.AreEqual(activity.TraceId.ToHexString(), telemetry.Context.Operation.Id, "OperationCorrelationTelemetryInitializer is expected to populate OperationID from Activity");
Assert.AreEqual(W3CUtilities.FormatTelemetryId(activity.TraceId.ToHexString(), activity.SpanId.ToHexString()),
telemetry.Context.Operation.ParentId,
Assert.AreEqual(activity.SpanId.ToHexString(), telemetry.Context.Operation.ParentId,
"OperationCorrelationTelemetryInitializer is expected to populate Operation ParentID as |traceID.SpanId. from Activity");
Assert.AreEqual(originalTelemetryId, telemetry.Id, "OperationCorrelationTelemetryInitializer is not expected to modify Telemetry ID");
activity.Stop();
@ -256,7 +255,7 @@
(new OperationCorrelationTelemetryInitializer()).Initialize(telemetry);
Assert.AreEqual(currentActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual(W3CUtilities.FormatTelemetryId(currentActivity.TraceId.ToHexString(), currentActivity.SpanId.ToHexString()), telemetry.Context.Operation.ParentId);
Assert.AreEqual(currentActivity.SpanId.ToHexString(), telemetry.Context.Operation.ParentId);
Assert.AreEqual("operation", telemetry.Context.Operation.Name);
Assert.AreEqual(3, telemetry.Properties.Count);
@ -278,7 +277,7 @@
(new OperationCorrelationTelemetryInitializer()).Initialize(telemetry);
Assert.AreEqual(currentActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual(W3CUtilities.FormatTelemetryId(currentActivity.TraceId.ToHexString(), currentActivity.SpanId.ToHexString()), telemetry.Context.Operation.ParentId);
Assert.AreEqual(currentActivity.SpanId.ToHexString(), telemetry.Context.Operation.ParentId);
Assert.AreEqual("operation", telemetry.Context.Operation.Name);
Assert.AreEqual(1, telemetry.Properties.Count);

13
BASE/Test/Microsoft.ApplicationInsights.Test/Shared/StartOperationActivityTests.cs
Просмотреть файл

@ -169,7 +169,7 @@
var request = this.sendItems.Single() as RequestTelemetry;
Assert.IsNotNull(request);
Assert.AreEqual(activity.TraceId.ToHexString(), request.Context.Operation.Id);
Assert.AreEqual($"|{activity.TraceId.ToHexString()}.{activity.SpanId.ToHexString()}.", request.Id);
Assert.AreEqual(activity.SpanId.ToHexString(), request.Id);
Assert.AreEqual("parentId", request.Context.Operation.ParentId);
}
@ -203,7 +203,7 @@
var request = this.sendItems.Single() as RequestTelemetry;
Assert.IsNotNull(request);
Assert.AreEqual(activity.TraceId.ToHexString(), request.Context.Operation.Id);
Assert.AreEqual($"|{activity.TraceId.ToHexString()}.{activity.SpanId.ToHexString()}.", request.Id);
Assert.AreEqual(activity.SpanId.ToHexString(), request.Id);
}
/// <summary>
@ -419,18 +419,13 @@
private void ValidateTelemetry<T>(T telemetry, Activity activity, bool isW3C = true, string legacyParentId = null) where T : OperationTelemetry
{
Assert.AreEqual(activity.OperationName, telemetry.Name);
Assert.AreEqual(
isW3C
? W3CUtilities.FormatTelemetryId(activity.TraceId.ToHexString(), activity.SpanId.ToHexString())
: activity.Id, telemetry.Id);
Assert.AreEqual(isW3C ? activity.SpanId.ToHexString() : activity.Id, telemetry.Id);
if (isW3C)
{
if (activity.ParentSpanId != default && activity.ParentSpanId.ToHexString() != "0000000000000000")
{
Assert.AreEqual(
W3CUtilities.FormatTelemetryId(activity.TraceId.ToHexString(),
activity.ParentSpanId.ToHexString()), telemetry.Context.Operation.ParentId);
Assert.AreEqual(activity.ParentSpanId.ToHexString(), telemetry.Context.Operation.ParentId);
}
else
{

68
BASE/Test/Microsoft.ApplicationInsights.Test/Shared/TelemetryClientExtensionAsyncTests.cs
Просмотреть файл

@ -1,4 +1,6 @@
namespace Microsoft.ApplicationInsights
using System.Diagnostics;
namespace Microsoft.ApplicationInsights
{
using System;
using System.Collections.Generic;
@ -48,10 +50,9 @@
/// Ensure that context being propagated via async/await.
/// </summary>
[TestMethod]
public void ContextPropagatesThroughAsyncAwait()
public async Task ContextPropagatesThroughAsyncAwait()
{
var task = this.TestAsync();
task.Wait();
await this.TestAsync();
}
/// <summary>
@ -60,8 +61,11 @@
/// <returns>Task to await.</returns>
public async Task TestAsync()
{
Activity activity;
using (var op = this.telemetryClient.StartOperation<RequestTelemetry>("request"))
{
activity = Activity.Current;
var id1 = Thread.CurrentThread.ManagedThreadId;
this.telemetryClient.TrackTrace("trace1");
@ -75,20 +79,32 @@
}
Assert.AreEqual(3, this.sendItems.Count);
var id = ((RequestTelemetry)this.sendItems[this.sendItems.Count - 1]).Id;
Assert.IsFalse(string.IsNullOrEmpty(id));
var requestTelemetry = ((RequestTelemetry) this.sendItems[this.sendItems.Count - 1]);
var requestId = requestTelemetry.Id;
var requestOperationId = requestTelemetry.Context.Operation.Id;
Assert.IsFalse(string.IsNullOrEmpty(requestTelemetry.Id));
Assert.IsFalse(string.IsNullOrEmpty(requestOperationId));
foreach (var item in this.sendItems)
{
if (item is TraceTelemetry)
{
Assert.AreEqual(id, item.Context.Operation.ParentId);
Assert.AreEqual(GetRootOperationId(id), item.Context.Operation.Id);
Assert.AreEqual(requestId, item.Context.Operation.ParentId);
Assert.AreEqual(requestOperationId, item.Context.Operation.Id);
}
else
{
Assert.AreEqual(id, ((RequestTelemetry)item).Id);
Assert.AreEqual(GetRootOperationId(id), item.Context.Operation.Id);
if (activity.IdFormat == ActivityIdFormat.W3C)
{
Assert.AreEqual(activity.TraceId.ToHexString(), requestOperationId);
Assert.AreEqual(activity.SpanId.ToHexString(), requestId);
}
else
{
Assert.AreEqual(activity.RootId, requestOperationId);
Assert.AreEqual(activity.Id, requestId);
}
Assert.IsNull(item.Context.Operation.ParentId);
}
}
@ -101,6 +117,7 @@
public void ContextPropagatesThroughBeginEnd()
{
var op = this.telemetryClient.StartOperation<RequestTelemetry>("request");
var activity = Activity.Current;
var id1 = Thread.CurrentThread.ManagedThreadId;
int id2 = 0;
this.telemetryClient.TrackTrace("trace1");
@ -126,30 +143,35 @@
Assert.AreNotEqual(id1, id2);
Assert.AreEqual(3, this.sendItems.Count);
var id = ((RequestTelemetry)this.sendItems[this.sendItems.Count - 1]).Id;
Assert.IsFalse(string.IsNullOrEmpty(id));
var requestTelemetry = ((RequestTelemetry)this.sendItems[this.sendItems.Count - 1]);
var requestId = requestTelemetry.Id;
var requestOperationId = requestTelemetry.Context.Operation.Id;
Assert.IsFalse(string.IsNullOrEmpty(requestTelemetry.Id));
Assert.IsFalse(string.IsNullOrEmpty(requestOperationId));
foreach (var item in this.sendItems)
{
if (item is TraceTelemetry)
{
Assert.AreEqual(id, item.Context.Operation.ParentId);
Assert.AreEqual(GetRootOperationId(id), item.Context.Operation.Id);
Assert.AreEqual(requestId, item.Context.Operation.ParentId);
Assert.AreEqual(requestOperationId, item.Context.Operation.Id);
}
else
{
Assert.AreEqual(id, ((RequestTelemetry)item).Id);
Assert.AreEqual(GetRootOperationId(id), item.Context.Operation.Id);
Assert.IsNull(item.Context.Operation.ParentId);
if (activity.IdFormat == ActivityIdFormat.W3C)
{
Assert.AreEqual(activity.TraceId.ToHexString(), requestOperationId);
Assert.AreEqual(activity.SpanId.ToHexString(), requestId);
}
else
{
Assert.AreEqual(activity.RootId, requestOperationId);
Assert.AreEqual(activity.Id, requestId);
}
Assert.IsNull(item.Context.Operation.ParentId);
}
}
}
private string GetRootOperationId(string operationId)
{
Assert.IsTrue(operationId.StartsWith("|"));
return operationId.Substring(1, operationId.IndexOf('.') - 1);
}
}
}

59
BASE/Test/Microsoft.ApplicationInsights.Test/Shared/TelemetryClientExtensionTests.cs
Просмотреть файл

@ -130,12 +130,12 @@
{
var operation = this.telemetryClient.StartOperation<DependencyTelemetry>("OperationName") as OperationHolder<DependencyTelemetry>;
var currentActivity = Activity.Current;
Assert.AreEqual(operation.Telemetry.Id, W3CUtilities.FormatTelemetryId(currentActivity.TraceId.ToHexString(), currentActivity.SpanId.ToHexString()));
Assert.AreEqual(operation.Telemetry.Id, currentActivity.SpanId.ToHexString());
Assert.AreEqual(operation.Telemetry.Context.Operation.Name, this.GetOperationName(currentActivity));
var childOperation = this.telemetryClient.StartOperation<DependencyTelemetry>("OperationName") as OperationHolder<DependencyTelemetry>;
var childActivity = Activity.Current;
Assert.AreEqual(childOperation.Telemetry.Id, W3CUtilities.FormatTelemetryId(childActivity.TraceId.ToHexString(), childActivity.SpanId.ToHexString()));
Assert.AreEqual(childOperation.Telemetry.Id, childActivity.SpanId.ToHexString());
Assert.AreEqual(childOperation.Telemetry.Context.Operation.Name, this.GetOperationName(currentActivity));
Assert.IsNull(currentActivity.Parent);
@ -559,10 +559,14 @@
[TestMethod]
public void StartOperationPopulatesContextCorrectlyW3C()
{
{
string spanId;
string traceId;
// Act - start an operation, and generate telemetry inside it.
using (this.telemetryClient.StartOperation<RequestTelemetry>("Request"))
{
traceId = Activity.Current.TraceId.ToHexString();
spanId = Activity.Current.SpanId.ToHexString();
this.telemetryClient.TrackTrace("child trace");
this.telemetryClient.TrackEvent("child event");
}
@ -571,7 +575,7 @@
// The RequestTelemetry is the root operation here.
var requestTelemetry = (RequestTelemetry)this.sendItems.Single(t => t is RequestTelemetry);
ValidateRootTelemetry(requestTelemetry);
ValidateRootTelemetry(requestTelemetry, traceId, spanId, null, true);
// The generated TraceTelemetry should become the child of the root RequestTelemetry
var traceTelemetry = (TraceTelemetry)this.sendItems.Single(t => t is TraceTelemetry);
@ -588,9 +592,13 @@
ActivityFormatHelper.DisableW3CFormatInActivity();
try
{
string expectedRequestId;
string expectedRootId;
// Act - start an operation, and generate telemetry inside it.
using (this.telemetryClient.StartOperation<RequestTelemetry>("Request"))
{
expectedRootId = Activity.Current.RootId;
expectedRequestId = Activity.Current.Id;
this.telemetryClient.TrackTrace("child trace");
this.telemetryClient.TrackEvent("child event");
}
@ -599,7 +607,8 @@
// The RequestTelemetry is the root operation here.
var requestTelemetry = (RequestTelemetry)this.sendItems.Single(t => t is RequestTelemetry);
ValidateRootTelemetry(requestTelemetry, isW3C: false);
ValidateRootTelemetry(requestTelemetry, expectedRootId, expectedRequestId, null, false);
// The generated TraceTelemetry should become the child of the root RequestTelemetry
var traceTelemetry = (TraceTelemetry)this.sendItems.Single(t => t is TraceTelemetry);
@ -617,10 +626,16 @@
[TestMethod]
public void StartOperationPopulatesContextCorrectlyWithOverridingNonW3CCompatibleRootIdW3C()
{
{
string spanId;
string traceId;
// Act - start an operation, supply operation ID which is NOT W3C compatible, and generate a telemetry inside it.
using (this.telemetryClient.StartOperation<RequestTelemetry>("Request", operationId: NonW3CCompatibleOperationId))
{
traceId = Activity.Current.TraceId.ToHexString();
spanId = Activity.Current.SpanId.ToHexString();
this.telemetryClient.TrackTrace("child trace");
this.telemetryClient.TrackEvent("child event");
}
@ -631,7 +646,7 @@
// The user provided operationid will be ignore as it is not W3C compatible, and it will
// be stored inside custom property.
var requestTelemetry = (RequestTelemetry)this.sendItems.Single(t => t is RequestTelemetry);
ValidateRootTelemetry(requestTelemetry);
ValidateRootTelemetry(requestTelemetry, traceId, spanId, null, true);
// Additional Validations.
Assert.AreNotEqual(NonW3CCompatibleOperationId, requestTelemetry.Context.Operation.Id, "Non compatible operation id supplied by user should be ignored in W3C mode.");
@ -649,9 +664,12 @@
[TestMethod]
public void StartOperationPopulatesContextCorrectlyWithOverridingW3CCompatibleRootIdW3C()
{
string spanId;
// Act - start an operation, supply operation ID which is NOT W3C compatible, and generate a telemetry inside it.
using (this.telemetryClient.StartOperation<RequestTelemetry>("Request", operationId: W3CCompatibleOperationId))
{
spanId = Activity.Current.SpanId.ToHexString();
this.telemetryClient.TrackTrace("child trace");
this.telemetryClient.TrackEvent("child event");
}
@ -661,8 +679,7 @@
// The RequestTelemetry is the root operation here.
// The user provided operationid will be used as it is W3C compatible.
var requestTelemetry = (RequestTelemetry)this.sendItems.Single(t => t is RequestTelemetry);
ValidateRootTelemetry(requestTelemetry, expectedOperationId:W3CCompatibleOperationId);
Assert.AreEqual(W3CCompatibleOperationId, requestTelemetry.Context.Operation.Id, "W3C compatible operation id supplied by user should be used.");
ValidateRootTelemetry(requestTelemetry, W3CCompatibleOperationId, spanId, null, true);
// The generated TraceTelemetry should become the child of the root RequestTelemetry
var traceTelemetry = (TraceTelemetry)this.sendItems.Single(t => t is TraceTelemetry);
@ -682,9 +699,12 @@
try
{
string expectedRequestId;
// Act - start an operation, supply ANY operation ID, and generate a telemetry inside it.
using (this.telemetryClient.StartOperation<RequestTelemetry>("Request", operationId: AnyRootId))
{
expectedRequestId = Activity.Current.Id;
this.telemetryClient.TrackTrace("child trace");
this.telemetryClient.TrackEvent("child event");
}
@ -694,7 +714,7 @@
// The RequestTelemetry is the root operation here.
// The user provided operationid will be used as is.
var requestTelemetry = (RequestTelemetry)this.sendItems.Single(t => t is RequestTelemetry);
ValidateRootTelemetry(requestTelemetry, expectedOperationId: AnyRootId, isW3C: false);
ValidateRootTelemetry(requestTelemetry, AnyRootId, expectedRequestId, null, false);
// The generated TraceTelemetry should become the child of the root RequestTelemetry
var traceTelemetry = (TraceTelemetry)this.sendItems.Single(t => t is TraceTelemetry);
@ -715,9 +735,11 @@
[Description("For W3C, Validate that any parentid id supplied by user will be respected.")]
public void StartOperationPopulatesContextCorrectlyWithAnyOverridingParentIdW3C()
{
string spanId;
// Act - start an operation, supply ANY parent operation ID, and generate a telemetry inside it.
using (this.telemetryClient.StartOperation<RequestTelemetry>("Request", operationId: W3CCompatibleOperationId, parentOperationId: AnyParentId))
{
spanId = Activity.Current.SpanId.ToHexString();
this.telemetryClient.TrackTrace("child trace");
this.telemetryClient.TrackEvent("child event");
}
@ -727,7 +749,7 @@
// The RequestTelemetry is the root operation here.
// The user provided parent operationid will be used as is.
var requestTelemetry = (RequestTelemetry)this.sendItems.Single(t => t is RequestTelemetry);
ValidateRootTelemetry(requestTelemetry, expectedOperationParentId: AnyParentId);
ValidateRootTelemetry(requestTelemetry, W3CCompatibleOperationId, spanId, AnyParentId, true);
// The generated TraceTelemetry should become the child of the root RequestTelemetry
var traceTelemetry = (TraceTelemetry)this.sendItems.Single(t => t is TraceTelemetry);
@ -747,9 +769,11 @@
try
{
string expectedRequestId;
// Act - start an operation, supply ANY parent operation ID, and generate a telemetry inside it.
using (this.telemetryClient.StartOperation<RequestTelemetry>("Request", operationId: AnyRootId, parentOperationId: AnyParentId))
{
expectedRequestId = Activity.Current.Id;
this.telemetryClient.TrackTrace("child trace");
this.telemetryClient.TrackEvent("child event");
}
@ -759,7 +783,7 @@
// The RequestTelemetry is the root operation here.
// The user provided parent operationid will be used as is.
var requestTelemetry = (RequestTelemetry)this.sendItems.Single(t => t is RequestTelemetry);
ValidateRootTelemetry(requestTelemetry, expectedOperationParentId: AnyParentId, isW3C: false);
ValidateRootTelemetry(requestTelemetry, AnyRootId, expectedRequestId, AnyParentId, false);
// The generated TraceTelemetry should become the child of the root RequestTelemetry
var traceTelemetry = (TraceTelemetry)this.sendItems.Single(t => t is TraceTelemetry);
@ -827,23 +851,20 @@
Assert.AreEqual(1, this.sendItems.Count);
}
private void ValidateRootTelemetry(OperationTelemetry operationTelemetry, string expectedOperationId = "", string expectedOperationParentId = null, bool isW3C = true)
private void ValidateRootTelemetry(OperationTelemetry operationTelemetry, string expectedOperationId, string expectedId, string expectedOperationParentId, bool isW3C)
{
Assert.AreEqual(expectedOperationParentId, operationTelemetry.Context.Operation.ParentId);
Assert.IsNotNull(operationTelemetry.Context.Operation.Id);
if (!string.IsNullOrEmpty(expectedOperationId))
{
Assert.AreEqual(expectedOperationId, operationTelemetry.Context.Operation.Id);
}
Assert.AreEqual(expectedOperationId, operationTelemetry.Context.Operation.Id);
if (isW3C)
{
Assert.IsTrue(W3CUtilities.IsCompatibleW3CTraceId(operationTelemetry.Context.Operation.Id));
}
Assert.IsNotNull(operationTelemetry.Id);
// ID is shaped like |TraceID.SpanID.
Assert.IsTrue(operationTelemetry.Id.Contains(operationTelemetry.Context.Operation.Id));
Assert.AreEqual(expectedId, operationTelemetry.Id);
}
private void ValidateChildTelemetry(OperationTelemetry rootOperationTelemetry, ITelemetry childTelemetry)

2
BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/OperationHolder.cs
Просмотреть файл

@ -78,7 +78,7 @@
var currentActivity = Activity.Current;
if (currentActivity == null
|| (Activity.DefaultIdFormat != ActivityIdFormat.W3C && operationTelemetry.Id != currentActivity.Id)
|| (Activity.DefaultIdFormat == ActivityIdFormat.W3C && operationTelemetry.Id != W3CUtilities.FormatTelemetryId(currentActivity.TraceId.ToHexString(), currentActivity.SpanId.ToHexString())))
|| (Activity.DefaultIdFormat == ActivityIdFormat.W3C && operationTelemetry.Id != currentActivity.SpanId.ToHexString()))
{
// W3COperationCorrelationTelemetryInitializer changes Id
// but keeps an original one in 'ai_legacyRequestId' property

8
BASE/src/Microsoft.ApplicationInsights/Extensibility/OperationCorrelationTelemetryInitializer.cs
Просмотреть файл

@ -7,7 +7,6 @@
using Microsoft.ApplicationInsights.Channel;
using Microsoft.ApplicationInsights.DataContracts;
using Microsoft.ApplicationInsights.Extensibility.Implementation;
using Microsoft.ApplicationInsights.Extensibility.W3C;
/// <summary>
/// Telemetry initializer that populates OperationContext for the telemetry item from Activity.
@ -64,14 +63,9 @@
// itemOperationContext.Id = currentActivity.RootId; // check if this can be used
itemOperationContext.Id = currentActivity.TraceId.ToHexString();
// Set OperationParentID to ID of parent, constructed as !traceid.spanid.
// ID for auto collected Request,Dependency are constructed as !traceid.spanid, so parentid must be set to the same format.
// While it is possible to set SpanID as the ID for auto collected Request,Dependency we have to stick to this format
// to maintain compatibility. This limitation may go away in the future.
if (string.IsNullOrEmpty(itemOperationContext.ParentId))
{
itemOperationContext.ParentId = W3CUtilities.FormatTelemetryId(itemOperationContext.Id,
currentActivity.SpanId.ToHexString());
itemOperationContext.ParentId = currentActivity.SpanId.ToHexString();
}
}
else

10
BASE/src/Microsoft.ApplicationInsights/Extensibility/W3C/W3CUtilities.cs
Просмотреть файл

@ -28,16 +28,6 @@
return ActivityTraceId.CreateRandom().ToHexString();
}
/// <summary>
/// Constructs a Telemetry ID from given traceid and span id in the format |traceid.spanid.
/// This is the format used by Application Insights.
/// </summary>
/// <returns>constructed Telemetry ID.</returns>
internal static string FormatTelemetryId(string traceId, string spanId)
{
return string.Concat("|", traceId, ".", spanId, ".");
}
/// <summary>
/// Checks if the given string is a valid trace-id as per W3C Specs.
/// https://github.com/w3c/distributed-tracing/blob/master/trace_context/HTTP_HEADER_FORMAT.md#trace-id .

9
BASE/src/Microsoft.ApplicationInsights/TelemetryClientExtensions.cs
Просмотреть файл

@ -188,9 +188,7 @@
telemetryContext.Id = operationActivity.TraceId.ToHexString();
}
// ID takes the form |TraceID.SpanId.
// TelemetryContext.Id used instead of TraceID.ToHexString() for perf.
operationTelemetry.Id = W3CUtilities.FormatTelemetryId(telemetryContext.Id, operationActivity.SpanId.ToHexString());
operationTelemetry.Id = operationActivity.SpanId.ToHexString();
}
else
{
@ -370,12 +368,11 @@
if (activity.IdFormat == ActivityIdFormat.W3C)
{
operationContext.Id = activity.TraceId.ToHexString();
telemetry.Id = W3CUtilities.FormatTelemetryId(operationContext.Id, activity.SpanId.ToHexString());
telemetry.Id = activity.SpanId.ToHexString();
if (string.IsNullOrEmpty(operationContext.ParentId) && activity.ParentSpanId != default)
{
operationContext.ParentId =
W3CUtilities.FormatTelemetryId(operationContext.Id, activity.ParentSpanId.ToHexString());
operationContext.ParentId = activity.ParentSpanId.ToHexString();
}
}
else

1
CHANGELOG.md
Просмотреть файл

@ -3,6 +3,7 @@
## VNext
- [Upgraded FxCop and fixed several issues related to null checks and disposing objects.](https://github.com/microsoft/ApplicationInsights-dotnet/pull/1499)
- [Exceptions are not correlated to requests when customErrors=Off and Request-Id is passed](https://github.com/microsoft/ApplicationInsights-dotnet/issues/1493)
- [Switch to compact Id format in W3C mode](https://github.com/microsoft/ApplicationInsights-dotnet/pull/1498)
## Version 2.12.0
- [Fix IndexOutOfRangeException in W3CUtilities.TryGetTraceId](https://github.com/microsoft/ApplicationInsights-dotnet/pull/1327)

17
NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/DiagnosticListeners/Implementation/HostingDiagnosticListener.cs
Просмотреть файл

@ -289,8 +289,7 @@
var requestTelemetry = this.InitializeRequestTelemetry(httpContext, currentActivity, Stopwatch.GetTimestamp(), legacyRootId);
requestTelemetry.Context.Operation.ParentId =
GetParentId(currentActivity, originalParentId, requestTelemetry.Context.Operation.Id);
requestTelemetry.Context.Operation.ParentId = GetParentId(currentActivity, originalParentId);
this.AddAppIdToResponseIfRequired(httpContext, requestTelemetry);
}
@ -380,8 +379,7 @@
ReadCorrelationContext(requestHeaders, activity);
var requestTelemetry = this.InitializeRequestTelemetry(httpContext, activity, timestamp, legacyRootId);
requestTelemetry.Context.Operation.ParentId =
GetParentId(activity, originalParentId, requestTelemetry.Context.Operation.Id);
requestTelemetry.Context.Operation.ParentId = GetParentId(activity, originalParentId);
this.AddAppIdToResponseIfRequired(httpContext, requestTelemetry);
}
@ -575,14 +573,14 @@
{
}
private static string GetParentId(Activity activity, string originalParentId, string operationId)
private static string GetParentId(Activity activity, string originalParentId)
{
if (activity.IdFormat == ActivityIdFormat.W3C && activity.ParentSpanId != default)
{
var parentSpanId = activity.ParentSpanId.ToHexString();
if (parentSpanId != "0000000000000000")
{
return FormatTelemetryId(operationId, parentSpanId);
return parentSpanId;
}
}
@ -640,11 +638,6 @@
}
}
private static string FormatTelemetryId(string traceId, string spanId)
{
return string.Concat("|", traceId, ".", spanId, ".");
}
private static void ReadCorrelationContext(IHeaderDictionary requestHeaders, Activity activity)
{
try
@ -763,7 +756,7 @@
if (activity.IdFormat == ActivityIdFormat.W3C)
{
var traceId = activity.TraceId.ToHexString();
requestTelemetry.Id = FormatTelemetryId(traceId, activity.SpanId.ToHexString());
requestTelemetry.Id = activity.SpanId.ToHexString();
requestTelemetry.Context.Operation.Id = traceId;
AspNetCoreEventSource.Instance.RequestTelemetryCreated("W3C", requestTelemetry.Id, traceId);
}

2
NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/DependencyTelemetryMvcTests.cs
Просмотреть файл

@ -104,7 +104,7 @@
var requestTelemetry = actual.OfType<TelemetryItem<RequestData>>().FirstOrDefault();
Assert.NotNull(requestTelemetry);
Assert.Contains(requestTelemetry.tags["ai.operation.id"], dependencyTelemetry.tags["ai.operation.parentId"]);
Assert.Equal(requestTelemetry.data.baseData.id, dependencyTelemetry.tags["ai.operation.parentId"]);
}
}
}

13
NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/HostingDiagnosticListenerTest.cs
Просмотреть файл

@ -507,7 +507,7 @@
if (isW3C)
{
// parentid populated only in W3C mode
ValidateRequestTelemetry(requestTelemetry, activity, true, expectedParentId: "|4e3083444c10254ba40513c7316332eb.e2a5f830c0ee2c46.", expectedSource: null);
ValidateRequestTelemetry(requestTelemetry, activity, true, expectedParentId: "e2a5f830c0ee2c46", expectedSource: null);
Assert.Equal("value1", requestTelemetry.Properties["prop1"]);
Assert.Equal("value2", requestTelemetry.Properties["prop2"]);
}
@ -603,7 +603,7 @@
if (IsW3C)
{
Assert.Equal("4e3083444c10254ba40513c7316332eb", requestTelemetry.Context.Operation.Id);
ValidateRequestTelemetry(requestTelemetry, activity, IsW3C, expectedParentId: "|4e3083444c10254ba40513c7316332eb.e2a5f830c0ee2c46.", expectedSource:null);
ValidateRequestTelemetry(requestTelemetry, activity, IsW3C, expectedParentId: "e2a5f830c0ee2c46", expectedSource:null);
}
else
{
@ -1184,7 +1184,7 @@
var requestTelemetry = context.Features.Get<RequestTelemetry>();
Assert.NotNull(requestTelemetry);
Assert.NotEqual(SamplingDecision.SampledOut, requestTelemetry.ProactiveSamplingDecision);
ValidateRequestTelemetry(requestTelemetry, Activity.Current, true, "|4e3083444c10254ba40513c7316332eb.e2a5f830c0ee2c46.");
ValidateRequestTelemetry(requestTelemetry, Activity.Current, true, "e2a5f830c0ee2c46");
}
}
@ -1327,11 +1327,6 @@
}
}
private static string FormatTelemetryId(string traceId, string spanId)
{
return string.Concat("|", traceId, ".", spanId, ".");
}
private void ValidateRequestTelemetry(RequestTelemetry requestTelemetry, Activity activity, bool isW3C, string expectedParentId = null, string expectedSource = null)
{
Assert.NotNull(requestTelemetry);
@ -1339,7 +1334,7 @@
Assert.Equal(expectedSource, requestTelemetry.Source);
if (isW3C)
{
Assert.Equal(requestTelemetry.Id, FormatTelemetryId(activity.TraceId.ToHexString(), activity.SpanId.ToHexString()));
Assert.Equal(requestTelemetry.Id, activity.SpanId.ToHexString());
Assert.Equal(requestTelemetry.Context.Operation.Id, activity.TraceId.ToHexString());
}
else

32
NETCORE/test/TestApp30.Tests/BasicTestWithCorrelation.cs
Просмотреть файл

@ -27,7 +27,7 @@ namespace TestApp30.Tests
[Fact]
public async Task RequestSuccessWithTraceParent()
{
{
// Arrange
var client = _factory.CreateClient();
var url = "Home/Index";
@ -43,11 +43,11 @@ namespace TestApp30.Tests
// Assert
response.EnsureSuccessStatusCode();
this.output.WriteLine(await response.Content.ReadAsStringAsync());
WaitForTelemetryToArrive();
var items = _factory.sentItems;
PrintItems(items);
// 1 Trace from Ilogger, 1 Request
@ -63,9 +63,8 @@ namespace TestApp30.Tests
Assert.NotNull(trace);
Assert.Equal("4e3083444c10254ba40513c7316332eb", req.Context.Operation.Id);
Assert.Equal("|4e3083444c10254ba40513c7316332eb.e2a5f830c0ee2c46.", req.Context.Operation.ParentId);
Assert.Equal("e2a5f830c0ee2c46", req.Context.Operation.ParentId);
Assert.Equal("4e3083444c10254ba40513c7316332eb", trace.Context.Operation.Id);
Assert.Contains("|4e3083444c10254ba40513c7316332eb.", req.Id);
Assert.Equal(req.Id, trace.Context.Operation.ParentId);
Assert.Equal("http://localhost/" + url, req.Url.ToString());
@ -109,9 +108,8 @@ namespace TestApp30.Tests
Assert.Equal("4e3083444c10254ba40513c7316332eb", req.Context.Operation.Id);
Assert.Equal("4e3083444c10254ba40513c7316332eb", exception.Context.Operation.Id);
Assert.Equal("|4e3083444c10254ba40513c7316332eb.e2a5f830c0ee2c46.", req.Context.Operation.ParentId);
Assert.Equal("e2a5f830c0ee2c46", req.Context.Operation.ParentId);
Assert.Equal(req.Id, exception.Context.Operation.ParentId);
Assert.Contains("|4e3083444c10254ba40513c7316332eb.", req.Id);
Assert.Equal("http://localhost/" + url, req.Url.ToString());
Assert.False(req.Success);
@ -157,7 +155,6 @@ namespace TestApp30.Tests
Assert.Equal("40d1a5a08a68c0998e4a3b7c91915ca6", trace.Context.Operation.Id);
Assert.Equal("|40d1a5a08a68c0998e4a3b7c91915ca6.b9e41c35_1.", req.Context.Operation.ParentId);
Assert.Contains("|40d1a5a08a68c0998e4a3b7c91915ca6.", req.Id);
Assert.Equal(req.Id, trace.Context.Operation.ParentId);
Assert.Equal("http://localhost/" + url, req.Url.ToString());
@ -201,14 +198,12 @@ namespace TestApp30.Tests
Assert.Equal("40d1a5a08a68c0998e4a3b7c91915ca6", req.Context.Operation.Id);
Assert.Equal("40d1a5a08a68c0998e4a3b7c91915ca6", exception.Context.Operation.Id);
Assert.Equal(req.Id, exception.Context.Operation.ParentId);
Assert.Equal("|40d1a5a08a68c0998e4a3b7c91915ca6.b9e41c35_1.", req.Context.Operation.ParentId);
Assert.Contains("|40d1a5a08a68c0998e4a3b7c91915ca6.", req.Id);
Assert.Equal("http://localhost/" + url, req.Url.ToString());
Assert.False(req.Success);
}
}
[Fact]
public async Task RequestSuccessWithNonW3CCompatibleRequestId()
@ -224,7 +219,7 @@ namespace TestApp30.Tests
};
var request = CreateRequestMessage(requestHeaders);
request.RequestUri = new Uri(client.BaseAddress + url);
var response = await client.SendAsync(request);
// Assert
@ -250,7 +245,6 @@ namespace TestApp30.Tests
Assert.NotEqual("noncompatible", trace.Context.Operation.Id);
Assert.Equal("|noncompatible.b9e41c35_1.", req.Context.Operation.ParentId);
Assert.Contains($"|{req.Context.Operation.Id}.", req.Id);
Assert.Equal(req.Id, trace.Context.Operation.ParentId);
Assert.Equal("noncompatible", req.Properties["ai_legacyRootId"]);
@ -287,11 +281,11 @@ namespace TestApp30.Tests
private List<T> GetTelemetryOfType<T>(ConcurrentBag<ITelemetry> items)
{
List<T> foundItems = new List<T>();
foreach(var item in items)
foreach (var item in items)
{
if(item is T)
if (item is T)
{
foundItems.Add((T) item);
foundItems.Add((T)item);
}
}
@ -303,7 +297,7 @@ namespace TestApp30.Tests
int i = 1;
foreach (var item in items)
{
this.output.WriteLine("Item " + (i++) + ".");
this.output.WriteLine("Item " + (i++) + ".");
if (item is RequestTelemetry req)
{

12
NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/RequestCorrelationTests.cs
Просмотреть файл

@ -94,7 +94,7 @@
var actualRequest = this.ValidateRequestWithHeaders(server, RequestPath, headers, expectedRequestTelemetry);
Assert.Equal("8ee8641cbdd8dd280d239fa2121c7e4e", actualRequest.tags["ai.operation.id"]);
Assert.Contains("|8ee8641cbdd8dd280d239fa2121c7e4e.df07da90a5b27d93.", actualRequest.tags["ai.operation.parentId"]);
Assert.Equal("|8ee8641cbdd8dd280d239fa2121c7e4e.df07da90a5b27d93.", actualRequest.tags["ai.operation.parentId"]);
Assert.Equal("v1", actualRequest.data.baseData.properties["k1"]);
Assert.Equal("v2", actualRequest.data.baseData.properties["k2"]);
}
@ -135,7 +135,7 @@
var actualRequest = this.ValidateRequestWithHeaders(server, RequestPath, headers, expectedRequestTelemetry);
Assert.NotEqual("noncompatible", actualRequest.tags["ai.operation.id"]);
Assert.Contains("|noncompatible.df07da90a5b27d93.", actualRequest.tags["ai.operation.parentId"]);
Assert.Equal("|noncompatible.df07da90a5b27d93.", actualRequest.tags["ai.operation.parentId"]);
Assert.Equal("noncompatible", actualRequest.data.baseData.properties["ai_legacyRootId"]);
Assert.Equal("v1", actualRequest.data.baseData.properties["k1"]);
Assert.Equal("v2", actualRequest.data.baseData.properties["k2"]);
@ -177,7 +177,7 @@
var actualRequest = this.ValidateRequestWithHeaders(server, RequestPath, headers, expectedRequestTelemetry);
Assert.NotEqual("noncompatible", actualRequest.tags["ai.operation.id"]);
Assert.Contains("somerandomidnotinanyformat", actualRequest.tags["ai.operation.parentId"]);
Assert.Equal("somerandomidnotinanyformat", actualRequest.tags["ai.operation.parentId"]);
Assert.Equal("somerandomidnotinanyformat", actualRequest.data.baseData.properties["ai_legacyRootId"]);
Assert.Equal("v1", actualRequest.data.baseData.properties["k1"]);
Assert.Equal("v2", actualRequest.data.baseData.properties["k2"]);
@ -218,7 +218,7 @@
var actualRequest = this.ValidateRequestWithHeaders(server, RequestPath, headers, expectedRequestTelemetry);
Assert.Equal("4bf92f3577b34da6a3ce929d0e0e4736", actualRequest.tags["ai.operation.id"]);
Assert.Equal("|4bf92f3577b34da6a3ce929d0e0e4736.00f067aa0ba902b7.", actualRequest.tags["ai.operation.parentId"]);
Assert.Equal("00f067aa0ba902b7", actualRequest.tags["ai.operation.parentId"]);
// Correlation-Context will be read if either Request-Id or TraceParent available.
Assert.True(actualRequest.data.baseData.properties.ContainsKey("k1"));
@ -265,7 +265,7 @@
Assert.Equal("4bf92f3577b34da6a3ce929d0e0e4736", actualRequest.tags["ai.operation.id"]);
Assert.NotEqual("8ee8641cbdd8dd280d239fa2121c7e4e", actualRequest.tags["ai.operation.id"]);
Assert.Equal("|4bf92f3577b34da6a3ce929d0e0e4736.00f067aa0ba902b7.", actualRequest.tags["ai.operation.parentId"]);
Assert.Equal("00f067aa0ba902b7", actualRequest.tags["ai.operation.parentId"]);
// Correlation-Context will be read if either Request-Id or traceparent is present.
Assert.True(actualRequest.data.baseData.properties.ContainsKey("k1"));
@ -318,7 +318,7 @@
Assert.Equal("8ee8641cbdd8dd280d239fa2121c7e4e", actualRequest.tags["ai.operation.id"]);
Assert.NotEqual("4bf92f3577b34da6a3ce929d0e0e4736", actualRequest.tags["ai.operation.id"]);
Assert.Contains("|8ee8641cbdd8dd280d239fa2121c7e4e.df07da90a5b27d93.", actualRequest.tags["ai.operation.parentId"]);
Assert.Contains("df07da90a5b27d93", actualRequest.tags["ai.operation.parentId"]);
// Correlation-Context should be read and populated.
Assert.True(actualRequest.data.baseData.properties.ContainsKey("k1"));

7
NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/RequestDependencyCorrelationTests.cs
Просмотреть файл

@ -7,7 +7,6 @@
using Microsoft.ApplicationInsights.AspNetCore;
using Microsoft.ApplicationInsights.DependencyCollector;
using Microsoft.ApplicationInsights.DataContracts;
using Microsoft.ApplicationInsights.Extensibility.W3C;
using Microsoft.Extensions.DependencyInjection;
using Xunit;
using Xunit.Abstractions;
@ -73,12 +72,12 @@
.Start();
var (request, dependency) = this.ValidateBasicDependency(server, RequestPath, expected);
string expectedTraceId = activity.GetTraceId();
string expectedParentSpanId = activity.GetSpanId();
string expectedTraceId = activity.TraceId.ToHexString();
string expectedParentSpanId = activity.SpanId.ToHexString();
Assert.Equal(expectedTraceId, request.tags["ai.operation.id"]);
Assert.Equal(expectedTraceId, dependency.tags["ai.operation.id"]);
Assert.Equal($"|{expectedTraceId}.{expectedParentSpanId}.", dependency.tags["ai.operation.parentId"]);
Assert.Equal(expectedParentSpanId, dependency.tags["ai.operation.parentId"]);
}
}

4
WEB/Src/Common/StringUtilities.cs
Просмотреть файл

@ -63,10 +63,10 @@
/// <param name="traceId">Trace Id.</param>
/// <param name="spanId">Span id.</param>
/// <returns>valid Request-Id.</returns>
[Obsolete("Obsolete, implement yourself with 'string.Concat(\"|\", traceId, \".\", spanId, \".\").'")]
[Obsolete("Obsolete, use spanId instead")]
public static string FormatRequestId(string traceId, string spanId)
{
return string.Concat("|", traceId, ".", spanId, ".");
return spanId;
}
}
}

3
WEB/Src/Common/W3C/W3CConstants.cs
Просмотреть файл

@ -47,8 +47,5 @@
public const char TracestateAzureSeparator = ';';
internal const string LegacyRootPropertyIdKey = "ai_legacyRootId";
// TODO[tracestate]: remove, this is done in base SDK
internal const string TracestatePropertyKey = "tracestate";
}
}

5
WEB/Src/Common/W3C/W3CUtilities.cs
Просмотреть файл

@ -45,10 +45,5 @@
return false;
}
internal static string FormatTelemetryId(string traceId, string spanId)
{
return string.Concat('|', traceId, '.', spanId, '.');
}
}
}

19
WEB/Src/DependencyCollector/Net45.Tests/DependencyTrackingTelemetryModuleHttpTest.cs
Просмотреть файл

@ -855,7 +855,8 @@
if (parentActivity.IdFormat == ActivityIdFormat.W3C)
{
Assert.AreEqual(parentActivity.TraceId.ToHexString(), item.Context.Operation.Id);
Assert.AreEqual($"|{parentActivity.TraceId.ToHexString()}.{parentActivity.SpanId.ToHexString()}.", item.Context.Operation.ParentId);
Assert.AreEqual(parentActivity.SpanId.ToHexString(), item.Context.Operation.ParentId);
if (parentActivity.TraceStateString != null)
{
Assert.IsTrue(item.Properties.ContainsKey("tracestate"));
@ -870,6 +871,7 @@
{
Assert.AreEqual(parentActivity.RootId, item.Context.Operation.Id);
Assert.AreEqual(parentActivity.Id, item.Context.Operation.ParentId);
Assert.IsTrue(item.Id.StartsWith('|' + item.Context.Operation.Id + '.'));
}
}
else
@ -878,8 +880,6 @@
Assert.IsNull(item.Context.Operation.ParentId);
}
Assert.IsTrue(item.Id.StartsWith('|' + item.Context.Operation.Id + '.'));
if (diagnosticSource)
{
this.operationDetailsInitializer.ValidateOperationDetailsDesktop(item, responseExpected, headersDetailExpected);
@ -906,28 +906,31 @@
SdkVersionHelper.GetExpectedSdkVersion(typeof(DependencyTrackingTelemetryModule), "rdddsd:"),
item.Context.GetInternalContext().SdkVersion);
var requestId = item.Id;
if (requestMsg != null)
{
var requestIdHeader = requestMsg.Headers[RequestResponseHeaders.RequestIdHeader];
string expectedRequestId;
if (expectW3CHeaders)
{
var traceId = item.Context.Operation.Id;
var spanId = requestId.Substring(34, 16);
var spanId = item.Id;
var expectedTraceparent = $"00-{traceId}-{spanId}-00";
expectedRequestId = $"|{traceId}.{spanId}.";
Assert.AreEqual(expectedTraceparent, requestMsg.Headers[W3C.W3CConstants.TraceParentHeader]);
Assert.AreEqual(Activity.Current?.TraceStateString, requestMsg.Headers[W3C.W3CConstants.TraceStateHeader]);
}
else
{
expectedRequestId = item.Id;
Assert.IsNull(requestMsg.Headers[W3C.W3CConstants.TraceParentHeader]);
Assert.IsNull(requestMsg.Headers[W3C.W3CConstants.TraceStateHeader]);
}
if (expectRequestId)
{
Assert.AreEqual(requestId, requestMsg.Headers[RequestResponseHeaders.RequestIdHeader]);
Assert.AreEqual(expectedRequestId, requestMsg.Headers[RequestResponseHeaders.RequestIdHeader]);
}
else
{
@ -936,7 +939,7 @@
if (expectLegacyHeaders)
{
Assert.AreEqual(requestId, requestMsg.Headers[RequestResponseHeaders.StandardParentIdHeader]);
Assert.AreEqual(item.Id, requestMsg.Headers[RequestResponseHeaders.StandardParentIdHeader]);
Assert.AreEqual(item.Context.Operation.Id, requestMsg.Headers[RequestResponseHeaders.StandardRootIdHeader]);
}
else

17
WEB/Src/DependencyCollector/NetCore.Tests/DependencyTrackingTelemetryModuleTestNetCore.cs
Просмотреть файл

@ -433,15 +433,12 @@
SdkVersionHelper.GetExpectedSdkVersion(typeof(DependencyTrackingTelemetryModule), "rdddsc:"),
item.Context.GetInternalContext().SdkVersion);
var requestId = item.Id;
Assert.IsTrue(requestId.StartsWith('|' + item.Context.Operation.Id + '.'));
if (parentActivity != null)
{
if (parentActivity.IdFormat == ActivityIdFormat.W3C)
{
Assert.AreEqual(parentActivity.TraceId.ToHexString(), item.Context.Operation.Id);
Assert.AreEqual($"|{parentActivity.TraceId.ToHexString()}.{parentActivity.SpanId.ToHexString()}.", item.Context.Operation.ParentId);
Assert.AreEqual(parentActivity.SpanId.ToHexString(), item.Context.Operation.ParentId);
if (parentActivity.TraceStateString != null)
{
Assert.IsTrue(item.Properties.ContainsKey("tracestate"));
@ -456,6 +453,7 @@
{
Assert.AreEqual(parentActivity.RootId, item.Context.Operation.Id);
Assert.AreEqual(parentActivity.Id, item.Context.Operation.ParentId);
Assert.IsTrue(item.Id.StartsWith('|' + item.Context.Operation.Id + '.'));
}
}
else
@ -466,11 +464,14 @@
if (request != null)
{
var requestIdHeader = request.Headers.GetValues(RequestResponseHeaders.RequestIdHeader).Single();
if (expectW3CHeaders)
{
var traceId = item.Context.Operation.Id;
var spanId = requestId.Substring(34, 16);
var spanId = item.Id;
var expectedTraceparent = $"00-{traceId}-{spanId}-00";
var expectedRequestId = $"|{traceId}.{spanId}.";
Assert.AreEqual(expectedTraceparent, request.Headers.GetValues(W3C.W3CConstants.TraceParentHeader).Single());
if (parentActivity?.TraceStateString != null)
@ -480,7 +481,7 @@
if (expectRequestId)
{
Assert.AreEqual(requestId, request.Headers.GetValues(RequestResponseHeaders.RequestIdHeader).Single());
Assert.AreEqual(expectedRequestId, request.Headers.GetValues(RequestResponseHeaders.RequestIdHeader).Single());
}
else
{
@ -494,12 +495,12 @@
{
Assert.IsFalse(request.Headers.Contains(W3C.W3CConstants.TraceParentHeader));
Assert.IsFalse(request.Headers.Contains(W3C.W3CConstants.TraceStateHeader));
Assert.AreEqual(requestId, request.Headers.GetValues(RequestResponseHeaders.RequestIdHeader).Single());
Assert.AreEqual(item.Id, request.Headers.GetValues(RequestResponseHeaders.RequestIdHeader).Single());
}
if (expectLegacyHeaders)
{
Assert.AreEqual(requestId, request.Headers.GetValues(RequestResponseHeaders.StandardParentIdHeader).Single());
Assert.AreEqual(item.Id, request.Headers.GetValues(RequestResponseHeaders.StandardParentIdHeader).Single());
Assert.AreEqual(item.Context.Operation.Id, request.Headers.GetValues(RequestResponseHeaders.StandardRootIdHeader).Single());
}
else

23
WEB/Src/DependencyCollector/Shared.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs
Просмотреть файл

@ -26,6 +26,7 @@
Activity.DefaultIdFormat = ActivityIdFormat.W3C;
Activity.ForceDefaultIdFormat = true;
this.configuration = new TelemetryConfiguration();
this.configuration.TelemetryInitializers.Add(new OperationCorrelationTelemetryInitializer());
this.sentItems = new List<ITelemetry>();
this.configuration.TelemetryChannel = new StubTelemetryChannel { OnSend = item => this.sentItems.Add(item), EndpointAddress = "https://dc.services.visualstudio.com/v2/track" };
this.configuration.InstrumentationKey = Guid.NewGuid().ToString();
@ -79,9 +80,9 @@
Assert.AreEqual("InProc", telemetry.Type);
Assert.IsTrue(telemetry.Success.Value);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.ParentSpanId.ToHexString()}.", telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.ParentSpanId.ToHexString(), telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(sendActivity.SpanId.ToHexString(), telemetry.Id);
Assert.AreEqual("v1", telemetry.Properties["k1"]);
@ -113,7 +114,7 @@
Assert.IsNull(telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(sendActivity.SpanId.ToHexString(), telemetry.Id);
}
}
@ -139,7 +140,7 @@
Assert.IsNull(telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(sendActivity.SpanId.ToHexString(), telemetry.Id);
}
}
@ -177,7 +178,7 @@
Assert.IsNull(telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(sendActivity.SpanId.ToHexString(), telemetry.Id);
// does not throw
var jsonSettingThrowOnError = new JsonSerializerSettings
@ -233,7 +234,7 @@
Assert.IsNull(telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(sendActivity.SpanId.ToHexString(), telemetry.Id);
}
}
@ -272,7 +273,7 @@
Assert.IsNull(telemetry.Context.Operation.ParentId);
Assert.AreEqual(httpActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{httpActivity.TraceId.ToHexString()}.{httpActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(httpActivity.SpanId.ToHexString(), telemetry.Id);
}
}
@ -306,7 +307,7 @@
Assert.IsNull(telemetry.Context.Operation.ParentId);
Assert.AreEqual(httpActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{httpActivity.TraceId.ToHexString()}.{httpActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(httpActivity.SpanId.ToHexString(), telemetry.Id);
}
}
@ -341,7 +342,7 @@
Assert.IsNull(telemetry.Context.Operation.ParentId);
Assert.AreEqual(httpActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{httpActivity.TraceId.ToHexString()}.{httpActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(httpActivity.SpanId.ToHexString(), telemetry.Id);
}
}
@ -376,7 +377,7 @@
Assert.AreEqual(exception.ToInvariantString(), telemetry.Properties["Error"]);
Assert.IsNull(telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(sendActivity.SpanId.ToHexString(), telemetry.Id);
}
}
@ -409,7 +410,7 @@
Assert.IsNull(telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(sendActivity.SpanId.ToHexString(), telemetry.Id);
}
}

10
WEB/Src/DependencyCollector/Shared.Tests/Implementation/ClientServerDependencyTrackerTests.cs
Просмотреть файл

@ -85,9 +85,9 @@
Assert.AreNotEqual(parentActivity, currentActivity);
Assert.AreEqual(parentActivity, currentActivity.Parent);
Assert.AreEqual($"|{currentActivity.TraceId.ToHexString()}.{currentActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(currentActivity.SpanId.ToHexString(), telemetry.Id);
Assert.AreEqual(currentActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{currentActivity.TraceId.ToHexString()}.{currentActivity.ParentSpanId.ToHexString()}.", telemetry.Context.Operation.ParentId);
Assert.AreEqual(currentActivity.ParentSpanId.ToHexString(), telemetry.Context.Operation.ParentId);
var properties = telemetry.Properties;
Assert.AreEqual(2, properties.Count);
@ -105,7 +105,7 @@
Assert.IsNotNull(Activity.Current);
Assert.IsNull(currentActivity.Parent);
Assert.AreEqual($"|{currentActivity.TraceId.ToHexString()}.{currentActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(currentActivity.SpanId.ToHexString(), telemetry.Id);
Assert.AreEqual(currentActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.IsNull(telemetry.Context.Operation.ParentId);
@ -152,9 +152,9 @@
var telemetry = ClientServerDependencyTracker.BeginTracking(this.telemetryClient);
Assert.AreEqual($"|{activity.TraceId.ToHexString()}.{activity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(activity.SpanId.ToHexString(), telemetry.Id);
Assert.AreEqual(activity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{activity.TraceId.ToHexString()}.{activity.ParentSpanId.ToHexString()}.", telemetry.Context.Operation.ParentId);
Assert.AreEqual(activity.ParentSpanId.ToHexString(), telemetry.Context.Operation.ParentId);
var properties = telemetry.Properties;
Assert.AreEqual(1, properties.Count);

20
WEB/Src/DependencyCollector/Shared.Tests/Implementation/DependencyCollectorDiagnosticListenerTests.Netcore20.cs
Просмотреть файл

@ -116,10 +116,8 @@ namespace Microsoft.ApplicationInsights.Tests
// check only legacy headers here
Assert.AreEqual(activity.RootId,
requestMsg.Headers.GetValues(RequestResponseHeaders.StandardRootIdHeader).Single());
Assert.AreEqual($"|{activity.TraceId.ToHexString()}.{activity.SpanId.ToHexString()}.",
requestMsg.Headers.GetValues(RequestResponseHeaders.StandardParentIdHeader).Single());
Assert.AreEqual(this.testApplicationId1,
GetRequestContextKeyValue(requestMsg, RequestResponseHeaders.RequestContextCorrelationSourceKey));
Assert.AreEqual(activity.SpanId.ToHexString(), requestMsg.Headers.GetValues(RequestResponseHeaders.StandardParentIdHeader).Single());
Assert.AreEqual(this.testApplicationId1, GetRequestContextKeyValue(requestMsg, RequestResponseHeaders.RequestContextCorrelationSourceKey));
}
}
@ -187,9 +185,7 @@ namespace Microsoft.ApplicationInsights.Tests
Assert.AreEqual(activity.RootId, telemetry.Context.Operation.Id);
Assert.IsNull(telemetry.Context.Operation.ParentId);
Assert.AreEqual(
string.Concat('|', telemetry.Context.Operation.Id, '.', activity.SpanId.ToHexString(), '.'),
telemetry.Id);
Assert.AreEqual(activity.SpanId.ToHexString(), telemetry.Id);
Assert.AreEqual("v", telemetry.Properties["k"]);
Assert.AreEqual(32, telemetry.Context.Operation.Id.Length);
@ -285,7 +281,7 @@ namespace Microsoft.ApplicationInsights.Tests
Assert.IsNotNull(telemetry);
Assert.AreEqual("0123456789abcdef0123456789abcdef", telemetry.Context.Operation.Id);
Assert.AreEqual("|0123456789abcdef0123456789abcdef.0123456789abcdef.",
Assert.AreEqual("0123456789abcdef",
telemetry.Context.Operation.ParentId);
}
}
@ -312,8 +308,7 @@ namespace Microsoft.ApplicationInsights.Tests
Assert.IsNotNull(telemetry);
Assert.AreEqual(parent.RootId, telemetry.Context.Operation.Id);
Assert.AreEqual($"|{parent.RootId}.{parent.SpanId.ToHexString()}.",
telemetry.Context.Operation.ParentId);
Assert.AreEqual(parent.SpanId.ToHexString(), telemetry.Context.Operation.ParentId);
}
}
@ -342,9 +337,8 @@ namespace Microsoft.ApplicationInsights.Tests
Assert.IsNotNull(telemetry);
Assert.AreEqual(parent.RootId, telemetry.Context.Operation.Id);
Assert.AreEqual($"|{activity.TraceId.ToHexString()}.{activity.ParentSpanId.ToHexString()}.",
telemetry.Context.Operation.ParentId);
Assert.AreEqual($"|{activity.TraceId.ToHexString()}.{activity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(activity.ParentSpanId.ToHexString(), telemetry.Context.Operation.ParentId);
Assert.AreEqual(activity.SpanId.ToHexString(), telemetry.Id);
Assert.AreEqual("v", telemetry.Properties["k"]);
string expectedVersion =

6
WEB/Src/DependencyCollector/Shared.Tests/Implementation/DependencyCollectorDiagnosticListenerTests.Netcore30.cs
Просмотреть файл

@ -94,10 +94,8 @@ namespace Microsoft.ApplicationInsights.Tests
// check only legacy headers here
Assert.AreEqual(activity.RootId,
requestMsg.Headers.GetValues(RequestResponseHeaders.StandardRootIdHeader).Single());
Assert.AreEqual($"|{activity.TraceId.ToHexString()}.{activity.SpanId.ToHexString()}.",
requestMsg.Headers.GetValues(RequestResponseHeaders.StandardParentIdHeader).Single());
Assert.AreEqual(this.testApplicationId1,
GetRequestContextKeyValue(requestMsg, RequestResponseHeaders.RequestContextCorrelationSourceKey));
Assert.AreEqual(activity.SpanId.ToHexString(), requestMsg.Headers.GetValues(RequestResponseHeaders.StandardParentIdHeader).Single());
Assert.AreEqual(this.testApplicationId1, GetRequestContextKeyValue(requestMsg, RequestResponseHeaders.RequestContextCorrelationSourceKey));
}
}

21
WEB/Src/DependencyCollector/Shared.Tests/Implementation/DependencyCollectorDiagnosticListenerTests.Netstandard16.cs
Просмотреть файл

@ -256,7 +256,7 @@ namespace Microsoft.ApplicationInsights.Tests
Assert.AreEqual(dependency.Telemetry.Id, legacyParentIdHeader);
Assert.AreEqual(dependency.Telemetry.Context.Operation.Id, legacyRootIdHeader);
Assert.AreEqual(dependency.Telemetry.Id, requestIdHeader);
Assert.AreEqual($"|{dependency.Telemetry.Context.Operation.Id}.{dependency.Telemetry.Id}.", requestIdHeader);
}
}
@ -324,7 +324,7 @@ namespace Microsoft.ApplicationInsights.Tests
GetRequestHeaderValues(requestMsg, RequestResponseHeaders.RequestIdHeader).Single();
Assert.IsFalse(requestMsg.Headers.Contains(RequestResponseHeaders.StandardRootIdHeader));
Assert.IsFalse(requestMsg.Headers.Contains(RequestResponseHeaders.StandardParentIdHeader));
Assert.AreEqual(dependency.Telemetry.Id, requestIdHeader);
Assert.AreEqual($"|{dependency.Telemetry.Context.Operation.Id}.{dependency.Telemetry.Id}.", requestIdHeader);
}
}
@ -711,14 +711,13 @@ namespace Microsoft.ApplicationInsights.Tests
listener.OnRequest(requestMsg, loggingRequestId);
Assert.IsNotNull(Activity.Current);
var requestId = requestMsg.Headers.GetValues(RequestResponseHeaders.RequestIdHeader).Single();
var traceparent = requestMsg.Headers.GetValues("traceparent").Single();
var tracestate = requestMsg.Headers.GetValues("tracestate").Single();
var requestIdHeader = requestMsg.Headers.GetValues(RequestResponseHeaders.RequestIdHeader).Single();
var traceparentHeader = requestMsg.Headers.GetValues("traceparent").Single();
var tracestateHeader = requestMsg.Headers.GetValues("tracestate").Single();
Assert.AreEqual($"|{Activity.Current.TraceId.ToHexString()}.{Activity.Current.SpanId.ToHexString()}.",
requestId);
Assert.AreEqual(Activity.Current.Id, traceparent);
Assert.AreEqual("state=some", tracestate);
Assert.AreEqual($"|{Activity.Current.TraceId.ToHexString()}.{Activity.Current.SpanId.ToHexString()}.", requestIdHeader);
Assert.AreEqual(Activity.Current.Id, traceparentHeader);
Assert.AreEqual("state=some", tracestateHeader);
var correlationContextHeader =
requestMsg.Headers.GetValues(RequestResponseHeaders.CorrelationContextHeader).ToArray();
@ -737,9 +736,9 @@ namespace Microsoft.ApplicationInsights.Tests
listener.OnResponse(responseMsg, loggingRequestId);
Assert.AreEqual(parentActivity, Activity.Current);
Assert.AreEqual(requestId, telemetry.Id);
Assert.AreEqual(requestIdHeader.Substring(34, 16), telemetry.Id);
Assert.AreEqual(parentActivity.RootId, telemetry.Context.Operation.Id);
Assert.AreEqual($"|{parentActivity.TraceId.ToHexString()}.{parentActivity.SpanId.ToHexString()}.", telemetry.Context.Operation.ParentId);
Assert.AreEqual(parentActivity.SpanId.ToHexString(), telemetry.Context.Operation.ParentId);
Assert.AreEqual("state=some", telemetry.Properties["tracestate"]);
// Check the operation details

25
WEB/Src/DependencyCollector/Shared.Tests/Implementation/EventHubsDiagnosticListenerTests.cs
Просмотреть файл

@ -25,6 +25,7 @@
Activity.DefaultIdFormat = ActivityIdFormat.W3C;
Activity.ForceDefaultIdFormat = true;
this.configuration = new TelemetryConfiguration();
this.configuration.TelemetryInitializers.Add(new OperationCorrelationTelemetryInitializer());
this.sentItems = new List<ITelemetry>();
this.configuration.TelemetryChannel = new StubTelemetryChannel { OnSend = item => this.sentItems.Add(item), EndpointAddress = "https://dc.services.visualstudio.com/v2/track" };
this.configuration.InstrumentationKey = Guid.NewGuid().ToString();
@ -87,9 +88,9 @@
Assert.AreEqual("sb://eventhubname.servicebus.windows.net/ | ehname", telemetry.Target);
Assert.IsTrue(telemetry.Success.Value);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.ParentSpanId.ToHexString()}.", telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.ParentSpanId.ToHexString(), telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(sendActivity.SpanId.ToHexString(), telemetry.Id);
Assert.AreEqual("v1", telemetry.Properties["k1"]);
Assert.AreEqual("eventhubname.servicebus.windows.net", telemetry.Properties["peer.hostname"]);
@ -127,9 +128,9 @@
Assert.AreEqual("sb://eventhubname.servicebus.windows.net/ | ehname", telemetry.Target);
Assert.IsTrue(telemetry.Success.Value);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.ParentSpanId.ToHexString()}.", telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.ParentSpanId.ToHexString(), telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(sendActivity.SpanId.ToHexString(), telemetry.Id);
Assert.AreEqual("v1", telemetry.Properties["k1"]);
Assert.AreEqual("eventhubname.servicebus.windows.net", telemetry.Properties["peer.hostname"]);
@ -167,9 +168,9 @@
Assert.AreEqual("sb://eventhubname.servicebus.windows.net/ | ehname", telemetry.Target);
Assert.IsTrue(telemetry.Success.Value);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.ParentSpanId.ToHexString()}.", telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.ParentSpanId.ToHexString(), telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(sendActivity.SpanId.ToHexString(), telemetry.Id);
Assert.AreEqual("v1", telemetry.Properties["k1"]);
Assert.AreEqual("eventhubname.servicebus.windows.net", telemetry.Properties["peer.hostname"]);
@ -207,9 +208,9 @@
Assert.AreEqual("sb://eventhubname.servicebus.windows.net/ | ehname", telemetry.Target);
Assert.IsTrue(telemetry.Success.Value);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.ParentSpanId.ToHexString()}.", telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.ParentSpanId.ToHexString(), telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(sendActivity.SpanId.ToHexString(), telemetry.Id);
Assert.AreEqual("v1", telemetry.Properties["k1"]);
Assert.AreEqual("eventhubname.servicebus.windows.net", telemetry.Properties["peer.hostname"]);
@ -285,7 +286,7 @@
Assert.IsNull(telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(sendActivity.SpanId.ToHexString(), telemetry.Id);
Assert.AreEqual("eventhubname.servicebus.windows.net", telemetry.Properties["peer.hostname"]);
Assert.AreEqual("ehname", telemetry.Properties["eh.event_hub_name"]);
@ -319,7 +320,7 @@
Assert.AreEqual("parent", telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(sendActivity.SpanId.ToHexString(), telemetry.Id);
Assert.AreEqual("eventhubname.servicebus.windows.net", telemetry.Properties["peer.hostname"]);
Assert.AreEqual("ehname", telemetry.Properties["eh.event_hub_name"]);
@ -352,9 +353,9 @@
Assert.AreEqual("sb://eventhubname.servicebus.windows.net/ | ehname", telemetry.Target);
Assert.IsFalse(telemetry.Success.Value);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.ParentSpanId.ToHexString()}.", telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.ParentSpanId.ToHexString(), telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(sendActivity.SpanId.ToHexString(), telemetry.Id);
Assert.AreEqual("v1", telemetry.Properties["k1"]);
Assert.AreEqual("eventhubname.servicebus.windows.net", telemetry.Properties["peer.hostname"]);

2
WEB/Src/DependencyCollector/Shared.Tests/Implementation/FrameworkHttpProcessingTest.cs
Просмотреть файл

@ -465,7 +465,7 @@
if (parentActivity.IdFormat == ActivityIdFormat.W3C)
{
Assert.AreEqual(parentActivity.TraceId.ToHexString(), remoteDependencyTelemetryActual.Context.Operation.Id);
Assert.AreEqual($"|{parentActivity.TraceId.ToHexString()}.{parentActivity.SpanId.ToHexString()}.", remoteDependencyTelemetryActual.Context.Operation.ParentId);
Assert.AreEqual(parentActivity.SpanId.ToHexString(), remoteDependencyTelemetryActual.Context.Operation.ParentId);
if (parentActivity.TraceStateString != null)
{
Assert.IsTrue(remoteDependencyTelemetryActual.Properties.ContainsKey("tracestate"));

2
WEB/Src/DependencyCollector/Shared.Tests/Implementation/FrameworkSqlProcessingTest.cs
Просмотреть файл

@ -351,7 +351,7 @@
if (parentActivity.IdFormat == ActivityIdFormat.W3C)
{
Assert.AreEqual(parentActivity.TraceId.ToHexString(), remoteDependencyTelemetryActual.Context.Operation.Id);
Assert.AreEqual($"|{parentActivity.TraceId.ToHexString()}.{parentActivity.SpanId.ToHexString()}.", remoteDependencyTelemetryActual.Context.Operation.ParentId);
Assert.AreEqual(parentActivity.SpanId.ToHexString(), remoteDependencyTelemetryActual.Context.Operation.ParentId);
if (parentActivity.TraceStateString != null)
{
Assert.IsTrue(remoteDependencyTelemetryActual.Properties.ContainsKey("tracestate"));

22
WEB/Src/DependencyCollector/Shared.Tests/Implementation/ServiceBusDiagnosticListenerTests.cs
Просмотреть файл

@ -86,9 +86,9 @@
Assert.AreEqual("sb://queuename.myservicebus.com/ | queueName", telemetry.Target);
Assert.IsTrue(telemetry.Success.Value);
Assert.AreEqual($"|{parentActivity.TraceId.ToHexString()}.{parentActivity.SpanId.ToHexString()}.", telemetry.Context.Operation.ParentId);
Assert.AreEqual(parentActivity.SpanId.ToHexString(), telemetry.Context.Operation.ParentId);
Assert.AreEqual(parentActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(sendActivity.SpanId.ToHexString(), telemetry.Id);
Assert.AreEqual("v1", telemetry.Properties["k1"]);
Assert.AreEqual("messageId", telemetry.Properties["MessageId"]);
@ -152,7 +152,7 @@
Assert.IsNull(telemetry.Context.Operation.ParentId);
Assert.AreEqual(sendActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(sendActivity.SpanId.ToHexString(), telemetry.Id);
Assert.AreEqual("messageId", telemetry.Properties["MessageId"]);
}
@ -181,9 +181,9 @@
Assert.AreEqual("sb://queuename.myservicebus.com/ | queueName", telemetry.Target);
Assert.IsFalse(telemetry.Success.Value);
Assert.AreEqual($"|{parentActivity.TraceId.ToHexString()}.{parentActivity.SpanId.ToHexString()}.", telemetry.Context.Operation.ParentId);
Assert.AreEqual(parentActivity.SpanId.ToHexString(), telemetry.Context.Operation.ParentId);
Assert.AreEqual(parentActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
Assert.AreEqual($"|{sendActivity.TraceId.ToHexString()}.{sendActivity.SpanId.ToHexString()}.", telemetry.Id);
Assert.AreEqual(sendActivity.SpanId.ToHexString(), telemetry.Id);
Assert.AreEqual("v1", telemetry.Properties["k1"]);
Assert.AreEqual("messageId", telemetry.Properties["MessageId"]);
@ -222,9 +222,9 @@
requestTelemetry.Source);
Assert.IsTrue(requestTelemetry.Success.Value);
Assert.AreEqual($"|{messageActivity.TraceId.ToHexString()}.{messageActivity.ParentSpanId.ToHexString()}.", requestTelemetry.Context.Operation.ParentId);
Assert.AreEqual(messageActivity.ParentSpanId.ToHexString(), requestTelemetry.Context.Operation.ParentId);
Assert.AreEqual(messageActivity.TraceId.ToHexString(), requestTelemetry.Context.Operation.Id);
Assert.AreEqual($"|{messageActivity.TraceId.ToHexString()}.{messageActivity.SpanId.ToHexString()}.", requestTelemetry.Id);
Assert.AreEqual(messageActivity.SpanId.ToHexString(), requestTelemetry.Id);
Assert.AreEqual("v1", requestTelemetry.Properties["k1"]);
@ -322,7 +322,7 @@
Assert.IsTrue(requestTelemetry.Properties.TryGetValue("ai_legacyRootId", out var legacyRoot));
Assert.AreEqual("hierarchical-parent", legacyRoot);
Assert.AreEqual("|hierarchical-parent.", requestTelemetry.Context.Operation.ParentId);
Assert.AreEqual($"|{messageActivity.TraceId.ToHexString()}.{messageActivity.SpanId.ToHexString()}.", requestTelemetry.Id);
Assert.AreEqual(messageActivity.SpanId.ToHexString(), requestTelemetry.Id);
Assert.AreEqual(messageActivity.TraceId.ToHexString(), requestTelemetry.Context.Operation.Id);
Assert.AreEqual("messageId", requestTelemetry.Properties["MessageId"]);
@ -369,7 +369,7 @@
Assert.IsFalse(requestTelemetry.Properties.TryGetValue("ai_legacyRootId", out _));
Assert.AreEqual(parentId, requestTelemetry.Context.Operation.ParentId);
Assert.AreEqual($"|{messageActivity.TraceId.ToHexString()}.{messageActivity.SpanId.ToHexString()}.", requestTelemetry.Id);
Assert.AreEqual(messageActivity.SpanId.ToHexString(), requestTelemetry.Id);
Assert.AreEqual(messageActivity.TraceId.ToHexString(), requestTelemetry.Context.Operation.Id);
Assert.AreEqual("messageId", requestTelemetry.Properties["MessageId"]);
@ -417,7 +417,7 @@
Assert.IsTrue(requestTelemetry.Properties.TryGetValue("ai_legacyRootId", out var legacyRoot));
Assert.AreEqual("malformed-parent", legacyRoot);
Assert.AreEqual("malformed-parent", requestTelemetry.Context.Operation.ParentId);
Assert.AreEqual($"|{messageActivity.TraceId.ToHexString()}.{messageActivity.SpanId.ToHexString()}.", requestTelemetry.Id);
Assert.AreEqual(messageActivity.SpanId.ToHexString(), requestTelemetry.Id);
Assert.AreEqual(messageActivity.TraceId.ToHexString(), requestTelemetry.Context.Operation.Id);
Assert.AreEqual("messageId", requestTelemetry.Properties["MessageId"]);
@ -461,7 +461,7 @@
Assert.AreEqual(messageActivity.TraceId.ToHexString(), requestTelemetry.Context.Operation.Id);
Assert.IsNull(requestTelemetry.Context.Operation.ParentId);
Assert.AreEqual($"|{messageActivity.TraceId.ToHexString()}.{messageActivity.SpanId.ToHexString()}.", requestTelemetry.Id);
Assert.AreEqual(messageActivity.SpanId.ToHexString(), requestTelemetry.Id);
Assert.AreEqual("messageId", requestTelemetry.Properties["MessageId"]);

2
WEB/Src/DependencyCollector/Shared.Tests/Implementation/SqlClientDiagnosticSourceListenerTests.cs
Просмотреть файл

@ -148,7 +148,7 @@ namespace Microsoft.ApplicationInsights.Tests
var dependencyTelemetry = (DependencyTelemetry)this.sendItems.Single();
Assert.Equal(activity.TraceId.ToHexString(), dependencyTelemetry.Context.Operation.Id);
Assert.Equal(W3CUtilities.FormatTelemetryId(activity.TraceId.ToHexString(), activity.SpanId.ToHexString()), dependencyTelemetry.Context.Operation.ParentId);
Assert.Equal(activity.SpanId.ToHexString(), dependencyTelemetry.Context.Operation.ParentId);
Assert.Equal("123", dependencyTelemetry.Properties["Stuff"]);
}

23
WEB/Src/DependencyCollector/Shared/HttpCoreDiagnosticSourceListener.cs
Просмотреть файл

@ -395,10 +395,10 @@ namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
telemetry.Context.Operation.Id = traceId;
if (currentActivity.ParentSpanId != default)
{
telemetry.Context.Operation.ParentId = W3CUtilities.FormatTelemetryId(traceId, currentActivity.ParentSpanId.ToHexString());
telemetry.Context.Operation.ParentId = currentActivity.ParentSpanId.ToHexString();
}
telemetry.Id = W3CUtilities.FormatTelemetryId(traceId, currentActivity.SpanId.ToHexString());
telemetry.Id = currentActivity.SpanId.ToHexString();
}
else
{
@ -415,12 +415,6 @@ namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
}
}
// TODO[tracestate]: remove, this is done in base SDK
if (!string.IsNullOrEmpty(currentActivity.TraceStateString) && !telemetry.Properties.ContainsKey(W3CConstants.TracestatePropertyKey))
{
telemetry.Properties.Add(W3CConstants.TracestatePropertyKey, currentActivity.TraceStateString);
}
this.client.Initialize(telemetry);
// If we started auxiliary Activity before to override the Id with W3C compatible one,
@ -472,13 +466,6 @@ namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
var dependency = this.client.StartOperation<DependencyTelemetry>(resourceName);
// TODO[tracestate]: remove, this is done in base SDK
var tracestate = Activity.Current?.TraceStateString;
if (!string.IsNullOrEmpty(tracestate) && !dependency.Telemetry.Properties.ContainsKey(W3CConstants.TracestatePropertyKey))
{
dependency.Telemetry.Properties.Add(W3CConstants.TracestatePropertyKey, tracestate);
}
dependency.Telemetry.Target = DependencyTargetNameHelper.GetDependencyTargetName(requestUri);
dependency.Telemetry.Type = RemoteDependencyConstants.HTTP;
dependency.Telemetry.Data = requestUri.OriginalString;
@ -557,9 +544,7 @@ namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
{
if (!requestHeaders.Contains(RequestResponseHeaders.RequestIdHeader))
{
requestHeaders.Add(RequestResponseHeaders.RequestIdHeader,
W3CUtilities.FormatTelemetryId(currentActivity.TraceId.ToHexString(),
currentActivity.SpanId.ToHexString()));
requestHeaders.Add(RequestResponseHeaders.RequestIdHeader, string.Concat('|', currentActivity.TraceId.ToHexString(), '.', currentActivity.SpanId.ToHexString(), '.'));
}
}
@ -651,7 +636,7 @@ namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
// Add the parent ID
string parentId = currentActivity.IdFormat == ActivityIdFormat.W3C ?
W3CUtilities.FormatTelemetryId(rootId, currentActivity.SpanId.ToHexString()) :
currentActivity.SpanId.ToHexString() :
currentActivity.Id;
if (!string.IsNullOrEmpty(parentId) && !requestHeaders.Contains(RequestResponseHeaders.StandardParentIdHeader))

10
WEB/Src/DependencyCollector/Shared/Implementation/ClientServerDependencyTracker.cs
Просмотреть файл

@ -55,16 +55,10 @@
if (activity.Parent != null || activity.ParentSpanId != default)
{
context.Operation.ParentId = W3CUtilities.FormatTelemetryId(context.Operation.Id, activity.ParentSpanId.ToHexString());
context.Operation.ParentId = activity.ParentSpanId.ToHexString();
}
telemetry.Id = W3CUtilities.FormatTelemetryId(context.Operation.Id, activity.SpanId.ToHexString());
// TODO[tracestate]: remove, this is done in base SDK
if (activity.TraceStateString != null && !telemetry.Properties.ContainsKey(W3CConstants.TracestatePropertyKey))
{
telemetry.Properties.Add(W3CConstants.TracestatePropertyKey, activity.TraceStateString);
}
telemetry.Id = activity.SpanId.ToHexString();
}
else
{

10
WEB/Src/DependencyCollector/Shared/Implementation/EventHandlers/DiagnosticsEventHandlerBase.cs
Просмотреть файл

@ -53,7 +53,7 @@
{
if (activity.ParentSpanId != default)
{
telemetry.Context.Operation.ParentId = W3CUtilities.FormatTelemetryId(traceId, activity.ParentSpanId.ToHexString());
telemetry.Context.Operation.ParentId = activity.ParentSpanId.ToHexString();
}
else if (!string.IsNullOrEmpty(activity.ParentId))
{
@ -62,13 +62,7 @@
}
}
telemetry.Id = W3CUtilities.FormatTelemetryId(traceId, activity.SpanId.ToHexString());
// TODO[tracestate]: remove, this is done in base SDK
if (!string.IsNullOrEmpty(activity.TraceStateString) && !telemetry.Properties.ContainsKey(W3CConstants.TracestatePropertyKey))
{
telemetry.Properties.Add(W3CConstants.TracestatePropertyKey, activity.TraceStateString);
}
telemetry.Id = activity.SpanId.ToHexString();
}
else
{

2
WEB/Src/DependencyCollector/Shared/Implementation/HttpProcessing.cs
Просмотреть файл

@ -240,7 +240,7 @@ namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
{
if (webRequest.Headers[RequestResponseHeaders.RequestIdHeader] == null)
{
webRequest.Headers.Add(RequestResponseHeaders.RequestIdHeader, telemetry.Id);
webRequest.Headers.Add(RequestResponseHeaders.RequestIdHeader, string.Concat('|', telemetry.Context.Operation.Id, '.', telemetry.Id, '.'));
}
}
}

2
WEB/Src/DependencyCollector/Shared/Implementation/SqlClientDiagnostics/SqlClientDiagnosticSourceListener.cs
Просмотреть файл

@ -354,7 +354,7 @@ namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation.SqlCl
{
var traceId = activity.TraceId.ToHexString();
telemetry.Context.Operation.Id = traceId;
telemetry.Context.Operation.ParentId = W3CUtilities.FormatTelemetryId(traceId, activity.SpanId.ToHexString());
telemetry.Context.Operation.ParentId = activity.SpanId.ToHexString();
}
else
{

21
WEB/Src/Web/Web.Net45.Tests/AspNetDiagnosticTelemetryModuleTest.cs
Просмотреть файл

@ -177,7 +177,7 @@
Assert.IsNotNull(requestTelemetry);
Assert.IsNull(requestTelemetry.Context.Operation.ParentId);
Assert.AreEqual(activity.TraceId.ToHexString(), requestTelemetry.Context.Operation.Id);
Assert.AreEqual(FormatTelemetryId(activity.TraceId, activity.SpanId), requestTelemetry.Id);
Assert.AreEqual(activity.SpanId.ToHexString(), requestTelemetry.Id);
}
[TestMethod]
@ -287,7 +287,7 @@
var request = (RequestTelemetry)this.sendItems[0];
Assert.AreEqual(activity.TraceId.ToHexString(), request.Context.Operation.Id);
Assert.IsNull(request.Context.Operation.ParentId);
Assert.AreEqual(FormatTelemetryId(activity.TraceId, activity.SpanId), request.Id);
Assert.AreEqual(activity.SpanId.ToHexString(), request.Id);
Assert.IsFalse(request.Properties.ContainsKey("ai_legacyRootId"));
}
@ -338,8 +338,8 @@
var requestTelemetry = this.sendItems[0] as RequestTelemetry;
Assert.IsNotNull(requestTelemetry);
Assert.AreEqual("4bf92f3577b34da6a3ce929d0e0e4736", requestTelemetry.Context.Operation.Id);
Assert.AreEqual("|4bf92f3577b34da6a3ce929d0e0e4736.00f067aa0ba902b7.", requestTelemetry.Context.Operation.ParentId);
Assert.AreEqual($"|4bf92f3577b34da6a3ce929d0e0e4736.{activity.SpanId.ToHexString()}.", requestTelemetry.Id);
Assert.AreEqual("00f067aa0ba902b7", requestTelemetry.Context.Operation.ParentId);
Assert.AreEqual(activity.SpanId.ToHexString(), requestTelemetry.Id);
Assert.AreEqual(0, requestTelemetry.Properties.Count);
Assert.IsFalse(requestTelemetry.Properties.ContainsKey("ai_legacyRootId"));
@ -371,8 +371,8 @@
var requestTelemetry = this.sendItems[0] as RequestTelemetry;
Assert.IsNotNull(requestTelemetry);
Assert.AreEqual("4bf92f3577b34da6a3ce929d0e0e4736", requestTelemetry.Context.Operation.Id);
Assert.AreEqual("|4bf92f3577b34da6a3ce929d0e0e4736.00f067aa0ba902b7.", requestTelemetry.Context.Operation.ParentId);
Assert.AreEqual($"|4bf92f3577b34da6a3ce929d0e0e4736.{activity.SpanId.ToHexString()}.", requestTelemetry.Id);
Assert.AreEqual("00f067aa0ba902b7", requestTelemetry.Context.Operation.ParentId);
Assert.AreEqual(activity.SpanId.ToHexString(), requestTelemetry.Id);
Assert.IsFalse(requestTelemetry.Properties.ContainsKey("ai_legacyRootId"));
Assert.AreEqual(0, requestTelemetry.Properties.Count);
@ -403,7 +403,7 @@
Assert.IsNotNull(requestTelemetry);
Assert.AreEqual(activity.TraceId.ToHexString(), requestTelemetry.Context.Operation.Id);
Assert.AreEqual("|requestId.", requestTelemetry.Context.Operation.ParentId);
Assert.AreEqual(FormatTelemetryId(activity.TraceId, activity.SpanId), requestTelemetry.Id);
Assert.AreEqual(activity.SpanId.ToHexString(), requestTelemetry.Id);
Assert.AreEqual(1, requestTelemetry.Properties.Count);
Assert.IsTrue(requestTelemetry.Properties.TryGetValue("ai_legacyRootId", out var aiLegacyRootId));
@ -515,7 +515,7 @@
Assert.IsNotNull(requestTelemetry);
Assert.AreEqual(activity.TraceId.ToHexString(), requestTelemetry.Context.Operation.Id);
Assert.AreEqual("parent", requestTelemetry.Context.Operation.ParentId);
Assert.AreEqual(FormatTelemetryId(activity.TraceId, activity.SpanId), requestTelemetry.Id);
Assert.AreEqual(activity.SpanId.ToHexString(), requestTelemetry.Id);
Assert.IsTrue(requestTelemetry.Properties.TryGetValue("ai_legacyRootId", out var legacyRootId));
Assert.AreEqual("root", legacyRootId);
@ -598,11 +598,6 @@
GC.SuppressFinalize(this);
}
private static string FormatTelemetryId(ActivityTraceId traceId, ActivitySpanId spanId)
{
return string.Concat('|', traceId, '.', spanId, '.');
}
private AspNetDiagnosticTelemetryModule CreateModule(string rootIdHeaderName = null, string parentIdHeaderName = null)
{
var initializer = new Web.OperationCorrelationTelemetryInitializer();

22
WEB/Src/Web/Web.Net45.Tests/RequestTrackingTelemetryModuleTest.Net45.cs
Просмотреть файл

@ -62,7 +62,7 @@
module.OnEndRequest(context);
Assert.Equal(activity.TraceId.ToHexString(), requestTelemetry.Context.Operation.Id);
Assert.Equal($"|{activity.TraceId.ToHexString()}.{activity.SpanId.ToHexString()}.", requestTelemetry.Id);
Assert.Equal(activity.SpanId.ToHexString(), requestTelemetry.Id);
Assert.Equal("guid1", requestTelemetry.Context.Operation.ParentId);
Assert.True(requestTelemetry.Properties.TryGetValue("ai_legacyRootId", out var legacyRootId));
Assert.Equal("guid1", legacyRootId);
@ -87,7 +87,7 @@
Assert.Null(requestTelemetry.Context.Operation.ParentId);
Assert.Equal(activity.TraceId.ToHexString(), requestTelemetry.Context.Operation.Id);
Assert.Equal($"|{activity.TraceId.ToHexString()}.{activity.SpanId.ToHexString()}.", requestTelemetry.Id);
Assert.Equal(activity.SpanId.ToHexString(), requestTelemetry.Id);
}
[TestMethod]
@ -136,7 +136,7 @@
module.OnEndRequest(context);
Assert.Equal(activity.TraceId.ToHexString(), requestTelemetry.Context.Operation.Id);
Assert.Equal($"|{activity.TraceId.ToHexString()}.{activity.SpanId.ToHexString()}.", requestTelemetry.Id);
Assert.Equal(activity.SpanId.ToHexString(), requestTelemetry.Id);
Assert.Equal("guid1", requestTelemetry.Context.Operation.ParentId);
Assert.True(requestTelemetry.Properties.TryGetValue("ai_legacyRootId", out var legacyRootId));
Assert.Equal("guid2", legacyRootId);
@ -169,7 +169,7 @@
var requestTelemetry = context.GetRequestTelemetry();
module.OnEndRequest(context);
Assert.Equal($"|{activityInitializedByW3CHeader.TraceId.ToHexString()}.{activityInitializedByW3CHeader.SpanId.ToHexString()}.", requestTelemetry.Id);
Assert.Equal(activityInitializedByW3CHeader.SpanId.ToHexString(), requestTelemetry.Id);
Assert.Equal(activityInitializedByW3CHeader.TraceId.ToHexString(), requestTelemetry.Context.Operation.Id);
Assert.Null(requestTelemetry.Context.Operation.ParentId);
}
@ -254,7 +254,7 @@
module.OnEndRequest(context);
Assert.Equal(activity.TraceId.ToHexString(), requestTelemetry.Context.Operation.Id);
Assert.Equal($"|{activity.TraceId.ToHexString()}.{activity.SpanId.ToHexString()}.", requestTelemetry.Id);
Assert.Equal(activity.SpanId.ToHexString(), requestTelemetry.Id);
Assert.Equal("guid1", requestTelemetry.Context.Operation.ParentId);
Assert.True(requestTelemetry.Properties.TryGetValue("ai_legacyRootId", out var legacyRootId));
Assert.Equal("guid2", legacyRootId);
@ -280,7 +280,9 @@
Assert.Equal("ParentId", requestTelemetry.Context.Operation.ParentId);
Assert.Equal(activity.TraceId.ToHexString(), requestTelemetry.Context.Operation.Id);
Assert.NotEqual($"|{activity.TraceId.ToHexString()}.{activity.SpanId.ToHexString()}", requestTelemetry.Id);
// Assert.NotEqual($"|{activity.TraceId.ToHexString()}.{activity.SpanId.ToHexString()}", requestTelemetry.Id);
Assert.Equal(activity.SpanId.ToHexString(), requestTelemetry.Id);
Assert.True(requestTelemetry.Properties.TryGetValue("ai_legacyRootId", out var legacyRootId));
Assert.Equal("RootId", legacyRootId);
}
@ -465,7 +467,7 @@
var request = (RequestTelemetry)this.sentTelemetry.Single(t => t is RequestTelemetry);
Assert.Equal("4bf92f3577b34da6a3ce929d0e0e4736", request.Context.Operation.Id);
Assert.Equal("|4bf92f3577b34da6a3ce929d0e0e4736.00f067aa0ba902b7.", request.Context.Operation.ParentId);
Assert.Equal("00f067aa0ba902b7", request.Context.Operation.ParentId);
Assert.Equal(trace1.Context.Operation.Id, request.Context.Operation.Id);
Assert.Equal(trace2.Context.Operation.Id, request.Context.Operation.Id);
@ -539,9 +541,9 @@
var requestTelemetry = context.GetRequestTelemetry();
module.OnEndRequest(context);
Assert.Equal($"|4bf92f3577b34da6a3ce929d0e0e4736.{activityInitializedByW3CHeader.SpanId.ToHexString()}.", requestTelemetry.Id);
Assert.Equal(activityInitializedByW3CHeader.SpanId.ToHexString(), requestTelemetry.Id);
Assert.Equal("4bf92f3577b34da6a3ce929d0e0e4736", requestTelemetry.Context.Operation.Id);
Assert.Equal("|4bf92f3577b34da6a3ce929d0e0e4736.00f067aa0ba902b7.", requestTelemetry.Context.Operation.ParentId);
Assert.Equal("00f067aa0ba902b7", requestTelemetry.Context.Operation.ParentId);
Assert.Equal("state=some", requestTelemetry.Properties["tracestate"]);
}
@ -565,7 +567,7 @@
var requestTelemetry = context.GetRequestTelemetry();
module.OnEndRequest(context);
Assert.Equal($"|{activityInitializedByW3CHeader.TraceId.ToHexString()}.{activityInitializedByW3CHeader.SpanId.ToHexString()}.", requestTelemetry.Id);
Assert.Equal(activityInitializedByW3CHeader.SpanId.ToHexString(), requestTelemetry.Id);
Assert.Equal(activityInitializedByW3CHeader.TraceId.ToHexString(), requestTelemetry.Context.Operation.Id);
if (addRequestId)

10
WEB/Src/Web/Web.Shared.Net/Implementation/RequestTrackingExtensions.cs
Просмотреть файл

@ -86,7 +86,7 @@
if (currentActivity.ParentSpanId != default && legacyParentId == null)
{
requestContext.ParentId = W3CUtilities.FormatTelemetryId(requestContext.Id, currentActivity.ParentSpanId.ToHexString());
requestContext.ParentId = currentActivity.ParentSpanId.ToHexString();
}
else
{
@ -97,13 +97,7 @@
}
}
// TODO[tracestate]: remove, this is done in base SDK
if (!string.IsNullOrEmpty(currentActivity.TraceStateString))
{
result.Properties[W3CConstants.TracestatePropertyKey] = currentActivity.TraceStateString;
}
result.Id = W3CUtilities.FormatTelemetryId(requestContext.Id, currentActivity.SpanId.ToHexString());
result.Id = currentActivity.SpanId.ToHexString();
}
else
{

106
WEB/Test/E2ETests/E2ETests/Test452Base.cs
Просмотреть файл

@ -28,9 +28,9 @@ namespace E2ETests
}
public abstract class Test452Base
{
internal static Dictionary<string, DeployedApp> Apps = new Dictionary<string, DeployedApp>()
{
{
{
TestConstants.WebApiName,
new DeployedApp
@ -96,9 +96,9 @@ namespace E2ETests
DockerUtils.PrintDockerProcessStats("Docker-Compose -build retry");
PopulateIPAddresses();
allAppsHealthy = HealthCheckAndRemoveImageIfNeededAllApp();
}
}
Assert.IsTrue(allAppsHealthy, "All Apps are not unhealthy.");
Assert.IsTrue(allAppsHealthy, "All Apps are not unhealthy.");
dataendpointClient = new DataEndpointClient(new Uri("http://" + Apps[TestConstants.IngestionName].ipAddress));
@ -160,13 +160,13 @@ namespace E2ETests
private static bool HealthCheckAndRemoveImageIfNeededAllApp()
{
bool healthy = true;
foreach(var app in Apps)
foreach (var app in Apps)
{
healthy = healthy && HealthCheckAndRemoveImageIfNeeded(app.Value);
}
return healthy;
}
}
private static void PopulateIPAddresses()
{
@ -174,7 +174,7 @@ namespace E2ETests
Trace.WriteLine("Inspecting Docker containers to get IP addresses");
foreach (var app in Apps)
{
app.Value.ipAddress = DockerUtils.FindIpDockerContainer(app.Value.containerName);
app.Value.ipAddress = DockerUtils.FindIpDockerContainer(app.Value.containerName);
}
}
@ -277,7 +277,7 @@ namespace E2ETests
var request = new HttpRequestMessage(HttpMethod.Post, string.Format($"http://{Apps[TestConstants.WebApiName].ipAddress}/api/values"));
request.Headers.Add("traceparent", $"00-{operationId}-{ActivitySpanId.CreateRandom()}-01");
request.Content = new StringContent($"\"{new string('1', 1024*1024)}\"", Encoding.UTF8, "application/json");
request.Content = new StringContent($"\"{new string('1', 1024 * 1024)}\"", Encoding.UTF8, "application/json");
var response = await httpClient.SendAsync(request);
@ -301,7 +301,7 @@ namespace E2ETests
PrintDependencies(dependencies);
Assert.AreEqual(1, dependencies.Count);
var requests = WaitForReceiveRequestItemsFromDataIngestion(Apps[TestConstants.WebApiName].ipAddress, Apps[TestConstants.WebApiName].ikey, expectNumberOfItems:1);
var requests = WaitForReceiveRequestItemsFromDataIngestion(Apps[TestConstants.WebApiName].ipAddress, Apps[TestConstants.WebApiName].ikey, expectNumberOfItems: 1);
Trace.WriteLine("Requests count for WebApp:" + requests.Count);
PrintRequests(requests);
Assert.AreEqual(1, requests.Count);
@ -314,7 +314,7 @@ namespace E2ETests
{
var spanId = restoredActivityId.Split('-')[2];
Assert.AreEqual(operationId, dependency.tags["ai.operation.id"]);
Assert.AreEqual($"|{operationId}.{spanId}.", dependency.tags["ai.operation.parentId"]);
Assert.AreEqual(spanId, dependency.tags["ai.operation.parentId"]);
Assert.AreEqual(requests[0].data.baseData.id, dependency.tags["ai.operation.parentId"]);
}
else
@ -515,7 +515,7 @@ namespace E2ETests
// will be a local url in case of emulator.
expectedDependencyTelemetry.Type = "Http";
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetToEmulatorTable;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetToEmulatorTable;
// 2 dependency item is expected.
// 1 from creating table, and 1 from writing data to it.
@ -531,7 +531,7 @@ namespace E2ETests
// will be a local url in case of emulator.
expectedDependencyTelemetry.Type = "Http";
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetToEmulatorQueue;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetToEmulatorQueue;
// 2 dependency item is expected.
// 1 from creating queue, and 1 from writing data to it.
@ -547,7 +547,7 @@ namespace E2ETests
// will be a local url in case of emulator.
expectedDependencyTelemetry.Type = "Http";
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetToEmulatorBlob;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetToEmulatorBlob;
// 2 dependency item is expected.
// 1 from creating table, and 1 from writing data to it.
@ -569,7 +569,7 @@ namespace E2ETests
}
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetNameToSql;
expectedDependencyTelemetry.Data = expectedData;
ValidateBasicDependency(Apps[appname].ipAddress, path, expectedDependencyTelemetry,
Apps[appname].ikey, 1, expectedPrefix);
}
@ -580,8 +580,8 @@ namespace E2ETests
expectedDependencyTelemetry.Type = "SQL";
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetNameToSql;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf")? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf") ? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
ValidateBasicDependency(Apps[AppNameBeingTested].ipAddress, "/Dependencies.aspx?type=ExecuteReaderAsync&success=true", expectedDependencyTelemetry,
Apps[AppNameBeingTested].ikey, 1, expectedPrefix);
@ -594,7 +594,7 @@ namespace E2ETests
expectedDependencyTelemetry.Success = false;
expectedDependencyTelemetry.ResultCode = "208";
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetNameToSql;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf") ? TestConstants.WebAppFullQueryToSqlException : string.Empty;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf") ? TestConstants.WebAppFullQueryToSqlException : string.Empty;
ValidateBasicDependency(Apps[AppNameBeingTested].ipAddress, "/Dependencies.aspx?type=ExecuteReaderAsync&success=false", expectedDependencyTelemetry,
Apps[AppNameBeingTested].ikey, 1, expectedPrefix);
@ -606,7 +606,7 @@ namespace E2ETests
expectedDependencyTelemetry.Type = "SQL";
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetNameToSql;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf")? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf") ? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
ValidateBasicDependency(Apps[AppNameBeingTested].ipAddress, "/Dependencies.aspx?type=BeginExecuteReader0&success=true", expectedDependencyTelemetry,
Apps[AppNameBeingTested].ikey, 1, expectedPrefix);
@ -631,7 +631,7 @@ namespace E2ETests
expectedDependencyTelemetry.Type = "SQL";
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetNameToSql;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf")? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf") ? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
ValidateBasicDependency(Apps[AppNameBeingTested].ipAddress, "/Dependencies.aspx?type=BeginExecuteReader1&success=true", expectedDependencyTelemetry,
Apps[AppNameBeingTested].ikey, 1, expectedPrefix);
@ -656,7 +656,7 @@ namespace E2ETests
expectedDependencyTelemetry.Type = "SQL";
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetNameToSql;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf")? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf") ? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
ValidateBasicDependency(Apps[AppNameBeingTested].ipAddress, "/Dependencies.aspx?type=BeginExecuteReader2&success=true", expectedDependencyTelemetry,
Apps[AppNameBeingTested].ikey, 1, expectedPrefix);
@ -681,7 +681,7 @@ namespace E2ETests
expectedDependencyTelemetry.Type = "SQL";
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetNameToSql;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf")? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf") ? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
ValidateBasicDependency(Apps[AppNameBeingTested].ipAddress, "/Dependencies.aspx?type=BeginExecuteReader3&success=true", expectedDependencyTelemetry,
Apps[AppNameBeingTested].ikey, 1, expectedPrefix);
@ -706,7 +706,7 @@ namespace E2ETests
expectedDependencyTelemetry.Type = "SQL";
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetNameToSql;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf")? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf") ? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
ValidateBasicDependency(Apps[AppNameBeingTested].ipAddress, "/Dependencies.aspx?type=SqlCommandExecuteReader1&success=true", expectedDependencyTelemetry,
Apps[AppNameBeingTested].ikey, 1, expectedPrefix);
@ -731,7 +731,7 @@ namespace E2ETests
expectedDependencyTelemetry.Type = "SQL";
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetNameToSql;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf")? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf") ? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
ValidateBasicDependency(Apps[AppNameBeingTested].ipAddress, "/Dependencies.aspx?type=SqlCommandExecuteReader1&success=true", expectedDependencyTelemetry,
Apps[AppNameBeingTested].ikey, 1, expectedPrefix);
@ -756,7 +756,7 @@ namespace E2ETests
expectedDependencyTelemetry.Type = "SQL";
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetNameToSql;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf")? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf") ? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
ValidateBasicDependency(Apps[AppNameBeingTested].ipAddress, "/Dependencies.aspx?type=ExecuteScalarAsync&success=true", expectedDependencyTelemetry,
Apps[AppNameBeingTested].ikey, 1, expectedPrefix);
@ -781,7 +781,7 @@ namespace E2ETests
expectedDependencyTelemetry.Type = "SQL";
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetNameToSql;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf")? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf") ? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
ValidateBasicDependency(Apps[AppNameBeingTested].ipAddress, "/Dependencies.aspx?type=SqlCommandExecuteScalar&success=true", expectedDependencyTelemetry,
Apps[AppNameBeingTested].ikey, 1, expectedPrefix);
@ -806,7 +806,7 @@ namespace E2ETests
expectedDependencyTelemetry.Type = "SQL";
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetNameToSql;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf")? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf") ? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
ValidateBasicDependency(Apps[AppNameBeingTested].ipAddress, "/Dependencies.aspx?type=SqlCommandExecuteNonQuery&success=true", expectedDependencyTelemetry,
Apps[AppNameBeingTested].ikey, 1, expectedPrefix);
@ -831,7 +831,7 @@ namespace E2ETests
expectedDependencyTelemetry.Type = "SQL";
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetNameToSql;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf")? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf") ? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
ValidateBasicDependency(Apps[AppNameBeingTested].ipAddress, "/Dependencies.aspx?type=ExecuteNonQueryAsync&success=true", expectedDependencyTelemetry,
Apps[AppNameBeingTested].ikey, 1, expectedPrefix);
@ -856,7 +856,7 @@ namespace E2ETests
expectedDependencyTelemetry.Type = "SQL";
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetNameToSql;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf")? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf") ? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
ValidateBasicDependency(Apps[AppNameBeingTested].ipAddress, "/Dependencies.aspx?type=BeginExecuteNonQuery0&success=true", expectedDependencyTelemetry,
Apps[AppNameBeingTested].ikey, 1, expectedPrefix);
@ -881,7 +881,7 @@ namespace E2ETests
expectedDependencyTelemetry.Type = "SQL";
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetNameToSql;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf")? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf") ? TestConstants.WebAppFullQueryToSqlSuccess : string.Empty;
ValidateBasicDependency(Apps[AppNameBeingTested].ipAddress, "/Dependencies.aspx?type=BeginExecuteNonQuery2&success=true", expectedDependencyTelemetry,
Apps[AppNameBeingTested].ikey, 1, expectedPrefix);
@ -956,7 +956,7 @@ namespace E2ETests
expectedDependencyTelemetry.Type = "SQL";
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetNameToSql;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf") ? TestConstants.WebAppFullQueryToSqlSuccessXML : string.Empty;
expectedDependencyTelemetry.Data = (expectedPrefix != "rddf") ? TestConstants.WebAppFullQueryToSqlSuccessXML : string.Empty;
ValidateBasicDependency(Apps[AppNameBeingTested].ipAddress, "/Dependencies.aspx?type=SqlCommandExecuteXmlReader&success=true", expectedDependencyTelemetry,
Apps[AppNameBeingTested].ikey, 1, expectedPrefix);
@ -979,7 +979,7 @@ namespace E2ETests
{
var expectedDependencyTelemetry = new DependencyTelemetry();
expectedDependencyTelemetry.Type = "SQL";
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Success = true;
expectedDependencyTelemetry.Target = TestConstants.WebAppTargetNameToSql;
expectedDependencyTelemetry.Data = TestConstants.WebAppStoredProcedureNameToSql;
@ -998,9 +998,9 @@ namespace E2ETests
Trace.WriteLine("Hitting the target url:" + url);
var response = await client.GetAsync(url);
Trace.WriteLine("Actual Response code: " + response.StatusCode);
Thread.Sleep(5 * AISDKBufferFlushTime);
Thread.Sleep(5 * AISDKBufferFlushTime);
var requestsSource = WaitForReceiveRequestItemsFromDataIngestion(sourceInstanceIp, sourceIKey);
var requestsSource = WaitForReceiveRequestItemsFromDataIngestion(sourceInstanceIp, sourceIKey);
var dependenciesSource = WaitForReceiveDependencyItemsFromDataIngestion(sourceInstanceIp, sourceIKey);
var requestsTarget = WaitForReceiveRequestItemsFromDataIngestion(targetInstanceIp, targetIKey);
@ -1084,7 +1084,7 @@ namespace E2ETests
ValidateDependency(expectedDependencyTelemetry, dependency, expectedPrefix);
}
private static IList<TelemetryItem<RemoteDependencyData>> WaitForReceiveDependencyItemsFromDataIngestion(string targetInstanceIp,string ikey, int maxRetryCount = 5, bool flushChannel = true)
private static IList<TelemetryItem<RemoteDependencyData>> WaitForReceiveDependencyItemsFromDataIngestion(string targetInstanceIp, string ikey, int maxRetryCount = 5, bool flushChannel = true)
{
int receivedItemCount = 0;
int iteration = 0;
@ -1092,12 +1092,12 @@ namespace E2ETests
while (iteration < maxRetryCount && receivedItemCount < 1)
{
Thread.Sleep(AISDKBufferFlushTime);
Thread.Sleep(AISDKBufferFlushTime);
items = dataendpointClient.GetItemsOfType<TelemetryItem<AI.RemoteDependencyData>>(ikey);
receivedItemCount = items.Count;
iteration++;
if (receivedItemCount == 0 && flushChannel)
{
{
ExecuteWebRequestToTarget(targetInstanceIp, Apps[AppNameBeingTested].flushPath).Wait();
}
}
@ -1140,7 +1140,7 @@ namespace E2ETests
}
Trace.WriteLine("End Application Traces for ikey:" + ikey + "----------------------------------------------------------------------------------------");
}
catch(Exception ex)
catch (Exception ex)
{
Trace.WriteLine("Exception printing application traces:" + ex.Message);
}
@ -1149,7 +1149,7 @@ namespace E2ETests
private void ReadApplicationTraces(string targetInstanceIp, string targetPath)
{
try
{
{
Trace.WriteLine("Begin Application Traces----------------------------------------------------------------------------------------");
@ -1176,7 +1176,7 @@ namespace E2ETests
private void ValidateAzureDependencyAsync(string targetInstanceIp, string targetPath,
DependencyTelemetry expectedDependencyTelemetry, string ikey, int minCount, string expectedPrefix, int additionalSleepTimeMsec = 0)
{
{
var success = ExecuteWebRequestToTarget(targetInstanceIp, targetPath).Result;
Assert.IsTrue(success, "Web App did not respond with success. Failing test. Check exception from logs.");
Thread.Sleep(AISDKBufferFlushTime + additionalSleepTimeMsec);
@ -1208,7 +1208,7 @@ namespace E2ETests
catch (Exception ex)
{
success = false;
Trace.WriteLine("Exception occured:" + ex);
Trace.WriteLine("Exception occured:" + ex);
}
return success;
@ -1224,7 +1224,7 @@ namespace E2ETests
string actualSdkVersion = actualDependencyTelemetry.tags[new ContextTagKeys().InternalSdkVersion];
Assert.IsTrue(actualSdkVersion.Contains(expectedPrefix), "Actual version:" + actualSdkVersion);
if(!string.IsNullOrEmpty(expectedDependencyTelemetry.ResultCode))
if (!string.IsNullOrEmpty(expectedDependencyTelemetry.ResultCode))
{
Assert.AreEqual(expectedDependencyTelemetry.ResultCode, actualDependencyTelemetry.data.baseData.resultCode);
}
@ -1239,11 +1239,11 @@ namespace E2ETests
{
Assert.AreEqual(expectedDependencyTelemetry.Data, actualDependencyTelemetry.data.baseData.data);
}
var depTime = TimeSpan.Parse(actualDependencyTelemetry.data.baseData.duration, CultureInfo.InvariantCulture);
var depTime = TimeSpan.Parse(actualDependencyTelemetry.data.baseData.duration, CultureInfo.InvariantCulture);
if (expectedDependencyTelemetry.Success.HasValue)
{
if(expectedDependencyTelemetry.Success.Value == true)
if (expectedDependencyTelemetry.Success.Value == true)
{
Assert.IsTrue(depTime.TotalMilliseconds > 0, "Access time should be above zero");
}
@ -1251,7 +1251,7 @@ namespace E2ETests
{
Assert.IsTrue(depTime.TotalMilliseconds >= 0, "Access time should be zero or above zero if success is false.");
}
}
}
}
private void PrintDependencies(IList<TelemetryItem<AI.RemoteDependencyData>> dependencies)
@ -1265,7 +1265,7 @@ namespace E2ETests
Trace.WriteLine("deps.data.baseData.name:" + deps.data.baseData.name);
Trace.WriteLine("deps.tags[ai.operation.id]:" + deps.tags["ai.operation.id"]);
Trace.WriteLine("deps.data.baseData.type:" + deps.data.baseData.type);
Trace.WriteLine("deps.data.baseData.data:" + deps.data.baseData.data);
Trace.WriteLine("deps.data.baseData.data:" + deps.data.baseData.data);
Trace.WriteLine("deps.data.baseData.success:" + deps.data.baseData.success);
Trace.WriteLine("deps.data.baseData.duration:" + deps.data.baseData.duration);
Trace.WriteLine("deps.data.baseData.resultCode:" + deps.data.baseData.resultCode);
@ -1285,10 +1285,10 @@ namespace E2ETests
Trace.WriteLine("req.iKey: " + req.iKey);
Trace.WriteLine("req.name: " + req.name);
Trace.WriteLine("req.data.baseData.name:" + req.data.baseData.name);
Trace.WriteLine("req.tags[ai.operation.id]:" + req.tags["ai.operation.id"]);
Trace.WriteLine("req.tags[ai.operation.id]:" + req.tags["ai.operation.id"]);
Trace.WriteLine("req.data.baseData.responseCode:" + req.data.baseData.responseCode);
Trace.WriteLine("req.data.baseData.success:" + req.data.baseData.success);
Trace.WriteLine("req.data.baseData.duration:" + req.data.baseData.duration);
Trace.WriteLine("req.data.baseData.duration:" + req.data.baseData.duration);
Trace.WriteLine("req.data.baseData.id:" + req.data.baseData.id);
Trace.WriteLine("req.data.baseData.url:" + req.data.baseData.url);
Trace.WriteLine("InternalSdkVersion:" + req.tags[new ContextTagKeys().InternalSdkVersion]);
@ -1298,12 +1298,12 @@ namespace E2ETests
private static void RemoveIngestionItems()
{
Trace.WriteLine("Deleting items started:" + DateTime.UtcNow.ToLongTimeString());
foreach(var app in Apps)
Trace.WriteLine("Deleting items started:" + DateTime.UtcNow.ToLongTimeString());
foreach (var app in Apps)
{
Trace.WriteLine("Deleting items for ikey:" + app.Value.ikey);
dataendpointClient.DeleteItems(app.Value.ikey);
}
}
Trace.WriteLine("Deleting items completed:" + DateTime.UtcNow.ToLongTimeString());
}
@ -1335,7 +1335,7 @@ namespace E2ETests
private static bool HealthCheck(DeployedApp app)
{
bool isHealthy = true;
bool isHealthy = true;
string url = "";
try
{
@ -1354,7 +1354,7 @@ namespace E2ETests
{
isHealthy = false;
Trace.WriteLine(string.Format("Exception occuring hitting {0} : {1}", url, ex));
}
}
return isHealthy;
}
}

4
WEB/Test/Web/FunctionalTests/FunctionalTests/WebAppFW45Tests.cs
Просмотреть файл

@ -104,8 +104,7 @@
// Check that request has operation Id, parentId and Id are set from headers
Assert.AreEqual("9d2341f8070895468dbdffb599cf49fc", request.tags[new ContextTagKeys().OperationId], "Request Operation Id is not parsed from header");
Assert.AreEqual("|9d2341f8070895468dbdffb599cf49fc.0895468dbdffb519.", request.tags[new ContextTagKeys().OperationParentId], "Request Parent Id is not parsed from header");
Assert.IsTrue(request.data.baseData.id.StartsWith("|9d2341f8070895468dbdffb599cf49fc."), "Request Id is not properly set");
Assert.AreEqual("0895468dbdffb519", request.tags[new ContextTagKeys().OperationParentId], "Request Parent Id is not parsed from header");
Assert.IsTrue(request.data.baseData.properties.TryGetValue("tracestate", out var tracestate));
Assert.AreEqual("some=state", tracestate);
@ -177,7 +176,6 @@
var operationId = request.tags[new ContextTagKeys().OperationId];
Assert.IsNotNull(operationId, "Request Operation Id is not parsed from header");
Assert.AreEqual("|guid2.guid1.", request.tags[new ContextTagKeys().OperationParentId], "Request Parent Id is not parsed from header");
Assert.IsTrue(request.data.baseData.id.StartsWith($"|{operationId}."), "Request Id is not properly set");
Assert.IsTrue(request.data.baseData.properties.TryGetValue("ai_legacyRootId", out var legacyRootId));
Assert.AreEqual("guid2", legacyRootId);
}