Skip to content

Commit aea0ada

Browse files
stevejgordonstevejgordon
committed
Fixes for ASP.NET (Framework) tests
1 parent 5bda20a commit aea0ada

File tree

9 files changed

+137
-275
lines changed

9 files changed

+137
-275
lines changed

‎Directory.Packages.props‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<PackageVersion Include="Elastic.CommonSchema.BenchmarkDotNetExporter" Version="1.5.0" />
2323
<PackageVersion Include="Elasticsearch.Net" Version="7.17.5" />
2424
<PackageVersion Include="Elasticsearch.Net.VirtualizedCluster" Version="7.6.1" />
25-
<PackageVersion Include="EntityFramework" Version="6.3.0" PrivateAssets="All" />
25+
<PackageVersion Include="EntityFramework" Version="6.5.1" PrivateAssets="All" />
2626
<PackageVersion Include="Fake.Core.Environment" Version="6.0.0" />
2727
<PackageVersion Include="Fake.Core.SemVer" Version="6.0.0" />
2828
<PackageVersion Include="Fake.DotNet.MsBuild" Version="6.0.0" />
@@ -38,6 +38,9 @@
3838
<PackageVersion Include="Grpc.Tools" Version="2.62.0" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
3939
<PackageVersion Include="JetBrains.Profiler.Api" Version="1.4.0" />
4040
<PackageVersion Include="JunitXml.TestLogger" Version="4.1.0" PrivateAssets="All" />
41+
<PackageVersion Include="Microsoft.Owin" Version="4.2.2" />
42+
<PackageVersion Include="Microsoft.Owin.Security.Cookies" Version="4.2.2" />
43+
<PackageVersion Include="Microsoft.Web.Infrastructure" Version="2.0.0" />
4144
<PackageVersion Include="MongoDB.Driver" Version="2.28.0" />
4245
<PackageVersion Include="MongoDB.Driver.Core" Version="2.28.0" />
4346
<PackageVersion Include="Moq" Version="4.20.72" />
@@ -63,6 +66,7 @@
6366
<PackageVersion Include="SpecFlow.xUnit" Version="3.5.5" />
6467
<PackageVersion Include="StackExchange.Redis" Version="2.7.20" />
6568
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
69+
<PackageVersion Include="System.Memory" Version="4.6.0" />
6670
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
6771
<PackageVersion Include="Testcontainers.Elasticsearch" Version="4.0.0" />
6872
<PackageVersion Include="Testcontainers.Kafka" Version="4.0.0" />
@@ -73,18 +77,19 @@
7377
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.0.0" />
7478
<PackageVersion Include="Testcontainers.RabbitMq" Version="4.0.0" />
7579
<PackageVersion Include="Testcontainers.Redis" Version="4.0.0" />
80+
<PackageVersion Include="WebGrease" Version="1.6.0" />
7681
<PackageVersion Include="YamlDotNet" Version="11.2.1" />
7782
<PackageVersion Include="xunit" Version="2.9.2" />
7883
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
7984
</ItemGroup>
8085
<!-- Microsoft/System packages -->
8186
<ItemGroup>
82-
<PackageVersion Include="Microsoft.AspNet.Identity.EntityFramework" Version="2.2.3" />
87+
<PackageVersion Include="Microsoft.AspNet.Identity.EntityFramework" Version="2.2.4" />
8388
<PackageVersion Include="Microsoft.AspNet.Identity.Owin" Version="2.2.4" />
84-
<PackageVersion Include="Microsoft.AspNet.Mvc" Version="5.2.4" />
85-
<PackageVersion Include="Microsoft.AspNet.TelemetryCorrelation" Version="1.0.7" />
89+
<PackageVersion Include="Microsoft.AspNet.Mvc" Version="5.3.0" />
90+
<PackageVersion Include="Microsoft.AspNet.TelemetryCorrelation" Version="1.0.8" />
8691
<PackageVersion Include="Microsoft.AspNet.Web.Optimization" Version="1.1.3" />
87-
<PackageVersion Include="Microsoft.AspNet.WebApi" Version="5.2.4" />
92+
<PackageVersion Include="Microsoft.AspNet.WebApi" Version="5.3.0" />
8893
<PackageVersion Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.1" />
8994
<PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.1.34" />
9095
<PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
@@ -119,7 +124,7 @@
119124
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
120125
<PackageVersion Include="Microsoft.NET.Sdk.Functions" Version="4.6.0" />
121126
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
122-
<PackageVersion Include="Microsoft.Owin.Host.SystemWeb" Version="4.1.1" />
127+
<PackageVersion Include="Microsoft.Owin.Host.SystemWeb" Version="4.2.2" />
123128
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
124129
<PackageVersion Include="Microsoft.Web.Administration" Version="11.1.0" />
125130
<PackageVersion Include="MicrosoftAspNetCore.Http" Version="2.1.22" />

