Merged PR 644773: Remove unnecessary event keywords: Performance, CloudBuild, DependencyAnalysis

**_No changes in the logging behavior_** CloudBuild keyword is used by absolute events. Performance and DependencyAnalysis keywords are only for categorization purposes. There is no special handling for those keywords unlike Progress, Diagnostics, SelectivelyEnabled, etc. Related work items: #1859016
2022-01-15 09:32:51 +00:00 · 2022-01-15 09:32:51 +00:00 · 90c52120dd
--- a/Public/Src/Engine/Dll/Tracing/Log.cs
+++ b/Public/Src/Engine/Dll/Tracing/Log.cs
@ -54,7 +54,7 @@ namespace BuildXL.Engine.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance | Keywords.Progress))]
+            Keywords = (int)(Keywords.UserMessage | Keywords.Progress))]
        public abstract void ParsePhaseComplete(LoggingContext context, ParseStatistics parseStatistics);

        [GeneratedEvent(
@ -74,7 +74,7 @@ namespace BuildXL.Engine.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance | Keywords.Progress))]
+            Keywords = (int)(Keywords.UserMessage | Keywords.Progress))]
        public abstract void EvaluatePhaseComplete(LoggingContext context, EvaluateStatistics evaluateStatistics);

        [GeneratedEvent(
@ -94,7 +94,7 @@ namespace BuildXL.Engine.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance | Keywords.Progress))]
+            Keywords = (int)(Keywords.UserMessage | Keywords.Progress))]
        public abstract void ExecutePhaseComplete(LoggingContext context, ExecuteStatistics executeStatistics, LimitingResourcePercentages limitingResourcePercentages);

        [GeneratedEvent(
@ -203,7 +203,7 @@ namespace BuildXL.Engine.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance | Keywords.Progress),
+            Keywords = (int)(Keywords.UserMessage | Keywords.Progress),
            Message = EventConstants.PhasePrefix + "Done visiting {fileCount} spec files for graph reuse check in {elapsedMilliseconds}ms")]
        public abstract void VisitingSpecFilesComplete(LoggingContext context, int elapsedMilliseconds, int fileCount);

@ -268,7 +268,7 @@ namespace BuildXL.Engine.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance | Keywords.Progress))]
+            Keywords = (int)(Keywords.UserMessage | Keywords.Progress))]
        public abstract void CheckingForPipGraphReuseComplete(LoggingContext context, GraphCacheCheckStatistics graphCacheCheckStatistics);

        [GeneratedEvent(
@ -277,7 +277,7 @@ namespace BuildXL.Engine.Tracing
            Message = EventConstants.PhasePrefix + "Checking input files for pip graph reuse. {done} done. {remaining} remaining.",
            EventLevel = Level.Informational,
            EventTask = (ushort)Tasks.Engine,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance | Keywords.Progress | Keywords.Overwritable))]
+            Keywords = (int)(Keywords.UserMessage | Keywords.Progress | Keywords.Overwritable))]
        public abstract void CheckingForPipGraphReuseStatus(LoggingContext context, int done, int remaining);

        [GeneratedEvent(
@ -307,7 +307,7 @@ namespace BuildXL.Engine.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance | Keywords.Progress))]
+            Keywords = (int)(Keywords.UserMessage | Keywords.Progress))]
        public abstract void PartiallyReloadingEngineStateComplete(LoggingContext context, GraphCacheReloadStatistics graphCacheReloadStatistics);

        [GeneratedEvent(
@ -317,7 +317,7 @@ namespace BuildXL.Engine.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance | Keywords.Progress))]
+            Keywords = (int)(Keywords.UserMessage | Keywords.Progress))]
        public abstract void EngineContextHeuristicOutcomeReuse(LoggingContext context, int generation, string reason);

        [GeneratedEvent(
@ -327,7 +327,7 @@ namespace BuildXL.Engine.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance | Keywords.Progress))]
+            Keywords = (int)(Keywords.UserMessage | Keywords.Progress))]
        public abstract void EngineContextHeuristicOutcomeSkip(LoggingContext context, int generation, string reason);

        [GeneratedEvent(
@ -357,7 +357,7 @@ namespace BuildXL.Engine.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance | Keywords.Progress))]
+            Keywords = (int)(Keywords.UserMessage | Keywords.Progress))]
        public abstract void SerializingPipGraphComplete(LoggingContext context, GraphCacheSaveStatistics graphCacheSaveStatistics);

        [GeneratedEvent(
@ -1001,15 +1001,6 @@ namespace BuildXL.Engine.Tracing
            Keywords = (int)(Keywords.UserMessage | Keywords.Diagnostics))]
        public abstract void MountsImpactingBuild(LoggingContext context, EffectiveMounts effectiveMounts);

-        [GeneratedEvent(
-            (ushort)LogEventId.PerformanceSample,
-            EventGenerators = EventGenerators.LocalOnly,
-            Message = "Perf: CPU:{machineProcessorTime}%, FreeMemory:{machineAvailableMemoryMegabytes}MB. Ready:{ready}, Running:{running}, Max:{maxRunning}, Limiting factor heuristic: {limitingResource}",
-            EventLevel = Level.Verbose,
-            EventTask = (ushort)Tasks.Engine,
-            Keywords = (int)Keywords.Performance)]
-        public abstract void PerformanceSample(LoggingContext context, int machineProcessorTime, int machineAvailableMemoryMegabytes, long ready, long running, int maxRunning, string limitingResource);
-
        [GeneratedEvent(
            (ushort)LogEventId.AllowlistFileAccess,

@ -1575,7 +1566,7 @@ If you can't update and need this feature after July 2018 please reach out to th
            (int)LogEventId.SerializedFile,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.Performance,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Engine,
            Message = "Serialized {0} in {1}ms")]
        public abstract void SerializedFile(LoggingContext context, string objectSerialized, long milliseconds);
@ -1584,7 +1575,7 @@ If you can't update and need this feature after July 2018 please reach out to th
            (int)LogEventId.DeserializedFile,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.Performance,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Engine,
            Message = "Deserialized '{0}' in {1}ms")]
        public abstract void DeserializedFile(LoggingContext context, string file, long milliseconds);
@ -2158,7 +2149,7 @@ If you can't update and need this feature after July 2018 please reach out to th
            (int)LogEventId.EndRehydratingConfigurationWithNewPathTable,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.Performance,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
            Message = EventConstants.PhasePrefix + "Done rehydrating configuration with new PathTable")]
@ -2178,7 +2169,7 @@ If you can't update and need this feature after July 2018 please reach out to th
            (int)LogEventId.EndLoadingHistoricPerfData,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.Performance,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
            Message = EventConstants.PhasePrefix + "Done loading historic perf data")]
@ -2198,7 +2189,7 @@ If you can't update and need this feature after July 2018 please reach out to th
            (int)LogEventId.EndSavingHistoricPerfData,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.Performance,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
            Message = EventConstants.PhasePrefix + "Done saving updated historic perf data")]
@ -2354,7 +2345,7 @@ If you can't update and need this feature after July 2018 please reach out to th
            (int)LogEventId.EndInitializingCache,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.Performance,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
            Message = EventConstants.PhasePrefix + "Machine-wide cache lock acquired")]
@ -2364,7 +2355,7 @@ If you can't update and need this feature after July 2018 please reach out to th
            (int)LogEventId.SynchronouslyWaitedForCache,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.Performance,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Engine,
            Message = "Synchronously waited {0}ms for cache to finish initializing. {1}ms of cache initialization overlapped other processing")]
        public abstract void SynchronouslyWaitedForCache(LoggingContext context, int waitTimeMs, int overlappedTimeMs);
@ -2383,7 +2374,7 @@ If you can't update and need this feature after July 2018 please reach out to th
            (int)LogEventId.EndParseConfig,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.Performance,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
            Message = EventConstants.PhasePrefix + "Done parsing configuration files")]
