Merge pull request #199 from cqse/ts/44454_fix_locking_dlls

TS-44454 Fix locking DLLs, revert TS-31191

Author: stahlbauer

CHANGELOG.md

@@ -6,6 +6,7 @@ Please prefix each entry with one of:
 - [documentation]
 
 # Next Release
+- [fix] Removed feature to upload coverage to multiple Teamscale projects via embedded resources, as it unexpectedly locked DLL files
 
 # v25.08.0
 - [feature] Removed `--config-from-env` option from the Upload Daemon: now it defaults to the `COR_PROFILER_CONFIG` environment variable
@@ -21,7 +22,7 @@ Please prefix each entry with one of:
 
 # v24.2.0
 - [fix] Log message when trace directory is not writable
-- [feature] Added support to upload coverage to multiple Teamscale projects with different revisions. 
+- [feature] Added support to upload coverage to multiple Teamscale projects with different revisions.
 
 # v23.6.0
 - [feature] Support for uploading to artifactory with the Teamscale default artifact storage schema.

Profiler/Profiler.vcxproj

@@ -22,7 +22,7 @@
     <ProjectGuid>{CC51C2F0-D0F2-41D9-B1D2-5108C1D3B8E6}</ProjectGuid>
     <RootNamespace>Profiler</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

TeamscaleEmbeddedResourceUpdater/README.md

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   <system.net>
     <!-- By default, the upload daemon uses the system proxy settings.
@@ -24,8 +24,8 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
       </dependentAssembly>
 		<dependentAssembly>
 			<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -50,12 +50,12 @@
       While this should usually not be necessary, in edge cases this may allow us to process amounts of
       coverage that could otherwise not be merged.
     -->
-    <gcAllowVeryLargeObjects enabled="true" />
+    <gcAllowVeryLargeObjects enabled="true"/>
     <!--
       Allow using SSLv3. Some people run really old stacks that don't support
       any modern protocols and .NET in newer versions disables SSLv3
       c.f. https://docs.microsoft.com/en-us/dotnet/framework/migration-guide/mitigation-tls-protocols
     -->
-    <AppContextSwitchOverrides value="Switch.System.Net.DontEnableSchUseStrongCrypto=true" />
+    <AppContextSwitchOverrides value="Switch.System.Net.DontEnableSchUseStrongCrypto=true"/>
   </runtime>
 </configuration>

TeamscaleEmbeddedResourceUpdater/TeamscaleResourceUpdate.ps1

@@ -1,8 +1,8 @@
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
+using System.Collections.Generic;
+using System;
 using System.Text.RegularExpressions;
+using System.Linq;
 using UploadDaemon.SymbolAnalysis;
 
 namespace UploadDaemon.Configuration
@@ -182,6 +182,13 @@ public IEnumerable<string> Validate()
                         @" without the file extension) to read the program version from in order to upload method coverage." +
                         @" Alternatively, you can configure line coverage upload (properties ""pdbDirectory"" and ""revisionFile"").";
                 }
+                if (PdbDirectory != null && RevisionFile == null)
+                {
+                    yield return $"Invalid configuration for process {ProcessPath}." +
+                        @" You provided a path to PDB files but no revision file (property ""revisionFile"")." +
+                        @" This file must contain the ID of the commit in your VCS from which the profiled code" +
+                        @" was built (e.g. for TFS: the changeset number, for Git: the SHA1) in the format `revision: COMMIT_ID`.";
+                }
             }
         }
 
@@ -283,6 +290,7 @@ public static Config ReadConfigFile(string configFilePath)
                 throw new InvalidConfigException($"{e.Message}: The uploader will only watch for trace files in the targetdir" +
                     $" directories configured in {configFilePath}");
             }
+
         }
 
         /// <summary>
@@ -313,6 +321,7 @@ private static bool SectionApplies(ConfigParser.ProcessSection section, string p
                 MatchesLoadedAssemblyPathRegex(section, traceFile),
             };
 