‎src/Elastic.Apm/Report/Serialization/MetricSetConverter.cs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public override void Write(Utf8JsonWriter writer, MetricSet value, JsonSerialize
1919
writer.WriteStartObject();
2020
if (value.Transaction != null)
2121
{
22-
2322
writer.WritePropertyName("transaction");
2423

2524
writer.WriteStartObject();
@@ -35,21 +34,22 @@ public override void Write(Utf8JsonWriter writer, MetricSet value, JsonSerialize
3534

3635
if (value.Span != null)
3736
{
38-
3937
writer.WritePropertyName("span");
4038

4139
writer.WriteStartObject();
4240

4341
writer.WritePropertyName("type");
4442
writer.WriteStringValue(value.Span.Type);
4543

46-
writer.WritePropertyName("subtype");
47-
writer.WriteStringValue(value.Span.SubType);
44+
if (value.Span.SubType is not null)
45+
{
46+
writer.WritePropertyName("subtype");
47+
writer.WriteStringValue(value.Span.SubType);
48+
}
4849

4950
writer.WriteEndObject();
5051
}
5152

52-
5353
writer.WritePropertyName("samples");
5454
writer.WriteStartObject();
5555

@@ -128,6 +128,5 @@ public override MetricSet Read(ref Utf8JsonReader reader, Type typeToConvert, Js
128128

129129
return new MetricSet(timestamp, samples);
130130
}
131-
132131
}
133132
}

‎src/integrations/Elastic.Apm.AspNetFullFramework/ElasticApmModule.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,14 +212,14 @@ private void RestoreContextIfNeeded(HttpContextBase context)
212212
if (Agent.Instance == null)
213213
{
214214
_logger.Trace()?
215-
.Log("Agent.Instance is null during {RequestNotification}. url: {{UrlPath}}",
215+
.Log("Agent.Instance is null during {RequestNotification}. url: {UrlPath}",
216216
$"{nameof(OnExecuteRequestStep)}:{EventName()}", urlPath);
217217
return;
218218
}
219219
if (Agent.Instance.Tracer == null)
220220
{
221221
_logger.Trace()?
222-
.Log("Agent.Instance.Tracer is null during {RequestNotification}. url: {{UrlPath}}",
222+
.Log("Agent.Instance.Tracer is null during {RequestNotification}. url: {UrlPath}",
223223
$"{nameof(OnExecuteRequestStep)}:{EventName()}", urlPath);
224224
return;
225225
}
@@ -235,10 +235,10 @@ private void RestoreContextIfNeeded(HttpContextBase context)
235235
var spanInApplicationInstance = context.Items[HttpContextCurrentExecutionSegmentsContainer.CurrentSpanKey] is not null;
236236

237237
_logger.Trace()?
238-
.Log($"{nameof(ITracer.CurrentTransaction)} is null during {{RequestNotification}}. url: {{UrlPath}}"
238+
.Log("{nameof(ITracer.CurrentTransaction)} is null during {RequestNotification}. url: {UrlPath}"
239239
+ "(HttpContext.Current Span: {HttpContextCurrentHasSpan}, Transaction: {HttpContextCurrenHasTransaction})"
240240
+ "(ApplicationContext Span: {ApplicationContextHasSpan}, Transaction: {ApplicationContextHasTransaction})",
241-
$"{nameof(OnExecuteRequestStep)}:{EventName()}", urlPath, spanInCurrent, transactionInCurrent, spanInApplicationInstance, transactionInApplicationInstance
241+
nameof(ITracer.CurrentTransaction), $"{nameof(OnExecuteRequestStep)}:{EventName()}", urlPath, spanInCurrent, transactionInCurrent, spanInApplicationInstance, transactionInApplicationInstance
242242
);
243243

244244
if (HttpContext.Current == null)

‎test/iis/AspNetFullFrameworkSampleApp/Areas/MyArea/Web.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</configSections>
1010

1111
<system.web.webPages.razor>
12-
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
12+
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
1313
<pages pageBaseType="System.Web.Mvc.WebViewPage">
1414
<namespaces>
1515
<add namespace="System.Web.Mvc" />
@@ -36,7 +36,7 @@
3636
<system.web>
3737
<compilation>
3838
<assemblies>
39-
<add assembly="System.Web.Mvc, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
39+
<add assembly="System.Web.Mvc, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
4040
</assemblies>
4141
</compilation>
4242
</system.web>

‎test/iis/AspNetFullFrameworkSampleApp/AspNetFullFrameworkSampleApp.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<MSBuildWarningsAsMessages>MSB4011</MSBuildWarningsAsMessages>
1616
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1717
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
18+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1819
</PropertyGroup>
1920

2021
<!-- prevents NU1503 -->
@@ -40,8 +41,8 @@
4041
<OutputType>Library</OutputType>
4142
<RootNamespace>AspNetFullFrameworkSampleApp</RootNamespace>
4243
<AssemblyName>AspNetFullFrameworkSampleApp</AssemblyName>
43-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
44-
<TargetFramework>net462</TargetFramework>
44+
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
45+
<TargetFramework>net481</TargetFramework>
4546
<RuntimeIdentifier>win</RuntimeIdentifier>
4647
</PropertyGroup>
4748
<PropertyGroup Condition="'$(BuildFullFrameworkAsp)' == 'true'">
@@ -92,11 +93,16 @@
9293
<PackageReference Include="Microsoft.AspNet.TelemetryCorrelation" />
9394
<PackageReference Include="Microsoft.AspNet.WebApi" />
9495
<PackageReference Include="Microsoft.AspNet.Web.Optimization" />
96+
<PackageReference Include="Microsoft.Owin" />
9597
<PackageReference Include="Microsoft.Owin.Host.SystemWeb" />
98+
<PackageReference Include="Microsoft.Owin.Security.Cookies" />
99+
<PackageReference Include="Microsoft.Web.Infrastructure" />
96100
<PackageReference Include="Newtonsoft.Json" />
97101
<PackageReference Include="NLog" />
98102
<PackageReference Include="SQLite.CodeFirst" />
99103
<PackageReference Include="System.Data.SQLite" />
104+
<PackageReference Include="System.Memory" />
105+
<PackageReference Include="WebGrease" />
100106
</ItemGroup>
101107
<ItemGroup>
102108
<Reference Include="Microsoft.CSharp" />

‎test/iis/AspNetFullFrameworkSampleApp/Views/Web.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</configSections>
1010

1111
<system.web.webPages.razor>
12-
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
12+
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
1313
<pages pageBaseType="System.Web.Mvc.WebViewPage">
1414
<namespaces>
1515
<add namespace="System.Diagnostics" />
@@ -39,7 +39,7 @@
3939
<system.web>
4040
<compilation>
4141
<assemblies>
42-
<add assembly="System.Web.Mvc, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
42+
<add assembly="System.Web.Mvc, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
4343
</assemblies>
4444
</compilation>
4545
</system.web>

0 commit comments

Comments
 (0)