@ -2402,7 +2393,7 @@ If you can't update and need this feature after July 2018 please reach out to th
            (int)LogEventId.StatsBanner,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.Performance | (int)Keywords.UserMessage,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Engine,
            Message = "Engine Statistics")]
        public abstract void StatsBanner(LoggingContext context);
@ -2411,7 +2402,7 @@ If you can't update and need this feature after July 2018 please reach out to th
            (int)LogEventId.FrontEndStatsBanner,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.Performance | (int)Keywords.UserMessage,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Engine,
            Message = "Front End Statistics")]
        public abstract void FrontEndStatsBanner(LoggingContext context);
@ -2420,7 +2411,7 @@ If you can't update and need this feature after July 2018 please reach out to th
            (int)LogEventId.GCStats,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.Performance | (int)Keywords.UserMessage,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Engine,
            Message = "  Garbage Collections: Gen0 {0}, Gen1 {1}, Gen2 {2}")]
        public abstract void GCStats(LoggingContext context, long gen0CollectionCount, long gen1CollectionCount, long gen2CollectionCount);
@ -2429,7 +2420,7 @@ If you can't update and need this feature after July 2018 please reach out to th
            (int)LogEventId.ObjectPoolStats,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.Performance | (int)Keywords.UserMessage,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Engine,
            Message = "  {0} object pool: {1} entries, {2} uses, {3} factory invocations")]
        public abstract void ObjectPoolStats(LoggingContext context, string pool, int entryCount, long useCount, long factoryInvocations);
@ -2438,7 +2429,7 @@ If you can't update and need this feature after July 2018 please reach out to th
            (int)LogEventId.PipWriterStats,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.Performance | (int)Keywords.UserMessage,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Engine,
            Message = "  Serialized {0}: {1} entries, {2} total bytes, {3} bytes/entry")]
        public abstract void PipWriterStats(LoggingContext context, string category, long entries, long totalBytes, int bytesPerEntry);
@ -2447,7 +2438,7 @@ If you can't update and need this feature after July 2018 please reach out to th
            (int)LogEventId.InterningStats,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.Performance | (int)Keywords.UserMessage,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Engine,
            Message = "  {0}: {1} entries, {2} bytes of heap, {3} skipped allocated entries")]
        public abstract void InterningStats(LoggingContext context, string table, int entryCount, long sizeInBytes, int skippedEntries = 0);
@ -2456,7 +2447,7 @@ If you can't update and need this feature after July 2018 please reach out to th
            (int)LogEventId.ObjectCacheStats,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.Performance | (int)Keywords.UserMessage,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Engine,
            Message = "  {0}: {1} hits, {2} misses")]
        public abstract void ObjectCacheStats(LoggingContext context, string table, long hits, long misses);
@ -2516,7 +2507,7 @@ If you can't update and need this feature after July 2018 please reach out to th
            (int)SharedLogEventId.EndEngineRun,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Informational,
-            Keywords = (int)Keywords.Diagnostics | (int)Keywords.Performance | (int)Keywords.Progress,
+            Keywords = (int)Keywords.Diagnostics | (int)Keywords.Progress,
            EventTask = (int)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
            Message = EventConstants.PhasePrefix + "Done running engine")]
@ -2552,6 +2543,7 @@ If you can't update and need this feature after July 2018 please reach out to th
            (int)LogEventId.PipTableStats,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
+            // Computing the parameters to log this is a bit expensive (~50ms). So make it diagnostic
            Keywords = (int)Keywords.Diagnostics,
            EventTask = (int)Tasks.Engine,
            Message = "  PipTable created {0} streams occupying {1} bytes, using {2} bytes; {3} entries, {4} entries written (in {7} ms), {5} entries read (in {8} ms), {6} entries alive")]
@ -2869,7 +2861,7 @@ If you can't update and need this feature after July 2018 please reach out to th
            (ushort)LogEventId.ScheduleConstructedWithConfiguration,
            EventGenerators = EventGenerators.LocalAndTelemetry,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance | Keywords.Progress),
+            Keywords = (int)(Keywords.UserMessage | Keywords.Progress),
            EventTask = (int)Tasks.Engine,
            Message = "Schedule constructed. Resolvers involved: [{frontendKinds}].")]
        public abstract void ScheduleConstructedWithConfiguration(LoggingContext context, string frontendKinds);
--- a/Public/Src/Engine/Dll/Tracing/LogEventId.cs
+++ b/Public/Src/Engine/Dll/Tracing/LogEventId.cs
@ -286,21 +286,6 @@ namespace BuildXL.Engine.Tracing
        MountsImpactingBuild = 3214,
        DominoEngineEnd = 3599,

-
-
-
-
-        PerformanceSample = 6303,
-
-
-
-
-
-
-
-
-
-
        // RESERVED TO [2800, 2899] (BuildXL.Engine.dll)

        // Distribution [7000, 7050]
--- a/Public/Src/Engine/Processes/SandboxedProcessFactory.cs
+++ b/Public/Src/Engine/Processes/SandboxedProcessFactory.cs
@ -12,6 +12,7 @@ using BuildXL.Utilities;
 using BuildXL.Utilities.Configuration;
 using BuildXL.Utilities.Instrumentation.Common;
 using BuildXL.Utilities.Tracing;
+using static BuildXL.Tracing.Diagnostics;

 namespace BuildXL.Processes
 {
@ -309,7 +310,10 @@ namespace BuildXL.Processes
        public static void LogSubPhaseDuration(LoggingContext context, Pip pip, SandboxedProcessCounters counter, TimeSpan duration, string extraInfo = "")
        {
            Counters.AddToCounter(counter, duration);
-            Logger.Log.LogPhaseDuration(context, pip.FormattedSemiStableHash, counter.ToString(), duration.ToString(), extraInfo);
+            if (ETWLogger.Log.IsEnabled(EventLevel.Verbose, Keywords.Diagnostics))
+            {
+                Logger.Log.LogPhaseDuration(context, pip.FormattedSemiStableHash, counter.ToString(), duration.ToString(), extraInfo);
+            }
        }
    }
 }
--- a/Public/Src/Engine/Scheduler/Artifacts/FileContentManager.cs
+++ b/Public/Src/Engine/Scheduler/Artifacts/FileContentManager.cs
@ -3390,7 +3390,7 @@ namespace BuildXL.Scheduler.Artifacts
                                Interlocked.Increment(ref m_stats.OutputFilesHashed);
                            }

-                            if (ETWLogger.Log.IsEnabled(BuildXL.Tracing.Diagnostics.EventLevel.Verbose, Keywords.Diagnostics))
+                            if (ETWLogger.Log.IsEnabled(EventLevel.Verbose, Keywords.Diagnostics))
                            {
                                Logger.Log.StorageHashedSourceFile(operationContext, artifactFullPath, fileTrackedHash.Hash.ToHex());
                            }
