From 6e0d9d883972244396446b511ce33469f10a68be Mon Sep 17 00:00:00 2001
From: Timothy Mothra <tilee@microsoft.com>
Date: Mon, 1 Aug 2022 14:48:47 -0700
Subject: [PATCH 01/24] add Net7 (preview) to test matrix (#2636)

* eval dotnet versions

* testing format fix

* apply fix to other yml

* update

* fix merge conflict
---
 .github/CONTRIBUTING.md                      | 1 +
 .github/workflows/build-and-test-BASE.yml    | 7 ++++++-
 .github/workflows/build-and-test-LOGGING.yml | 7 ++++++-
 .github/workflows/build-and-test-NETCORE.yml | 7 ++++++-
 .github/workflows/build-and-test-WEB.yml     | 7 ++++++-
 .github/workflows/redfield-sanity-check.yml  | 7 ++++++-
 .github/workflows/sanity.yml                 | 5 +++++
 .props/Test.props                            | 7 ++++---
 Directory.Build.props                        | 4 ++--
 9 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 5196f20210..23bf0510e2 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -26,6 +26,7 @@ To successfully build the sources on your machine, make sure you've installed th
     - .NET Framework 4.8
     - .NET Core 3.1
     - .NET 6
+    - .NET 7
 
 ## Build
 
diff --git a/.github/workflows/build-and-test-BASE.yml b/.github/workflows/build-and-test-BASE.yml
index c1ac1246a7..b01f0dd052 100644
--- a/.github/workflows/build-and-test-BASE.yml
+++ b/.github/workflows/build-and-test-BASE.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0]
+        framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0, net7.0]
         include: 
           - os: ubuntu-latest
             args: "--filter TestCategory!=WindowsOnly"
@@ -39,6 +39,11 @@ jobs:
             3.1.x
             6.0.x
 
+    - uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: '7.0.x'
+        include-prerelease: true
+
     - name: Restore
       run: dotnet restore ${{ env.SOLUTION }}
 
diff --git a/.github/workflows/build-and-test-LOGGING.yml b/.github/workflows/build-and-test-LOGGING.yml
index 79ba5d0a64..c922f851b4 100644
--- a/.github/workflows/build-and-test-LOGGING.yml
+++ b/.github/workflows/build-and-test-LOGGING.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest]
-        framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0]
+        framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0, net7.0]
 
     steps:
     - uses: actions/checkout@v2
@@ -36,6 +36,11 @@ jobs:
             3.1.x
             6.0.x
 
+    - uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: '7.0.x'
+        include-prerelease: true
+
     - name: Restore
       run: dotnet restore ${{ env.SOLUTION }} 
 
diff --git a/.github/workflows/build-and-test-NETCORE.yml b/.github/workflows/build-and-test-NETCORE.yml
index 1de041f3cd..83fcef0e79 100644
--- a/.github/workflows/build-and-test-NETCORE.yml
+++ b/.github/workflows/build-and-test-NETCORE.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0]
+        framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0, net7.0]
         include: 
           - os: ubuntu-latest
             args: "--filter TestCategory!=WindowsOnly"
@@ -39,6 +39,11 @@ jobs:
             3.1.x
             6.0.x
 
+    - uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: '7.0.x'
+        include-prerelease: true
+
     - name: Restore
       run: dotnet restore ${{ env.SOLUTION }}
 
diff --git a/.github/workflows/build-and-test-WEB.yml b/.github/workflows/build-and-test-WEB.yml
index 9e313a6b35..b7374a87c2 100644
--- a/.github/workflows/build-and-test-WEB.yml
+++ b/.github/workflows/build-and-test-WEB.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest]
-        framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0]
+        framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0, net7.0]
 
     steps:
     - uses: actions/checkout@v2
@@ -36,6 +36,11 @@ jobs:
             3.1.x
             6.0.x
 
+    - uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: '7.0.x'
+        include-prerelease: true
+
     - name: Restore
       run: dotnet restore ${{ env.SOLUTION }}
 
diff --git a/.github/workflows/redfield-sanity-check.yml b/.github/workflows/redfield-sanity-check.yml
index 7dfbf9260c..464aeb0074 100644
--- a/.github/workflows/redfield-sanity-check.yml
+++ b/.github/workflows/redfield-sanity-check.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        framework: [netcoreapp3.1,net6.0]
+        framework: [netcoreapp3.1,net6.0,net7.0]
         include: 
             - os: ubuntu-latest
               args: "--filter TestCategory!=WindowsOnly"
@@ -39,6 +39,11 @@ jobs:
             3.1.x
             6.0.x
 
+    - uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: '7.0.x'
+        include-prerelease: true
+
     - name: Restore
       run: dotnet restore ${{ env.SOLUTION }}
 
diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
index 366f01cfd4..8b05036065 100644
--- a/.github/workflows/sanity.yml
+++ b/.github/workflows/sanity.yml
@@ -38,6 +38,11 @@ jobs:
             3.1.x
             6.0.x
 
+    - uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: '7.0.x'
+        include-prerelease: true
+
     - name: Restore
       run: dotnet restore ${{ matrix.solution }}
 
diff --git a/.props/Test.props b/.props/Test.props
index 9ec8bcf889..797ab6472a 100644
--- a/.props/Test.props
+++ b/.props/Test.props
@@ -16,10 +16,11 @@
           - net4.7.2
           - net4.8.0
           - netcoreapp3.1 (EoL Dec 2022)
-          - net6.0 (GA Nov 2021)
+          - net6.0 (EoL Nov 2024)
+          - net7.0 (GA Nov 2022)
     -->
-    <TargetFrameworks>net462;net472;net480;netcoreapp3.1;net6.0</TargetFrameworks>
-    <TargetFrameworks Condition="$(OS) != 'Windows_NT'">netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net462;net472;net480;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks Condition="$(OS) != 'Windows_NT'">netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Directory.Build.props b/Directory.Build.props
index e365a51256..808128974e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -82,8 +82,8 @@
     <LangVersion>preview</LangVersion>
 
     <IsNetFramework Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net480' ">True</IsNetFramework>
-    <IsNetCore Condition="'$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0'">True</IsNetCore>
-    <IsNetStandard20 Condition="'$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net480' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0'">True</IsNetStandard20>
+    <IsNetCore Condition="'$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0'">True</IsNetCore>
+    <IsNetStandard20 Condition="'$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net480' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0'">True</IsNetStandard20>
 
     <!-- .NET 6 introduces implicit global usings.
     This causes build errors in our multi-target projects.

