Skip to content

Commit 368af3c

Browse files
nr-ahemsathlspangler584
nr-ahemsath
and
lspangler584
authored
Integration test fixes (#181)
* Don't need to assert on the value of apdex, just make sure it is present * Fix copyright header issue * Clean up WebForms45 application * Remove unused field * Clean up references in BasicMvcApplication * Clean up references in BasicWebApplication * Cleaned up references in ConsoleMultiFuctionApplicationFW * BasicMvcApplication changes to reduce build warnings and remove unnecessary redirects * WebForms45Application remove unnecessary redirects * RejitMvcApplication remove unnecessary redirects * Clean up comments Co-authored-by: lspangler584 <[email protected]>
1 parent 8c6196e commit 368af3c

File tree

10 files changed

+25
-181
lines changed

10 files changed

+25
-181
lines changed

‎tests/Agent/IntegrationTests/Applications/BasicMvcApplication/BasicMvcApplication.csproj

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -55,27 +55,14 @@
5555
<Reference Include="System.Xml" />
5656
<Reference Include="System.Configuration" />
5757
<Reference Include="System.Web.Services" />
58-
<Reference Include="System.EnterpriseServices" />
59-
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60-
<SpecificVersion>False</SpecificVersion>
61-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.Helpers.dll</HintPath>
62-
</Reference>
63-
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<Private>True</Private>
65-
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
66-
</Reference>
67-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
68-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
69-
<Private>True</Private>
70-
</Reference>
58+
<Reference Include="System.EnterpriseServices" />
7159
<Reference Include="System.Net.Http" />
7260
</ItemGroup>
73-
7461
<ItemGroup>
7562
<Content Include="Global.asax" />
7663
<Content Include="Web.config" />
7764
</ItemGroup>
78-
<ItemGroup>
65+
<ItemGroup>
7966
<Compile Include="App_Start\WebApiConfig.cs" />
8067
<Compile Include="App_Start\FilterConfig.cs" />
8168
<Compile Include="App_Start\RouteConfig.cs" />
@@ -104,13 +91,12 @@
10491
<DependentUpon>Web.config</DependentUpon>
10592
</None>
10693
</ItemGroup>
107-
10894
<ItemGroup>
10995
<PackageReference Include="Microsoft.AspNet.Mvc">
11096
<Version>5.2.7</Version>
11197
</PackageReference>
11298
<PackageReference Include="Microsoft.AspNet.Razor">
113-
<Version>3.2.0</Version>
99+
<Version>3.2.7</Version>
114100
</PackageReference>
115101
<PackageReference Include="Microsoft.AspNet.WebApi.Client">
116102
<Version>5.2.3</Version>
@@ -122,7 +108,7 @@
122108
<Version>5.2.3</Version>
123109
</PackageReference>
124110
<PackageReference Include="Microsoft.AspNet.Webpages">
125-
<Version>3.2.0</Version>
111+
<Version>3.2.7</Version>
126112
</PackageReference>
127113
<PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform">
128114
<Version>2.0.1</Version>
@@ -146,7 +132,6 @@
146132
<Version>4.0.40</Version>
147133
</PackageReference>
148134
</ItemGroup>
149-
150135
<ItemGroup />
151136
<PropertyGroup>
152137
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -176,4 +161,4 @@
176161
<Target Name="Deploy" AfterTargets="Build">
177162
<MSBuild Projects="$(ProjectPath)" Targets="WebPublish" Properties="PublishProfile=LocalDeploy" />
178163
</Target>
179-
</Project>
164+
</Project>

‎tests/Agent/IntegrationTests/Applications/BasicMvcApplication/Web.config

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,6 @@
1414
<add key="ClientValidationEnabled" value="true" />
1515
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
1616
</appSettings>
17-
<runtime>
18-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
19-
<dependentAssembly>
20-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
21-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
22-
</dependentAssembly>
23-
<dependentAssembly>
24-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
25-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
26-
</dependentAssembly>
27-
<dependentAssembly>
28-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
29-
<bindingRedirect oldVersion="1.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
30-
</dependentAssembly>
31-
<dependentAssembly>
32-
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
33-
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
34-
</dependentAssembly>
35-
<dependentAssembly>
36-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
37-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
38-
</dependentAssembly>
39-
</assemblyBinding>
40-
</runtime>
4117
<system.webServer>
4218
<modules>
4319
<remove name="WebDAVModule" />
@@ -50,4 +26,4 @@
5026
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
5127
</handlers>
5228
</system.webServer>
53-
</configuration>
29+
</configuration>

‎tests/Agent/IntegrationTests/Applications/BasicWebApplication/BasicWebApplication.csproj

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<IISExpressAnonymousAuthentication />
1919
<IISExpressWindowsAuthentication />
2020
<IISExpressUseClassicPipelineMode />
21+
<Use64BitIISExpress />
22+
<UseGlobalApplicationHostFile />
2123
</PropertyGroup>
2224
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2325
<DebugSymbols>true</DebugSymbols>
@@ -37,9 +39,6 @@
3739
<WarningLevel>4</WarningLevel>
3840
</PropertyGroup>
3941
<ItemGroup>
40-
<Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
41-
<HintPath>..\..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
42-
</Reference>
4342
<Reference Include="Microsoft.CSharp" />
4443
<Reference Include="System.ComponentModel.DataAnnotations" />
4544
<Reference Include="System" />
@@ -57,20 +56,8 @@
5756
<Reference Include="System.Web.DynamicData" />
5857
<Reference Include="System.Web.Entity" />
5958
<Reference Include="System.Web.ApplicationServices" />
60-
<Reference Include="Microsoft.ScriptManager.MSAjax">
61-
<HintPath>..\..\packages\Microsoft.AspNet.ScriptManager.MSAjax.5.0.0\lib\net45\Microsoft.ScriptManager.MSAjax.dll</HintPath>
62-
</Reference>
6359
</ItemGroup>
6460
<ItemGroup>
65-
<Reference Include="Microsoft.Owin.Host.SystemWeb">
66-
<HintPath>..\..\packages\Microsoft.Owin.Host.SystemWeb.3.0.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
67-
</Reference>
68-
<Reference Include="Owin">
69-
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
70-
</Reference>
71-
</ItemGroup>
72-
73-
<ItemGroup>
7461
<PackageReference Include="EntityFramework">
7562
<Version>6.1.1</Version>
7663
</PackageReference>
@@ -126,7 +113,6 @@
126113
<Version>6.0.4</Version>
127114
</PackageReference>
128115
</ItemGroup>
129-
130116
<ItemGroup>
131117
<None Include="Properties\PublishProfiles\LocalDeploy.pubxml" />
132118
<Content Include="Default.aspx" />

‎tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoaderCore/Program.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
/*
2-
* Copyright 2020 New Relic Corporation. All rights reserved.
3-
* SPDX-License-Identifier: Apache-2.0
4-
*/
1+
// Copyright 2020 New Relic, Inc. All rights reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
54

65
using NewRelic.Agent.IntegrationTests.ApplicationHelpers;
76
using NewRelic.Api.Agent;

‎tests/Agent/IntegrationTests/Applications/ConsoleMultiFunctionApplicationFW/ConsoleMultiFunctionApplicationFW.csproj

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -38,39 +38,15 @@
3838
<Prefer32Bit>false</Prefer32Bit>
3939
</PropertyGroup>
4040
<ItemGroup>
41-
<Reference Include="Microsoft.Owin, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\Microsoft.Owin.4.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
43-
</Reference>
44-
<Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
45-
<HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.4.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
46-
</Reference>
47-
<Reference Include="Microsoft.Owin.Hosting, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48-
<HintPath>..\..\packages\Microsoft.Owin.Hosting.4.1.0\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
49-
</Reference>
50-
<Reference Include="NewRelic.Api.Agent, Version=8.19.353.0, Culture=neutral, PublicKeyToken=06552fced0b33d87, processorArchitecture=MSIL">
51-
<HintPath>..\..\packages\NewRelic.Agent.Api.8.19.353\lib\net45\NewRelic.Api.Agent.dll</HintPath>
52-
</Reference>
5341
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5442
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
5543
</Reference>
56-
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
57-
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
58-
</Reference>
5944
<Reference Include="System" />
6045
<Reference Include="System.Configuration" />
6146
<Reference Include="System.Core" />
6247
<Reference Include="System.Net" />
63-
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
65-
</Reference>
6648
<Reference Include="System.ServiceModel" />
6749
<Reference Include="System.ServiceModel.Web" />
68-
<Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
70-
</Reference>
71-
<Reference Include="System.Web.Http.Owin, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Owin.5.2.7\lib\net45\System.Web.Http.Owin.dll</HintPath>
73-
</Reference>
7450
<Reference Include="System.Xml.Linq" />
7551
<Reference Include="System.Data.DataSetExtensions" />
7652
<Reference Include="Microsoft.CSharp" />

‎tests/Agent/IntegrationTests/Applications/RejitMvcApplication/Web.config

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,6 @@
1616
<httpModules>
1717
</httpModules>
1818
</system.web>
19-
<runtime>
20-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
21-
<dependentAssembly>
22-
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
23-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
24-
</dependentAssembly>
25-
<dependentAssembly>
26-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
27-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
28-
</dependentAssembly>
29-
<dependentAssembly>
30-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
31-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
32-
</dependentAssembly>
33-
<dependentAssembly>
34-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
35-
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
36-
</dependentAssembly>
37-
</assemblyBinding>
38-
</runtime>
3919
<system.webServer>
4020
<validation validateIntegratedModeConfiguration="false" />
4121
<modules>

‎tests/Agent/IntegrationTests/Applications/WebForms45Application/Web.config

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,6 @@
3838
<remove name="FormsAuthentication" />
3939
</modules>
4040
</system.webServer>
41-
42-
<runtime>
43-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
44-
<dependentAssembly>
45-
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f"/>
46-
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
47-
</dependentAssembly>
48-
<dependentAssembly>
49-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
50-
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
51-
</dependentAssembly>
52-
<dependentAssembly>
53-
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
54-
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
55-
</dependentAssembly>
56-
</assemblyBinding>
57-
</runtime>
58-
5941
<entityFramework>
6042
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
6143
<parameters>

‎tests/Agent/IntegrationTests/Applications/WebForms45Application/WebForms45Application.csproj

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -58,48 +58,6 @@
5858
<Reference Include="System.Web.DynamicData" />
5959
<Reference Include="System.Web.Entity" />
6060
<Reference Include="System.Web.ApplicationServices" />
61-
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62-
<Private>True</Private>
63-
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
64-
</Reference>
65-
<Reference Include="AspNet.ScriptManager.bootstrap">
66-
<HintPath>..\..\packages\AspNet.ScriptManager.bootstrap.3.4.1\lib\net45\AspNet.ScriptManager.bootstrap.dll</HintPath>
67-
</Reference>
68-
<Reference Include="AspNet.ScriptManager.jQuery">
69-
<HintPath>..\..\packages\AspNet.ScriptManager.jQuery.3.4.1\lib\net45\AspNet.ScriptManager.jQuery.dll</HintPath>
70-
</Reference>
71-
<Reference Include="Microsoft.ScriptManager.MSAjax">
72-
<HintPath>..\..\packages\Microsoft.AspNet.ScriptManager.MSAjax.5.0.0\lib\net45\Microsoft.ScriptManager.MSAjax.dll</HintPath>
73-
</Reference>
74-
<Reference Include="Microsoft.ScriptManager.WebForms">
75-
<HintPath>..\..\packages\Microsoft.AspNet.ScriptManager.WebForms.5.0.0\lib\net45\Microsoft.ScriptManager.WebForms.dll</HintPath>
76-
</Reference>
77-
<Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
78-
<HintPath>..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
79-
</Reference>
80-
<Reference Include="Newtonsoft.Json">
81-
<HintPath>..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
82-
</Reference>
83-
<Reference Include="WebGrease">
84-
<Private>True</Private>
85-
<HintPath>..\..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
86-
</Reference>
87-
<Reference Include="Antlr3.Runtime">
88-
<Private>True</Private>
89-
<HintPath>..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
90-
</Reference>
91-
<Reference Include="Microsoft.AspNet.Web.Optimization.WebForms">
92-
<Private>True</Private>
93-
<HintPath>..\..\packages\Microsoft.AspNet.Web.Optimization.WebForms.1.1.3\lib\net45\Microsoft.AspNet.Web.Optimization.WebForms.dll</HintPath>
94-
</Reference>
95-
<Reference Include="Microsoft.AspNet.FriendlyUrls">
96-
<HintPath>..\..\packages\Microsoft.AspNet.FriendlyUrls.Core.1.0.2\lib\net45\Microsoft.AspNet.FriendlyUrls.dll</HintPath>
97-
</Reference>
98-
</ItemGroup>
99-
<ItemGroup>
100-
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform">
101-
<HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
102-
</Reference>
10361
</ItemGroup>
10462
<ItemGroup>
10563
<Content Include="About.aspx" />
@@ -147,10 +105,7 @@
147105
<DependentUpon>Site.Master</DependentUpon>
148106
</Compile>
149107
</ItemGroup>
150-
<ItemGroup>
151-
<Folder Include="App_Data\" />
152-
<Folder Include="Scripts\" />
153-
</ItemGroup>
108+
<ItemGroup />
154109
<ItemGroup>
155110
<None Include="Properties\PublishProfiles\LocalDeploy.pubxml" />
156111
<None Include="Web.Debug.config">

‎tests/Agent/IntegrationTests/IntegrationTests.sln

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCore3Features", "Appl
132132
EndProject
133133
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore3Collectible", "ApplicationHelperLibraries\NetCore3Collectible\NetCore3Collectible.csproj", "{1F9D5857-EEE4-48FC-B101-2ADFFC88EA4A}"
134134
EndProject
135+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleInstrumentationLoaderCore", "Applications\ConsoleInstrumentationLoaderCore\ConsoleInstrumentationLoaderCore.csproj", "{8AC32C1E-2C20-4ECE-8480-700E28C3E43D}"
136+
EndProject
135137
Global
136138
GlobalSection(SolutionConfigurationPlatforms) = preSolution
137139
Debug|Any CPU = Debug|Any CPU
@@ -358,6 +360,10 @@ Global
358360
{1F9D5857-EEE4-48FC-B101-2ADFFC88EA4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
359361
{1F9D5857-EEE4-48FC-B101-2ADFFC88EA4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
360362
{1F9D5857-EEE4-48FC-B101-2ADFFC88EA4A}.Release|Any CPU.Build.0 = Release|Any CPU
363+
{8AC32C1E-2C20-4ECE-8480-700E28C3E43D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
364+
{8AC32C1E-2C20-4ECE-8480-700E28C3E43D}.Debug|Any CPU.Build.0 = Debug|Any CPU
365+
{8AC32C1E-2C20-4ECE-8480-700E28C3E43D}.Release|Any CPU.ActiveCfg = Release|Any CPU
366+
{8AC32C1E-2C20-4ECE-8480-700E28C3E43D}.Release|Any CPU.Build.0 = Release|Any CPU
361367
EndGlobalSection
362368
GlobalSection(SolutionProperties) = preSolution
363369
HideSolutionNode = FALSE
@@ -411,6 +417,7 @@ Global
411417
{CD2C128F-2A0E-4453-8F85-F6E53F7C8E8A} = {F0F6F2CE-8AE8-49E1-8EE9-A44B451EFC29}
412418
{383D35CC-5B34-4ABE-AEB2-B3E2666DD572} = {F0F6F2CE-8AE8-49E1-8EE9-A44B451EFC29}
413419
{1F9D5857-EEE4-48FC-B101-2ADFFC88EA4A} = {CB5B7DCD-F949-4435-BC39-C34F4F3D2009}
420+
{8AC32C1E-2C20-4ECE-8480-700E28C3E43D} = {F0F6F2CE-8AE8-49E1-8EE9-A44B451EFC29}
414421
EndGlobalSection
415422
GlobalSection(ExtensibilityGlobals) = postSolution
416423
SolutionGuid = {3830ABDF-4AEA-4D91-83A2-13F091D1DF5F}

‎tests/Agent/IntegrationTests/IntegrationTests/CallStackFallbackMvc.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright 2020 New Relic, Inc. All rights reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
5-
using System;
64
using System.Collections.Generic;
75
using System.Linq;
86
using NewRelic.Agent.IntegrationTestHelpers;
@@ -73,8 +71,8 @@ public void Test()
7371
new Assertions.ExpectedMetric { metricName = @"OtherTransaction/Normalized/*" },
7472
new Assertions.ExpectedMetric { metricName = @"OtherTransaction/all" },
7573

76-
// The .NET agent does not have the information needed to generate this metric
77-
new Assertions.ExpectedMetric { metricName = @"CPU/WebTransaction", callCount = 1 },
74+
// The .NET agent does not have the information needed to generate this metric
75+
new Assertions.ExpectedMetric { metricName = @"CPU/WebTransaction", callCount = 1 },
7876
new Assertions.ExpectedMetric { metricName = @"CPU/WebTransaction/MVC/DefaultController/Index", callCount = 1 },
7977
};
8078

@@ -110,16 +108,16 @@ public void Test()
110108
};
111109
var expectedTransactionEventIntrinsicAttributes1 = new Dictionary<string, string>
112110
{
113-
{"type", "Transaction"},
114-
{"nr.apdexPerfZone", "F"}
111+
{"type", "Transaction"}
115112
};
116113
var expectedTransactionEventIntrinsicAttributes2 = new List<string>
117114
{
118115
"timestamp",
119116
"duration",
120117
"webDuration",
121118
"queueDuration",
122-
"totalTime"
119+
"totalTime",
120+
"nr.apdexPerfZone"
123121
};
124122
var expectedTransactionEventAgentAttributes = new Dictionary<string, object>
125123
{

0 commit comments

Comments
 (0)