@ -3784,6 +3784,11 @@ namespace BuildXL.Scheduler.Artifacts

        private void LogOutputOrigin(OperationContext operationContext, long pipSemiStableHash, string path, in FileMaterializationInfo info, PipOutputOrigin origin, string additionalInfo = null)
        {
+            if (origin == PipOutputOrigin.NotMaterialized && !ETWLogger.Log.IsEnabled(EventLevel.Verbose, Keywords.Diagnostics))
+            {
+                return;
+            }
+
            string hashHex = info.Hash.ToHex();
            string pipDescription = Pip.FormatSemiStableHash(pipSemiStableHash);
            var reparseInfo = info.ReparsePointInfo.IsActionableReparsePoint ? info.ReparsePointInfo.ToString() : string.Empty;
--- a/Public/Src/Engine/Scheduler/Caching/PipTwoPhaseCache.cs
+++ b/Public/Src/Engine/Scheduler/Caching/PipTwoPhaseCache.cs
@ -22,6 +22,7 @@ using BuildXL.Utilities.Instrumentation.Common;
 using BuildXL.Utilities.Tasks;
 using BuildXL.Utilities.Tracing;
 using static BuildXL.Utilities.FormattableStringEx;
+using static BuildXL.Tracing.Diagnostics;

 namespace BuildXL.Scheduler.Cache
 {
@ -369,7 +370,8 @@ namespace BuildXL.Scheduler.Cache
        {
            var result = await TwoPhaseFingerprintStore.TryGetCacheEntryAsync(weakFingerprint, pathSetHash, strongFingerprint);

-            if (result.Succeeded)
+            if (result.Succeeded &&
+                ETWLogger.Log.IsEnabled(EventLevel.Verbose, Keywords.Diagnostics))
            {
                Tracing.Logger.Log.PipTwoPhaseCacheGetCacheEntry(
                    LoggingContext,
@ -407,15 +409,19 @@ namespace BuildXL.Scheduler.Cache
            if (result.Succeeded)
            {
                var publishedEntry = result.Result.Status == CacheEntryPublishStatus.Published ? entry : result.Result.ConflictingEntry;
-                Tracing.Logger.Log.PipTwoPhaseCachePublishCacheEntry(
-                    LoggingContext,
-                    pip.GetDescription(Context),
-                    weakFingerprint.ToString(),
-                    pathSetHash.ToString(),
-                    strongFingerprint.ToString(),
-                    entry.MetadataHash.ToString(),
-                    result.Result.Status.ToString(),
-                    publishedEntry.MetadataHash.ToString());
+
+                if (ETWLogger.Log.IsEnabled(EventLevel.Verbose, Keywords.Diagnostics))
+                {
+                    Tracing.Logger.Log.PipTwoPhaseCachePublishCacheEntry(
+                        LoggingContext,
+                        pip.GetDescription(Context),
+                        weakFingerprint.ToString(),
+                        pathSetHash.ToString(),
+                        strongFingerprint.ToString(),
+                        entry.MetadataHash.ToString(),
+                        result.Result.Status.ToString(),
+                        publishedEntry.MetadataHash.ToString());
+                }
            }

            return result;
--- a/Public/Src/Engine/Scheduler/Scheduler.cs
+++ b/Public/Src/Engine/Scheduler/Scheduler.cs
@ -905,6 +905,10 @@ namespace BuildXL.Scheduler
        /// </summary>
        private readonly ConcurrentBigMap<AbsolutePath, IReadOnlyList<DirectoryMemberEntry>> m_alienFileEnumerationCache;

+        /// <summary>
+        /// Whether diagnostics events are enabled to be logged.
+        /// </summary>
+        private readonly bool m_diagnosticsEnabled;
        #endregion

        #region Ready Queue
@ -1415,6 +1419,8 @@ namespace BuildXL.Scheduler
            ReparsePointAccessResolver = new ReparsePointResolver(context, directoryTranslator);

            m_alienFileEnumerationCache = new ConcurrentBigMap<AbsolutePath, IReadOnlyList<DirectoryMemberEntry>>();
+
+            m_diagnosticsEnabled = ETWLogger.Log.IsEnabled(EventLevel.Verbose, Keywords.Diagnostics);
        }

        private static int GetLoggingPeriodInMsForExecution(IConfiguration configuration)
@ -7126,15 +7132,18 @@ namespace BuildXL.Scheduler
                        ? executableVersionedHash.Hash.ToHex()
                        : executablePath;

-                Logger.Log.ProcessStart(
-                    pipLoggingContext,
-                    provenance.Token.Path.ToString(Context.PathTable),
-                    provenance.Token.Line,
-                    provenance.Token.Position,
-                    pip.GetDescription(Context),
-                    provenance.OutputValueSymbol.ToString(Context.SymbolTable),
-                    executablePath,
-                    executableHashStr);
+                if (m_diagnosticsEnabled)
+                {
+                    Logger.Log.ProcessStart(
+                        pipLoggingContext,
+                        provenance.Token.Path.ToString(Context.PathTable),
+                        provenance.Token.Line,
+                        provenance.Token.Position,
+                        runnablePip.Description,
+                        provenance.OutputValueSymbol.ToString(Context.SymbolTable),
+                        executablePath,
+                        executableHashStr);
+                }
            }
            else
            {
@ -7150,7 +7159,7 @@ namespace BuildXL.Scheduler
                        break;
                }

-                if (startEvent != null)
+                if (startEvent != null && m_diagnosticsEnabled)
                {
                    startEvent(
                        pipLoggingContext,
@ -7192,13 +7201,16 @@ namespace BuildXL.Scheduler
                        ? executableVersionedHash.Hash.ToHex()
                        : executablePath;

-                Logger.Log.ProcessEnd(
-                    pipLoggingContext,
-                    pip.GetDescription(Context),
-                    provenance.OutputValueSymbol.ToString(Context.SymbolTable),
-                    (int)status,
-                    ticks,
-                    executableHashStr);
+                if (ETWLogger.Log.IsEnabled(EventLevel.Verbose, Keywords.Diagnostics))
+                {
+                    Logger.Log.ProcessEnd(
+                        pipLoggingContext,
+                        pip.GetDescription(Context),
+                        provenance.OutputValueSymbol.ToString(Context.SymbolTable),
+                        (int)status,
+                        ticks,
+                        executableHashStr);
+                }
            }
            else
            {
@ -7214,7 +7226,7 @@ namespace BuildXL.Scheduler
                        break;
                }

-                if (endEvent != null)
+                if (endEvent != null && m_diagnosticsEnabled)
                {
                    endEvent(
                        pipLoggingContext,
--- a/Public/Src/Engine/Scheduler/Tracing/Log.cs
+++ b/Public/Src/Engine/Scheduler/Tracing/Log.cs
@ -616,7 +616,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.TryBringContentToLocalCache,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.Diagnostics | (int)Keywords.Performance,
+            Keywords = (int)Keywords.Diagnostics,
            EventTask = (ushort)Tasks.Storage,
            Message = "[{pipDescription}] Try bring content to local cache.")]
        internal abstract void ScheduleTryBringContentToLocalCache(LoggingContext loggingContext, string pipDescription);
@ -1060,7 +1060,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.IncrementalBuildSavingsSummary,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Informational,
-            Keywords = (int)(Keywords.Performance | Keywords.UserMessage),
+            Keywords = (int)(Keywords.UserMessage),
            EventTask = (ushort)Tasks.Scheduler,
            Message = EventConstants.PhasePrefix + "Cache savings: {cacheRate:P} of {totalProcesses} included processes. {ignoredProcesses} excluded via filtering.")]
        internal abstract void IncrementalBuildSavingsSummary(LoggingContext loggingContext, double cacheRate, long totalProcesses, long ignoredProcesses);
@ -1069,7 +1069,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.IncrementalBuildSharedCacheSavingsSummary,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Informational,
-            Keywords = (int)(Keywords.Performance | Keywords.UserMessage),
+            Keywords = (int)(Keywords.UserMessage),
            EventTask = (ushort)Tasks.Scheduler,
            Message = EventConstants.PhasePrefix + "Shared cache usage: Downloaded {remoteProcesses} processes [{relativeCacheRate:P} of cache hits] and {contentDownloaded} of outputs.")]
        internal abstract void IncrementalBuildSharedCacheSavingsSummary(LoggingContext loggingContext, double relativeCacheRate, long remoteProcesses, string contentDownloaded);
