return ActivitySource + more polishing

Author: YuliiaKovalova

THIRDPARTYNOTICES.txt

@@ -43,25 +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.
-
--------------------------------

documentation/specs/VS-OpenTelemetry.md

@@ -11,12 +11,6 @@
     <ItemsToSign Include="$(ArtifactsDir)\xsd\Update-MSBuildXsds.ps1" />
 
     <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>
 
   <!-- Remove existing .nupkg signing info and set to None for testing to workaround the existing issue in arcade. -->

documentation/specs/proposed/telemetry-onepager.md

@@ -463,9 +463,6 @@ private void UpdatePriority(Process p, ProcessPriorityClass priority)
         /// <exception cref="InvalidOperationException">Thrown if a build is already in progress.</exception>
         public void BeginBuild(BuildParameters parameters)
         {
-#if NETFRAMEWORK
-            TelemetryManager.Instance.Initialize(isStandalone: false);
-#endif
             if (_previousLowPriority != null)
             {
                 if (parameters.LowPriority != _previousLowPriority)
@@ -1115,9 +1112,8 @@ public void EndBuild()
                             _buildTelemetry.SACEnabled = sacState == NativeMethodsShared.SAC_State.Evaluation || sacState == NativeMethodsShared.SAC_State.Enforcement;
 
                             loggingService.LogTelemetry(buildEventContext: null, _buildTelemetry.EventName, _buildTelemetry.GetProperties());
-#if NETFRAMEWORK
                             EndBuildTelemetry();
-#endif
+
                             // Clean telemetry to make it ready for next build submission.
                             _buildTelemetry = null;
                         }
@@ -1160,17 +1156,15 @@ void SerializeCaches()
             }
         }
 
-#if NETFRAMEWORK
-        [MethodImpl(MethodImplOptions.NoInlining)]
         private void EndBuildTelemetry()
         {
-            using IActivity? activity = TelemetryManager.Instance.StartActivity(TelemetryConstants.Build)
+            using IActivity? activity = TelemetryManager.Instance?.DefaultActivitySource
+                ?.StartActivity(TelemetryConstants.Build)
                 ?.SetTags(_buildTelemetry)
                 ?.SetTags(_telemetryConsumingLogger?.WorkerNodeTelemetryData.AsActivityDataHolder(
                         includeTasksDetails: !Traits.Instance.ExcludeTasksDetailsFromTelemetry,
                         includeTargetDetails: false));
         }
-#endif
 
         /// <summary>
         /// Convenience method.  Submits a lone build request and blocks until results are available.
@@ -3013,6 +3007,8 @@ private ILoggingService CreateLoggingService(
 
             if (_buildParameters.IsTelemetryEnabled)
             {
+                TelemetryManager.Instance.Initialize(isStandalone: false);
+
                 // We do want to dictate our own forwarding logger (otherwise CentralForwardingLogger with minimum transferred importance MessageImportance.Low is used)
                 // In the future we might optimize for single, in-node build scenario - where forwarding logger is not needed (but it's just quick pass-through)
                 LoggerDescription forwardingLoggerDescription = new LoggerDescription(
@@ -3245,6 +3241,8 @@ private void Dispose(bool disposing)
                         s_singletonInstance = null;
                     }
 
+                    TelemetryManager.Instance?.Dispose();
+
                     _disposed = true;
                 }
             }

eng/Signing.props

@@ -2430,9 +2430,6 @@ Utilization:          {0} Average Utilization: {1:###.0}</value>
     <value>succeeded: {0}</value>
     <comment>{0} whole number</comment>
   </data>
-  <data name="OpenTelemetryLoadFailed" xml:space="preserve">
-    <value>Loading telemetry libraries failed with exception: {0}.</value>
-  </data>
   <data name="CustomTaskFactoryOutOfProcNotSupported" xml:space="preserve">
     <value>Custom TaskFactory '{0}' for Task '{1}' does not support out of process TaskHost execution. Turn off the multithreaded build mode or remove the custom TaskFactory from your &lt;UsingTask&gt; definitions in project files.</value>
   </data>