+
             // The section applies if at least one of the check criteria is set (!= null) and all of these are true.
             return checks.Where(check => check != null).All(check => check == true);
         }

UploadDaemon/App.config

@@ -43,24 +43,6 @@ public string Url
         /// </summary>
         public string Message { get; set; } = "Test coverage for version %v from %p created at %t";
 
-        public TeamscaleServer(string targetProject, TeamscaleServer other)
-        {
-            Url = other.Url;
-            Project = targetProject;
-            Partition = other.Partition;
-            Username = other.Username;
-            AccessKey = other.AccessKey;
-            Message = other.Message;
-        }
-
-        /// <summary>
-        /// Needed only for automatic creation via yaml file.
-        /// </summary>
-        public TeamscaleServer()
-        {
-            // intentionally left blank.
-        }
-
         public override string ToString()
         {
             return $"Teamscale {Url} project {Project} with user {Username}, partition {Partition}";
@@ -76,6 +58,10 @@ public IEnumerable<string> Validate()
             {
                 yield return @"You must provide a valid URL to connect to Teamscale";
             }
+            if (Project == null)
+            {
+                yield return @"You must provide a project into which the coverage will be uploaded";
+            }
             if (Username == null)
             {
                 yield return @"You must provide a username to connect to Teamscale";

UploadDaemon/Configuration/Config.cs

@@ -2,10 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Resources;
 using System.Text.RegularExpressions;
-using static UploadDaemon.SymbolAnalysis.RevisionFileUtils;
 
 namespace UploadDaemon.SymbolAnalysis
 {
@@ -36,16 +33,6 @@ public class ParsedTraceFile
         private static readonly Regex AssemblyLineRegex = new Regex(@"^Assembly=(?<name>[^:]+):(?<id>\d+).*?(?: Path:(?<path>.*))?$");
         private static readonly Regex CoverageLineRegex = new Regex(@"^(?:Inlined|Jitted)=(\d+):(?:\d+:)?(\d+)");
 
-        /// <summary>
-        /// The name of the Resource .resx file that holed information about embedded upload targets.
-        /// </summary>
-        private const String TeamscaleResourceName = "Teamscale";
-
-        /// <summary>
-        /// The uploads targets (revision/timestamp and optionally teamscale project) that are retrieved from resource files that are embedded into assemblies referenced in the trace file.
-        /// </summary>
-        public readonly List<(string project, RevisionOrTimestamp revisionOrTimestamp)> embeddedUploadTargets = new List<(string project, RevisionOrTimestamp revisionOrTimestamp)>();
-
         public ParsedTraceFile(string[] lines, string filePath)
         {
             this.FilePath = filePath;
@@ -57,7 +44,7 @@ public ParsedTraceFile(string[] lines, string filePath)
                     match => (name: match.Groups["name"].Value, path: match.Groups["path"].Value)
                 );
             this.LoadedAssemblies = assemblyTokens.Values.ToList();
-            SearchForEmbeddedUploadTargets();
+
             IEnumerable<Match> coverageMatches = lines.Select(line => CoverageLineRegex.Match(line))
                             .Where(match => match.Success);
             foreach (Match match in coverageMatches)
@@ -72,88 +59,5 @@ public ParsedTraceFile(string[] lines, string filePath)
                 CoveredMethods.Add((assembly.name, Convert.ToUInt32(match.Groups[2].Value)));
             }
         }
-
-        /// <summary>
-        /// Checks the loaded assemblies for resources that contain information about target revision or teamscale projects.
-        /// </summary>
-        private void SearchForEmbeddedUploadTargets()
-        {
-            foreach ((_, string path) in this.LoadedAssemblies)
-            {
-                Assembly assembly = LoadAssemblyFromPath(path);
-                if (assembly == null || assembly.DefinedTypes == null)
-                {
-                    continue;
-                }
-                TypeInfo teamscaleResourceType = assembly.DefinedTypes.FirstOrDefault(x => x.Name == TeamscaleResourceName) ?? null;
-                if (teamscaleResourceType == null)
-                {
-                    continue;
-                }
-                logger.Info("Found embedded Teamscale resource in {assembly} that can be used to identify upload targets.", assembly);
-                ResourceManager teamscaleResourceManager = new ResourceManager(teamscaleResourceType.FullName, assembly);
-                string embeddedTeamscaleProject = teamscaleResourceManager.GetString("Project");
-                string embeddedRevision = teamscaleResourceManager.GetString("Revision");
-                string embeddedTimestamp = teamscaleResourceManager.GetString("Timestamp");
-                AddUploadTarget(embeddedRevision, embeddedTimestamp, embeddedTeamscaleProject, embeddedUploadTargets, assembly.FullName);
-            }
-        }
-
-        /// <summary>
-        /// Adds a revision or timestamp and optionally a project to the list of upload targets. This method checks if both, revision and timestamp, are declared, or neither.
-        /// </summary>
-        /// <param name="revision"></param>
-        /// <param name="timestamp"></param>
-        /// <param name="project"></param>
-        /// <param name="uploadTargets"></param>
-        /// <param name="origin"></param>
-        public static void AddUploadTarget(string revision, string timestamp, string project, List<(string project, RevisionOrTimestamp revisionOrTimestamp)> uploadTargets, string origin)
-        {
-            Logger logger = LogManager.GetCurrentClassLogger();
-
-            if (revision == null && timestamp == null)
-            {
-                logger.Error("Not all required fields in {origin}. Please specify either 'Revision' or 'Timestamp'", origin);
-                return;
-            }
-            if (revision != null && timestamp != null)
-            {
-                logger.Error("'Revision' and 'Timestamp' are both set in {origin}. Please set only one, not both.", origin);
-                return;
-            }
-            if (revision != null)
-            {
-                uploadTargets.Add((project, new RevisionOrTimestamp(revision, true)));
-            }
-            else
-            {
-                uploadTargets.Add((project, new RevisionOrTimestamp(timestamp, false)));
-            }
-        }
-
-        private Assembly LoadAssemblyFromPath(string path)
-        {
-            if (String.IsNullOrEmpty(path))
-            {
-                return null;
-            }
-            Assembly assembly;
-            try
-            {
-                assembly = Assembly.LoadFrom(path);
-                // Check that defined types can actually be loaded
-                if (assembly == null)
-                {
-                    return null;
-                }
-                IEnumerable<TypeInfo> ignored = assembly.DefinedTypes;
-            }
-            catch (Exception e)
-            {
-                logger.Debug("Could not load {assembly}. Skipping upload resource discovery. {e}", path, e);
-                return null;
-            }
-            return assembly;
-        }
     }