@ -1078,7 +1078,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.SchedulerDidNotConverge,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Informational,
-            Keywords = (int)(Keywords.Performance | Keywords.UserMessage),
+            Keywords = (int)(Keywords.UserMessage),
            EventTask = (ushort)Tasks.Scheduler,
            Message = "This build did not converge with the remote. Run the cache miss analyzer against the remote build to see why.\r\n\r\n{executionAnalyzerPath} /mode:cacheMiss /xl:[REPACE_WITH_REMOTE_XLG] /xl:{executionLogPath} /o:{outputFilePath}")]
        internal abstract void SchedulerDidNotConverge(LoggingContext loggingContext, string executionLogPath, string executionAnalyzerPath, string outputFilePath);
@ -1087,7 +1087,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.RemoteCacheHitsGreaterThanTotalCacheHits,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Warning,
-            Keywords = (int)(Keywords.Performance | Keywords.UserMessage),
+            Keywords = (int)(Keywords.UserMessage),
            EventTask = (ushort)Tasks.Scheduler,
            Message = EventConstants.PhasePrefix + "Inconsistent cache hit statistics: number of remote cache hits ({remoteHits}) greater than number of total cache hits ({totalHits}).")]
        internal abstract void RemoteCacheHitsGreaterThanTotalCacheHits(LoggingContext loggingContext, long remoteHits, long totalHits);
@ -1096,7 +1096,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.PipsSucceededStats,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.Performance | Keywords.UserMessage),
+            Keywords = (int)(Keywords.UserMessage),
            EventTask = (ushort)Tasks.Scheduler,
            Message = "  Pips successfully executed: {numberOfPips}")]
        internal abstract void PipsSucceededStats(LoggingContext loggingContext, long numberOfPips);
@ -1105,7 +1105,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.PipsFailedStats,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)(Keywords.UserMessage),
            EventTask = (ushort)Tasks.Scheduler,
            Message = "  Pips that failed: {numberOfPips}")]
        internal abstract void PipsFailedStats(LoggingContext loggingContext, long numberOfPips);
@ -1114,7 +1114,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.PipDetailedStats,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)(Keywords.UserMessage),
            EventTask = (ushort)Tasks.Scheduler,
            Message = "  PipStats Type: {pipType}, successful: {success}, failed: {fail}, skipped: {skipped} ignored: {ignored}, total: {total}")]
        internal abstract void PipDetailedStats(LoggingContext loggingContext, string pipType, long success, long fail, long skipped, long ignored, long total);
@ -1123,7 +1123,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.ProcessesCacheMissStats,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)(Keywords.UserMessage),
            EventTask = (ushort)Tasks.Scheduler,
            Message = "  Processes that were launched: {numberOfProcesses}")]
        internal abstract void ProcessesCacheMissStats(LoggingContext loggingContext, long numberOfProcesses);
@ -1132,7 +1132,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.ProcessesCacheHitStats,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)(Keywords.UserMessage),
            EventTask = (ushort)Tasks.Scheduler,
            Message = "  Processes that were skipped due to cache hit: {numberOfProcesses}")]
        internal abstract void ProcessesCacheHitStats(LoggingContext loggingContext, long numberOfProcesses);
@ -1141,7 +1141,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.SourceFileHashingStats,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)(Keywords.UserMessage),
            EventTask = (ushort)Tasks.Scheduler,
            Message = "  Source files: {sourceFilesHashed} changed | {sourceFilesUnchanged} unchanged | {sourceFilesUntracked} untracked | {sourceFilesAbsent} absent")]
        internal abstract void SourceFileHashingStats(LoggingContext loggingContext, long sourceFilesHashed, long sourceFilesUnchanged, long sourceFilesUntracked, long sourceFilesAbsent);
@ -1150,7 +1150,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.OutputFileHashingStats,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)(Keywords.UserMessage),
            EventTask = (ushort)Tasks.Scheduler,
            Message = "  Output files: {outputFilesHashed} changed | {outputFilesUnchanged} unchanged")]
        internal abstract void OutputFileHashingStats(LoggingContext loggingContext, long outputFilesHashed, long outputFilesUnchanged);
@ -1159,7 +1159,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.OutputFileStats,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)(Keywords.UserMessage),
            EventTask = (ushort)Tasks.Scheduler,
            Message = "  Output files: {outputFilesNewlyCreated} produced | {outputFilesDeployed} copied from cache | {outputFilesUpToDate} up-to-date")]
        internal abstract void OutputFileStats(LoggingContext loggingContext, long outputFilesNewlyCreated, long outputFilesDeployed, long outputFilesUpToDate);
@ -1168,7 +1168,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.WarningStats,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)(Keywords.UserMessage),
            EventTask = (ushort)Tasks.Scheduler,
            Message = "  Tool warnings: {pipsWithWarnings} pip runs caused {warnings} warnings | {pipsWithWarningsFromCache} cached pips caused {warningsFromCache} cached warnings")]
        internal abstract void WarningStats(LoggingContext loggingContext, int pipsWithWarnings, long warnings, int pipsWithWarningsFromCache, long warningsFromCache);
@ -1177,7 +1177,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.CacheTransferStats,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)(Keywords.UserMessage),
            EventTask = (ushort)Tasks.Scheduler,
            Message = "  Attempts at bringing content to local cache: {tryBringContentToLocalCacheCounts} | Number of artifacts brought to local cache: {artifactsBroughtToLocalCacheCounts} | Total size of artifacts brought to local cache {totalSizeArtifactsBroughtToLocalCache} Mb")]
        internal abstract void CacheTransferStats(
@ -1425,7 +1425,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.EndAssigningPriorities,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)(Keywords.UserMessage),
            EventTask = (ushort)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
            Message = "-- Done calculating pip priorities")]
@ -1445,7 +1445,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.EndSettingPipStates,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)(Keywords.UserMessage),
            EventTask = (ushort)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
            Message = "-- Done setting pip states")]
@ -1541,7 +1541,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.ProcessStart,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.Diagnostics | Keywords.Performance),
+            Keywords = (int)(Keywords.Diagnostics),
            EventTask = (ushort)Tasks.PipExecutor,
            EventOpcode = (byte)EventOpcode.Start,
            Message = PipStartMessage)]
@ -1559,7 +1559,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.ProcessEnd,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.Diagnostics | Keywords.Performance),
+            Keywords = (int)(Keywords.Diagnostics),
            EventTask = (ushort)Tasks.PipExecutor,
            EventOpcode = (byte)EventOpcode.Stop,
            Message = PipEndMessage)]
@ -1575,7 +1575,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.CopyFileStart,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.Diagnostics | Keywords.Performance),
+            Keywords = (int)(Keywords.Diagnostics),
            EventTask = (ushort)Tasks.PipExecutor,
            EventOpcode = (byte)EventOpcode.Start,
            Message = PipStartMessage)]
@ -1591,7 +1591,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.CopyFileEnd,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.Diagnostics | Keywords.Performance),
+            Keywords = (int)(Keywords.Diagnostics),
            EventTask = (ushort)Tasks.PipExecutor,
            EventOpcode = (byte)EventOpcode.Stop,
            Message = PipEndMessage)]
@ -1601,7 +1601,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.WriteFileStart,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.Diagnostics | Keywords.Performance),
+            Keywords = (int)(Keywords.Diagnostics),
            EventTask = (ushort)Tasks.PipExecutor,
            EventOpcode = (byte)EventOpcode.Start,
            Message = PipStartMessage)]
@ -1617,7 +1617,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.WriteFileEnd,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.Diagnostics | Keywords.Performance),
+            Keywords = (int)(Keywords.Diagnostics),
            EventTask = (ushort)Tasks.PipExecutor,
            EventOpcode = (byte)EventOpcode.Stop,
            Message = PipEndMessage)]
@ -1735,15 +1735,6 @@ namespace BuildXL.Scheduler.Tracing
            string pipDescription,
            string pipValueId);

