-
Notifications
You must be signed in to change notification settings - Fork 84
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Restore assembly redirection for .NET Framework (#2479)
- Loading branch information
Showing
5 changed files
with
135 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
test/IntegrationTests/AssemblyRedirectionOnNetFrameworkTests.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // <copyright file="AssemblyRedirectionOnNetFrameworkTests.cs" company="OpenTelemetry Authors"> | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // </copyright> | ||
|
|
||
| #if NETFRAMEWORK | ||
| using FluentAssertions; | ||
| using IntegrationTests.Helpers; | ||
| using Xunit.Abstractions; | ||
|
|
||
| namespace IntegrationTests; | ||
|
|
||
| public class AssemblyRedirectionOnNetFrameworkTests : TestHelper | ||
| { | ||
| public AssemblyRedirectionOnNetFrameworkTests(ITestOutputHelper output) | ||
| : base("AssemblyRedirection.NetFramework", output) | ||
| { | ||
| } | ||
|
|
||
| [Fact] | ||
| public void SubmitsTraces() | ||
| { | ||
| using var collector = new MockSpansCollector(Output); | ||
| SetExporter(collector); | ||
|
|
||
| const string TestApplicationActivitySource = "AssemblyRedirection.NetFramework.ActivitySource"; | ||
| SetEnvironmentVariable("OTEL_DOTNET_AUTO_TRACES_ADDITIONAL_SOURCES", TestApplicationActivitySource); | ||
| collector.Expect(TestApplicationActivitySource); | ||
|
|
||
| RunTestApplication(); | ||
|
|
||
| collector.AssertExpectations(); | ||
| } | ||
| } | ||
| #endif |
27 changes: 27 additions & 0 deletions
27
...est-applications/integrations/TestApplication.AssemblyRedirection.NetFramework/Program.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| using System.Diagnostics; | ||
| using System.Reflection; | ||
|
|
||
| using var activitySource = new ActivitySource("AssemblyRedirection.NetFramework.ActivitySource"); | ||
| using var activity = activitySource.StartActivity("AssemblyRedirection.Activity"); | ||
|
|
||
| Console.WriteLine($"Running {Assembly.GetExecutingAssembly()?.Location}"); | ||
|
|
||
| var loadedAssemblyNames = new HashSet<string>(); | ||
| var hasMultipleInstancesOfSingleAssembly = false; | ||
| var assemblies = AppDomain.CurrentDomain.GetAssemblies(); | ||
| Array.Sort<Assembly>(assemblies, (l, r) => l.FullName?.CompareTo(r.FullName) ?? -1); | ||
| Console.WriteLine("Loaded assemblies:"); | ||
| foreach (var assembly in assemblies) | ||
| { | ||
| var location = assembly.IsDynamic ? "<dynamic>" : assembly.Location; | ||
| Console.WriteLine($" + {assembly.FullName}\n\t{location} "); | ||
| var assemblyName = assembly.GetName()?.Name ?? string.Empty; | ||
| if (!string.IsNullOrWhiteSpace(assemblyName) && !loadedAssemblyNames.Add(assemblyName)) | ||
| { | ||
| hasMultipleInstancesOfSingleAssembly = true; | ||
| Console.WriteLine($"\n * WARNING: {assemblyName} loaded more than once.\n"); | ||
| } | ||
| } | ||
|
|
||
| Console.WriteLine(); | ||
| return hasMultipleInstancesOfSingleAssembly ? -1 : 0; |
12 changes: 12 additions & 0 deletions
12
....AssemblyRedirection.NetFramework/TestApplication.AssemblyRedirection.NetFramework.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <!-- In order to test assembly redirection this project will force the use of specific versions --> | ||
| <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally> | ||
| <TargetFramework>net462</TargetFramework> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <!-- WARNING: Keep this version of System.Diagnostics.DiagnosticSource to ensure the test is validating the actual scenario. --> | ||
| <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" /> | ||
| </ItemGroup> | ||
| </Project> |