Fixes a bug in .NET 6.0 preview (and possibly all preview releases) w… (

#61) * Fixes a bug in .NET 6.0 preview (and possibly all preview releases) where the runtime version cannot be determined. * Let's try running the tests in .NET 6.0 in github.. * Fucking tabs.. * Need to include prerelease
djluck · Aug 31, 2021 · 747138a · 747138a
1 parent 13ae303
commit 747138a
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 15 deletions.
diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
@@ -17,6 +17,11 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 5.0.x
+    - name: Setup .NET Core 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     - uses: actions/checkout@v1
     # This test constantly passes localy (windows + linux) but fails in the test environment. Don't have the time/ inclination to figure out why this is right now..
     - run: dotnet test -c "Debug" --filter Name!=When_blocking_work_is_executed_on_the_thread_pool_then_thread_pool_delays_are_measured
diff --git a/src/prometheus-net.DotNetRuntime.Tests/EventListening/TestHelpers.cs b/src/prometheus-net.DotNetRuntime.Tests/EventListening/TestHelpers.cs
@@ -12,18 +12,30 @@ public class TestHelpers
     {
         public static EventWrittenEventArgs CreateEventWrittenEventArgs(int eventId, DateTime? timestamp = null, params object[] payload)
         {
-            var args = (EventWrittenEventArgs)typeof(EventWrittenEventArgs).CreateInstance(new []{ typeof(EventSource)}, Flags.NonPublic | Flags.Instance, new object[] { null});
-            args.SetPropertyValue("EventId", eventId);
+            EventWrittenEventArgs args;
+            var bindFlags = Flags.NonPublic | Flags.Instance;
+
+            // In .NET 6.0, they changed the signature of these constructors- handle this annoyance
+            if (typeof(EventWrittenEventArgs).GetConstructors(bindFlags).Any(x => x.GetParameters().Length == 1))
+            {
+                args = (EventWrittenEventArgs)typeof(EventWrittenEventArgs).CreateInstance(new[] { typeof(EventSource)}, Flags.NonPublic | Flags.Instance, new object[] { null });
+                args.SetPropertyValue("EventId", eventId);
+            }
+            else
+            {
+                args = (EventWrittenEventArgs)typeof(EventWrittenEventArgs).CreateInstance(new[] { typeof(EventSource), typeof(int) }, Flags.NonPublic | Flags.Instance, new object[] { null, eventId });
+            }
+
             args.SetPropertyValue("Payload", new ReadOnlyCollection<object>(payload));
 
             if (timestamp.HasValue)
             {
                 args.SetPropertyValue("TimeStamp", timestamp.Value);
             }
-            
+
             return args;
         }
-        
+
         public static EventWrittenEventArgs CreateCounterEventWrittenEventArgs(params (string key, object val)[] payload)
         {
             var counterPayload = payload.ToDictionary(k => k.key, v => v.val);
@@ -41,14 +53,11 @@ public static EventAssertion<T> ArrangeEventAssertion<T>(Action<Action<T>> wireU
         public class EventAssertion<T>
         {
             private Action<T> _handler;
-            
+
             public EventAssertion(Action<Action<T>> wireUp)
             {
-                _handler = e =>
-                {
-                    History.Add(e);
-                };
-
+                _handler = e => { History.Add(e); };
+
                 wireUp(_handler);
             }
 

diff --git a/src/prometheus-net.DotNetRuntime.Tests/prometheus-net.DotNetRuntime.Tests.csproj b/src/prometheus-net.DotNetRuntime.Tests/prometheus-net.DotNetRuntime.Tests.csproj
@@ -2,11 +2,12 @@
     <Import Project="../Common.csproj" />
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
         <RootNamespace>Prometheus.DotNetRuntime.Tests</RootNamespace>
         <Platforms>AnyCPU</Platforms>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <LangVersion>10</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/prometheus-net.DotNetRuntime/EventListening/EventParserTypes.cs b/src/prometheus-net.DotNetRuntime/EventListening/EventParserTypes.cs
@@ -87,8 +87,16 @@ internal static IEnumerable<Type> GetEventParsers(Assembly fromAssembly)
         internal static Lazy<Version> CurrentRuntimeVerison = new Lazy<Version>(() =>
         {
             var split = RuntimeInformation.FrameworkDescription.Split(' ');
-
-            if (Version.TryParse(split[split.Length - 1], out var version))
+            if (split.Length < 2)
+                return null;
+
+            var versionPart = split[^1];
+            // Handle preview version strings, e.g. .NET 6.0.0-preview.7.21377.19. 
+            var hyphenIndex = versionPart.IndexOf('-');
+            if (hyphenIndex > -1)
+                versionPart = versionPart.Substring(0, hyphenIndex);
+
+            if (Version.TryParse(versionPart, out var version))
                 return new Version(version.Major, version.Minor);
 
             return null;

diff --git a/src/prometheus-net.DotNetRuntime/ListenerRegistration.cs b/src/prometheus-net.DotNetRuntime/ListenerRegistration.cs
@@ -26,10 +26,8 @@ public static ListenerRegistration Create<T>(CaptureLevel level, Func<IServicePr
             if (!supportedLevels.Contains(eventLevel))
                 throw new UnsupportedEventParserLevelException(typeof(T), level, supportedLevels);
 
-
             if (!EventParserTypes.AreEventsSupportedByRuntime(typeof(T)))
                 throw new UnsupportedEventParserRuntimeException(typeof(T));
-
 
             return new ListenerRegistration(eventLevel, typeof(T), sp => (object)factory(sp));
         }