-        [GeneratedEvent(
-            (int)LogEventId.StorageCacheGetContentUsingFallback,
-            EventGenerators = EventGenerators.LocalOnly,
-            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.Diagnostics,
-            EventTask = (int)Tasks.Storage,
-            Message = "Placing content {0}: Trying ingress of fallback path '{1}' since content not in cache.")]
-        public abstract void StorageCacheGetContentUsingFallback(LoggingContext context, string contentHash, string fallbackPath);
-
        #endregion

        #region Status updating
@ -1874,7 +1865,7 @@ namespace BuildXL.Scheduler.Tracing
             (int)LogEventId.DependencyViolationDoubleWrite,
             EventGenerators = EventGenerators.LocalOnly,
             EventLevel = Level.Verbose,
-             Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+             Keywords = (int)Keywords.UserMessage,
             EventTask = (int)Tasks.Scheduler,
             Message =
                 PipDependencyAnalysisPrefix +
@ -1891,7 +1882,7 @@ namespace BuildXL.Scheduler.Tracing
             (int)LogEventId.AllowedSameContentDoubleWrite,
             EventGenerators = EventGenerators.LocalOnly,
             EventLevel = Level.Verbose,
-             Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+             Keywords = (int)Keywords.UserMessage,
             EventTask = (int)Tasks.Scheduler,
             Message =
                 PipDependencyAnalysisPrefix +
@ -1908,7 +1899,7 @@ namespace BuildXL.Scheduler.Tracing
             (int)LogEventId.AllowedRewriteOnUndeclaredFile,
             EventGenerators = EventGenerators.LocalOnly,
             EventLevel = Level.Verbose,
-             Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+             Keywords = (int)Keywords.UserMessage,
             EventTask = (int)Tasks.Scheduler,
             Message =
                 "Pip {1} wrote to the undeclared file '{2}'. However, the configured policy allows for it and the rewrite is safe.")]
@ -1931,7 +1922,7 @@ namespace BuildXL.Scheduler.Tracing
             (int)LogEventId.DisallowedRewriteOnUndeclaredFile,
             EventGenerators = EventGenerators.LocalOnly,
             EventLevel = Level.Verbose,
-             Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+             Keywords = (int)Keywords.UserMessage,
             EventTask = (int)Tasks.Scheduler,
             Message = PipDependencyAnalysisPrefix +
                 "Rewrite on the undeclared file '{2}' was disallowed. {3}")]
@ -1946,7 +1937,7 @@ namespace BuildXL.Scheduler.Tracing
            (int)LogEventId.DependencyViolationReadRace,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Scheduler,
            Message =
                PipSpecDependencyAnalysisPrefix +
@ -1966,7 +1957,7 @@ namespace BuildXL.Scheduler.Tracing
            (int)LogEventId.DependencyViolationUndeclaredOrderedRead,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Scheduler,
            Message =
                PipSpecDependencyAnalysisPrefix +
@ -1987,7 +1978,7 @@ namespace BuildXL.Scheduler.Tracing
            (int)LogEventId.DependencyViolationMissingSourceDependencyWithValueSuggestion,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Scheduler,
            Message =
                PipDependencyAnalysisPrefix +
@ -2005,7 +1996,7 @@ namespace BuildXL.Scheduler.Tracing
            (int)LogEventId.DependencyViolationMissingSourceDependency,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Scheduler,
            Message =
                PipDependencyAnalysisPrefix +
@ -2022,7 +2013,7 @@ namespace BuildXL.Scheduler.Tracing
            (int)LogEventId.DependencyViolationUndeclaredReadCycle,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Scheduler,
            Message =
                PipDependencyAnalysisPrefix +
@ -2039,7 +2030,7 @@ namespace BuildXL.Scheduler.Tracing
            (int)LogEventId.DependencyViolationReadUndeclaredOutput,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Scheduler,
            Message =
                PipDependencyAnalysisPrefix +
@ -2059,7 +2050,7 @@ namespace BuildXL.Scheduler.Tracing
            (int)LogEventId.DependencyViolationWriteInSourceSealDirectory,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Scheduler,
            Message =
                PipDependencyAnalysisPrefix +
@ -2078,7 +2069,7 @@ namespace BuildXL.Scheduler.Tracing
           (int)LogEventId.DependencyViolationWriteInExclusiveOpaqueDirectory,
           EventGenerators = EventGenerators.LocalOnly,
           EventLevel = Level.Verbose,
-           Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+           Keywords = (int)Keywords.UserMessage,
           EventTask = (int)Tasks.Scheduler,
           Message =
               PipDependencyAnalysisPrefix +
@ -2097,7 +2088,7 @@ namespace BuildXL.Scheduler.Tracing
            (int)LogEventId.DependencyViolationWriteInUndeclaredSourceRead,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Scheduler,
            Message =
                PipDependencyAnalysisPrefix +
@ -2116,7 +2107,7 @@ namespace BuildXL.Scheduler.Tracing
            (int)LogEventId.DependencyViolationWriteOnExistingFile,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Scheduler,
            Message =
                PipDependencyAnalysisPrefix +
@ -2134,7 +2125,7 @@ namespace BuildXL.Scheduler.Tracing
            (int)LogEventId.DependencyViolationWriteOnAbsentPathProbe,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Scheduler,
            Message =
                PipDependencyAnalysisPrefix +
@ -2157,7 +2148,7 @@ namespace BuildXL.Scheduler.Tracing
            (int)LogEventId.DependencyViolationAbsentPathProbeInsideUndeclaredOpaqueDirectory,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Scheduler,
            Message =
                PipDependencyAnalysisPrefix +
@ -2173,7 +2164,7 @@ namespace BuildXL.Scheduler.Tracing
            (int)LogEventId.AbsentPathProbeInsideUndeclaredOpaqueDirectory,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Scheduler,
            Message =
                "[{1}]" +
@ -2189,7 +2180,7 @@ namespace BuildXL.Scheduler.Tracing
            (int)LogEventId.DependencyViolationGenericWithRelatedPip,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Scheduler,
            Message =
                PipDependencyAnalysisPrefix +
@ -2207,7 +2198,7 @@ namespace BuildXL.Scheduler.Tracing
            (int)LogEventId.DependencyViolationGeneric,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Scheduler,
            Message =
                PipDependencyAnalysisPrefix +
@ -2224,7 +2215,7 @@ namespace BuildXL.Scheduler.Tracing
            (int)LogEventId.DependencyViolationUndeclaredOutput,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Scheduler,
            Message =
                PipDependencyAnalysisPrefix +
@ -2240,7 +2231,7 @@ namespace BuildXL.Scheduler.Tracing
            (int)LogEventId.DependencyViolationSharedOpaqueWriteInTempDirectory,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Scheduler,
            Message =
                PipDependencyAnalysisPrefix +
@ -2260,7 +2251,7 @@ namespace BuildXL.Scheduler.Tracing
            (ushort)LogEventId.DependencyViolationTheSameTempFileProducedByIndependentPips,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.UserMessage | (int)Keywords.DependencyAnalysis,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Scheduler,
            Message =
                PipDependencyAnalysisPrefix +
@ -2325,7 +2316,7 @@ namespace BuildXL.Scheduler.Tracing
            (int)LogEventId.HistoricPerfDataStats,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.Performance | (int)Keywords.UserMessage,
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (int)Tasks.Scheduler,
            Message = "  HistoricPerfData: {0} hits | {1} misses | {2} added | {3} updated | {4}% average relative process runtime deviation where critical path suggestions were available")]
        public abstract void HistoricPerfDataStats(LoggingContext context, long hits, long misses, long added, long updated, int averageRuntimeDeviation);
