Add provider to ProcessExit

Author: TheAngryByrd

Expecto.Tests/Expecto.Tests.fsproj

@@ -4,16 +4,17 @@
     <AssemblyName>Expecto.Tests</AssemblyName>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
+    <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Prelude.fs" />
+    <Compile Include="OpenTelemetry.fs" />
     <Compile Include="Tests.fs" />
     <Compile Include="SummaryTests.fs" />
     <Compile Include="FocusedTests.fs" />
     <Compile Include="FsCheckTests.fs" />
     <Compile Include="PerformanceTests.fs" />
     <Compile Include="Bug341.fs" />
-    <Compile Include="OpenTelemetry.fs" />
     <Compile Include="Main.fs" />
     <None Include="paket.references" />
     <ProjectReference Include="..\Expecto.Hopac\Expecto.Hopac.fsproj" />

Expecto.Tests/OpenTelemetry.fs

@@ -160,8 +160,6 @@ module OpenTelemetry =
           handleFailure span e
       )
 
-
-
   let addOpenTelemetry_SpanPerTest (config: ExpectoConfig) (activitySource: ActivitySource) (rootTest: Test) : Test =
     rootTest
     |> Test.toTestCodeList
@@ -172,8 +170,3 @@ module OpenTelemetry =
     )
     |> Test.fromFlatTests config.joinWith.asString
 
-
-  let addOpenTelemetry_SpanPerTest_WithProvider (config: ExpectoConfig) (activitySource: ActivitySource) (providerFactory : unit -> #IDisposable) (rootTest: Test) : Test =
-    let provider = providerFactory()
-    AppDomain.CurrentDomain.ProcessExit.Add(fun _ -> provider.Dispose())
-    addOpenTelemetry_SpanPerTest config activitySource rootTest

Expecto.Tests/Tests.fs

@@ -10,6 +10,31 @@ open Expecto
 open Expecto.Impl
 open Expecto.Logging
 open System.Globalization
+open OpenTelemetry.Resources
+open OpenTelemetry.Trace
+open System.Diagnostics
+open OpenTelemetry
+
+let serviceName = "Expecto.Tests"
+
+let source = new ActivitySource(serviceName)
+
+let resourceBuilder () =
+    ResourceBuilder
+        .CreateDefault()
+        .AddService(serviceName = serviceName)
+
+let traceProvider () =
+  Sdk
+      .CreateTracerProviderBuilder()
+      .AddSource(serviceName)
+      .SetResourceBuilder(resourceBuilder ())
+      .AddOtlpExporter()
+      .Build()
+do
+    let provider = traceProvider()
+    AppDomain.CurrentDomain.ProcessExit.Add(fun _ -> provider.Dispose())
+
 
 module Dummy =
 
@@ -1830,6 +1855,7 @@ let cancel =
     )
   ]
 
+
 [<Tests>]
 let theory =
   testList "theory testing" [
@@ -1857,24 +1883,8 @@ let theory =
       }
     ]
   ]
+  |> addOpenTelemetry_SpanPerTest ExpectoConfig.defaultConfig source
 
-open OpenTelemetry.Resources
-open OpenTelemetry.Trace
-
-let serviceName = "Expecto.Tests"
-
-let resourceBuilder () =
-    ResourceBuilder
-        .CreateDefault()
-        .AddService(serviceName = serviceName)
-
-let traceProvider () =
-  Sdk
-      .CreateTracerProviderBuilder()
-      .AddSource(serviceName)
-      .SetResourceBuilder(resourceBuilder ())
-      .AddOtlpExporter()
-      .Build()
 
 
 [<Tests>]
@@ -1889,6 +1899,5 @@ let fixtures =
         }
     ]
 
-  let source = new ActivitySource(serviceName)
   testList "MyTests" tests
-  |> addOpenTelemetry_SpanPerTest_WithProvider ExpectoConfig.defaultConfig (source) (fun () -> traceProvider ())
+  |> addOpenTelemetry_SpanPerTest ExpectoConfig.defaultConfig source

Expecto.Tests/paket.references

@@ -1,2 +1,4 @@
 FsCheck
-OpenTelemetry.Exporter.OpenTelemetryProtocol
+OpenTelemetry.Exporter.OpenTelemetryProtocol
+YoloDev.Expecto.TestSdk
+Microsoft.NET.Test.Sdk