-}
+}

UploadDaemon/Configuration/TeamscaleServer.cs

@@ -16,12 +16,6 @@ public class RevisionFileUtils
         /// </summary>
         public class RevisionOrTimestamp
         {
-            public RevisionOrTimestamp(string value, bool isRevision)
-            {
-                this.Value = value;
-                this.IsRevision = isRevision;
-            }
-
             /// <summary>
             /// The timestamp or revision.
             /// </summary>
@@ -72,15 +66,23 @@ public static RevisionOrTimestamp Parse(string[] revisionFileLines, string fileP
                     " found neither a timestamp nor a revision entry." +
                     " Examples: 'timestamp: 1234567890' or 'revision: 123456'");
             }
-            (string type, string value) = matches.First();
 
+            (string type, string value) = matches.First();
             switch (type.ToLower())
             {
                 case "timestamp":
-                    return new RevisionOrTimestamp(value, false);
+                    return new RevisionOrTimestamp
+                    {
+                        Value = value,
+                        IsRevision = false,
+                    };
 
                 case "revision":
-                    return new RevisionOrTimestamp(value, true);
+                    return new RevisionOrTimestamp
+                    {
+                        Value = value,
+                        IsRevision = true,
+                    };
 
                 default:
                     throw new InvalidRevisionFileException($"The revision file {filePath} is not valid:" +