@ -2605,7 +2596,7 @@ namespace BuildXL.Scheduler.Tracing
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Scheduler,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance | Keywords.Progress),
+            Keywords = (int)(Keywords.UserMessage | Keywords.Progress),
            Message = EventConstants.PhasePrefix + "USN journal statistics for scheduler: {message}")]
        public abstract void JournalProcessingStatisticsForScheduler(LoggingContext context, string message);

@ -2614,7 +2605,7 @@ namespace BuildXL.Scheduler.Tracing
            EventGenerators = EventGenerators.TelemetryOnly | Generators.Statistics,
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Scheduler,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance | Keywords.Progress),
+            Keywords = (int)(Keywords.UserMessage | Keywords.Progress),
            Message = "USN journal statistics for scheduler")]
        public abstract void JournalProcessingStatisticsForSchedulerTelemetry(LoggingContext context, string scanningJournalStatus, IDictionary<string, long> stats);

@ -2695,7 +2686,7 @@ namespace BuildXL.Scheduler.Tracing
            EventGenerators = EventGenerators.LocalAndTelemetry,
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Scheduler,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)(Keywords.UserMessage),
            Message = "Reading dirty node state file '{path}': Status: {status} | Reason: {reason} | Elapsed time: {elapsedMs}ms")]
        public abstract void IncrementalSchedulingReadDirtyNodeState(LoggingContext context, string path, string status, string reason, long elapsedMs);

@ -2776,7 +2767,7 @@ namespace BuildXL.Scheduler.Tracing
            EventGenerators = EventGenerators.LocalAndTelemetry,
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Scheduler,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)(Keywords.UserMessage),
            Message = "Loading incremental scheduling state at '{path}': Status: {status} | Reason: {reason} | Elapsed time: {elapsedMs}ms")]
        public abstract void IncrementalSchedulingLoadState(LoggingContext context, string path, string status, string reason, long elapsedMs);

@ -2785,7 +2776,7 @@ namespace BuildXL.Scheduler.Tracing
            EventGenerators = EventGenerators.LocalAndTelemetry,
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Scheduler,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)(Keywords.UserMessage),
            Message = "Attempt to reuse existing incremental scheduling state from engine state: {reason} | Engine state id (if reuseable): {engineStateIdIfReusable}")]
        public abstract void IncrementalSchedulingReuseState(LoggingContext context, string reason, string engineStateIdIfReusable);

@ -2794,7 +2785,7 @@ namespace BuildXL.Scheduler.Tracing
            EventGenerators = EventGenerators.LocalAndTelemetry,
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Scheduler,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)(Keywords.UserMessage),
            Message = "Saving incremental scheduling state at '{path}': Status: {status} | Reason: {reason} | Elapsed time: {elapsedMs}ms")]
        public abstract void IncrementalSchedulingSaveState(LoggingContext context, string path, string status, string reason, long elapsedMs);

@ -2803,7 +2794,7 @@ namespace BuildXL.Scheduler.Tracing
            EventGenerators = EventGenerators.LocalAndTelemetry,
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Scheduler,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)(Keywords.UserMessage),
            Message = "Processing graph change to update incremental scheduling state: Loaded graph id: {loadedGraphId} | New graph id: {newGraphId} | Elapsed time: {elapsedMs}ms")]
        public abstract void IncrementalSchedulingProcessGraphChange(LoggingContext context, string loadedGraphId, string newGraphId, long elapsedMs);

--- a/Public/Src/FrontEnd/Core/Tracing/Log.cs
+++ b/Public/Src/FrontEnd/Core/Tracing/Log.cs
@ -46,7 +46,7 @@ namespace BuildXL.FrontEnd.Core.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance | Keywords.Progress))]
+            Keywords = (int)(Keywords.UserMessage | Keywords.Progress))]
        public abstract void FrontEndLoadConfigPhaseComplete(LoggingContext context, LoadConfigurationStatistics statistics);

        [GeneratedEvent(
@ -67,7 +67,7 @@ namespace BuildXL.FrontEnd.Core.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Engine,
            EventOpcode = (byte)EventOpcode.Stop,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance | Keywords.Progress))]
+            Keywords = (int)(Keywords.UserMessage | Keywords.Progress))]
        public abstract void FrontEndInitializeResolversPhaseComplete(LoggingContext context, InitializeResolversStatistics statistics);

        [GeneratedEvent(
@ -434,7 +434,7 @@ namespace BuildXL.FrontEnd.Core.Tracing
            (ushort)LogEventId.EndDownloadingTool,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)(Keywords.UserMessage),
            EventTask = (ushort)Tasks.Parser,
            EventOpcode = (byte)EventOpcode.Stop,
            Message = "-- Done downloading tool '{toolName}'.")]
@ -573,7 +573,7 @@ namespace BuildXL.FrontEnd.Core.Tracing
            (ushort)LogEventId.StartRetrievingPackage,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.Diagnostics | Keywords.Performance),
+            Keywords = (int)(Keywords.Diagnostics),
            EventTask = (ushort)Tasks.Parser,
            EventOpcode = (byte)EventOpcode.Start,
            Message = "-- Checking if package '{friendlyPackageName}' is cached or needs to be downloaded from '{targetLocation}'")]
@ -583,7 +583,7 @@ namespace BuildXL.FrontEnd.Core.Tracing
            (ushort)LogEventId.EndRetrievingPackage,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.Diagnostics | Keywords.Performance),
+            Keywords = (int)(Keywords.Diagnostics),
            EventTask = (ushort)Tasks.Parser,
            EventOpcode = (byte)EventOpcode.Stop,
            Message = "-- Done retrieving package {friendlyPackageName}.")]
@ -938,7 +938,7 @@ namespace BuildXL.FrontEnd.Core.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Parser,
            Message = "  cycle detection: {0} threads created, {1} chains added, {2} removed before processing, {3} abandoned while processing, {4} removed after processing.",
