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

Update to newer build of diagnosticsouce (#718)

This commit is contained in:
Cijo Thomas 2020-06-09 12:23:59 -07:00 committed by GitHub
parent f256db8bc8
commit c7333e49fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenTelemetry.Api/OpenTelemetry.Api.csproj
View File

@ -19,7 +19,7 @@
</PropertyGroup>
-->
<ItemGroup>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.0-preview.7.20308.13" />
</ItemGroup>
</Project>

5
test/OpenTelemetry.Exporter.Jaeger.Tests/Implementation/JaegerActivityConversionTest.cs
View File

@ -457,8 +457,7 @@ namespace OpenTelemetry.Exporter.Jaeger.Tests.Implementation
kind,
parentContext: new ActivityContext(traceId, parentSpanId, ActivityTraceFlags.Recorded),
tags: setAttributes ?
// TODO: reverse here for now so it matches order in tests.
attributes.Reverse().Select(kvp => new KeyValuePair<string, string>(kvp.Key, kvp.Value.ToString()))
attributes.Select(kvp => new KeyValuePair<string, string>(kvp.Key, kvp.Value.ToString()))
: null,
links: addLinks ?
new[] { new ActivityLink(new ActivityContext(
@ -470,8 +469,6 @@ namespace OpenTelemetry.Exporter.Jaeger.Tests.Implementation
if (addEvents)
{
// TODO: reverse here for now so it matches order in tests.
events.Reverse();
foreach (var evnt in events)
{
activity.AddEvent(evnt);

5
test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/ActivityExtensionsTest.cs
View File

@ -1,4 +1,4 @@
// <copyright file="SpanDataExtensionsTest.cs" company="OpenTelemetry Authors">
// <copyright file="SpanDataExtensionsTest.cs" company="OpenTelemetry Authors">
// Copyright The OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
@ -130,8 +130,6 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests
tags.Add(new KeyValuePair<string, string>(kvp.Key, kvp.Value.ToString()));
}
tags.Reverse(); // Activity.AddTag put tags on the front of backing collection.
var startTime = new DateTime(2020, 02, 20, 20, 20, 20, DateTimeKind.Utc);
var expectedUnixTimeTicks = (ulong)(startTime.Ticks - DateTimeOffset.FromUnixTimeMilliseconds(0).Ticks);
var duration = TimeSpan.FromMilliseconds(1555);
@ -184,7 +182,6 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests
Assert.Equal(parentId, otlpSpan.ParentSpanId);
Assert.Empty(otlpSpan.Attributes);
childEvents.Reverse();
Assert.Equal(childEvents.Count, otlpSpan.Events.Count);
for (var i = 0; i < childEvents.Count; i++)
{

1
test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj
View File

@ -30,7 +30,6 @@
<ProjectReference Include="..\..\src\OpenTelemetry\OpenTelemetry.csproj" />
<ProjectReference Include="..\TestApp.AspNetCore.3.1\TestApp.AspNetCore.3.1.csproj" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.0.0" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.0-preview.4.20251.6" />
</ItemGroup>
<ItemGroup>