From 288d34438bf5f4f2a893363c94a6b62e09f58505 Mon Sep 17 00:00:00 2001
From: Timothy Mothra <tilee@microsoft.com>
Date: Tue, 2 Aug 2022 12:20:22 -0700
Subject: [PATCH 02/24] Update CONTRIBUTING.md (#2647)

* Update CONTRIBUTING.md

* Update CONTRIBUTING.md
---
 .github/CONTRIBUTING.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 23bf0510e2..2128338a55 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -21,6 +21,8 @@ To successfully build the sources on your machine, make sure you've installed th
 - Visual Studio 2022 Community, Professional or Enterprise
 - .NET SDKs (https://dotnet.microsoft.com/download)
     - .NET Framework 4.5.2
+    - .NET Framework 4.6.0
+    - .NET Framework 4.6.1
     - .NET Framework 4.6.2
     - .NET Framework 4.7.2
     - .NET Framework 4.8
@@ -28,6 +30,10 @@ To successfully build the sources on your machine, make sure you've installed th
     - .NET 6
     - .NET 7
 
+Note: .NET has an annual release cycle and we include the preview version in our test matrix.
+Visual Studio requires a setting to compile using these preview versions:
+  - Tools > Options > Environment > Preview Features > "Use previews of the .NET SDK".
+
 ## Build
 
 Solutions can be built in either Visual Studio or via .NET CLI `dotnet build` ([link](https://docs.microsoft.com/dotnet/core/tools/dotnet-build)).

From b09c78bb523a7fa511991b0466c1100a60fdc0ef Mon Sep 17 00:00:00 2001
From: Ramanuj Bhattacharjee
 <103154538+ramanujbhattacharjee93@users.noreply.github.com>
Date: Tue, 9 Aug 2022 13:38:21 -0700
Subject: [PATCH 03/24] Rename redirect header for QuickPulse (#2638)

* rename redirect header

* add changelog

Co-authored-by: Ramanuj Bhattacharjee <rambhatt@microsoft.com>
---
 CHANGELOG.md                                                    | 2 +-
 .../Implementation/QuickPulse/QuickPulseConstants.cs            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 276ee864bb..8e5b08648d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog
 
 ## VNext
-
+- Update endpoint redirect header name for QuickPulse module to v2
 - AzureSdkDiagnosticListener modified to use sdkversion prefix "rdddsaz" instead of "dotnet".
 
 ## Version 2.21.0
diff --git a/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseConstants.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseConstants.cs
index fd0bf96070..c893039b5a 100644
--- a/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseConstants.cs
+++ b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseConstants.cs
@@ -64,7 +64,7 @@ internal static class QuickPulseConstants
         /// Service endpoint redirect.
         /// </summary>
         /// <remarks>Contains a URI of the service endpoint we must permanently use <b>for the particular resource</b>.</remarks>
-        internal const string XMsQpsServiceEndpointRedirectHeaderName = "x-ms-qps-service-endpoint-redirect";
+        internal const string XMsQpsServiceEndpointRedirectHeaderName = "x-ms-qps-service-endpoint-redirect-v2";
 
         /// <summary>
         /// The following authentication headers must be received and submitted back to the service with no modification.

From 9b3e18b00c4838d8a94c0fabcca43f543c1a8e5a Mon Sep 17 00:00:00 2001
From: Timothy Mothra <tilee@microsoft.com>
Date: Wed, 10 Aug 2022 18:49:12 -0700
Subject: [PATCH 04/24] fix test for Net7 Preview 7 (#2655)

---
 .../Extensibility/TelemetryConfigurationFactoryTest.cs    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/TelemetryConfigurationFactoryTest.cs b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/TelemetryConfigurationFactoryTest.cs
index 93227d842a..d54804996d 100644
--- a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/TelemetryConfigurationFactoryTest.cs
+++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/TelemetryConfigurationFactoryTest.cs
@@ -1150,7 +1150,11 @@ public void LoadPropertiesGivesPrecedenceToValuesFromElementsBecauseTheyAppearBe
         }
 
         [TestMethod]
+#if NET7_0_OR_GREATER
+        [ExpectedExceptionWithMessage(typeof(ArgumentException), "Failed to parse configuration value. Property: 'IntegerProperty' Reason: The input string '123a' was not in a correct format.")]
+#else
         [ExpectedExceptionWithMessage(typeof(ArgumentException), "Failed to parse configuration value. Property: 'IntegerProperty' Reason: Input string was not in a correct format.")]
+#endif
         public void LoadPropertiesThrowsExceptionWithPropertyName()
         {
             // parsing this integer will throw "System.FormatException: Input string was not in a correct format."
@@ -1167,7 +1171,11 @@ public void LoadPropertiesThrowsExceptionWithPropertyName()
         }
 
         [TestMethod]
+#if NET7_0_OR_GREATER
+        [ExpectedExceptionWithMessage(typeof(ArgumentException), "Failed to parse configuration value. Property: 'IntegerProperty' Reason: The input string '123a' was not in a correct format.")]
+#else
         [ExpectedExceptionWithMessage(typeof(ArgumentException), "Failed to parse configuration value. Property: 'IntegerProperty' Reason: Input string was not in a correct format.")]
+#endif
         public void LoadProperties_TelemetryClientThrowsException()
         {
             string testConfig = Configuration(

From 5b05c9b6c985b3e82712f36e93eaa4b84f43556d Mon Sep 17 00:00:00 2001
From: Rajkumar Rangaraj <rajrang@microsoft.com>
Date: Wed, 10 Aug 2022 19:05:36 -0700
Subject: [PATCH 05/24] Update versions_and_names.md (#2654)

---
 docs/versions_and_names.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/versions_and_names.md b/docs/versions_and_names.md
index 00ae0b4d8f..5d5b066a72 100644
--- a/docs/versions_and_names.md
+++ b/docs/versions_and_names.md
@@ -117,6 +117,7 @@ Define the prefixes for the SDK.
 |-----------|:------:|-------------------------------------|
 | Redfield<sup>1</sup> |   ad_  | Telemetry from Redfield AppServices attach, using the **default** configuration |
 | Redfield<sup>1</sup> |   ar_  | Telemetry from Redfield AppServices attach, using the **recommended** configuration |
+| Redfield<sup>1</sup> |   al_  | Telemetry from Redfield Linux AppServices attach, using the **recommended** configuration |
 | Redfield<sup>1</sup> |  csd_  | Telemetry from Redfield CloudServices attach, using the **default** configuration |
 | Redfield<sup>1</sup> |  csr_  | Telemetry from Redfield CloudServices attach, using the **recommended** configuration |
 | Redfield<sup>1</sup> |   ud_  | Telemetry from Redfield unknown environment attach, using the **default** configuration |

From c5f622e767dd65b4ab8ad180d7e918655d642ccd Mon Sep 17 00:00:00 2001
From: Timothy Mothra <tilee@microsoft.com>
Date: Fri, 19 Aug 2022 13:10:44 -0700
Subject: [PATCH 06/24] ignore config files for Visual Studio Live Unit Testing
 (#2660)

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 1ba2c8282d..4e569cda5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,6 +65,10 @@ ipch/
 *.vsp
 *.vspx
 
+# Visual Studio live unit testing config
+*.lutconfig
+*.lutignore
+
 # Guidance Automation Toolkit
 *.gpState
 

From ecda31388bcadc55f6383fc0146bb79ed04b99b8 Mon Sep 17 00:00:00 2001
From: Timothy Mothra <tilee@microsoft.com>
Date: Fri, 19 Aug 2022 14:04:50 -0700
Subject: [PATCH 07/24] dependabot (#2659)

---
 .github/dependabot.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..4cff4d6f18
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

From dabb115743a2814bc3dc78b5f01b912e2e2b669e Mon Sep 17 00:00:00 2001
From: Timothy Mothra <tilee@microsoft.com>
Date: Fri, 19 Aug 2022 14:24:36 -0700
Subject: [PATCH 08/24] improve eventsource tests (#2661)

---
 .../Test/TestFramework/Shared/EventSourceTest.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/BASE/Test/TestFramework/Shared/EventSourceTest.cs b/BASE/Test/TestFramework/Shared/EventSourceTest.cs
index 7814127651..4c7a280590 100644
--- a/BASE/Test/TestFramework/Shared/EventSourceTest.cs
+++ b/BASE/Test/TestFramework/Shared/EventSourceTest.cs
@@ -27,10 +27,24 @@ private static void VerifyMethodImplementation(EventSource eventSource, MethodIn
                 listener.EnableEvents(eventSource, EventLevel.Verbose, (EventKeywords)AllKeywords);
                 try
                 {
+                    var guid = Guid.NewGuid();
+                    EventSource.SetCurrentThreadActivityId(guid);
+
                     object[] eventArguments = GenerateEventArguments(eventMethod);
                     eventMethod.Invoke(eventSource, eventArguments);
 
-                    EventWrittenEventArgs actualEvent = listener.Messages.First();
+                    EventWrittenEventArgs actualEvent = listener.Messages.FirstOrDefault(x => x.ActivityId == guid);
+
+                    if (actualEvent == null)
+                    {
+                        throw new Exception("Listener failed to collect event.");
+                    }
+                    else if (actualEvent.EventId == 0)
+                    {
+                        // an error occurred
+                        throw new Exception(actualEvent.Message);
+                    }
+
                     VerifyEventId(eventMethod, actualEvent);
                     VerifyEventLevel(eventMethod, actualEvent);
                     VerifyEventMessage(eventMethod, actualEvent, eventArguments);

From ffbc00c02d111d7304f35aa4627068f016e93974 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Aug 2022 23:18:11 +0000
Subject: [PATCH 09/24] Bump actions/checkout from 2 to 3 (#2663)

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/build-and-test-BASE.yml    | 2 +-
 .github/workflows/build-and-test-LOGGING.yml | 2 +-
 .github/workflows/build-and-test-NETCORE.yml | 2 +-
 .github/workflows/build-and-test-WEB.yml     | 2 +-
 .github/workflows/nightly.yml                | 2 +-
 .github/workflows/redfield-sanity-check.yml  | 2 +-
 .github/workflows/sanity.yml                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-and-test-BASE.yml b/.github/workflows/build-and-test-BASE.yml
index b01f0dd052..707ff2b3fe 100644
--- a/.github/workflows/build-and-test-BASE.yml
+++ b/.github/workflows/build-and-test-BASE.yml
@@ -30,7 +30,7 @@ jobs:
             args: "--filter TestCategory!=WindowsOnly"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     
     - name: Setup dotnet
       uses: actions/setup-dotnet@v2
diff --git a/.github/workflows/build-and-test-LOGGING.yml b/.github/workflows/build-and-test-LOGGING.yml
index c922f851b4..82d4646fe4 100644
--- a/.github/workflows/build-and-test-LOGGING.yml
+++ b/.github/workflows/build-and-test-LOGGING.yml
@@ -27,7 +27,7 @@ jobs:
         framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0, net7.0]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     
     - name: Setup dotnet
       uses: actions/setup-dotnet@v2
diff --git a/.github/workflows/build-and-test-NETCORE.yml b/.github/workflows/build-and-test-NETCORE.yml
index 83fcef0e79..9ce7c5e9a8 100644
--- a/.github/workflows/build-and-test-NETCORE.yml
+++ b/.github/workflows/build-and-test-NETCORE.yml
@@ -30,7 +30,7 @@ jobs:
             args: "--filter TestCategory!=WindowsOnly"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     
     - name: Setup dotnet
       uses: actions/setup-dotnet@v2
diff --git a/.github/workflows/build-and-test-WEB.yml b/.github/workflows/build-and-test-WEB.yml
index b7374a87c2..de9d8b8c12 100644
--- a/.github/workflows/build-and-test-WEB.yml
+++ b/.github/workflows/build-and-test-WEB.yml
@@ -27,7 +27,7 @@ jobs:
         framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0, net7.0]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     
     - name: Setup dotnet
       uses: actions/setup-dotnet@v2
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 5ffefecaf4..7f502b9180 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -22,7 +22,7 @@ jobs:
         solution: [./ProjectsForSigning.sln]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         ref: ${{ matrix.branch }}
     
diff --git a/.github/workflows/redfield-sanity-check.yml b/.github/workflows/redfield-sanity-check.yml
index 464aeb0074..80bf6e1918 100644
--- a/.github/workflows/redfield-sanity-check.yml
+++ b/.github/workflows/redfield-sanity-check.yml
@@ -30,7 +30,7 @@ jobs:
               args: "--filter TestCategory!=WindowsOnly"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     
     - name: Setup dotnet
       uses: actions/setup-dotnet@v2
diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
index 8b05036065..2592175666 100644
--- a/.github/workflows/sanity.yml
+++ b/.github/workflows/sanity.yml
@@ -29,7 +29,7 @@ jobs:
           ./WEB/Src/Microsoft.ApplicationInsights.Web.sln]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Setup dotnet
       uses: actions/setup-dotnet@v2

From 6c4f37aed26d37caf6990f6d00afa53fbb6e7094 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Aug 2022 23:34:29 +0000
Subject: [PATCH 10/24] Bump actions/stale from 4.0.0 to 5.1.1 (#2662)

Bumps [actions/stale](https://github.com/actions/stale) from 4.0.0 to 5.1.1.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/v5.1.1/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v4.0.0...v5.1.1)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index c61831781f..854a27f471 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -12,7 +12,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v4.0.0
+      - uses: actions/stale@v5.1.1
         id: stale
         with:
           stale-issue-message: 'This issue is stale because it has been open 300 days with no activity. Remove stale label or this will be closed in 7 days. Commenting will instruct the bot to automatically remove the label.'

From f1a9c0dbd6507ae0a879c8eaf43c944709f5cfc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Baptista?= <vmcbaptista95@gmail.com>
Date: Thu, 25 Aug 2022 21:31:52 +0100
Subject: [PATCH 11/24] stop considering log entries with LogLevel.None (#2667)

---
 CHANGELOG.md                                  |  1 +
 .../src/ILogger/ApplicationInsightsLogger.cs  |  2 +-
 .../ILogger.Tests/ILoggerIntegrationTests.cs  | 32 +++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e5b08648d..6c3f646db4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## VNext
 - Update endpoint redirect header name for QuickPulse module to v2
 - AzureSdkDiagnosticListener modified to use sdkversion prefix "rdddsaz" instead of "dotnet".
+- [ILogger logs with LogLevel.None severity are now ignored by ApplicationInsightsLogger](https://github.com/microsoft/ApplicationInsights-dotnet/pull/2667). Fixes ([#2666](https://github.com/microsoft/ApplicationInsights-dotnet/issues/2666))
 
 ## Version 2.21.0
 - no changes since beta.
diff --git a/LOGGING/src/ILogger/ApplicationInsightsLogger.cs b/LOGGING/src/ILogger/ApplicationInsightsLogger.cs
index 5dec727df7..24637a4994 100644
--- a/LOGGING/src/ILogger/ApplicationInsightsLogger.cs
+++ b/LOGGING/src/ILogger/ApplicationInsightsLogger.cs
@@ -65,7 +65,7 @@ public IDisposable BeginScope<TState>(TState state)
         /// </returns>
         public bool IsEnabled(LogLevel logLevel)
         {
-            return this.telemetryClient.IsEnabled();
+            return logLevel != LogLevel.None && this.telemetryClient.IsEnabled();
         }
 
         /// <summary>
diff --git a/LOGGING/test/ILogger.Tests/ILoggerIntegrationTests.cs b/LOGGING/test/ILogger.Tests/ILoggerIntegrationTests.cs
index b2beaf719b..4a74e99f6d 100644
--- a/LOGGING/test/ILogger.Tests/ILoggerIntegrationTests.cs
+++ b/LOGGING/test/ILogger.Tests/ILoggerIntegrationTests.cs
@@ -96,6 +96,7 @@ public void ApplicationInsightsLoggerIsInvokedWhenUsingILogger()
             testLogger.LogTrace("Trace");
             testLogger.LogWarning("Warning");
             testLogger.LogDebug("Debug");
+            testLogger.Log(LogLevel.None, "None");
 
             Assert.AreEqual(7, itemsReceived.Count);
 
@@ -125,6 +126,37 @@ public void ApplicationInsightsLoggerIsInvokedWhenUsingILogger()
             Assert.AreEqual("Debug", (itemsReceived[6] as TraceTelemetry).Message);
         }
 
+        /// <summary>
+        /// Ensures that <see cref="ApplicationInsightsLogger"/> is invoked when user logs using <see cref="ILogger"/>.
+        /// </summary>
+        [TestMethod]
+        [TestCategory("ILogger")]
+        public void ApplicationInsightsLoggerIsNotInvokedWhenUsingILoggerAndTelemetryIsDisabled()
+        {
+            List<ITelemetry> itemsReceived = new List<ITelemetry>();
+
+            IServiceProvider serviceProvider = ILoggerIntegrationTests.SetupApplicationInsightsLoggerIntegration((telemetryItem, telemetryProcessor) =>
+            {
+                itemsReceived.Add(telemetryItem);
+            }, configuration =>
+            {
+                configuration.DisableTelemetry = true;
+            });
+
+            ILogger<ILoggerIntegrationTests> testLogger = serviceProvider.GetRequiredService<ILogger<ILoggerIntegrationTests>>();
+
+            testLogger.LogInformation("Testing");
+            testLogger.LogError(new Exception("ExceptionMessage"), "LoggerMessage");
+            testLogger.LogInformation(new EventId(100, "TestEvent"), "TestingEvent");
+            testLogger.LogCritical("Critical");
+            testLogger.LogTrace("Trace");
+            testLogger.LogWarning("Warning");
+            testLogger.LogDebug("Debug");
+            testLogger.Log(LogLevel.None, "None");
+
+            Assert.AreEqual(0, itemsReceived.Count);
+        }
+
         /// <summary>
         /// Ensures that the <see cref="ApplicationInsightsLoggerOptions.TrackExceptionsAsExceptionTelemetry"/> switch is honored
         /// and exceptions are logged as trace messages when value is true.

From a7ca15790a301275ede66722bab21cc8d71f1509 Mon Sep 17 00:00:00 2001
From: Paul Harrington <pharring@users.noreply.github.com>
Date: Tue, 30 Aug 2022 09:52:06 -0700
Subject: [PATCH 12/24] Preserve Context when setting
 ExceptionTelemetry.Exception (#2668)

* Preserve context when setting ExceptionTelemetry.Exception
Fixes #2086

* Update CHANGELOG
---
 .../DataContracts/ExceptionTelemetryTest.cs   | 24 +++++++++++++++++++
 .../DataContracts/ExceptionTelemetry.cs       | 10 +++++++-
 CHANGELOG.md                                  |  1 +
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/DataContracts/ExceptionTelemetryTest.cs b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/DataContracts/ExceptionTelemetryTest.cs
index eba8dbbf0c..5a2e39b1c4 100644
--- a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/DataContracts/ExceptionTelemetryTest.cs
+++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/DataContracts/ExceptionTelemetryTest.cs
@@ -265,6 +265,30 @@ public void ExceptionPropertySetterReplacesExceptionDetailsInExceptionsCollectio
             Assert.AreEqual(nextException.Message, testExceptionTelemetry.ExceptionDetailsInfoList.First().Message);
         }
 
+        [TestMethod]
+        public void ExceptionPropertySetterPreservesContext()
+        {
+            // ARRANGE
+            Exception constructorException = new Exception("ConstructorException");
+            var testExceptionTelemetry = new ExceptionTelemetry(constructorException);
+
+            const string expectedAccountId = "AccountId";
+            testExceptionTelemetry.Context.User.AccountId = expectedAccountId;
+            const string expectedAuthenticatedUserId = "AuthUserId";
+            testExceptionTelemetry.Context.User.AuthenticatedUserId = expectedAuthenticatedUserId;
+            const string expectedUserAgent = "ExceptionComponent";
+            testExceptionTelemetry.Context.User.UserAgent = expectedUserAgent;
+
+            // ACT
+            Exception nextException = new Exception("NextException");
+            testExceptionTelemetry.Exception = nextException;
+
+            // ASSERT
+            Assert.AreEqual(expectedAccountId, testExceptionTelemetry.Context.User.AccountId);
+            Assert.AreEqual(expectedAuthenticatedUserId, testExceptionTelemetry.Context.User.AuthenticatedUserId);
+            Assert.AreEqual(expectedUserAgent, testExceptionTelemetry.Context.User.UserAgent);
+        }
+
 #pragma warning disable 618
         [TestMethod]
         public void HandledAtReturnsUnhandledByDefault()
diff --git a/BASE/src/Microsoft.ApplicationInsights/DataContracts/ExceptionTelemetry.cs b/BASE/src/Microsoft.ApplicationInsights/DataContracts/ExceptionTelemetry.cs
index 68bb6ee63c..8bffa80d91 100644
--- a/BASE/src/Microsoft.ApplicationInsights/DataContracts/ExceptionTelemetry.cs
+++ b/BASE/src/Microsoft.ApplicationInsights/DataContracts/ExceptionTelemetry.cs
@@ -449,7 +449,15 @@ private void UpdateData(Exception exception)
 
                 this.Data = new ExceptionInfo(exceptions.Select(ex => new ExceptionDetailsInfo(ex)), this.SeverityLevel,
                     this.ProblemId, this.Properties, this.Metrics);
-                this.context = new TelemetryContext(this.Data.Properties);
+
+                if (this.context == null)
+                {
+                    this.context = new TelemetryContext(this.Data.Properties);
+                }
+                else
+                {
+                    this.context = this.context.DeepClone(this.Data.Properties);
+                }
             }
             catch (Exception ex)
             {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c3f646db4..3d50241877 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Update endpoint redirect header name for QuickPulse module to v2
 - AzureSdkDiagnosticListener modified to use sdkversion prefix "rdddsaz" instead of "dotnet".
 - [ILogger logs with LogLevel.None severity are now ignored by ApplicationInsightsLogger](https://github.com/microsoft/ApplicationInsights-dotnet/pull/2667). Fixes ([#2666](https://github.com/microsoft/ApplicationInsights-dotnet/issues/2666))
+- [Fix ExceptionTelemetry clears all Context when updating Exception property](https://github.com/microsoft/ApplicationInsights-dotnet/issues/2086)
 
 ## Version 2.21.0
 - no changes since beta.

From 708dc9622464050a6f488324fb9c777dbef24993 Mon Sep 17 00:00:00 2001
From: Timothy Mothra <tilee@microsoft.com>
Date: Tue, 6 Sep 2022 11:38:11 -0700
Subject: [PATCH 13/24] remove comment (#2671)

---
 LOGGING/test/Shared/CustomTelemetryChannel.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/LOGGING/test/Shared/CustomTelemetryChannel.cs b/LOGGING/test/Shared/CustomTelemetryChannel.cs
index 807da59c82..0a95bce990 100644
--- a/LOGGING/test/Shared/CustomTelemetryChannel.cs
+++ b/LOGGING/test/Shared/CustomTelemetryChannel.cs
@@ -1,7 +1,6 @@
 //-----------------------------------------------------------------------------------
 // <copyright file='CustomTelemetryChannel.cs' company='Microsoft Corporation'>
 //     Copyright (c) Microsoft Corporation. All Rights Reserved.
-//     Information Contained Herein is Proprietary and Confidential.
 // </copyright>
 //-----------------------------------------------------------------------------------
 

From 19a3ecf77bebd7bbcffb6ca553b920016a412ed4 Mon Sep 17 00:00:00 2001
From: Timothy Mothra <tilee@microsoft.com>
Date: Tue, 6 Sep 2022 13:55:27 -0700
Subject: [PATCH 14/24] adding net481 to test matrix (#2664)

* adding net481 to test matrix

* adding net481 to test matrix

* update contrib
---
 .github/CONTRIBUTING.md                      | 3 ++-
 .github/workflows/build-and-test-BASE.yml    | 2 +-
 .github/workflows/build-and-test-LOGGING.yml | 2 +-
 .github/workflows/build-and-test-NETCORE.yml | 2 +-
 .github/workflows/build-and-test-WEB.yml     | 2 +-
 .props/Test.props                            | 2 +-
 Directory.Build.props                        | 4 ++--
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 2128338a55..63c79d2779 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -25,7 +25,8 @@ To successfully build the sources on your machine, make sure you've installed th
     - .NET Framework 4.6.1
     - .NET Framework 4.6.2
     - .NET Framework 4.7.2
-    - .NET Framework 4.8
+    - .NET Framework 4.8.0
+    - .NET Framework 4.8.1
     - .NET Core 3.1
     - .NET 6
     - .NET 7
diff --git a/.github/workflows/build-and-test-BASE.yml b/.github/workflows/build-and-test-BASE.yml
index 707ff2b3fe..e9ab04d502 100644
--- a/.github/workflows/build-and-test-BASE.yml
+++ b/.github/workflows/build-and-test-BASE.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0, net7.0]
+        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0]
         include: 
           - os: ubuntu-latest
             args: "--filter TestCategory!=WindowsOnly"
diff --git a/.github/workflows/build-and-test-LOGGING.yml b/.github/workflows/build-and-test-LOGGING.yml
index 82d4646fe4..fe73e94889 100644
--- a/.github/workflows/build-and-test-LOGGING.yml
+++ b/.github/workflows/build-and-test-LOGGING.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest]
-        framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0, net7.0]
+        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0]
 
     steps:
     - uses: actions/checkout@v3
diff --git a/.github/workflows/build-and-test-NETCORE.yml b/.github/workflows/build-and-test-NETCORE.yml
index 9ce7c5e9a8..d496d6f782 100644
--- a/.github/workflows/build-and-test-NETCORE.yml
+++ b/.github/workflows/build-and-test-NETCORE.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0, net7.0]
+        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0]
         include: 
           - os: ubuntu-latest
             args: "--filter TestCategory!=WindowsOnly"
diff --git a/.github/workflows/build-and-test-WEB.yml b/.github/workflows/build-and-test-WEB.yml
index de9d8b8c12..30c86e2a67 100644
--- a/.github/workflows/build-and-test-WEB.yml
+++ b/.github/workflows/build-and-test-WEB.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest]
-        framework: [net452, net462, net472, net480, netcoreapp3.1, net6.0, net7.0]
+        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0]
 
     steps:
     - uses: actions/checkout@v3
diff --git a/.props/Test.props b/.props/Test.props
index 797ab6472a..c075526ee7 100644
--- a/.props/Test.props
+++ b/.props/Test.props
@@ -19,7 +19,7 @@
           - net6.0 (EoL Nov 2024)
           - net7.0 (GA Nov 2022)
     -->
-    <TargetFrameworks>net462;net472;net480;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net462;net472;net480;net481;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <TargetFrameworks Condition="$(OS) != 'Windows_NT'">netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
diff --git a/Directory.Build.props b/Directory.Build.props
index 808128974e..58e3e9f31c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -81,9 +81,9 @@
     <!-- https://docs.microsoft.com/dotnet/csharp/language-reference/configure-language-version -->
     <LangVersion>preview</LangVersion>
 
-    <IsNetFramework Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net480' ">True</IsNetFramework>
+    <IsNetFramework Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net480' Or '$(TargetFramework)' == 'net481' ">True</IsNetFramework>
     <IsNetCore Condition="'$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0'">True</IsNetCore>
-    <IsNetStandard20 Condition="'$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net480' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0'">True</IsNetStandard20>
+    <IsNetStandard20 Condition="'$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net480' Or '$(TargetFramework)' == 'net481' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0'">True</IsNetStandard20>
 
     <!-- .NET 6 introduces implicit global usings.
     This causes build errors in our multi-target projects.

From 109993a523c4f462792a9fafdfd048394af78125 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 09:29:09 -0700
Subject: [PATCH 15/24] Bump actions/stale from 5.1.1 to 5.2.0 (#2673)

Bumps [actions/stale](https://github.com/actions/stale) from 5.1.1 to 5.2.0.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v5.1.1...v5.2.0)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 854a27f471..eea567e29d 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -12,7 +12,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v5.1.1
+      - uses: actions/stale@v5.2.0
         id: stale
         with:
           stale-issue-message: 'This issue is stale because it has been open 300 days with no activity. Remove stale label or this will be closed in 7 days. Commenting will instruct the bot to automatically remove the label.'

From 13479bddaaba7cb3b69f81d63dc76228d32c099d Mon Sep 17 00:00:00 2001
From: Leighton Chen <lechen@microsoft.com>
Date: Fri, 23 Sep 2022 15:50:11 -0700
Subject: [PATCH 16/24] Remove python related entries from sdkname (#2675)

Removing python values as they are outdated and this document should only contain things related to dot net.
---
 docs/versions_and_names.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/versions_and_names.md b/docs/versions_and_names.md
index 5d5b066a72..00bf5f3c99 100644
--- a/docs/versions_and_names.md
+++ b/docs/versions_and_names.md
@@ -87,9 +87,6 @@ Define your own SDK name and send PR to update the list below. Please do not re-
 | owin | May point to unofficial OWIN telemetry module | [github](https://github.com/MatthewRudolph/Airy-ApplicationInsights-Owin/blob/a555ddc810edb5b9e8d4866c41ba18ddf793bc1d/src/Dematt.Airy.ApplicationInsights.Owin/ExceptionTracking/MvcExceptionHandler.cs#L38)
 | pc | performance counters | [github](https://github.com/Microsoft/ApplicationInsights-dotnet-server/releases)
 | pccore | performance counters from .Net Core | [github](https://github.com/Microsoft/ApplicationInsights-dotnet-server/releases)
-| py2 | python SDK for py2 application | [github](https://github.com/Microsoft/ApplicationInsights-Python/blob/7ac535f451383d78d63bfc2b8aad518cdde598c7/applicationinsights/channel/TelemetryChannel.py#L9-L15)
-| py3 | python SDK for py3 application | [github](https://github.com/Microsoft/ApplicationInsights-Python/blob/7ac535f451383d78d63bfc2b8aad518cdde598c7/applicationinsights/channel/TelemetryChannel.py#L9-L15)
-| python-oc | Opencensus for Python | [github](https://github.com/census-instrumentation/opencensus-python)
 | rddf | Remote dependency telemetry collected via Framework instrumentation (Event Source) | [github](https://github.com/Microsoft/ApplicationInsights-dotnet-server/releases)
 | rddfd | Telemetry was processed via framework and diagnosticsource paths. Deprecated in latest versions of SDK |
 | rddp | Remote dependency telemetry collected via Profiler instrumentation | [github](https://github.com/Microsoft/ApplicationInsights-dotnet-server/releases)
@@ -124,7 +121,6 @@ Define the prefixes for the SDK.
 | Redfield<sup>1</sup> |   ur_  | Telemetry from Redfield unknown environment attach, using the **recommended** configuration |
 | ap        |   w_   | Telemetry from **Windows** Platform |
 | ap        |   l_   | Telemetry from **Linux** Platform   |
-| python-oc |   lf_  | Telemetry captured by LocalForwarder |
 | go-oc     |   lf_  | Telemetry captured by LocalForwarder |
 | java      |   lf_  | Telemetry captured by LocalForwarder |
 

From b465c24096f46d7e76191a41dc09bb903087748a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 16:19:42 +0000
Subject: [PATCH 17/24] Bump actions/stale from 5.2.0 to 6.0.0 (#2674)

Bumps [actions/stale](https://github.com/actions/stale) from 5.2.0 to 6.0.0.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v5.2.0...v6.0.0)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index eea567e29d..c5b64f2c2a 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -12,7 +12,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v5.2.0
+      - uses: actions/stale@v6.0.0
         id: stale
         with:
           stale-issue-message: 'This issue is stale because it has been open 300 days with no activity. Remove stale label or this will be closed in 7 days. Commenting will instruct the bot to automatically remove the label.'

From fadc927fd86b490ecd97ba49a7e885176c40d043 Mon Sep 17 00:00:00 2001
From: Liudmila Molkova <limolkova@microsoft.com>
Date: Wed, 30 Mar 2022 21:55:01 -0700
Subject: [PATCH 18/24] Cosmos attributes and tests

---
 .../AzureSdkDiagnosticListenerTest.cs         | 216 ++++++++++++++++++
 .../AzureSdkDiagnosticListenerSubscriber.cs   |  12 +-
 .../AzureSdkDiagnosticsEventHandler.cs        |  62 ++++-
 .../AzureSdk/AzureSdkEventListener.cs         | 110 +++++++++
 .../DiagnosticSourceListenerBase.cs           |   2 +-
 5 files changed, 396 insertions(+), 6 deletions(-)
 create mode 100644 WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkEventListener.cs

diff --git a/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs
index 728b90a46e..cbc3f64af6 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs
@@ -3,6 +3,7 @@
     using System;
     using System.Collections.Generic;
     using System.Diagnostics;
+    using System.Diagnostics.Tracing;
     using System.Linq;
     using System.Net.Http;
     using Microsoft.ApplicationInsights.Channel;
@@ -13,6 +14,7 @@
     using Microsoft.ApplicationInsights.Web.TestFramework;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
     using Newtonsoft.Json;
+    using static Microsoft.ApplicationInsights.MetricDimensionNames.TelemetryContext;
 
     [TestClass]
     public class AzureSdkDiagnosticListenerTest
@@ -1263,6 +1265,190 @@ public void AzureServiceBusSpansAreCollectedError(string kind)
             }
         }
 
+        [TestMethod]
+        public void AzureCosmosDbSpansAreCollected()
+        {
+            using (var listener = new DiagnosticListener("Azure.Cosmos"))
+            using (var module = new DependencyTrackingTelemetryModule())
+            {
+                module.Initialize(this.configuration);
+
+                var exception = new InvalidOperationException();
+                Activity sendActivity = new Activity("Azure.Cosmos.ReadItems")
+                    .AddTag("net.peer.name", "my.documents.azure.com")
+                    .AddTag("db.name", "database")
+                    .AddTag("db.operation", "ReadItems")
+                    .AddTag("db.cosmosdb.container", "container")
+                    .AddTag("kind", "client")
+                    .AddTag("az.namespace", "Microsoft.DocumentDB");
+
+                listener.StartActivity(sendActivity, null);
+                listener.Write("Azure.Cosmos.ReadItems.Exception", exception);
+                sendActivity.AddTag("db.cosmosdb.status_code", "503");
+                listener.StopActivity(sendActivity, null);
+
+                var telemetry = this.sentItems.Last();
+
+                Assert.IsNotNull(telemetry);
+                Assert.IsNull(telemetry.Context.Operation.ParentId);
+                Assert.AreEqual(sendActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
+
+                DependencyTelemetry dependency = telemetry as DependencyTelemetry;
+                Assert.IsFalse(dependency.Success.Value);
+                Assert.AreEqual(exception.ToInvariantString(), dependency.Properties["Error"]);
+                Assert.AreEqual(sendActivity.SpanId.ToHexString(), dependency.Id);
+                Assert.AreEqual("container | ReadItems", dependency.Name);
+                Assert.AreEqual("my.documents.azure.com | database", dependency.Target);
+                Assert.AreEqual("ReadItems", dependency.Data);
+                Assert.AreEqual("503", dependency.ResultCode);
+                Assert.AreEqual("Azure DocumentDB", dependency.Type);
+            }
+        }
+
+        [TestMethod]
+        public void AzureCosmosDbSpansErrorsAreCollected()
+        {
+            using (var listener = new DiagnosticListener("Azure.Cosmos"))
+            using (var module = new DependencyTrackingTelemetryModule())
+            {
+                module.Initialize(this.configuration);
+
+                var exception = new InvalidOperationException();
+                Activity sendActivity = new Activity("Azure.Cosmos.ReadItems")
+                    .AddTag("net.peer.name", "my.documents.azure.com")
+                    .AddTag("db.name", "database")
+                    .AddTag("db.operation", "ReadItems")
+                    .AddTag("db.cosmosdb.container", "container")
+                    .AddTag("kind", "client")
+                    .AddTag("az.namespace", "Microsoft.DocumentDB");
+
+                listener.StartActivity(sendActivity, null);
+
+                sendActivity.AddTag("db.cosmosdb.status_code", "200");
+                listener.StopActivity(sendActivity, null);
+
+                var telemetry = this.sentItems.Last();
+
+                Assert.IsNotNull(telemetry);
+                Assert.IsNull(telemetry.Context.Operation.ParentId);
+                Assert.AreEqual(sendActivity.TraceId.ToHexString(), telemetry.Context.Operation.Id);
+
+                DependencyTelemetry dependency = telemetry as DependencyTelemetry;
+                Assert.IsTrue(dependency.Success.Value);
+                Assert.AreEqual(sendActivity.SpanId.ToHexString(), dependency.Id);
+                Assert.AreEqual("container | ReadItems", dependency.Name);
+                Assert.AreEqual("my.documents.azure.com | database", dependency.Target);
+                Assert.AreEqual("ReadItems", dependency.Data);
+                Assert.AreEqual("200", dependency.ResultCode);
+                Assert.AreEqual("Azure DocumentDB", dependency.Type);
+                Assert.IsTrue(dependency.Properties.ContainsKey("db.cosmosdb.container"));
+                Assert.AreEqual("container", dependency.Properties["db.cosmosdb.container"]);
+            }
+        }
+
+        [TestMethod]
+        public void AzureCosmosDbSpansAreCollectedWithExtraAttributes()
+        {
+            using (var listener = new DiagnosticListener("Azure.Cosmos"))
+            using (var module = new DependencyTrackingTelemetryModule())
+            {
+                module.Initialize(this.configuration);
+
+                var exception = new InvalidOperationException();
+                Activity sendActivity = new Activity("Azure.Cosmos.ReadItems")
+                    .AddTag("kind", "client")
+                    .AddTag("net.peer.name", "my.documents.azure.com")
+                    .AddTag("db.name", "database")
+                    .AddTag("db.operation", "ReadItems")
+                    .AddTag("db.cosmosdb.container", "container")
+                    .AddTag("db.cosmosdb.retry_count", "2")
+                    .AddTag("db.cosmosdb.connection_mode", "Direct")
+                    .AddTag("db.cosmosdb.item_count", "42")
+                    .AddTag("db.cosmosdb.request_charge", "0.123")
+                    .AddTag("az.namespace", "Microsoft.DocumentDB");
+
+                listener.StartActivity(sendActivity, null);
+                sendActivity.AddTag("db.cosmosdb.status_code", "503");
+                listener.StopActivity(sendActivity, null);
+
+                var telemetry = this.sentItems.Last();
+                DependencyTelemetry dependency = telemetry as DependencyTelemetry;
+                Assert.AreEqual("container | ReadItems", dependency.Name);
+                Assert.AreEqual("my.documents.azure.com | database", dependency.Target);
+                Assert.AreEqual("ReadItems", dependency.Data);
+                Assert.AreEqual("503", dependency.ResultCode);
+                Assert.AreEqual("Azure DocumentDB", dependency.Type);
+                Assert.AreEqual("2", dependency.Properties["db.cosmosdb.retry_count"]);
+                Assert.AreEqual("0.123", dependency.Properties["db.cosmosdb.request_charge"]);
+                Assert.AreEqual("Direct", dependency.Properties["db.cosmosdb.connection_mode"]);
+                Assert.AreEqual("42", dependency.Properties["db.cosmosdb.item_count"]);
+            }
+        }
+
+#if !NET452
+        [TestMethod]
+        public void AzureCosmosDbSpansAreCollectedWithLogs()
+        {
+            // .NET452 does not support setting custom EventSource and Cosmos DB SDK does not have targets below net461
+            // so no point in testing net452.
+            // but we still need to test .NET framework versions that support setting event source name
+            // but fallback to depednencycollector dependency net452 target 
+            using (var listener = new DiagnosticListener("Azure.Cosmos"))
+            using (var module = new DependencyTrackingTelemetryModule())
+            {
+                module.Initialize(this.configuration);
+
+                var exception = new InvalidOperationException();
+                Activity sendActivity = new Activity("Azure.Cosmos.ReadItems")
+                    .AddTag("kind", "client")
+                    .AddTag("net.peer.name", "my.documents.azure.com")
+                    .AddTag("db.name", "database")
+                    .AddTag("db.operation", "ReadItems")
+                    .AddTag("db.cosmosdb.container", "container")
+                    .AddTag("az.namespace", "Microsoft.DocumentDB");
+
+                listener.StartActivity(sendActivity, null);
+
+                CosmosDbEventSource.Singleton.RecordInfo("info message - ignored");
+                CosmosDbEventSource.Singleton.RecordWarn("warn message");
+                CosmosDbEventSource.Singleton.RecordError("error message");
+                listener.StopActivity(sendActivity, null);
+
+                var dependency = this.sentItems.Single(t => t is DependencyTelemetry) as DependencyTelemetry;
+                var logs = this.sentItems
+                    .Where(t => t is TraceTelemetry)
+                    .Select(t => t as TraceTelemetry)
+                    .ToList();
+
+                Assert.IsTrue(dependency.Success.Value);
+                Assert.IsTrue(String.IsNullOrEmpty(dependency.ResultCode));
+                Assert.AreEqual(2, logs.Count);
+                
+                Assert.AreEqual("warn message", logs[0].Message);
+                Assert.AreEqual("error message", logs[1].Message);
+                
+                Assert.AreEqual(SeverityLevel.Warning, logs[0].SeverityLevel);
+                Assert.AreEqual(SeverityLevel.Error, logs[1].SeverityLevel);
+                
+                Assert.AreEqual(dependency.Id, logs[0].Context.Operation.ParentId);
+                Assert.AreEqual(dependency.Id, logs[1].Context.Operation.ParentId);
+                
+                Assert.AreEqual(dependency.Context.Operation.Id, logs[0].Context.Operation.Id);
+                Assert.AreEqual(dependency.Context.Operation.Id, logs[1].Context.Operation.Id);
+
+                Assert.AreEqual("2", logs[0].Properties["EventId"]);
+                Assert.AreEqual("1", logs[1].Properties["EventId"]);
+
+#if NET5_0_OR_GREATER || NETCOREAPP2_0_OR_GREATER
+                // DependencyCollector has net452 and netstandard20 targets
+                // test targets that falls back to net452 dependency would not have EventName available
+                // because EventSource on .NET 4.5.2 does not support it
+                Assert.AreEqual("RecordWarn", logs[0].Properties["EventName"]);
+                Assert.AreEqual("RecordError", logs[1].Properties["EventName"]);
+#endif
+            }
+        }
+#endif
 
         private T TrackOperation<T>(
             DiagnosticListener listener,
@@ -1330,5 +1516,35 @@ private class ApplicationInsightsLink
             [JsonProperty("id")]
             public string Id { get; set; }
         }
+
+#if !NET452
+        class CosmosDbEventSource : EventSource
+        {
+            private CosmosDbEventSource()
+                : base("Azure.Cosmos", EventSourceSettings.Default, "Azure.Cosmos", "true")
+            {
+            }
+
+            public static CosmosDbEventSource Singleton { get; } = new CosmosDbEventSource();
+
+            [Event(1, Level = EventLevel.Error, Message = "{0}")]
+            public void RecordError(string diagnostics)
+            {
+                this.WriteEvent(1, diagnostics);
+            }
+
+            [Event(2, Level = EventLevel.Warning, Message = "{0}")]
+            public void RecordWarn(string diagnostics)
+            {
+                this.WriteEvent(2, diagnostics);
+            }
+
+            [Event(3, Level = EventLevel.Informational, Message = "{0}")]
+            public void RecordInfo(string diagnostics)
+            {
+                this.WriteEvent(3, diagnostics);
+            }
+        }
+#endif
     }
 }
\ No newline at end of file
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticListenerSubscriber.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticListenerSubscriber.cs
index 0d0e7d0a91..95c131359e 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticListenerSubscriber.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticListenerSubscriber.cs
@@ -3,18 +3,28 @@
     using System;
     using System.Diagnostics;
     using Microsoft.ApplicationInsights.Common;
+    using System.Diagnostics.Tracing;
     using Microsoft.ApplicationInsights.Extensibility;
     using Microsoft.ApplicationInsights.Extensibility.Implementation;
 
-    internal sealed class AzureSdkDiagnosticListenerSubscriber : DiagnosticSourceListenerBase<object>
+    internal sealed class AzureSdkDiagnosticListenerSubscriber : DiagnosticSourceListenerBase<object>, IDisposable
     {
         public const string DiagnosticListenerName = "Azure.";
+        private readonly IDisposable logsListener;
 
         public AzureSdkDiagnosticListenerSubscriber(TelemetryConfiguration configuration) : base(configuration)
         {
+            // listen to Cosmos EventSource only - other logs can be sent using ILogger
+            this.logsListener = new AzureSdkEventListener(this.Client, EventLevel.Warning, "Azure.Cosmos");
             this.Client.Context.GetInternalContext().SdkVersion = SdkVersionUtils.GetSdkVersion("rdd" + RddSource.DiagnosticSourceListenerAzure + ":");
         }
 
+        public override void Dispose()
+        {
+            this.logsListener?.Dispose();
+            base.Dispose();
+        }
+
         internal override bool IsSourceEnabled(DiagnosticListener diagnosticListener)
         {
             return diagnosticListener.Name.StartsWith(DiagnosticListenerName, StringComparison.Ordinal);
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticsEventHandler.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticsEventHandler.cs
index 549ef16838..53001f55ab 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticsEventHandler.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticsEventHandler.cs
@@ -12,6 +12,7 @@
     using Microsoft.ApplicationInsights.Extensibility;
     using Microsoft.ApplicationInsights.Extensibility.Implementation;
     using Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing;
+    using static Microsoft.ApplicationInsights.MetricDimensionNames.TelemetryContext;
 
     internal class AzureSdkDiagnosticsEventHandler : DiagnosticsEventHandlerBase
     {
@@ -89,12 +90,19 @@ public override void OnEvent(KeyValuePair<string, object> evnt, DiagnosticListen
 
                     this.SetCommonProperties(evnt.Key, evnt.Value, currentActivity, telemetry);
 
-                    if (telemetry is DependencyTelemetry dependency && dependency.Type == RemoteDependencyConstants.HTTP)
+                    if (telemetry is DependencyTelemetry dependency)
                     {
-                        SetHttpProperties(currentActivity, dependency);
-                        if (evnt.Value != null)
+                        if (dependency.Type == RemoteDependencyConstants.HTTP)
                         {
-                            dependency.SetOperationDetail(evnt.Value.GetType().FullName, evnt.Value);
+                            SetHttpProperties(currentActivity, dependency);
+                            if (evnt.Value != null)
+                            {
+                                dependency.SetOperationDetail(evnt.Value.GetType().FullName, evnt.Value);
+                            }
+                        }
+                        else if (dependency.Type.EndsWith(RemoteDependencyConstants.AzureDocumentDb, StringComparison.Ordinal))
+                        {
+                            SetCosmosDbProperties(currentActivity, dependency);
                         }
                     }
 
@@ -245,6 +253,10 @@ private static string GetType(Activity currentActivity)
             else if (component == "Microsoft.ServiceBus")
             {
                 component = RemoteDependencyConstants.AzureServiceBus;
+            } 
+            else if (component == "Microsoft.DocumentDB") 
+            {
+                component = RemoteDependencyConstants.AzureDocumentDb;
             }
 
             if (component != null)
@@ -325,6 +337,48 @@ private static bool IsMessagingDependency(string dependencyType)
                          dependencyType.EndsWith(RemoteDependencyConstants.AzureServiceBus, StringComparison.Ordinal));
         }
 
+        private static void SetCosmosDbProperties(Activity activity, DependencyTelemetry telemetry)
+        {
+            string dbAccount = null;
+            string dbName = null;
+            string dbOperation = null;
+            string dbContainer = null;
+
+            foreach (var tag in activity.Tags)
+            {
+                if (tag.Key == "db.name")
+                {
+                    dbName = tag.Value;
+                }
+                else if (tag.Key == "db.operation")
+                {
+                    dbOperation = tag.Value;
+                }
+                else if (tag.Key == "net.peer.name")
+                {
+                    dbAccount = tag.Value;
+                }
+                else if (tag.Key == "db.cosmosdb.container")
+                {
+                    dbContainer = tag.Value;
+                    telemetry.Properties[tag.Key] = dbContainer;
+                }
+                else if (tag.Key == "db.cosmosdb.status_code")
+                {
+                    telemetry.ResultCode = tag.Value;
+                }
+                else if (tag.Key.StartsWith("db.cosmosdb.", StringComparison.Ordinal))
+                {
+                    telemetry.Properties[tag.Key] = tag.Value;
+                }
+            }
+
+            // similar to SqlClientDiagnosticSourceListener
+            telemetry.Target = string.Join(" | ", dbAccount, dbName);
+            telemetry.Name = string.Join(" | ", dbContainer, dbOperation);
+            telemetry.Data = dbOperation;
+        }
+
         private static void SetMessagingProperties(Activity activity, OperationTelemetry telemetry)
         {
             string endpoint = null;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkEventListener.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkEventListener.cs
new file mode 100644
index 0000000000..aa1bafed77
--- /dev/null
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkEventListener.cs
@@ -0,0 +1,110 @@
+namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics.Tracing;
+    using System.Globalization;
+    using System.Linq;
+    using Microsoft.ApplicationInsights;
+    using Microsoft.ApplicationInsights.DataContracts;
+
+    internal class AzureSdkEventListener : EventListener
+    {
+        private const string TraitValue = "true";
+        private readonly object[] EmptyArray = new object[0];
+
+        private readonly List<EventSource> eventSources = new List<EventSource>();
+        private readonly TelemetryClient telemetryClient;
+        private readonly EventLevel level;
+        private readonly string traitName;
+
+        public AzureSdkEventListener(TelemetryClient telemetryClient, EventLevel level, string traitName)
+        {
+            this.telemetryClient = telemetryClient ?? throw new ArgumentNullException(nameof(telemetryClient));
+            this.level = level;
+            this.traitName = traitName;
+
+            foreach (EventSource eventSource in this.eventSources)
+            {
+                this.OnEventSourceCreated(eventSource);
+            }
+
+            this.eventSources.Clear();
+        }
+
+        protected sealed override void OnEventSourceCreated(EventSource eventSource)
+        {
+            base.OnEventSourceCreated(eventSource);
+
+            if (this.telemetryClient == null)
+            {
+                this.eventSources.Add(eventSource);
+            }
+
+#if NET452
+            if (eventSource.Name == this.traitName)
+#else
+            if (eventSource.GetTrait(this.traitName) == TraitValue)
+#endif
+            {
+                this.EnableEvents(eventSource, this.level);
+            }
+        }
+        
+        protected sealed override void OnEventWritten(EventWrittenEventArgs eventData)
+        {
+            // Workaround https://github.com/dotnet/corefx/issues/42600
+            if (eventData.EventId == -1)
+            {
+                return;
+            }
+
+            var payloadArray = eventData.Payload?.ToArray() ?? EmptyArray;
+            string message = string.Empty;
+            if (eventData.Message != null)
+            {
+                try
+                {
+                    message = string.Format(CultureInfo.InvariantCulture, eventData.Message, payloadArray);
+                }
+                catch (FormatException)
+                {
+                }
+            }
+
+            var trace = new TraceTelemetry(message, FromEventLevel(eventData.Level));
+            trace.Properties["CategoryName"] = eventData.EventSource.Name;
+
+            if (eventData.EventId > 0)
+            {
+                trace.Properties["EventId"] = eventData.EventId.ToString(CultureInfo.InvariantCulture);
+            }
+
+#if !NET452
+            if (!string.IsNullOrEmpty(eventData.EventName))
+            {
+                trace.Properties["EventName"] = eventData.EventName;
+            }
+#endif
+            this.telemetryClient?.TrackTrace(trace);
+        }
+
+        private static SeverityLevel FromEventLevel(EventLevel level)
+        {
+            switch (level)
+            {
+                case EventLevel.Critical:
+                    return SeverityLevel.Critical;
+                case EventLevel.Error:
+                    return SeverityLevel.Error;
+                case EventLevel.Warning:
+                    return SeverityLevel.Warning;
+                case EventLevel.Informational:
+                    return SeverityLevel.Information;
+                case EventLevel.Verbose:
+                default:
+                    return SeverityLevel.Verbose;
+            }
+        }
+    }
+}
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DiagnosticSourceListenerBase.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DiagnosticSourceListenerBase.cs
index c032d09c62..30e7348db5 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DiagnosticSourceListenerBase.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DiagnosticSourceListenerBase.cs
@@ -113,7 +113,7 @@ public void OnError(Exception error)
         {
         }
 
-        public void Dispose()
+        public virtual void Dispose()
         {
             this.Dispose(true);
             GC.SuppressFinalize(this);

From bbf106bf4ca3bffcc655f0f27697c88538c9626f Mon Sep 17 00:00:00 2001
From: Liudmila Molkova <limolkova@microsoft.com>
Date: Mon, 25 Jul 2022 10:41:56 -0700
Subject: [PATCH 19/24] support eventsource deduplication

---
 .../AzureSdkDiagnosticListenerTest.cs           |  2 +-
 .../AzureSdk/AzureSdkEventListener.cs           | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs
index cbc3f64af6..9623590441 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs
@@ -1521,7 +1521,7 @@ private class ApplicationInsightsLink
         class CosmosDbEventSource : EventSource
         {
             private CosmosDbEventSource()
-                : base("Azure.Cosmos", EventSourceSettings.Default, "Azure.Cosmos", "true")
+                : base("Azure.Cosmos_foo")
             {
             }
 
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkEventListener.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkEventListener.cs
index aa1bafed77..cd46673a2d 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkEventListener.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkEventListener.cs
@@ -10,8 +10,7 @@
 
     internal class AzureSdkEventListener : EventListener
     {
-        private const string TraitValue = "true";
-        private readonly object[] EmptyArray = new object[0];
+        private static readonly object[] EmptyArray = new object[0];
 
         private readonly List<EventSource> eventSources = new List<EventSource>();
         private readonly TelemetryClient telemetryClient;
@@ -20,9 +19,9 @@ internal class AzureSdkEventListener : EventListener
 
         public AzureSdkEventListener(TelemetryClient telemetryClient, EventLevel level, string traitName)
         {
-            this.telemetryClient = telemetryClient ?? throw new ArgumentNullException(nameof(telemetryClient));
+            this.traitName = traitName ?? throw new ArgumentNullException(nameof(traitName));
             this.level = level;
-            this.traitName = traitName;
+            this.telemetryClient = telemetryClient ?? throw new ArgumentNullException(nameof(telemetryClient));
 
             foreach (EventSource eventSource in this.eventSources)
             {
@@ -39,13 +38,13 @@ protected sealed override void OnEventSourceCreated(EventSource eventSource)
             if (this.telemetryClient == null)
             {
                 this.eventSources.Add(eventSource);
+                return;
             }
 
-#if NET452
-            if (eventSource.Name == this.traitName)
-#else
-            if (eventSource.GetTrait(this.traitName) == TraitValue)
-#endif
+            // EventSource names are deduplicated for environments like
+            // Functions where the same library can be loaded twice.
+            // Two EventSources with the same name are not allowed.
+            if (eventSource.Name != null && eventSource.Name.StartsWith(this.traitName, StringComparison.Ordinal))
             {
                 this.EnableEvents(eventSource, this.level);
             }

From 846e6d78c79d922c32da15f65992ec75b774b917 Mon Sep 17 00:00:00 2001
From: Liudmila Molkova <limolkova@microsoft.com>
Date: Wed, 27 Jul 2022 11:51:00 -0700
Subject: [PATCH 20/24] Add custom attributes so users can slice and dice by
 db/account/container/operation

---
 .../AzureSdkDiagnosticListenerTest.cs         | 22 ++++++++++++++-----
 .../AzureSdkDiagnosticsEventHandler.cs        |  8 +++----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs
index 9623590441..915ed24048 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs
@@ -1299,9 +1299,18 @@ public void AzureCosmosDbSpansAreCollected()
                 Assert.AreEqual(sendActivity.SpanId.ToHexString(), dependency.Id);
                 Assert.AreEqual("container | ReadItems", dependency.Name);
                 Assert.AreEqual("my.documents.azure.com | database", dependency.Target);
-                Assert.AreEqual("ReadItems", dependency.Data);
                 Assert.AreEqual("503", dependency.ResultCode);
                 Assert.AreEqual("Azure DocumentDB", dependency.Type);
+                Assert.IsTrue(String.IsNullOrEmpty(dependency.Data));
+
+                Assert.IsTrue(dependency.Properties.ContainsKey("db.name"));
+                Assert.IsTrue(dependency.Properties.ContainsKey("db.operation"));
+                Assert.IsTrue(dependency.Properties.ContainsKey("net.peer.name"));
+                Assert.IsTrue(dependency.Properties.ContainsKey("db.cosmosdb.container"));
+                Assert.AreEqual("container", dependency.Properties["db.cosmosdb.container"]);
+                Assert.AreEqual("database", dependency.Properties["db.name"]);
+                Assert.AreEqual("ReadItems", dependency.Properties["db.operation"]);
+                Assert.AreEqual("my.documents.azure.com", dependency.Properties["net.peer.name"]);
             }
         }
 
@@ -1338,11 +1347,8 @@ public void AzureCosmosDbSpansErrorsAreCollected()
                 Assert.AreEqual(sendActivity.SpanId.ToHexString(), dependency.Id);
                 Assert.AreEqual("container | ReadItems", dependency.Name);
                 Assert.AreEqual("my.documents.azure.com | database", dependency.Target);
-                Assert.AreEqual("ReadItems", dependency.Data);
                 Assert.AreEqual("200", dependency.ResultCode);
                 Assert.AreEqual("Azure DocumentDB", dependency.Type);
-                Assert.IsTrue(dependency.Properties.ContainsKey("db.cosmosdb.container"));
-                Assert.AreEqual("container", dependency.Properties["db.cosmosdb.container"]);
             }
         }
 
@@ -1365,6 +1371,7 @@ public void AzureCosmosDbSpansAreCollectedWithExtraAttributes()
                     .AddTag("db.cosmosdb.connection_mode", "Direct")
                     .AddTag("db.cosmosdb.item_count", "42")
                     .AddTag("db.cosmosdb.request_charge", "0.123")
+                    .AddTag("foo", "bar")
                     .AddTag("az.namespace", "Microsoft.DocumentDB");
 
                 listener.StartActivity(sendActivity, null);
@@ -1375,13 +1382,18 @@ public void AzureCosmosDbSpansAreCollectedWithExtraAttributes()
                 DependencyTelemetry dependency = telemetry as DependencyTelemetry;
                 Assert.AreEqual("container | ReadItems", dependency.Name);
                 Assert.AreEqual("my.documents.azure.com | database", dependency.Target);
-                Assert.AreEqual("ReadItems", dependency.Data);
                 Assert.AreEqual("503", dependency.ResultCode);
                 Assert.AreEqual("Azure DocumentDB", dependency.Type);
                 Assert.AreEqual("2", dependency.Properties["db.cosmosdb.retry_count"]);
                 Assert.AreEqual("0.123", dependency.Properties["db.cosmosdb.request_charge"]);
                 Assert.AreEqual("Direct", dependency.Properties["db.cosmosdb.connection_mode"]);
                 Assert.AreEqual("42", dependency.Properties["db.cosmosdb.item_count"]);
+
+                Assert.AreEqual("container", dependency.Properties["db.cosmosdb.container"]);
+                Assert.AreEqual("database", dependency.Properties["db.name"]);
+                Assert.AreEqual("ReadItems", dependency.Properties["db.operation"]);
+                Assert.AreEqual("my.documents.azure.com", dependency.Properties["net.peer.name"]);
+                Assert.IsFalse(dependency.Properties.ContainsKey("foo"));
             }
         }
 
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticsEventHandler.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticsEventHandler.cs
index 53001f55ab..73d97c9ce3 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticsEventHandler.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticsEventHandler.cs
@@ -361,22 +361,22 @@ private static void SetCosmosDbProperties(Activity activity, DependencyTelemetry
                 else if (tag.Key == "db.cosmosdb.container")
                 {
                     dbContainer = tag.Value;
-                    telemetry.Properties[tag.Key] = dbContainer;
                 }
                 else if (tag.Key == "db.cosmosdb.status_code")
                 {
                     telemetry.ResultCode = tag.Value;
                 }
-                else if (tag.Key.StartsWith("db.cosmosdb.", StringComparison.Ordinal))
+                else if (!tag.Key.StartsWith("db.cosmosdb.", StringComparison.Ordinal))
                 {
-                    telemetry.Properties[tag.Key] = tag.Value;
+                    continue;
                 }
+                
+                telemetry.Properties[tag.Key] = tag.Value;
             }
 
             // similar to SqlClientDiagnosticSourceListener
             telemetry.Target = string.Join(" | ", dbAccount, dbName);
             telemetry.Name = string.Join(" | ", dbContainer, dbOperation);
-            telemetry.Data = dbOperation;
         }
 
         private static void SetMessagingProperties(Activity activity, OperationTelemetry telemetry)

From 503adae39c4eedc059eeac94546ff405e61b74e7 Mon Sep 17 00:00:00 2001
From: Liudmila Molkova <limolkova@microsoft.com>
Date: Thu, 28 Jul 2022 17:40:43 -0700
Subject: [PATCH 21/24] don't add  status - it's populated as ResultCode

---
 .../Implementation/AzureSdkDiagnosticListenerTest.cs             | 1 +
 .../Implementation/AzureSdk/AzureSdkDiagnosticsEventHandler.cs   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs
index 915ed24048..4c3fceab07 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs
@@ -1394,6 +1394,7 @@ public void AzureCosmosDbSpansAreCollectedWithExtraAttributes()
                 Assert.AreEqual("ReadItems", dependency.Properties["db.operation"]);
                 Assert.AreEqual("my.documents.azure.com", dependency.Properties["net.peer.name"]);
                 Assert.IsFalse(dependency.Properties.ContainsKey("foo"));
+                Assert.IsFalse(dependency.Properties.ContainsKey("db.system"));
             }
         }
 
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticsEventHandler.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticsEventHandler.cs
index 73d97c9ce3..b785d67c78 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticsEventHandler.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticsEventHandler.cs
@@ -365,6 +365,7 @@ private static void SetCosmosDbProperties(Activity activity, DependencyTelemetry
                 else if (tag.Key == "db.cosmosdb.status_code")
                 {
                     telemetry.ResultCode = tag.Value;
+                    continue;
                 }
                 else if (!tag.Key.StartsWith("db.cosmosdb.", StringComparison.Ordinal))
                 {

From f7b397d6f0cf642fafd88c2ce08702820f8030d8 Mon Sep 17 00:00:00 2001
From: Liudmila Molkova <limolkova@microsoft.com>
Date: Fri, 29 Jul 2022 12:04:12 -0700
Subject: [PATCH 22/24] documentDb -> cosmosDb

---
 .../Implementation/AzureSdkDiagnosticListenerTest.cs        | 6 +++---
 .../AzureSdk/AzureSdkDiagnosticsEventHandler.cs             | 4 ++--
 .../Implementation/RemoteDependencyConstants.cs             | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs
index 4c3fceab07..0dd712f6e3 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs
@@ -1300,7 +1300,7 @@ public void AzureCosmosDbSpansAreCollected()
                 Assert.AreEqual("container | ReadItems", dependency.Name);
                 Assert.AreEqual("my.documents.azure.com | database", dependency.Target);
                 Assert.AreEqual("503", dependency.ResultCode);
-                Assert.AreEqual("Azure DocumentDB", dependency.Type);
+                Assert.AreEqual("Azure CosmosDB", dependency.Type);
                 Assert.IsTrue(String.IsNullOrEmpty(dependency.Data));
 
                 Assert.IsTrue(dependency.Properties.ContainsKey("db.name"));
@@ -1348,7 +1348,7 @@ public void AzureCosmosDbSpansErrorsAreCollected()
                 Assert.AreEqual("container | ReadItems", dependency.Name);
                 Assert.AreEqual("my.documents.azure.com | database", dependency.Target);
                 Assert.AreEqual("200", dependency.ResultCode);
-                Assert.AreEqual("Azure DocumentDB", dependency.Type);
+                Assert.AreEqual("Azure CosmosDB", dependency.Type);
             }
         }
 
@@ -1383,7 +1383,7 @@ public void AzureCosmosDbSpansAreCollectedWithExtraAttributes()
                 Assert.AreEqual("container | ReadItems", dependency.Name);
                 Assert.AreEqual("my.documents.azure.com | database", dependency.Target);
                 Assert.AreEqual("503", dependency.ResultCode);
-                Assert.AreEqual("Azure DocumentDB", dependency.Type);
+                Assert.AreEqual("Azure CosmosDB", dependency.Type);
                 Assert.AreEqual("2", dependency.Properties["db.cosmosdb.retry_count"]);
                 Assert.AreEqual("0.123", dependency.Properties["db.cosmosdb.request_charge"]);
                 Assert.AreEqual("Direct", dependency.Properties["db.cosmosdb.connection_mode"]);
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticsEventHandler.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticsEventHandler.cs
index b785d67c78..dcaef71300 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticsEventHandler.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticsEventHandler.cs
@@ -100,7 +100,7 @@ public override void OnEvent(KeyValuePair<string, object> evnt, DiagnosticListen
                                 dependency.SetOperationDetail(evnt.Value.GetType().FullName, evnt.Value);
                             }
                         }
-                        else if (dependency.Type.EndsWith(RemoteDependencyConstants.AzureDocumentDb, StringComparison.Ordinal))
+                        else if (dependency.Type.EndsWith(RemoteDependencyConstants.AzureCosmosDb, StringComparison.Ordinal))
                         {
                             SetCosmosDbProperties(currentActivity, dependency);
                         }
@@ -256,7 +256,7 @@ private static string GetType(Activity currentActivity)
             } 
             else if (component == "Microsoft.DocumentDB") 
             {
-                component = RemoteDependencyConstants.AzureDocumentDb;
+                component = RemoteDependencyConstants.AzureCosmosDb;
             }
 
             if (component != null)
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/RemoteDependencyConstants.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/RemoteDependencyConstants.cs
index 60ba424e03..d0a486bc4d 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/RemoteDependencyConstants.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/RemoteDependencyConstants.cs
@@ -10,6 +10,7 @@ internal static class RemoteDependencyConstants
         public const string AzureTable = "Azure table";
         public const string AzureQueue = "Azure queue";
         public const string AzureDocumentDb = "Azure DocumentDB";
+        public const string AzureCosmosDb = "Azure CosmosDB";
         public const string AzureEventHubs = "Azure Event Hubs";
         public const string AzureServiceBus = "Azure Service Bus";
         public const string AzureIotHub = "Azure IoT Hub";

From de3d0d3671bc8750f2494375417433df662de5d0 Mon Sep 17 00:00:00 2001
From: Liudmila Molkova <limolkova@microsoft.com>
Date: Fri, 29 Jul 2022 12:10:40 -0700
Subject: [PATCH 23/24] formatting

---
 .../AzureSdk/AzureSdkDiagnosticListenerSubscriber.cs            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticListenerSubscriber.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticListenerSubscriber.cs
index 95c131359e..334f5c7cd9 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticListenerSubscriber.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticListenerSubscriber.cs
@@ -2,8 +2,8 @@
 {
     using System;
     using System.Diagnostics;
-    using Microsoft.ApplicationInsights.Common;
     using System.Diagnostics.Tracing;
+    using Microsoft.ApplicationInsights.Common;
     using Microsoft.ApplicationInsights.Extensibility;
     using Microsoft.ApplicationInsights.Extensibility.Implementation;
 

From 130a894914888036554156a2fd4eba9bccee5ddc Mon Sep 17 00:00:00 2001
From: Liudmila Molkova <limolkova@microsoft.com>
Date: Mon, 26 Sep 2022 16:27:25 -0700
Subject: [PATCH 24/24] Fix for events without fornmatted message

---
 .../Implementation/AzureSdk/AzureSdkEventListener.cs      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkEventListener.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkEventListener.cs
index cd46673a2d..8d72b81238 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkEventListener.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkEventListener.cs
@@ -10,7 +10,11 @@
 
     internal class AzureSdkEventListener : EventListener
     {
+#if NET452
         private static readonly object[] EmptyArray = new object[0];
+#else
+        private static readonly object[] EmptyArray = Array.Empty<object>();
+#endif
 
         private readonly List<EventSource> eventSources = new List<EventSource>();
         private readonly TelemetryClient telemetryClient;
@@ -70,6 +74,10 @@ protected sealed override void OnEventWritten(EventWrittenEventArgs eventData)
                 {
                 }
             }
+            else
+            {
+                message = String.Join(", ", payloadArray); 
+            }
 
             var trace = new TraceTelemetry(message, FromEventLevel(eventData.Level));
             trace.Properties["CategoryName"] = eventData.EventSource.Name;