-            Keywords = (int)Keywords.Performance | (int)Keywords.UserMessage)]
+            Keywords = (int)Keywords.UserMessage)]
        public abstract void CycleDetectionStatistics(LoggingContext context, long threadsCreated, long chainsAdded, long chainsRemovedBeforeProcessing, long chainsAbandonedWhileProcessing, long chainsRemovedAfterProcessing);

        [GeneratedEvent(
--- a/Public/Src/FrontEnd/Download/Tracing/Log.cs
+++ b/Public/Src/FrontEnd/Download/Tracing/Log.cs
@ -95,7 +95,7 @@ namespace BuildXL.FrontEnd.Download.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Parser,
            Message = "[Download.{0}] contexts: {1} trees, {2} contexts.",
-            Keywords = (int)Keywords.Performance | (int)Keywords.UserMessage)]
+            Keywords = (int)Keywords.UserMessage)]
        public abstract void ContextStatistics(LoggingContext context, string name, long contextTrees, long contexts);

        [GeneratedEvent(
--- a/Public/Src/FrontEnd/Nuget/Tracing/Log.cs
+++ b/Public/Src/FrontEnd/Nuget/Tracing/Log.cs
@ -210,7 +210,7 @@ namespace BuildXL.FrontEnd.Nuget.Tracing
            EventTask = (ushort)Tasks.Parser,
            Message = "Nuget statistics: from disk: {packagesFromDisk}, from cache: {packagesFromCache}, from the remote: {packagesDownloaded}, " +
                      "failed: {packagesFailed}. Total elapsed milliseconds: {totalMilliseconds}. Degree of parallelism: {dop}.",
-            Keywords = (int)Keywords.Performance | (int)Keywords.UserMessage)]
+            Keywords = (int)Keywords.UserMessage)]
        public abstract void NugetStatistics(LoggingContext context, long packagesFromDisk, long packagesFromCache, long packagesDownloaded, long packagesFailed, long totalMilliseconds, int dop);

        [GeneratedEvent(
--- a/Public/Src/FrontEnd/Script/Tracing/LogEvaluationEvents.cs
+++ b/Public/Src/FrontEnd/Script/Tracing/LogEvaluationEvents.cs
@ -619,7 +619,7 @@ namespace BuildXL.FrontEnd.Script.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Parser,
            Message = "  [DScript.{0}] array evaluation: {1} empty, {2} evaluations, {3} constructed as evaluated arrays.",
-            Keywords = (int)Keywords.Performance | (int)Keywords.UserMessage)]
+            Keywords = (int)Keywords.UserMessage)]
        public abstract void ArrayEvaluationStatistics(LoggingContext context, string name, long empty, long evaluations, long evaluatedArrays);

        [GeneratedEvent(
@ -628,7 +628,7 @@ namespace BuildXL.FrontEnd.Script.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Parser,
            Message = "  [DScript.{name}] glob: total time {totalGlobTimeInMs} ms.",
-            Keywords = (int)Keywords.Performance | (int)Keywords.UserMessage)]
+            Keywords = (int)Keywords.UserMessage)]
        public abstract void GlobStatistics(LoggingContext context, string name, long totalGlobTimeInMs);

        [GeneratedEvent(
@ -637,7 +637,7 @@ namespace BuildXL.FrontEnd.Script.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Parser,
            Message = "  [DScript.{name}] [{duration} ms] {methodName} was called {numberOfCalls} times.",
-            Keywords = (int)Keywords.Performance | (int)Keywords.UserMessage)]
+            Keywords = (int)Keywords.UserMessage)]
        public abstract void MethodInvocationCountStatistics(LoggingContext context, string name, string methodName, long numberOfCalls, string duration);

        [GeneratedEvent(
@ -646,7 +646,7 @@ namespace BuildXL.FrontEnd.Script.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.Parser,
            Message = "  [DScript.{0}] contexts: {1} trees, {2} contexts.",
-            Keywords = (int)Keywords.Performance | (int)Keywords.UserMessage)]
+            Keywords = (int)Keywords.UserMessage)]
        public abstract void ContextStatistics(LoggingContext context, string name, long contextTrees, long contexts);

        [GeneratedEvent(
--- a/Public/Src/Tools/ServicePipDaemon/BuildXLBasedCloudBuildLogger.cs
+++ b/Public/Src/Tools/ServicePipDaemon/BuildXLBasedCloudBuildLogger.cs
@ -41,8 +41,7 @@ namespace Tool.ServicePipDaemon

        private void LogDropEventLocally(DropOperationBaseEvent e)
        {
-            var enabled = ETWLogger.Log.IsEnabled(EventLevel.Verbose, Keywords.CloudBuild) ? "ENABLED" : "DISABLED";
-            m_localLogger.Info("Logging {0}Event(dropUrl: {1}, succeeded: {2}): {3}", e.Kind, e.DropUrl, e.Succeeded, enabled);
+            m_localLogger.Info("Logging {0}Event(dropUrl: {1}, succeeded: {2})", e.Kind, e.DropUrl, e.Succeeded);
        }
    }
 }
--- a/Public/Src/Utilities/Instrumentation/Common/Keywords.cs
+++ b/Public/Src/Utilities/Instrumentation/Common/Keywords.cs
@ -12,11 +12,6 @@ namespace BuildXL.Utilities.Instrumentation.Common
    [SuppressMessage("Microsoft.Design", "CA1034:NestedTypesShouldNotBeVisible", Justification = "Needed by event infrastructure.")]
    public static class Keywords
    {
-        /// <summary>
-        /// Added to events that log performance data (GC stats, parsing stats, object sizes)
-        /// </summary>
-        public const EventKeywords Performance = (EventKeywords)(1 << 29);
-
        /// <summary>
        /// Added to Level=Verbose events that may need to be optionally enabled for additional diagnostics but are
        /// generally disabled. The BuildXL host application has command lines to optionally enable events with this
@ -24,11 +19,6 @@ namespace BuildXL.Utilities.Instrumentation.Common
        /// </summary>
        public const EventKeywords Diagnostics = (EventKeywords)(1 << 28);

-        /// <summary>
-        /// Events that are sent to CloudBuild listener
-        /// </summary>
-        public const EventKeywords CloudBuild = (EventKeywords)(1 << 27);
-
        /// <summary>
        /// Indicates an event that will be interpreted by the BuildXL listeners.
        /// </summary>
@ -39,11 +29,6 @@ namespace BuildXL.Utilities.Instrumentation.Common
        /// </summary>
        public const EventKeywords Progress = (EventKeywords)(1 << 1);

-        /// <summary>
-        /// Events related to analysis of file monitoring violations.
-        /// </summary>
-        public const EventKeywords DependencyAnalysis = (EventKeywords)(1 << 2);
-
        /// <summary>
        /// Events that are only shown as temporary status on the console. They may be overwritten by future events
        /// if supported by the console
--- a/Public/Src/Utilities/Instrumentation/Tracing/Log.cs
+++ b/Public/Src/Utilities/Instrumentation/Tracing/Log.cs
@ -105,7 +105,7 @@ namespace BuildXL.Tracing
            (ushort)LogEventId.Memory,
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Informational,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)Keywords.UserMessage,
            EventTask = (ushort)Tasks.Engine,
            Message = "Managed memory: {0} MB, private bytes: {1} MB, threads: {2}")]
        public abstract void Memory(LoggingContext context, long managedHeapMegabytes, long privateMemorySizeMegabytes, int threads);
@ -257,83 +257,6 @@ namespace BuildXL.Tracing
            Message = "{logKind} {message}",
            Keywords = (int)Keywords.ExternalEtwOnly)]
        public abstract void TextLogEtwOnly(LoggingContext context, string sessionId, string logKind, int sequenceNumber, int eventNumber, string eventLabel, string message);
-
-        #region CloudBuildEvents
-        private const string CloudBuildMessageVersion = " v{cbEvent.Version}";
-        private const string CloudBuildMessageVersionTargetId = " v{cbEvent.Version} Id:{cbEvent.TargetId}";
-
-        [GeneratedEvent(
-            (ushort)LogEventId.DominoInvocationEvent,
-            EventGenerators = EventGenerators.LocalOnly,
-            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.CloudBuild | Keywords.UserMessage),
-            Message = "{ShortProductName}InvocationEvent" + CloudBuildMessageVersion)]
-        public abstract void DominoInvocationEvent(LoggingContext context, DominoInvocationEvent cbEvent);
-
-        [GeneratedEvent(
-            (ushort)LogEventId.DominoCompletedEvent,
-            EventGenerators = EventGenerators.LocalOnly,
-            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.CloudBuild | Keywords.UserMessage),
-            Message = "{ShortProductName}CompletedEvent" + CloudBuildMessageVersion)]
-        public abstract void DominoCompletedEvent(LoggingContext context, DominoCompletedEvent cbEvent);
-
-        [GeneratedEvent(
-            (ushort)LogEventId.DominoContinuousStatisticsEvent,
-            EventGenerators = EventGenerators.LocalOnly,
-            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.CloudBuild | Keywords.UserMessage),
-            Message = "{ShortProductName}ContinuousStatisticsEvent" + CloudBuildMessageVersion)]
-        public abstract void DominoContinuousStatisticsEvent(LoggingContext context, DominoContinuousStatisticsEvent cbEvent);
-
-        [GeneratedEvent(
-            (ushort)LogEventId.TargetAddedEvent,
-            EventGenerators = EventGenerators.LocalOnly,
-            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.CloudBuild | Keywords.UserMessage),
-            Message = "TargetAddedEvent" + CloudBuildMessageVersionTargetId + " Name:{cbEvent.TargetName}")]
-        public abstract void TargetAddedEvent(LoggingContext context, TargetAddedEvent cbEvent);
-
-        [GeneratedEvent(
-            (ushort)LogEventId.TargetRunningEvent,
-            EventGenerators = EventGenerators.LocalOnly,
-            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.CloudBuild | Keywords.UserMessage),
-            Message = "TargetRunningEvent" + CloudBuildMessageVersionTargetId)]
-        public abstract void TargetRunningEvent(LoggingContext context, TargetRunningEvent cbEvent);
-
-        [GeneratedEvent(
-            (ushort)LogEventId.TargetFailedEvent,
-            EventGenerators = EventGenerators.LocalOnly,
-            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.CloudBuild | Keywords.UserMessage),
-            Message = "TargetFailedEvent" + CloudBuildMessageVersionTargetId)]
-        public abstract void TargetFailedEvent(LoggingContext context, TargetFailedEvent cbEvent);
-
-        [GeneratedEvent(
-            (ushort)LogEventId.TargetFinishedEvent,
-            EventGenerators = EventGenerators.LocalOnly,
-            EventLevel = Level.Verbose,
-            Keywords = (int)(Keywords.CloudBuild | Keywords.UserMessage),
-            Message = "TargetFinishedEvent" + CloudBuildMessageVersionTargetId)]
-        public abstract void TargetFinishedEvent(LoggingContext context, TargetFinishedEvent cbEvent);
-
-        [GeneratedEvent(
-            (ushort)LogEventId.DropCreationEvent,
-            EventGenerators = EventGenerators.LocalOnly,
-            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.CloudBuild,
-            Message = "'drop create': {cbEvent.ErrorMessage} {cbEvent.AdditionalInformation}")]
-        public abstract void DropCreationEvent(LoggingContext context, DropCreationEvent cbEvent);
-
-        [GeneratedEvent(
-            (ushort)LogEventId.DropFinalizationEvent,
-            EventGenerators = EventGenerators.LocalOnly,
-            EventLevel = Level.Verbose,
-            Keywords = (int)Keywords.CloudBuild,
-            Message = "'drop finalize': {cbEvent.ErrorMessage} {cbEvent.AdditionalInformation}")]
-        public abstract void DropFinalizationEvent(LoggingContext context, DropFinalizationEvent cbEvent);
-        #endregion
    }

    /// <summary>
