Merge pull request #1074 from Microsoft/dmitmatv_stable_upd1

Stable 2.9 - second merge
microsoft · Jan 28, 2019 · 219d72f · 219d72f
2 parents 82b96de + 802d94b
commit 219d72f
Show file tree

Hide file tree

Showing 6 changed files with 157 additions and 13 deletions.
diff --git a/NuGet.exe b/NuGet.exe
diff --git a/NugetAudit.ps1 b/NugetAudit.ps1
@@ -15,7 +15,7 @@ Param(
 
 $requiredCopyright = "$([char]0x00A9) Microsoft Corporation. All rights reserved.";#"© Microsoft Corporation. All rights reserved.";
 $expectedProjectUrl = "https://go.microsoft.com/fwlink/?LinkId=392727"; # Application Insights Project Url
-$expectedLicenseUrl = "https://licenses.nuget.org/MIT"; # MIT license Url
+$expectedLicense = "MIT"; # MIT license Url
 $expectedOwner = "AppInsightsSdk"; # Application Insights Nuget Account
 $expectedTags = @("Azure","Monitoring");
 
@@ -175,13 +175,13 @@ function Get-IsValidProjectUrl([xml]$nuspecXml) {
     Test-Condition ($projectUrl -eq $expectedProjectUrl) $message $requirement;
 }
 
-function Get-IsValidLicenseUrl([xml]$nuspecXml) {
-    $licenseUrl = $nuspecXml.package.metadata.licenseUrl;
+function Get-IsValidLicense([xml]$nuspecXml) {
+    $license = $nuspecXml.package.metadata.license.InnerText;
 
-    $message = "License Url: $licenseUrl";
+    $message = "License Url: $license";
     $requirement = "Must match expected."
 
-    Test-Condition ($licenseUrl -eq $expectedLicenseUrl) $message $requirement;
+    Test-Condition ($license -eq $expectedLicense) $message $requirement;
 }
 
 function Get-IsValidLicenseAcceptance([xml]$nuspecXml) {
@@ -290,7 +290,7 @@ function Start-EvaluateNupkg ($nupkgPath) {
         Get-IsValidAuthors $nuspecXml;
         Get-IsValidOwners $nuspecXml;
         Get-IsValidProjectUrl $nuspecXml;
-        Get-IsValidLicenseUrl $nuspecXml;
+        Get-IsValidLicense $nuspecXml;
         Get-IsValidLicenseAcceptance $nuspecXml;
         Get-IsValidCopyright $nuspecXml;
         Get-IsValidLogoUrl $nuspecXml $unzipPath;

diff --git a/Nupkg.props b/Nupkg.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
+  <PropertyGroup Condition="$(OS) == 'Windows_NT'">
     <!-- Including this file will generate both the *.nupkg and *.symbols.nupkg -->
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <IncludeSymbols>True</IncludeSymbols>
@@ -15,7 +15,7 @@
     <Authors>Microsoft</Authors>
     <Owners>Microsoft,AppInsightsSdk</Owners>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageLicenseUrl>https://go.microsoft.com/fwlink/?LinkID=510709</PackageLicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?LinkId=392727</PackageProjectUrl>
     <PackageIconUrl>http://appanacdn.blob.core.windows.net/cdn/icons/aic.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/Microsoft/ApplicationInsights-dotnet</RepositoryUrl>

diff --git a/Test/Microsoft.ApplicationInsights.Test/Shared/W3C/W3CActivityExtensionsTests.cs b/Test/Microsoft.ApplicationInsights.Test/Shared/W3C/W3CActivityExtensionsTests.cs
@@ -1,4 +1,6 @@
-namespace Microsoft.ApplicationInsights.W3C
+using Microsoft.ApplicationInsights.DataContracts;
+
+namespace Microsoft.ApplicationInsights.W3C
 {
     using System.Diagnostics;
     using System.Linq;
@@ -250,5 +252,148 @@ public void RequestedFlagIsRespected()
                 Assert.AreEqual($"00-{TraceId}-{a.GetSpanId()}-02", a.GetTraceparent(), notReq);
             }
         }
+
+        [TestMethod]
+        public void UpdateValidRequestTelemetryWithForceFalse()
+        {
+            var traceId = W3CUtilities.GenerateTraceId();
+            var parentSpanId = W3CUtilities.GenerateSpanId();
+            var spanId = W3CUtilities.GenerateSpanId();
+
+            var telemetry = new RequestTelemetry();
+            telemetry.Context.Operation.Id = traceId;
+            telemetry.Context.Operation.ParentId = $"|{traceId}.{parentSpanId}.";
+            telemetry.Id = $"|{traceId}.{spanId}.";
+
+            var a = new Activity("foo").Start();
+            a.SetTraceparent($"00-{traceId}-{spanId}-01");
+
+            a.UpdateTelemetry(telemetry, false);
+
+            Assert.AreEqual(traceId, telemetry.Context.Operation.Id);
+
+#if NET45 || NET46
+            Assert.AreEqual($"|{traceId}.{parentSpanId}.", telemetry.Context.Operation.ParentId);
+            Assert.AreEqual($"|{traceId}.{spanId}.", telemetry.Id);
+#else
+            Assert.AreEqual($"|{traceId}.{spanId}.", telemetry.Context.Operation.ParentId);
+            Assert.AreEqual($"|{traceId}.{a.GetSpanId()}.", telemetry.Id);
+#endif
+        }
+
+        [TestMethod]
+        public void UpdateValidRequestTelemetryWithForceInvalidIdFalse()
+        {
+            var traceId = W3CUtilities.GenerateTraceId();
+            var parentSpanId = W3CUtilities.GenerateSpanId();
+            var spanId = W3CUtilities.GenerateSpanId();
+
+            var telemetry = new RequestTelemetry();
+            telemetry.Context.Operation.Id = traceId;
+            telemetry.Context.Operation.ParentId = $"|{traceId}.{parentSpanId}.";
+            telemetry.Id = "|123.456.";
+
+            var a = new Activity("foo").Start();
+            a.SetTraceparent($"00-{traceId}-{spanId}-01");
+
+            a.UpdateTelemetry(telemetry, false);
+
+            Assert.AreEqual(traceId, telemetry.Context.Operation.Id);
+            Assert.AreEqual($"|{traceId}.{spanId}.", telemetry.Context.Operation.ParentId);
+            Assert.AreEqual($"|{traceId}.{a.GetSpanId()}.", telemetry.Id);
+        }
+
+        [TestMethod]
+        public void UpdateValidRequestTelemetryWithForceTrue()
+        {
+            var traceId = W3CUtilities.GenerateTraceId();
+            var parentSpanId = W3CUtilities.GenerateSpanId();
+            var spanId = W3CUtilities.GenerateSpanId();
+
+            var telemetry = new RequestTelemetry();
+            telemetry.Context.Operation.Id = traceId;
+            telemetry.Context.Operation.ParentId = $"|{traceId}.{parentSpanId}.";
+            telemetry.Id = $"|{traceId}.{spanId}.";
+
+            var a = new Activity("foo").Start();
+            a.SetTraceparent($"00-{traceId}-{spanId}-01");
+
+            a.UpdateTelemetry(telemetry, true);
+
+            Assert.AreEqual(traceId, telemetry.Context.Operation.Id);
+            Assert.AreEqual($"|{traceId}.{spanId}.", telemetry.Context.Operation.ParentId);
+            Assert.AreEqual($"|{traceId}.{a.GetSpanId()}.", telemetry.Id);
+        }
+
+        [TestMethod]
+        public void UpdateValidDependencyTelemetryWithForceFalse()
+        {
+            var traceId = W3CUtilities.GenerateTraceId();
+            var parentSpanId = W3CUtilities.GenerateSpanId();
+            var spanId = W3CUtilities.GenerateSpanId();
+
+            var telemetry = new DependencyTelemetry();
+            telemetry.Context.Operation.Id = traceId;
+            telemetry.Context.Operation.ParentId = $"|{traceId}.{parentSpanId}.";
+            telemetry.Id = $"|{traceId}.{spanId}.";
+
+            var a = new Activity("foo").Start();
+            a.SetTraceparent($"00-{traceId}-{spanId}-01");
+
+            a.UpdateTelemetry(telemetry, false);
+
+            Assert.AreEqual(traceId, telemetry.Context.Operation.Id);
+#if NET45 || NET46
+            Assert.AreEqual($"|{traceId}.{parentSpanId}.", telemetry.Context.Operation.ParentId);
+            Assert.AreEqual($"|{traceId}.{spanId}.", telemetry.Id);
+#else
+            Assert.AreEqual($"|{traceId}.{spanId}.", telemetry.Context.Operation.ParentId);
+            Assert.AreEqual($"|{traceId}.{a.GetSpanId()}.", telemetry.Id);
+#endif
+        }
+
+        [TestMethod]
+        public void UpdateValidDependencyTelemetryWithForceInvalidIdFalse()
+        {
+            var traceId = W3CUtilities.GenerateTraceId();
+            var parentSpanId = W3CUtilities.GenerateSpanId();
+            var spanId = W3CUtilities.GenerateSpanId();
+
+            var telemetry = new DependencyTelemetry();
+            telemetry.Context.Operation.Id = traceId;
+            telemetry.Context.Operation.ParentId = $"|{traceId}.{parentSpanId}.";
+            telemetry.Id = "|123.456.";
+
+            var a = new Activity("foo").Start();
+            a.SetTraceparent($"00-{traceId}-{spanId}-01");
+
+            a.UpdateTelemetry(telemetry, false);
+
+            Assert.AreEqual(traceId, telemetry.Context.Operation.Id);
+            Assert.AreEqual($"|{traceId}.{spanId}.", telemetry.Context.Operation.ParentId);
+            Assert.AreEqual($"|{traceId}.{a.GetSpanId()}.", telemetry.Id);
+        }
+
+        [TestMethod]
+        public void UpdateValidDependencyTelemetryTelemetryWithForceTrue()
+        {
+            var traceId = W3CUtilities.GenerateTraceId();
+            var parentSpanId = W3CUtilities.GenerateSpanId();
+            var spanId = W3CUtilities.GenerateSpanId();
+
+            var telemetry = new DependencyTelemetry();
+            telemetry.Context.Operation.Id = traceId;
+            telemetry.Context.Operation.ParentId = $"|{traceId}.{parentSpanId}.";
+            telemetry.Id = $"|{traceId}.{spanId}.";
+
+            var a = new Activity("foo").Start();
+            a.SetTraceparent($"00-{traceId}-{spanId}-01");
+
+            a.UpdateTelemetry(telemetry, true);
+
+            Assert.AreEqual(traceId, telemetry.Context.Operation.Id);
+            Assert.AreEqual($"|{traceId}.{spanId}.", telemetry.Context.Operation.ParentId);
+            Assert.AreEqual($"|{traceId}.{a.GetSpanId()}.", telemetry.Id);
+        }
     }
 }
diff --git a/...t.ApplicationInsights.Test/Shared/W3C/W3COperationCorrelationTelemetryInitializerTests.cs b/...t.ApplicationInsights.Test/Shared/W3C/W3COperationCorrelationTelemetryInitializerTests.cs
@@ -5,7 +5,6 @@
     using Microsoft.ApplicationInsights.DataContracts;
     using Microsoft.ApplicationInsights.Extensibility.Implementation;
     using Microsoft.ApplicationInsights.Extensibility.W3C;
-    using Microsoft.ApplicationInsights.W3C;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
@@ -218,7 +217,7 @@ public void InitializerOnNestedActivitities()
         }
 
         [TestMethod]
-        public void InitializerOnSqlDepenedency()
+        public void InitializerOnSqlDependency()
         {
             Activity requestActivity = new Activity("request")
                 .Start()

diff --git a/src/Microsoft.ApplicationInsights/Extensibility/W3C/W3CActivityExtensions.cs b/src/Microsoft.ApplicationInsights/Extensibility/W3C/W3CActivityExtensions.cs
@@ -275,7 +275,7 @@ public static void UpdateTelemetry(this Activity activity, ITelemetry telemetry,
 
             if (initializeFromCurrent)
             {
-#if NET45
+#if NET45 || NET46
                 // on .NET Fx Activities are not always reliable, this code prevents update
                 // of the telemetry that was forcibly updated during Activity lifetime
                 // ON .NET Core there is no such problem 
@@ -366,7 +366,7 @@ private static Activity UpdateContextFromParent(this Activity activity)
             return activity;
         }
 
-#if NET45
+#if NET45 || NET46
         private static bool IsValidTelemetryId(string id, string operationId)
         {
             return id.Length == 51 &&