Replace OpenTelemetry with Microsoft.VisualStudio.Telemetry for VS

Directory.Packages.props

@@ -46,10 +46,8 @@
     <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="$(SystemThreadingTasksDataflowVersion)" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" />
     <PackageVersion Include="xunit.console" Version="$(XUnitVersion)" />
-    <PackageVersion Include="Microsoft.VisualStudio.OpenTelemetry.Collector" Version="$(MicrosoftVisualStudioOpenTelemetryVersion)" />
-    <PackageVersion Include="Microsoft.VisualStudio.OpenTelemetry.ClientExtensions" Version="$(MicrosoftVisualStudioOpenTelemetryVersion)" />
-
-    <!-- Microsoft.VisualStudio.SolutionPersistence is maintained in eng/dependabot/Directory.Packages.props -->
+    <PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="$(MicrosoftVisualStudioTelemetryVersion)" />
+    <!-- Microsoft.VisualStudio.SolutionPersistence is maintained in eng/dependabot/Packages.props -->
   </ItemGroup>
 
 </Project>

NuGet.config

@@ -18,11 +18,7 @@
     <add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
     <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
   </packageSources>
-  <!-- We don't want other than VS OpenTelemetry libraries from vs-impl -->
   <packageSourceMapping>
-    <packageSource key="vs-impl">
-      <package pattern="Microsoft.VisualStudio.OpenTelemetry*" />
-    </packageSource>
     <packageSource key="arcade">
       <package pattern="*" />
     </packageSource>

THIRDPARTYNOTICES.txt

@@ -43,33 +43,3 @@ Unless required by applicable law or agreed to in writing, software distributed
 under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
 language governing permissions and limitations under the License.
-
--------------------------------
-
-Notice for OpenTelemetry .NET
--------------------------------
-MSBuild.exe is distributed with OpenTelemetry .NET binaries.
-
-Copyright (c) OpenTelemetry Authors
-Source:       https://github.com/open-telemetry/opentelemetry-dotnet
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
-language governing permissions and limitations under the License.
-
--------------------------------
-
-Notice for Microsoft.VisualStudio.OpenTelemetry.*
--------------------------------
-MSBuild.exe is distributed with Microsoft.VisualStudio.OpenTelemetry.* binaries.
-
-Project:      Microsoft.VisualStudio.OpenTelemetry
-Copyright:    (c) Microsoft Corporation
-License:      https://visualstudio.microsoft.com/license-terms/mt736442/

eng/Signing.props

@@ -13,9 +13,6 @@
     <FileSignInfo Include="RuntimeContracts.dll" CertificateName="3PartySHA2" />
 
     <!-- For Telemetry in VS.-->
-    <FileSignInfo Include="OpenTelemetry.dll" CertificateName="3PartySHA2" />
-    <FileSignInfo Include="OpenTelemetry.Api.dll" CertificateName="3PartySHA2" />
-    <FileSignInfo Include="OpenTelemetry.Api.ProviderBuilderExtensions.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="3PartySHA2" />
   </ItemGroup>
 

eng/Versions.props

@@ -59,8 +59,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <MicrosoftVisualStudioOpenTelemetryVersion>0.2.104-beta</MicrosoftVisualStudioOpenTelemetryVersion>
-    <!-- Microsoft.VisualStudio.SolutionPersistence is maintained in eng/dependabot/Directory.Packages.props -->
+    <MicrosoftVisualStudioTelemetryVersion>17.14.18</MicrosoftVisualStudioTelemetryVersion>
+    <!-- Microsoft.VisualStudio.SolutionPersistence is maintained in eng/dependabot/Packages.props -->
   </PropertyGroup>
 
   <!-- Toolset Dependencies -->

src/Build.UnitTests/BackEnd/BuildManager_Tests.cs

@@ -1801,7 +1801,6 @@ public void OverlappingBuildsOfTheSameProjectDifferentTargetsAreAllowed()
  </Target>
 </Project>
 ");
-
             Project project = CreateProject(contents, MSBuildDefaultToolsVersion, _projectCollection, true);
             ProjectInstance instance = _buildManager.GetProjectInstanceForBuild(project);
             _buildManager.BeginBuild(_parameters);

src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj

@@ -30,10 +30,7 @@
     <PackageReference Include="NuGet.Frameworks">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-
-    <PackageReference Include="Microsoft.VisualStudio.OpenTelemetry.ClientExtensions" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
-    <PackageReference Include="Microsoft.VisualStudio.OpenTelemetry.Collector" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
-
+
     <ProjectReference Include="..\Build\Microsoft.Build.csproj" />
     <ProjectReference Include="..\Framework\Microsoft.Build.Framework.csproj" />
     <ProjectReference Include="..\MSBuild\MSBuild.csproj" />