--- a/Public/Src/Utilities/Storage/Tracing/Log.cs
+++ b/Public/Src/Utilities/Storage/Tracing/Log.cs
@ -70,7 +70,7 @@ namespace BuildXL.Storage.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.ChangeDetection,
            EventOpcode = (byte)EventOpcode.Stop,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance | Keywords.Progress),
+            Keywords = (int)(Keywords.UserMessage | Keywords.Progress),
            Message = EventConstants.PhasePrefix + "Done saving change tracking set")]
        public abstract void EndSavingChangeTracker(LoggingContext context);

@ -79,7 +79,7 @@ namespace BuildXL.Storage.Tracing
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.ChangeDetection,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)Keywords.UserMessage,
            Message = "Saving change tracking set: Path: {path} | Token: {token} | State: {state} | Tracked volume count: {trackedVolumeCount} | Elapsed time: {durationMs}ms")]
        public abstract void SavingChangeTracker(LoggingContext context, string path, string token, string state, int trackedVolumeCount, long durationMs);

@ -259,7 +259,7 @@ namespace BuildXL.Storage.Tracing
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.ChangeDetection,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)Keywords.UserMessage,
            Message = "Anti dependency validation: Verified to be absent: {0} | Failed to retrack as non-existent: {1} | Failed to probe: {2} | Elapsed time: {3}ms")]
        public abstract void AntiDependencyValidationStats(LoggingContext context, int numOfVerifiedToBeAbsent, int numOfFailedToRetrackAsNonExistent, int numOfFailedToProbe, long elapsedMs);

@ -295,7 +295,7 @@ namespace BuildXL.Storage.Tracing
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.ChangeDetection,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)Keywords.UserMessage,
            Message = "Enumeration dependency validation: Unchanged: {0} | Failed to retrack: {1} | Failed to open and enumerate: {2} | Elapsed time: {3}ms")]
        public abstract void EnumerationDependencyValidationStats(LoggingContext context, int numOfUnchanges, int numOfFailedToRetrack, int numOfFailedToOpenAndEnumerate, long elapsedMs);

@ -349,7 +349,7 @@ namespace BuildXL.Storage.Tracing
            EventGenerators = EventGenerators.LocalOnly,
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.ChangeDetection,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)Keywords.UserMessage,
            Message = "Hard link validation: Unchanged: {0} | File id changes: {1} | Failed to retrack: {2} | Non-existent: {3} | Failed to open: {4} | Elapsed time: {5}ms")]
        public abstract void HardLinkValidationStats(LoggingContext context, int numOfUnchanges, int numOfFileIdChanges, int numOfFailedToRetrack, int numOfNonExistent, int numOfFailedToOpenAndTrack, long elapsedMs);

@ -620,7 +620,7 @@ namespace BuildXL.Storage.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.ChangeDetection,
            EventOpcode = (byte)EventOpcode.Stop,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance | Keywords.Progress),
+            Keywords = (int)(Keywords.UserMessage | Keywords.Progress),
            Message = EventConstants.PhasePrefix + "Done loading previous change tracking set")]
        public abstract void EndLoadingChangeTracker(LoggingContext context);

@ -629,7 +629,7 @@ namespace BuildXL.Storage.Tracing
            EventGenerators = EventGenerators.LocalAndTelemetry,
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.ChangeDetection,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)Keywords.UserMessage,
            Message = "Loading previous change tracking set: Path: {path} |  Token: {token} | Status: {status} | Reason: {reason} | Tracked volume count: {trackedVolumeCount} | Tracked journal size: {trackedJournalSizeByte} bytes| Elapsed time: {durationMs}ms")]
        public abstract void LoadingChangeTracker(LoggingContext context, string path, string token, string status, string reason, int trackedVolumeCount, long trackedJournalSizeByte, long durationMs);

@ -657,7 +657,7 @@ namespace BuildXL.Storage.Tracing
            EventGenerators = EventGenerators.LocalAndTelemetry,
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.ChangeDetection,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance),
+            Keywords = (int)Keywords.UserMessage,
            Message = "Scanning journal: Token: {token} | Status: {status} | Elapsed time: {durationMs}ms")]
        public abstract void ScanningJournal(LoggingContext context, string token, string status, long durationMs);

@ -667,7 +667,7 @@ namespace BuildXL.Storage.Tracing
            EventLevel = Level.Verbose,
            EventTask = (ushort)Tasks.ChangeDetection,
            EventOpcode = (byte)EventOpcode.Stop,
-            Keywords = (int)(Keywords.UserMessage | Keywords.Performance | Keywords.Progress),
+            Keywords = (int)(Keywords.UserMessage | Keywords.Progress),
            Message = EventConstants.PhasePrefix + "Done scanning USN journal")]
        public abstract void EndScanningJournal(LoggingContext context);

--- a/Public/Src/Utilities/UnitTests/Utilities/EventTests.cs
+++ b/Public/Src/Utilities/UnitTests/Utilities/EventTests.cs
@ -135,8 +135,7 @@ namespace Test.BuildXL.Utilities
                    // We exclude pip-provenance and phase events for now because for some reason they define GUIDs that never actually
                    // get logged (which is probably not a valid thing to do on an EventSource).
                    if (!l.LastEvent.Message.StartsWith(EventConstants.ProvenancePrefix, StringComparison.Ordinal)
-                        && !l.LastEvent.Message.StartsWith(EventConstants.PhasePrefix, StringComparison.Ordinal)
-                        && !l.LastEvent.Keywords.HasFlag(Keywords.Performance))
+                        && !l.LastEvent.Message.StartsWith(EventConstants.PhasePrefix, StringComparison.Ordinal))
                    {
                        for (int i = 0; i < payload.Length; i++)
                        {