Skip to content

Enable OpenTelemetry for Desktop target in xUnit tests #18233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 15, 2025
Merged

Enable OpenTelemetry for Desktop target in xUnit tests #18233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
531588c
enable otel for desktop target
majocha Jan 13, 2025
0041777
make sure it does not break things
majocha Jan 13, 2025
6201839
Merge branch 'main' into tests-otel-2
majocha Jan 13, 2025
1066960
Merge branch 'main' into tests-otel-2
majocha Jan 14, 2025
579f882
Merge branch 'main' into tests-otel-2
majocha Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions tests/FSharp.Test.Utilities/CompilerAssert.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ module AssemblyResolver =
match found() with
| None -> Unchecked.defaultof<Assembly>
| Some name -> Assembly.Load(name) )

do addResolver()
#endif

type ExecutionOutcome =
Expand Down
2 changes: 1 addition & 1 deletion tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<None Include="ScriptingShims.fsx" />
<Compile Include="TestConsole.fs" />
<Compile Include="TestFramework.fs" />
<Compile Include="XunitHelpers.fs" />
<Compile Include="ILChecker.fs" />
<Compile Include="Utilities.fs" />
<Compile Include="CompilerAssert.fs" />
Expand All @@ -46,6 +45,7 @@
<Compile Include="FileInlineDataAttribute.fs" />
<Compile Include="ReflectionHelper.fs" />
<Compile Include="SurfaceArea.fs" />
<Compile Include="XunitHelpers.fs" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 7 additions & 5 deletions tests/FSharp.Test.Utilities/XunitHelpers.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ type FSharpXunitFramework(sink: IMessageSink) =
// This gets executed once per test assembly.
MessageSink.sinkWriter |> ignore
TestConsole.install()
#if !NETCOREAPP
AssemblyResolver.addResolver ()
#endif

interface IDisposable with
member _.Dispose() =
Expand Down Expand Up @@ -148,24 +151,23 @@ type FSharpXunitFramework(sink: IMessageSink) =
log "FSharpXunitFramework with XUNIT_EXTRAS installing TestConsole redirection"
TestConsole.install()

// TODO: Currently does not work with Desktop .NET Framework. Upcoming OpenTelemetry 1.11.0 may change it.
#if NETCOREAPP
#if !NETCOREAPP
AssemblyResolver.addResolver ()
#endif

let traceProvider =
Sdk.CreateTracerProviderBuilder()
.AddSource(ActivityNames.FscSourceName)
.SetResourceBuilder(
ResourceBuilder.CreateDefault().AddService(serviceName="F#", serviceVersion = "1.0.0"))
.AddOtlpExporter()
.Build()
#endif

interface IDisposable with
member _.Dispose() =
cleanUpTemporaryDirectoryOfThisTestRun ()
#if NETCOREAPP
traceProvider.ForceFlush() |> ignore
traceProvider.Dispose()
#endif
base.Dispose()

override this.CreateDiscoverer (assemblyInfo) =
Expand Down
Loading