Use an environment variable TEAMCITY_PROCESS_FLOW_ID as a root flow id

JetBrains · Sep 18, 2021 · 477425b · 477425b
1 parent 0047b48
commit 477425b
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 10 deletions.
diff --git a/IntegrationTests/Dual.Tests/Dual.Tests.csproj b/IntegrationTests/Dual.Tests/Dual.Tests.csproj
@@ -13,7 +13,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.25" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.27" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/IntegrationTests/MS.Tests/MS.Tests.csproj b/IntegrationTests/MS.Tests/MS.Tests.csproj
@@ -8,7 +8,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
     <PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.26" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.27" />
   </ItemGroup>
 
 </Project>
diff --git a/IntegrationTests/XUnit.Tests/XUnit.Tests.csproj b/IntegrationTests/XUnit.Tests/XUnit.Tests.csproj
@@ -11,7 +11,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.26" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.27" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/DevTeam.Tests/DevTeam.Tests.csproj b/Samples/DevTeam.Tests/DevTeam.Tests.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="DevTeam.TestAdapter" Version="1.0.9-beta" />
     <PackageReference Include="DevTeam.TestFramework" Version="1.0.9-beta" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.26" />    
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.27" />    
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/MS.Tests/MS.Tests.csproj b/Samples/MS.Tests/MS.Tests.csproj
@@ -8,7 +8,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
     <PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.26" />    
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.27" />    
   </ItemGroup>
 
   <ItemGroup>

diff --git a/TeamCity.VSTest.TestLogger.Tests/TeamCity.VSTest.TestLogger.Tests.csproj b/TeamCity.VSTest.TestLogger.Tests/TeamCity.VSTest.TestLogger.Tests.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="Shouldly" Version="4.0.3" />
     <PackageReference Include="TeamCity.ServiceMessages" Version="3.0.13" />

diff --git a/TeamCity.VSTest.TestLogger/FlowIdGenerator.cs b/TeamCity.VSTest.TestLogger/FlowIdGenerator.cs
@@ -7,10 +7,29 @@ namespace TeamCity.VSTest.TestLogger
     internal class FlowIdGenerator : IFlowIdGenerator
     {
         private readonly IIdGenerator _idGenerator;
+        private readonly IOptions _options;
+        private bool _isFirst = true;
 
-        public FlowIdGenerator(IIdGenerator idGenerator) =>
+        public FlowIdGenerator(IIdGenerator idGenerator, IOptions options)
+        {
             _idGenerator = idGenerator ?? throw new ArgumentNullException(nameof(idGenerator));
+            _options = options;
+        }
 
-        public string NewFlowId() => _idGenerator.NewId();
+        public string NewFlowId()
+        {
+            // ReSharper disable once InvertIf
+            if (_isFirst)
+            {
+                _isFirst = false;
+                var flowId = _options.RootFlowId;
+                if (!string.IsNullOrEmpty(flowId))
+                {
+                    return flowId;
+                }
+            }
+
+            return _idGenerator.NewId();
+        }
     }
 }
diff --git a/TeamCity.VSTest.TestLogger/ServiceLocatorNet35.cs b/TeamCity.VSTest.TestLogger/ServiceLocatorNet35.cs
@@ -14,7 +14,7 @@ public IMessageHandler CreateMessageHandler()
 
             var teamCityWriter = new TeamCityServiceMessages(
                 new ServiceMessageFormatter(),
-                new FlowIdGenerator(idGenerator),
+                new FlowIdGenerator(idGenerator, this),
                 new IServiceMessageUpdater[] {new TimestampUpdater(() => DateTime.Now)}).CreateWriter(Console.WriteLine);
 
             return new MessageHandler(

diff --git a/build.proj b/build.proj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <PackageVersion Condition=" '$(PackageVersion)' == '' ">1.0.26</PackageVersion>
+        <PackageVersion Condition=" '$(PackageVersion)' == '' ">1.0.27</PackageVersion>
         <Build_Number Condition=" '$(Build_Number)' == '' ">0</Build_Number>
         <Version>$(PackageVersion).$(Build_Number)</Version>
     </PropertyGroup>