diff --git a/.docs/concepts.md b/.docs/concepts.md new file mode 100644 index 000000000..fe860a072 --- /dev/null +++ b/.docs/concepts.md @@ -0,0 +1,81 @@ +# Application Insights DotNet SDK Concepts +This lists the high level concepts of the AI DotNet SDK and links to detailed guides to help you get started. + +To use the Application Insights SDK you must configure an Instrumentation Key which can be [obtained from an Application Insights resource](https://docs.microsoft.com/azure/azure-monitor/app/create-new-resource). +Or you can use a [Connection string](https://docs.microsoft.com/azure/azure-monitor/app/sdk-connection-string?tabs=net) to simplify the configuration of our endpoints. +Both an Instrumentation Key and Connection String are provided for you on the Overivew Dashboard of your Application Insights resource. + +## TelemetryClient +The `TelemetryClient` object is the primary root object for the library. +Almost all functionality around telemetry sending is located on this object. + +### Initialization +You must initialize an instance of this object and populate it with your Instrumentation Key to identify your data. + +```C# +using Microsoft.ApplicationInsights; +using Microsoft.ApplicationInsights.Extensibility; + +var configuration = new TelemetryConfiguration +{ + ConnectionString = "InstrumentationKey=00000000-0000-0000-0000-000000000000", +}; +var tc = new TelemetryClient(configuration); +``` + +### Using the TelemetryClient to send telemetry +You can populate common context on the `TelemetryClient.context` property which will be automatically attached to each telemetry item sent. +You can also attach additional property data to each telemetry item sent. +The `TelemetryClient` also exposes several `Track` methods that can be used to send all telemetry types understood by the Application Insights service. Some example use cases are shown below. + +Please review the full [API summary for custom events and metrics](https://docs.microsoft.com/azure/azure-monitor/app/api-custom-events-metrics) for more examples. + +```C# +tc.Context.Device.OperatingSystem = Environment.OSVersion.ToString(); + +tc.TrackTrace(message: "Custom message."); + +tc.TrackEvent( + eventName: "PurchaseOrderSubmitted", + properties: new Dictionary() { { "CouponCode", "JULY2015" } }, + metrics: new Dictionary() { { "OrderTotal", 68.99 }, { "ItemsOrdered", 5 } } + ); + +try +{ + // do something +} +catch(Exception ex) +{ + tc.TrackException(ex); +} +``` + +## Telemetry Channels +Telemetry channels are responsible for sending the telemetry data to the designated place. Optional features can be provided by the telemetry channels, for example, buffering the data and sending in them in batches, persisting the data to a local storage in case of transmission failure (e.g. network outage), traffic shaping and retry mechanisms + +The .NET and .NET Core versions of the SDKs provide two built-in telemetry channels: +- [InMemoryChannel](https://github.com/microsoft/ApplicationInsights-dotnet/blob/develop/BASE/src/Microsoft.ApplicationInsights/Channel/InMemoryChannel.cs): A lightweight channel that buffers items in memory until they're sent. Items are buffered in memory and flushed once every 30 seconds, or whenever 500 items are buffered. +- [ServerTelemetryChannel](https://github.com/microsoft/ApplicationInsights-dotnet/blob/develop/BASE/src/ServerTelemetryChannel/ServerTelemetryChannel.cs): A more advanced channel that has retry policies and the capability to store data on a local disk. + +Please review our full guide on [Telemetry Channels in Application Insights](https://docs.microsoft.com/azure/azure-monitor/app/telemetry-channels). + +## TelemetryProcessors and TelemetryInitializers +You can write and configure plug-ins for the Application Insights SDK to customize how telemetry can be enriched and processed before it's sent to the Application Insights service. + +Please review our full guide on [Filtering and preprocessing telemetry](https://docs.microsoft.com/azure/azure-monitor/app/api-filtering-sampling). + +## Telemetry correlation +Application Insights supports distributed telemetry correlation, which you use to detect which component is responsible for failures or performance degradation. + +Please review our full guide on [Telemetry correlation in Application Insights](https://docs.microsoft.com/azure/azure-monitor/app/correlation). + +## Custom metric collection +The Azure Monitor Application Insights .NET and .NET Core SDKs have two different methods of collecting custom metrics, `TrackMetric()`, and `GetMetric()`. The key difference between these two methods is local aggregation. + +Please review our full guide on [Custom metric collection in .NET and .NET Core](https://docs.microsoft.com/azure/azure-monitor/app/get-metric). + +## Sampling +Sampling is the recommended way to reduce telemetry traffic, data costs, and storage costs, while preserving a statistically correct analysis of application data. + +Please review our full guide on [Sampling in Application Insights](https://docs.microsoft.com/azure/azure-monitor/app/sampling). diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 27d0f96f6..52a67e858 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,14 +1,19 @@ # How to Contribute -If you're interested in contributing, take a look at the general [contributer's guide](https://github.com/Microsoft/ApplicationInsights-Home/blob/master/CONTRIBUTING.md) first and continue here. +- Please read the general [contributor's guide](https://github.com/Microsoft/ApplicationInsights-Home/blob/master/CONTRIBUTING.md) located in the ApplicationInsights-Home repository +- If making a large change we request that you open an [issue](https://github.com/Microsoft/ApplicationInsights-dotnet/issues) first. +- We follow the [Git Flow](http://nvie.com/posts/a-successful-git-branching-model/) approach to branching. +- This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. ## Solutions -- Everything.sln - this will build all projects and tests. +- Everything.sln - this will build all projects and unit tests. - ProjectsForSigning.sln - this builds all shipping projects. +- IntegrationTests.sln - this builds all Net Core Integration tests. - BASE\Microsoft.ApplicationInsights.sln - this builds the Base SDK and ServerTelemetryChannel. - WEB\Microsoft.ApplicationInsights.Web.sln - this builds the ASP.Net projects. +- WEB\dirs.proj - this builds the functional tests which rely on docker. - NETCORE\ApplicationInsights.AspNetCore.sln - this builds the .Net Core projects. - LOGGING\Logging.sln - this builds the logging adapters. @@ -17,41 +22,16 @@ If you're interested in contributing, take a look at the general [contributer's ## Build To successfully build the sources on your machine, make sure you've installed the following prerequisites: -* Visual Studio 2017 Community or Enterprise -* .NET 4.6 -* .NET Core SDK 1.1.7 -* .NET Core SDK 2.0 or above.(https://www.microsoft.com/net/download/windows) +- Visual Studio 2019 Community or Enterprise +- .NET SDKs (https://dotnet.microsoft.com/download) + - .NET 4.8 + - .NET Core 3.1 SDK -If using Azure VM, the following image from Microsoft contains the above pre-requisites already installed. - -_Visual Studio Enterprise 2017 (latest release) on Windows Server 2016._ - -Once you've installed the prerequisites execute either ```buildDebug.cmd``` or ```buildRelease.cmd``` script in the repository root to build the project (excluding functional tests) locally. - -```buildRelease.cmd``` also runs StlyeCop checks, and is required before merging any pull requests. - -You can also open the solutions in Visual Studio and build directly from there. ## Unit Tests -Several tests require that you configure a strong name verification exception for Microsoft.WindowsAzure.ServiceRuntime.dll using the [Strong Name Tool](https://msdn.microsoft.com/en-us/library/k5b5tt23(v=vs.110).aspx). - -Using the Developer Command Prompt as Administrator, run this command from the repository root to register the assembly for verification skipping. (after building Microsoft.ApplicationInsights.Web.sln) - - "%ProgramFiles(x86)%\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.7.1 Tools\sn.exe" -Vr ..\bin\Debug\Src\WindowsServer\WindowsServer.Net45.Tests\Microsoft.WindowsAzure.ServiceRuntime.dll - -(Depending on you OS version, the above exe may be located in different folder. Modify the path according to local path). - -Once you've configured the strong name verification, execute the ```runUnitTests.cmd``` script in the repository root. - -If the script fail with errors like unable to find path to Visual Studio Test runner, please edit the helper script to match you local installation of Visual Studio. - -You can also run the tests within Visual Studio using the test explorer. If test explorer is not showing all the tests, please make sure you have installed all updates to Visual Studio. - -You can remove the strong name verification exception by running this command as Administrator: - - "%ProgramFiles(x86)%\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.7.1 Tools\sn.exe" -Vr ..\bin\Debug\Src\WindowsServer\WindowsServer.Net45.Tests\Microsoft.WindowsAzure.ServiceRuntime.dll +Unit tests can be run in either the Visual Studio Test Exploror or via command line `dotnet test`. ## Functional Tests It is recommended to rely on unit tests to test functionalities wherever possible. For doing end-to-end validation, functional tests exists for all the modules. Unless doing significant changes, @@ -62,18 +42,18 @@ These tests works like described below: Functional tests contain test apps which refers to the product dlls from the local build. Tests deploy the Test apps to IIS/Docker and http requests are fired against it to trigger various scenarios. Tests apps are modified to send telemetry to a fake ingestion endpoint controlled by tests. Tests then validate the telemetry received by this endpoint. -Pre-requisites: +### Pre-requisites: To execute the functional tests, you need to install some additional prerequisites: -For Web and PerformanceCollector tests IIS Express should be installed. +- For **Web** and **PerformanceCollector** tests IIS Express should be installed. -For Dependency Collector, you need to install Docker for windows as these tests need several additional dependencies to be deployed like SQL Server, Azure Emulator etc, and these are deployed as Docker containers. +- For **Dependency Collector**, you need to install Docker for windows as these tests need several additional dependencies to be deployed like SQL Server and Azure Emulator. Docker for Windows (https://docs.docker.com/docker-for-windows/install/). After installation switch Docker engine to Windows Containers.(https://blogs.msdn.microsoft.com/webdev/2017/09/07/getting-started-with-windows-containers/) And finally, make sure you can run ```docker run hello-world``` successfully to confirm that your machine is Docker ready. -Running functional tests: +### Running functional tests: Before running the functional tests, the product code should be built following 'Build' instructions above. @@ -96,7 +76,7 @@ Helper script to build product and run all tests in this solution - ```runFuncti "..bin\Debug\Test\E2ETests" -- Binary location for Test and Test apps. -Special Notes regarding DependencyCollectionTests +### Special Notes regarding DependencyCollectionTests 1. All Docker images are downloaded from internet when ran for first time and this could take several minutes (depends on network speed as **around 20GB will be downloaded on first time on a machine**.). Tests may appear hung during this time. 2. If using Visual Studio Test Explorer to run tests, group the tests by namespace and run each namespaces separately to avoid test conflicts. ```runFunctionalTestsDependencyCollector``` does this automatically. @@ -107,18 +87,21 @@ Edit the helper scripts to change between 'Release' and 'Debug' as per your buil Its is important to note that functional tests do not trigger product code build, so explicit build of product code is required before running functional tests. A typical work flow would be make-produce-change followed by build-product followed by build-functest-solution and finally run-func-tests. (This helpers scripts does this.) -## Known issues/workarounds with running functional tests. +### Known issues/workarounds with running functional tests. If any tests fail, please retry first to see if it helps. If not, try one of the known issues below. -Tests fail with error like "It was not possible to find any compatible framework version The specified framework 'Microsoft.NETCore.App', version '1.0.4' was not found" +If these don't help, please open an [issue](https://github.com/Microsoft/ApplicationInsights-dotnet/issues) in Github describing the problem. + +- Tests fail with error like "It was not possible to find any compatible framework version The specified framework 'Microsoft.NETCore.App', version '1.0.4' was not found" Workaround: Install .NET Core SDK 1.1.7. -Web and PerformanceCollector fails with error related to 'Port conflicts' - its possible that some prior tests has not released ports. - Workaround - Kill all running IISExpress processes and re-run tests. +- Web and PerformanceCollector fails with error related to 'Port conflicts' - its possible that some prior tests has not released ports. -All/many functional tests fail with error "Incorrect number of items. Expected: 1 Received: 0" when ran from Visual Studio IDE. +Workaround: Kill all running IISExpress processes and re-run tests. + +- All/many functional tests fail with error "Incorrect number of items. Expected: 1 Received: 0" when ran from Visual Studio IDE. Look for warnings in Visual Studio output window which contains errors like 'Unable to copy dll file due to file being locked..' etc. Workarounds: @@ -127,12 +110,13 @@ Workarounds: 3. Delete bin folder from repository root and rebuild. 4. Restart machine if none of the above helps. -Dependency Collector functional tests fail with messages like "Assert.AreEqual failed. Expected:<1>. Actual<0>." or "All apps are not healthy", then its likely that Docker installation has some issues. +- Dependency Collector functional tests fail with messages like "Assert.AreEqual failed. Expected:<1>. Actual<0>." or "All apps are not healthy", then its likely that Docker installation has some issues. Workaround if you are trying first time - Make sure you can run ```docker run hello-world``` successfully to confirm that your machine is Docker ready. Also, the very first time DependencyCollector tests are run, all Docker images are downloaded from web and this could potentially take an hour or so. This is only one time per machine. Alternate workaround if you have previously run the tests successfully at least once - execute the ```dockercleanup.ps1``` from repository root to cleanup any containers from prior runs. -All DependencyCollectionTests fail at initialization stage itself with error 'All apps are not healthy'. In the logs you'll find that Docker container has exited with some error codes. Eg: "Exited (2147943452) 53 seconds ago". +- All DependencyCollectionTests fail at initialization stage itself with error 'All apps are not healthy'. In the logs you'll find that Docker container has exited with some error codes. Eg: "Exited (2147943452) 53 seconds ago". + If this error occurs execute ```dockercleanup.ps1``` from repository root, and re-run the tests. The test code intentionally does not clean up the containers it spun up. This is to enable fast re-runs of the tests. If the Test App code is changed, then Docker-Compose will detect it, and re-build the container. @@ -140,7 +124,7 @@ If you want to do clean up all the containers created by the test, execute the ` After retrying, it tests still fail, please clear the binaries folder and rebuild the product solution and test solution and run the tests again. -If none of the above helps, please open an issue in Github describing the problem. + ## Debugging the functional tests. It is important to note that since the test application is deployed as a separate process/container, debugging the tests itself will not help debug the application code. A debugger need to be attached @@ -149,8 +133,7 @@ to the process hosting the Application, IISExpress or IIS, after deploying the a The test apps refers to the Web SDK assemblies from your local build. After making the changes to product code, build locally (from Visual Studio or using ```buildDebug.cmd```). Then build and start the test application from its publish folder in either IISExpress or IIS, and attach debugger to it. Open the .cs file you want your breakpoint in and set it. Now triggering a request to the application will hit the breakpoint. The exact request to be triggered depends on what you are doing. If investigating functional test failures locally, then the tests logs should contain the url it hit to trigger scenarios. -Dependency Collector tests deploy the test apps, along with dependencies (Fake Ingestion, SQL etc) to Docker containers inside same Docker virtual network, so that apps can access the dependencies with their names. However, if -the test apps are deployed to IIS or IISExpress, then they are outside the Docker virtual network of dependencies, and so it won't be able to access dependencies without using their IP Address. This is a Docker for windows limitation, and could be fixed in future. +Dependency Collector tests deploy the test apps, along with dependencies (Fake Ingestion, SQL etc) to Docker containers inside same Docker virtual network, so that apps can access the dependencies with their names. However, if the test apps are deployed to IIS or IISExpress, then they are outside the Docker virtual network of dependencies, and so it won't be able to access dependencies without using their IP Address. This is a Docker for windows limitation, and could be fixed in future. Until then, the test app need to address the dependencies using their IP Address. Instead of manually finding IP Addresses and replacing containers names with IP Address, its easy to just run the following script. This uses Docker commands to determine the IP Addresses, and replaces them in the necessary configs. "\bin\Debug\Test\E2ETests\E2ETests\replacecontainernamewithip.ps1" @@ -161,12 +144,8 @@ Following pre-requisite is needed to deploy to IIS locally. ## Debugging the SDK in general (How to test Application Insights from local build in any Test App) -* Build the project using ```buildDebug.cmd``` -* If the build was successful, you'll find that it generated NuGet packages in \..\bin\Debug\NuGet -* If your change is confined to one of the nuget packages (say Web sdk), and you are developing on one of VNext branches, you can get the rest of the compatible nuget packages from [myget feed](https://www.myget.org/F/applicationinsights/) -* Create a web application project to test the SDK on, and install the Microsoft.ApplicationInsights.Web NuGet package from the above directory -* In your web application, point your project references to Microsoft.AI.Web, Microsoft.AI.WindowsServer, Microsoft.AI.PerfCounterCollector and Microsoft.AI.DependencyCollector to those DLLs in the SDK debug output folder (this makes sure you get the symbol files and that your web application is updated when you recompile the SDK). +* Build the project using ```buildDebug.cmd```. If you build using the solution (*.sln) all required depenencies will also be built. +* If the build was successful, you'll find that it generated NuGet packages in "\..\bin\Debug\NuGet". You can set this directory as a NuGet Repository to consume within your applications. +* Create a web application project to test the SDK on, and install the Microsoft.ApplicationInsights.Web NuGet package from the above directory. * From your web application, open the .cs file you want your breakpoint in and set it -* Run your web application. - -Your breakpoints should be hit now when your web application triggers them. +* Run your web application. Your breakpoints should be hit now when your web application triggers them. diff --git a/.props/Product.props b/.props/Product.props index 331c526dd..c891bd9b9 100644 --- a/.props/Product.props +++ b/.props/Product.props @@ -7,8 +7,35 @@ - + + + + + All + + + All + + + All + + + All + + + + + + + All + + + + + + + \ No newline at end of file diff --git a/.props/_GlobalStaticVersion.props b/.props/_GlobalStaticVersion.props index 36d64677e..d1114745f 100644 --- a/.props/_GlobalStaticVersion.props +++ b/.props/_GlobalStaticVersion.props @@ -13,7 +13,8 @@ 2 15 0 - beta1 + beta2 + nightly true - - True - snupkg - $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb @@ -39,12 +35,30 @@ For the release notes please follow http://go.microsoft.com/fwlink/?LinkId=535037 Analytics Azure ApplicationInsights Telemetry Monitoring SDK + + true + + true + + True + snupkg - + + + + + + + + + + true + + UNDEFINED @@ -67,7 +81,7 @@ - + diff --git a/.publicApi/Microsoft.ApplicationInsights.DiagnosticSourceListener.dll/netstandard1.3/PublicAPI.Shipped.txt b/.publicApi/Microsoft.ApplicationInsights.DiagnosticSourceListener.dll/netstandard2.0/PublicAPI.Shipped.txt similarity index 100% rename from .publicApi/Microsoft.ApplicationInsights.DiagnosticSourceListener.dll/netstandard1.3/PublicAPI.Shipped.txt rename to .publicApi/Microsoft.ApplicationInsights.DiagnosticSourceListener.dll/netstandard2.0/PublicAPI.Shipped.txt diff --git a/.publicApi/Microsoft.ApplicationInsights.DiagnosticSourceListener.dll/netstandard1.3/PublicAPI.Unshipped.txt b/.publicApi/Microsoft.ApplicationInsights.DiagnosticSourceListener.dll/netstandard2.0/PublicAPI.Unshipped.txt similarity index 100% rename from .publicApi/Microsoft.ApplicationInsights.DiagnosticSourceListener.dll/netstandard1.3/PublicAPI.Unshipped.txt rename to .publicApi/Microsoft.ApplicationInsights.DiagnosticSourceListener.dll/netstandard2.0/PublicAPI.Unshipped.txt diff --git a/.publicApi/Microsoft.ApplicationInsights.EventSourceListener.dll/netstandard1.3/PublicAPI.Shipped.txt b/.publicApi/Microsoft.ApplicationInsights.EventSourceListener.dll/netstandard2.0/PublicAPI.Shipped.txt similarity index 100% rename from .publicApi/Microsoft.ApplicationInsights.EventSourceListener.dll/netstandard1.3/PublicAPI.Shipped.txt rename to .publicApi/Microsoft.ApplicationInsights.EventSourceListener.dll/netstandard2.0/PublicAPI.Shipped.txt diff --git a/.publicApi/Microsoft.ApplicationInsights.EventSourceListener.dll/netstandard1.3/PublicAPI.Unshipped.txt b/.publicApi/Microsoft.ApplicationInsights.EventSourceListener.dll/netstandard2.0/PublicAPI.Unshipped.txt similarity index 100% rename from .publicApi/Microsoft.ApplicationInsights.EventSourceListener.dll/netstandard1.3/PublicAPI.Unshipped.txt rename to .publicApi/Microsoft.ApplicationInsights.EventSourceListener.dll/netstandard2.0/PublicAPI.Unshipped.txt diff --git a/.publicApi/Microsoft.ApplicationInsights.Log4NetAppender.dll/netstandard1.3/PublicAPI.Shipped.txt b/.publicApi/Microsoft.ApplicationInsights.Log4NetAppender.dll/netstandard2.0/PublicAPI.Shipped.txt similarity index 100% rename from .publicApi/Microsoft.ApplicationInsights.Log4NetAppender.dll/netstandard1.3/PublicAPI.Shipped.txt rename to .publicApi/Microsoft.ApplicationInsights.Log4NetAppender.dll/netstandard2.0/PublicAPI.Shipped.txt diff --git a/.publicApi/Microsoft.ApplicationInsights.Log4NetAppender.dll/netstandard1.3/PublicAPI.Unshipped.txt b/.publicApi/Microsoft.ApplicationInsights.Log4NetAppender.dll/netstandard2.0/PublicAPI.Unshipped.txt similarity index 100% rename from .publicApi/Microsoft.ApplicationInsights.Log4NetAppender.dll/netstandard1.3/PublicAPI.Unshipped.txt rename to .publicApi/Microsoft.ApplicationInsights.Log4NetAppender.dll/netstandard2.0/PublicAPI.Unshipped.txt diff --git a/.publicApi/Microsoft.ApplicationInsights.TraceListener.dll/netstandard1.3/PublicAPI.Shipped.txt b/.publicApi/Microsoft.ApplicationInsights.TraceListener.dll/netstandard2.0/PublicAPI.Shipped.txt similarity index 100% rename from .publicApi/Microsoft.ApplicationInsights.TraceListener.dll/netstandard1.3/PublicAPI.Shipped.txt rename to .publicApi/Microsoft.ApplicationInsights.TraceListener.dll/netstandard2.0/PublicAPI.Shipped.txt diff --git a/.publicApi/Microsoft.ApplicationInsights.TraceListener.dll/netstandard1.3/PublicAPI.Unshipped.txt b/.publicApi/Microsoft.ApplicationInsights.TraceListener.dll/netstandard2.0/PublicAPI.Unshipped.txt similarity index 100% rename from .publicApi/Microsoft.ApplicationInsights.TraceListener.dll/netstandard1.3/PublicAPI.Unshipped.txt rename to .publicApi/Microsoft.ApplicationInsights.TraceListener.dll/netstandard2.0/PublicAPI.Unshipped.txt diff --git a/BASE/.vsts/linux-build.yml b/BASE/.vsts/linux-build.yml index ee2e8aa09..8e051b092 100644 --- a/BASE/.vsts/linux-build.yml +++ b/BASE/.vsts/linux-build.yml @@ -2,7 +2,6 @@ pool: vmImage: 'ubuntu-16.04' steps: - ## Install NetCore 3.1, Restore Solution, Build Solution, Test NetCore 3.1 - task: DotNetCoreInstaller@1 @@ -30,7 +29,6 @@ steps: projects: "BASE/Test/**/Microsoft.ApplicationInsights.Tests.csproj" arguments: "--configuration Release --framework netcoreapp3.1 -l trx --filter TestCategory!=WindowsOnly" - ## Install and Test NetCore 2.2 - task: DotNetCoreInstaller@1 @@ -45,21 +43,6 @@ steps: projects: "BASE/Test/**/Microsoft.ApplicationInsights.Tests.csproj" arguments: "--configuration Release --framework netcoreapp2.1 -l trx --filter TestCategory!=WindowsOnly" - - ## Install and Test NetCore 1.1 - -- task: DotNetCoreInstaller@0 - displayName: install dotnet core 1.1 - inputs: - version: 1.1.5 - -- task: DotNetCoreCLI@1 - displayName: DotNetCoreCLI - Test NetCore 1.1 - inputs: - command: "test" - projects: "BASE/Test/**/Microsoft.ApplicationInsights.Tests.csproj" - arguments: "--configuration Release --framework netcoreapp1.1 -l trx --filter TestCategory!=WindowsOnly" - ## Publish Test results - task: PublishTestResults@2 @@ -67,6 +50,7 @@ steps: inputs: testRunner: "VSTest" testResultsFiles: "**/*.trx" + failTaskOnFailedTests: true #- task: DotNetCoreCLI@1 # inputs: diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj b/BASE/Test/Microsoft.ApplicationInsights.Test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj index 135e60b17..9c245af4b 100644 --- a/BASE/Test/Microsoft.ApplicationInsights.Test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj +++ b/BASE/Test/Microsoft.ApplicationInsights.Test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj @@ -11,8 +11,8 @@ false false - net45;netstandard1.3;netstandard2.0 - netstandard1.3;netstandard2.0 + net45;netstandard2.0 + netstandard2.0 {4B0BC3B7-C7FC-4333-9E28-5790D9153F07} ApplicationInsightsTypes @@ -90,9 +90,4 @@ StackFrame.bond - - - - - \ No newline at end of file diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/ExceptionConverterTest.cs b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/ExceptionConverterTest.cs index 2079e73d7..4a02694b3 100644 --- a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/ExceptionConverterTest.cs +++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/ExceptionConverterTest.cs @@ -84,7 +84,7 @@ Assert.AreEqual(0, stackFrame.line); } -#if (!NETCOREAPP1_1 && !NETCOREAPP2_0) +#if !NETCOREAPP2_0 [TestMethod] public void CheckThatFileNameAndLineAreCorrectIfAvailable() @@ -112,7 +112,7 @@ } #endif -#if !NETCOREAPP1_1 || NETCOREAPP2_0 +#if NETCOREAPP2_0 [TestMethod] public void CheckThatAssemblyNameHasCorrectValue() diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/PlatformTest.cs b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/PlatformTest.cs index 5646415e2..3a9b73515 100644 --- a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/PlatformTest.cs +++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/PlatformTest.cs @@ -1,6 +1,6 @@ namespace Microsoft.ApplicationInsights.Extensibility.Implementation { -#if (!NETCOREAPP1_1 && !NETCOREAPP2_0) +#if !NETCOREAPP2_0 using System; using System.IO; using System.Reflection; diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/ExtensionsTest.cs b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/ExtensionsTest.cs index 0c94a78f3..31ef0c8a6 100644 --- a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/ExtensionsTest.cs +++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/ExtensionsTest.cs @@ -1,6 +1,6 @@ namespace Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing { -#if (!NETCOREAPP1_1 && !NETCOREAPP2_0) +#if !NETCOREAPP2_0 using System; using System.Globalization; using System.Threading; diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/SelfDiagnostics/DiagnosticsTelemetryModuleTest.cs b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/SelfDiagnostics/DiagnosticsTelemetryModuleTest.cs index 638a4a826..8584e7d2e 100644 --- a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/SelfDiagnostics/DiagnosticsTelemetryModuleTest.cs +++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/SelfDiagnostics/DiagnosticsTelemetryModuleTest.cs @@ -1,6 +1,5 @@ namespace Microsoft.ApplicationInsights.TestFramework.Extensibility.Implementation.Tracing.SelfDiagnostics { -#if !NETCOREAPP1_1 using System; using System.Diagnostics.Tracing; using System.IO; @@ -199,5 +198,4 @@ } } } -#endif } diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/SelfDiagnostics/TraceSourceForEventSourceTest.cs b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/SelfDiagnostics/TraceSourceForEventSourceTest.cs index d8d8e6d9a..52b4d71ee 100644 --- a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/SelfDiagnostics/TraceSourceForEventSourceTest.cs +++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/SelfDiagnostics/TraceSourceForEventSourceTest.cs @@ -1,6 +1,5 @@ namespace Microsoft.ApplicationInsights.TestFramework.Extensibility.Implementation.Tracing.SelfDiagnostics { -#if !NETCOREAPP1_1 using System.Diagnostics; using System.Diagnostics.Tracing; @@ -86,5 +85,4 @@ } } } -#endif } diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Microsoft.ApplicationInsights.Tests.csproj b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Microsoft.ApplicationInsights.Tests.csproj index 7838946c2..63fd19007 100644 --- a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Microsoft.ApplicationInsights.Tests.csproj +++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Microsoft.ApplicationInsights.Tests.csproj @@ -14,14 +14,11 @@ - net45;net46;netcoreapp1.1;netcoreapp2.1;netcoreapp3.1 - netcoreapp1.1;netcoreapp2.1;netcoreapp3.1 + net45;net46;netcoreapp2.1;netcoreapp3.1 + netcoreapp2.1;netcoreapp3.1 pdbonly true true - - - $(DefineConstants);NETCOREAPP; @@ -44,11 +41,6 @@ - - - - - diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/OperationTelemetryExtensionsTests.cs b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/OperationTelemetryExtensionsTests.cs index ca9431251..aa8702e9b 100644 --- a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/OperationTelemetryExtensionsTests.cs +++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/OperationTelemetryExtensionsTests.cs @@ -64,7 +64,6 @@ Assert.AreEqual(telemetry.Duration, TimeSpan.Zero); } -#if !NETCOREAPP1_1 /// /// Tests the scenario if Start assigns current *precise* time to start time. /// @@ -93,7 +92,6 @@ Assert.IsTrue(ComputeSomethingHeavy() > 0); } } -#endif /// /// Tests the scenario if Stop computes the duration of the telemetry when timestamps are supplied to Start and Stop. diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/TelemetryClientTest.cs b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/TelemetryClientTest.cs index e3176a924..82b170124 100644 --- a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/TelemetryClientTest.cs +++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/TelemetryClientTest.cs @@ -108,7 +108,6 @@ Assert.IsTrue(telemetry.Timestamp != default(DateTimeOffset)); } -#if !NETCOREAPP1_1 /// /// Tests the scenario if Initialize assigns current precise time to start time. /// @@ -137,7 +136,6 @@ Assert.IsTrue(ComputeSomethingHeavy() > 0); } } -#endif [TestMethod] public void InitializeSetsRoleInstance() diff --git a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Nuget.Tests/TelemetryChannel.Nuget.Tests.csproj b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Nuget.Tests/TelemetryChannel.Nuget.Tests.csproj index 02aaf56a4..3e9923598 100644 --- a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Nuget.Tests/TelemetryChannel.Nuget.Tests.csproj +++ b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Nuget.Tests/TelemetryChannel.Nuget.Tests.csproj @@ -18,11 +18,12 @@ true + false netstandard1.3 - + diff --git a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/AdaptiveSamplingTelemetryProcessorTest.cs b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/AdaptiveSamplingTelemetryProcessorTest.cs index 42d7dcc36..515a677d5 100644 --- a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/AdaptiveSamplingTelemetryProcessorTest.cs +++ b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/AdaptiveSamplingTelemetryProcessorTest.cs @@ -65,9 +65,6 @@ Assert.AreEqual(itemsProduced, sentTelemetry.Count); } -#if !NETCOREAPP1_1 -// Sampling tests are not stable on linux Azure pipelines agent on .NET Core 1.1. -// considering .NET Core 1.1 is no longer supported, let's not run sampling tests there at all [TestMethod] public void ProactivelySampledInTelemetryCapturedWhenProactiveSamplingRateIsLowerThanTarget() { @@ -364,7 +361,6 @@ Assert.IsTrue(sentTelemetry.Count > targetItemCount - tolerance); Assert.IsTrue(sentTelemetry.Count < targetItemCount + tolerance); } -#endif private class AdaptiveTesterMessageSink : ITelemetryProcessor { @@ -514,17 +510,10 @@ { // Regular Dispose() does not wait for all callbacks to complete // so TelemetryConfiguration could be disposed while callback still runs - -#if (NETCOREAPP1_1) - timer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan); - timer.Dispose(); - Thread.Sleep(1000); -#else AutoResetEvent allDone = new AutoResetEvent(false); timer.Dispose(allDone); // this will wait for all callbacks to complete allDone.WaitOne(); -#endif } } } diff --git a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/ApplicationFolderProviderTest.cs b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/ApplicationFolderProviderTest.cs index dc9d7b20d..8460bec15 100644 --- a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/ApplicationFolderProviderTest.cs +++ b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/ApplicationFolderProviderTest.cs @@ -3,7 +3,8 @@ using System.Collections; using System.Diagnostics; using System.IO; - using System.Linq; + using System.Linq; + using System.Runtime.InteropServices; using System.Security.AccessControl; using System.Security.Principal; using Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.Helpers; @@ -11,7 +12,10 @@ [TestClass] public class ApplicationFolderProviderTest - { + { + private const string NonWindowsStorageProbePathVarTmp = "/var/tmp/"; + private const string NonWindowsStorageProbePathTmp = "/tmp/"; + private DirectoryInfo testDirectory; [TestInitialize] @@ -30,7 +34,6 @@ } [TestMethod] - [TestCategory("WindowsOnly")] public void GetApplicationFolderReturnsValidPlatformFolder() { IApplicationFolderProvider provider = new ApplicationFolderProvider(); @@ -295,6 +298,129 @@ localAppData.Delete(true); } +#if !NET45 + + [TestMethod] + public void GetApplicationFolderReturnsSubfolderFromTmpDirFolderInNonWindows() + { + if (!ApplicationFolderProvider.IsWindowsOperatingSystem()) + { + DirectoryInfo tmpDir = this.testDirectory.CreateSubdirectory(@"tmpdir"); + var environmentVariables = new Hashtable { { "TMPDIR", tmpDir.FullName } }; + var provider = new ApplicationFolderProvider(environmentVariables); + + IPlatformFolder applicationFolder = provider.GetApplicationFolder(); + Assert.IsNotNull(applicationFolder); + Assert.AreEqual(1, tmpDir.GetDirectories().Length); + tmpDir.Delete(true); + } + } + + [TestMethod] + public void GetApplicationFolderReturnsSubfolderFromCustomFolderFirstInNonWindows() + { + if (!ApplicationFolderProvider.IsWindowsOperatingSystem()) + { + DirectoryInfo tmpDir = this.testDirectory.CreateSubdirectory(@"tmpdir"); + DirectoryInfo customFolder = this.testDirectory.CreateSubdirectory(@"Custom"); + + var environmentVariables = new Hashtable { { "TMPDIR", tmpDir.FullName } }; + var provider = new ApplicationFolderProvider(environmentVariables, customFolder.FullName); + + IPlatformFolder applicationFolder = provider.GetApplicationFolder(); + + Assert.IsNotNull(applicationFolder); + Assert.AreEqual(((PlatformFolder)applicationFolder).Folder.Name, customFolder.Name, "Sub-folder for custom folder should not be created."); + + tmpDir.Delete(true); + customFolder.Delete(true); + } + } + + [TestMethod] + public void GetApplicationFolderReturnsSubfolderFromVarTmpFolderIfTmpDirIsNotAvailableInNonWindows() + { + if (!ApplicationFolderProvider.IsWindowsOperatingSystem()) + { + var dir = new System.IO.DirectoryInfo(NonWindowsStorageProbePathVarTmp); + var provider = new ApplicationFolderProvider(); + + IPlatformFolder applicationFolder = provider.GetApplicationFolder(); + + Assert.IsNotNull(applicationFolder); + Assert.IsTrue(dir.GetDirectories().Any(r => r.Name.Equals("Microsoft"))); + + + dir.EnumerateDirectories().ToList().ForEach(d => { if (d.Name == "Microsoft") d.Delete(true); }); + } + } + + [TestMethod] + public void GetApplicationFolderReturnsSubfolderFromTmpFolderIfVarTmpIsNotAvailableInNonWindows() + { + if (!ApplicationFolderProvider.IsWindowsOperatingSystem()) + { + var dir = new System.IO.DirectoryInfo(NonWindowsStorageProbePathTmp); + + var provider = new ApplicationFolderProvider(); + var vartmpPathFieldInfo = provider.GetType().GetField("nonWindowsStorageProbePathVarTmp", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance); + vartmpPathFieldInfo.SetValue(provider, ""); + + IPlatformFolder applicationFolder = provider.GetApplicationFolder(); + + Assert.IsNotNull(applicationFolder); + Assert.IsTrue(dir.GetDirectories().Any(r => r.Name.Equals("Microsoft"))); + + + dir.EnumerateDirectories().ToList().ForEach(d => { if (d.Name == "Microsoft") d.Delete(true); }); + } + } + + [TestMethod] + public void GetApplicationFolderReturnsNullWhenNoFolderAvailableToStoreDataInNonWindows() + { + if (!ApplicationFolderProvider.IsWindowsOperatingSystem()) + { + var provider = new ApplicationFolderProvider(); + var vartmpPathFieldInfo = provider.GetType().GetField("nonWindowsStorageProbePathVarTmp", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance); + vartmpPathFieldInfo.SetValue(provider, ""); + var tmpPathFieldInfo = provider.GetType().GetField("nonWindowsStorageProbePathTmp", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance); + tmpPathFieldInfo.SetValue(provider, ""); + + IPlatformFolder applicationFolder = provider.GetApplicationFolder(); + Assert.IsNull(applicationFolder); + } + } + + [TestMethod] + public void GetApplicationFolderReturnsSubfolderFromVarTmpIfTmpDirIsTooLongInNonWindows() + { + if (!ApplicationFolderProvider.IsWindowsOperatingSystem()) + { + string longDirectoryName = Path.Combine(this.testDirectory.FullName, new string('A', 300)); + var varTmpdir = new System.IO.DirectoryInfo(NonWindowsStorageProbePathVarTmp); + + // Initialize ApplicationfolderProvider + var environmentVariables = new Hashtable + { + { "TMPDIR", longDirectoryName }, + }; + + var provider = new ApplicationFolderProvider(environmentVariables); + + IPlatformFolder applicationFolder = provider.GetApplicationFolder(); + + // Evaluate + Assert.IsNotNull(applicationFolder); + Assert.IsFalse(Directory.Exists(longDirectoryName), "TEST ERROR: This directory should not be created."); + Assert.IsTrue(Directory.Exists(varTmpdir.FullName), "TEST ERROR: This directory should be created."); + Assert.IsTrue(varTmpdir.GetDirectories().Any(r => r.Name.Equals("Microsoft")), "TEST FAIL: TEMP subdirectories were not created"); + varTmpdir.EnumerateDirectories().ToList().ForEach(d => { if (d.Name == "Microsoft") d.Delete(true); }); + } + } + +#endif + // TODO: Find way to detect denied FileSystemRights.DeleteSubdirectoriesAndFiles public void GetApplicationFolderReturnsNullWhenFolderAlreadyExistsButDeniesRightToDeleteSubdirectoriesAndFiles() { diff --git a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/FileSystemTest.cs b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/FileSystemTest.cs index 77db1d69b..5b6ad9888 100644 --- a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/FileSystemTest.cs +++ b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/FileSystemTest.cs @@ -1,6 +1,5 @@ namespace Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.Implementation { -#if !NETCOREAPP1_1 using System; using System.IO; using System.Linq; @@ -74,5 +73,4 @@ return platformFile.Open(FileMode.Open); } } -#endif } \ No newline at end of file diff --git a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/PlatformFileTest.cs b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/PlatformFileTest.cs index b579d5db0..68b91d8ba 100644 --- a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/PlatformFileTest.cs +++ b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/PlatformFileTest.cs @@ -1,6 +1,5 @@ namespace Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.Implementation { -#if !NETCOREAPP1_1 using System; using System.IO; using System.Security.AccessControl; @@ -280,5 +279,4 @@ } } } -#endif } \ No newline at end of file diff --git a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/PlatformFolderTest.cs b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/PlatformFolderTest.cs index 79c405dff..e6e354559 100644 --- a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/PlatformFolderTest.cs +++ b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/PlatformFolderTest.cs @@ -1,6 +1,5 @@ namespace Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.Implementation { -#if !NETCOREAPP1_1 using System; using System.Collections.Generic; using System.IO; @@ -268,5 +267,4 @@ } } } -#endif } \ No newline at end of file diff --git a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/TransmissionStorageTest.cs b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/TransmissionStorageTest.cs index 90a291333..c2d8c84c8 100644 --- a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/TransmissionStorageTest.cs +++ b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/TransmissionStorageTest.cs @@ -61,7 +61,7 @@ // [TestMethod] public void IsThreadSafe() { -#if (!NETCOREAPP1_1 && !NETCOREAPP2_1) +#if !NETCOREAPP2_1 const int NumberOfThreads = 16; const int NumberOfFilesPerThread = 64; var storage = new TransmissionStorage(); diff --git a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/TelemetryChannel.Tests.csproj b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/TelemetryChannel.Tests.csproj index a48364f22..cb61cff01 100644 --- a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/TelemetryChannel.Tests.csproj +++ b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/TelemetryChannel.Tests.csproj @@ -15,16 +15,13 @@ - net45;netcoreapp1.1;netcoreapp2.1;netcoreapp3.1 - netcoreapp1.1;netcoreapp2.1;netcoreapp3.1 + net45;netcoreapp2.1;netcoreapp3.1 + netcoreapp2.1;netcoreapp3.1 Microsoft.ApplicationInsights.TelemetryChannel.Tests pdbonly true - - - $(DefineConstants);NETCOREAPP;NETCOREAPP1_1; @@ -53,18 +50,6 @@ - - - - - - - - - - - - diff --git a/BASE/Test/TestFramework/Shared/EventSourceTest.cs b/BASE/Test/TestFramework/Shared/EventSourceTest.cs index edae0f073..781412765 100644 --- a/BASE/Test/TestFramework/Shared/EventSourceTest.cs +++ b/BASE/Test/TestFramework/Shared/EventSourceTest.cs @@ -93,11 +93,7 @@ namespace Microsoft.ApplicationInsights.TestFramework private static void VerifyEventApplicationName(MethodInfo eventMethod, EventWrittenEventArgs actualEvent) { -#if !NETCOREAPP1_1 string expectedApplicationName = AppDomain.CurrentDomain.FriendlyName; -#else - string expectedApplicationName = ""; -#endif string actualApplicationName = actualEvent.Payload.Last().ToString(); AssertEqual(expectedApplicationName, actualApplicationName, "Application Name"); } diff --git a/BASE/src/Microsoft.ApplicationInsights/DataContracts/InnerExceptionCountExceededException.cs b/BASE/src/Microsoft.ApplicationInsights/DataContracts/InnerExceptionCountExceededException.cs index aeed45f77..cdd6b6259 100644 --- a/BASE/src/Microsoft.ApplicationInsights/DataContracts/InnerExceptionCountExceededException.cs +++ b/BASE/src/Microsoft.ApplicationInsights/DataContracts/InnerExceptionCountExceededException.cs @@ -2,16 +2,12 @@ namespace Microsoft.ApplicationInsights.DataContracts { using System; using System.Diagnostics.CodeAnalysis; -#if !NETSTANDARD1_3 using System.Runtime.Serialization; -#endif /// /// This exception is used to notify the user that the set of inner exceptions has been trimmed because it exceeded our allowed send limit. /// -#if !NETSTANDARD1_3 [Serializable] -#endif [SuppressMessage("Microsoft.Design", "CA1064:ExceptionsShouldBePublic", Justification = "We expect that this exception will be caught within the internal scope and should never be exposed to an end user.")] internal class InnerExceptionCountExceededException : Exception { @@ -37,7 +33,6 @@ namespace Microsoft.ApplicationInsights.DataContracts public InnerExceptionCountExceededException(string message, Exception innerException) : base(message, innerException) { } -#if !NETSTANDARD1_3 /// /// Initializes a new instance of the class with serialized data. @@ -49,6 +44,5 @@ namespace Microsoft.ApplicationInsights.DataContracts protected InnerExceptionCountExceededException(SerializationInfo info, StreamingContext context) : base(info, context) { } -#endif } } \ No newline at end of file diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/DictionarySerializationWriter.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/DictionarySerializationWriter.cs index a8f34bb3b..cd6f14c5e 100644 --- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/DictionarySerializationWriter.cs +++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/DictionarySerializationWriter.cs @@ -98,11 +98,7 @@ { if (value.HasValue) { -#if NETSTANDARD1_3 - this.AccumulatedDictionary[key] = value.Value.ToString(); -#else this.AccumulatedDictionary[key] = value.Value.ToString(CultureInfo.InvariantCulture); -#endif } else { diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Endpoints/EndpointMetaAttribute.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Endpoints/EndpointMetaAttribute.cs index 95056cbff..7abaa87cc 100644 --- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Endpoints/EndpointMetaAttribute.cs +++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Endpoints/EndpointMetaAttribute.cs @@ -20,15 +20,9 @@ public static EndpointMetaAttribute GetAttribute(EndpointName enumValue) { -#if NETSTANDARD1_3 - Type type = enumValue.GetType(); - string name = Enum.GetName(type, enumValue); - return type.GetRuntimeField(name).GetCustomAttribute(); -#else Type type = enumValue.GetType(); string name = Enum.GetName(type, enumValue); return type.GetField(name).GetCustomAttribute(); -#endif } } } diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/External/Tags.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/External/Tags.cs index 00cb76000..0046b3481 100644 --- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/External/Tags.cs +++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/External/Tags.cs @@ -68,11 +68,7 @@ namespace Microsoft.ApplicationInsights.Extensibility.Implementation.External { if (tagValue.HasValue) { -#if NETSTANDARD1_3 - string value = tagValue.Value.ToString(); -#else string value = tagValue.Value.ToString(CultureInfo.InvariantCulture); -#endif tags.Add(tagKey, value); } } diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/FormattableStringTools.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/FormattableStringTools.cs index 11d89b853..dc20aaae4 100644 --- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/FormattableStringTools.cs +++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/FormattableStringTools.cs @@ -1,4 +1,4 @@ -#if NET45 || NETSTANDARD1_1 +#if NET45 // FormattableString & Co are available in NetFx 4.6+, but not in NetFx 4.5 or NetStandard 1.1 diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Platform/PlatformImplementation.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Platform/PlatformImplementation.cs index 1b4ebac49..4c28c91f2 100644 --- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Platform/PlatformImplementation.cs +++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Platform/PlatformImplementation.cs @@ -1,5 +1,4 @@ -#if !NETSTANDARD1_3 // netstandard1.3 has it's own implementation -namespace Microsoft.ApplicationInsights.Extensibility.Implementation.Platform +namespace Microsoft.ApplicationInsights.Extensibility.Implementation.Platform { using System; using System.Collections; @@ -142,82 +141,4 @@ namespace Microsoft.ApplicationInsights.Extensibility.Implementation.Platform return string.Empty; } } -} -#else -namespace Microsoft.ApplicationInsights.Extensibility.Implementation.Platform -{ - using System; - using System.Collections.Generic; - using Microsoft.ApplicationInsights.Extensibility.Implementation.External; - using Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing; - - internal class PlatformImplementation : IPlatform - { - private IDebugOutput debugOutput = null; - - public IDictionary GetApplicationSettings() - { - return null; - } - - public string ReadConfigurationXml() - { - return null; - } - - public ExceptionDetails GetExceptionDetails(Exception exception, ExceptionDetails parentExceptionDetails) - { - return ExceptionConverter.ConvertToExceptionDetails(exception, parentExceptionDetails); - } - - /// - /// Returns the platform specific Debugger writer to the VS output console. - /// - public IDebugOutput GetDebugOutput() - { - if (this.debugOutput == null) - { - this.debugOutput = new TelemetryDebugWriter(); - } - - return this.debugOutput; - } - - /// - public bool TryGetEnvironmentVariable(string name, out string value) - { - value = string.Empty; - - try - { - value = Environment.GetEnvironmentVariable(name); - return !string.IsNullOrEmpty(value); - } - catch (Exception e) - { - CoreEventSource.Log.FailedToLoadEnvironmentVariables(e.ToString()); - } - - return false; - } - - /// - /// Returns the machine name. - /// - /// The machine name. - public string GetMachineName() - { - try - { - return Environment.GetEnvironmentVariable("COMPUTERNAME"); - } - catch (Exception e) - { - CoreEventSource.Log.FailedToLoadEnvironmentVariables(e.ToString()); - } - - return string.Empty; - } - } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/SdkVersionUtils.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/SdkVersionUtils.cs index 53cf38857..2e2b8143c 100644 --- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/SdkVersionUtils.cs +++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/SdkVersionUtils.cs @@ -15,18 +15,11 @@ /// String representation of the version with prefix added. internal static string GetSdkVersion(string versionPrefix) { -#if !NETSTANDARD1_3 string versionStr = typeof(TelemetryClient).Assembly.GetCustomAttributes(false) .OfType() .First() .Version; -#else - string versionStr = typeof(TelemetryClient).GetTypeInfo().Assembly.GetCustomAttributes() - .FirstOrDefault() - ?.Version; -#endif - Version version; // this may happen when Application Insights SDK assembly was merged into another assembly diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/TelemetryDebugWriter.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/TelemetryDebugWriter.cs index 9cbb66e45..1a99655b6 100644 --- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/TelemetryDebugWriter.cs +++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/TelemetryDebugWriter.cs @@ -56,11 +56,7 @@ namespace Microsoft.ApplicationInsights.Extensibility.Implementation void IDebugOutput.WriteLine(string message) { -#if NETSTANDARD1_3 - Debug.WriteLine(message); -#else Debugger.Log(0, "category", message + Environment.NewLine); -#endif } bool IDebugOutput.IsLogging() @@ -69,11 +65,8 @@ namespace Microsoft.ApplicationInsights.Extensibility.Implementation { return false; } -#if NETSTANDARD1_3 - return true; -#else + return Debugger.IsLogging(); -#endif } bool IDebugOutput.IsAttached() diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/ApplicationNameProvider.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/ApplicationNameProvider.cs index b68e63ff2..1b8cef871 100644 --- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/ApplicationNameProvider.cs +++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/ApplicationNameProvider.cs @@ -22,11 +22,7 @@ string name; try { -#if !NETSTANDARD1_3 name = AppDomain.CurrentDomain.FriendlyName; -#else - name = string.Empty; -#endif } catch (Exception exp) { diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/BaseDefaultHeartbeatPropertyProvider.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/BaseDefaultHeartbeatPropertyProvider.cs index 1bbbb70df..2f4aea1b9 100644 --- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/BaseDefaultHeartbeatPropertyProvider.cs +++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/BaseDefaultHeartbeatPropertyProvider.cs @@ -91,7 +91,7 @@ .Cast() .FirstOrDefault(); return objectAssemblyFileVer != null ? objectAssemblyFileVer.Version : "undefined"; -#elif NETSTANDARD1_3 || NETSTANDARD2_0 +#elif NETSTANDARD2_0 return System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription; #else #error Unrecognized framework @@ -109,8 +109,6 @@ return "net45"; #elif NET46 return "net46"; -#elif NETSTANDARD1_3 - return "netstandard1.3"; #elif NETSTANDARD2_0 return "netstandard2.0"; #else @@ -133,7 +131,7 @@ osValue = Environment.OSVersion.Platform.ToString(); -#elif NETSTANDARD1_3 || NETSTANDARD2_0 +#elif NETSTANDARD2_0 if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) { diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/Extensions.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/Extensions.cs index 64f61601f..3a9f1338f 100644 --- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/Extensions.cs +++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/Extensions.cs @@ -22,9 +22,6 @@ return string.Empty; } -#if NETSTANDARD1_3 - return exception.ToString(); -#else CultureInfo originalUICulture = Thread.CurrentThread.CurrentUICulture; try { @@ -35,7 +32,6 @@ { Thread.CurrentThread.CurrentUICulture = originalUICulture; } -#endif } } } diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/FileDiagnosticsModule/TraceSourceForEventSource.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/FileDiagnosticsModule/TraceSourceForEventSource.cs index 218870be0..8bfa6313f 100644 --- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/FileDiagnosticsModule/TraceSourceForEventSource.cs +++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/FileDiagnosticsModule/TraceSourceForEventSource.cs @@ -1,6 +1,5 @@ namespace Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing.FileDiagnosticsModule { -#if !NETSTANDARD1_3 using System; using System.Collections.Generic; using System.Diagnostics; @@ -202,5 +201,4 @@ } } } -#endif } diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/FileDiagnosticsTelemetryModule.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/FileDiagnosticsTelemetryModule.cs index 5c7a9df5b..008b4d337 100644 --- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/FileDiagnosticsTelemetryModule.cs +++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/FileDiagnosticsTelemetryModule.cs @@ -1,7 +1,5 @@ namespace Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing { -#if !NETSTANDARD1_3 - using System; using System.Diagnostics; using System.Diagnostics.Tracing; @@ -244,5 +242,4 @@ return result; } } -#endif } diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Utils.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Utils.cs index f0a863f22..c18a90e58 100644 --- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Utils.cs +++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Utils.cs @@ -18,11 +18,8 @@ { return true; } -#if !NETSTANDARD1_3 + return value.All(char.IsWhiteSpace); -#else - return string.IsNullOrWhiteSpace(value); -#endif } public static void CopyDictionary(IDictionary source, IDictionary target) diff --git a/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj b/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj index 758dfef3d..86987d47b 100644 --- a/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj +++ b/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj @@ -6,12 +6,8 @@ Microsoft.ApplicationInsights Microsoft.ApplicationInsights - net45;net46;netstandard1.3;netstandard2.0 - netstandard1.3;netstandard2.0 - - - - $(DefineConstants);NETSTANDARD; + net45;net46;netstandard2.0 + netstandard2.0 @@ -25,29 +21,6 @@ - - - - All - - - All - - - All - - - All - - - - - - - All - - - All @@ -60,14 +33,6 @@ - - - - - - - - diff --git a/BASE/src/ServerTelemetryChannel/Implementation/ApplicationFolderProvider.cs b/BASE/src/ServerTelemetryChannel/Implementation/ApplicationFolderProvider.cs index 03ca2ad36..4563ebda4 100644 --- a/BASE/src/ServerTelemetryChannel/Implementation/ApplicationFolderProvider.cs +++ b/BASE/src/ServerTelemetryChannel/Implementation/ApplicationFolderProvider.cs @@ -6,6 +6,7 @@ using System.Diagnostics; using System.Globalization; using System.IO; + using System.Runtime.InteropServices; using System.Security; using System.Security.AccessControl; using System.Security.Cryptography; @@ -21,6 +22,10 @@ private readonly string customFolderName; private readonly IIdentityProvider identityProvider; + // Creating readonly instead of constant, from test we could use reflection to replace the value of these fields. + private readonly string nonWindowsStorageProbePathVarTmp = "/var/tmp/"; + private readonly string nonWindowsStorageProbePathTmp = "/tmp/"; + public ApplicationFolderProvider(string folderName = null) : this(Environment.GetEnvironmentVariables(), folderName) { @@ -33,17 +38,14 @@ throw new ArgumentNullException(nameof(environment)); } - try + if(IsWindowsOperatingSystem()) { - // In NETSTANDARD 1.3 Most reliable way to know if WindowsIdentityProvider can be used - // is to check if it throws exception. - WindowsIdentity.GetCurrent(); this.identityProvider = new WindowsIdentityProvider(); this.ApplySecurityToDirectory = this.SetSecurityPermissionsToAdminAndCurrentUserWindows; } - catch (Exception) + else { - this.identityProvider = new NonWindowsIdentityProvider(environment); + this.identityProvider = new NonWindowsIdentityProvider(); this.ApplySecurityToDirectory = this.SetSecurityPermissionsToAdminAndCurrentUserNonWindows; } @@ -56,22 +58,46 @@ var errors = new List(this.environment.Count + 1); var result = this.CreateAndValidateApplicationFolder(this.customFolderName, createSubFolder: false, errors: errors); - - if (result == null) + + if (IsWindowsOperatingSystem()) { - object localAppData = this.environment["LOCALAPPDATA"]; - if (localAppData != null) + if (result == null) { - result = this.CreateAndValidateApplicationFolder(localAppData.ToString(), createSubFolder: true, errors: errors); + object localAppData = this.environment["LOCALAPPDATA"]; + if (localAppData != null) + { + result = this.CreateAndValidateApplicationFolder(localAppData.ToString(), createSubFolder: true, errors: errors); + } + } + + if (result == null) + { + object temp = this.environment["TEMP"]; + if (temp != null) + { + result = this.CreateAndValidateApplicationFolder(temp.ToString(), createSubFolder: true, errors: errors); + } } } - - if (result == null) - { - object temp = this.environment["TEMP"]; - if (temp != null) + else + { + if (result == null) { - result = this.CreateAndValidateApplicationFolder(temp.ToString(), createSubFolder: true, errors: errors); + object tmpdir = this.environment["TMPDIR"]; + if (tmpdir != null) + { + result = this.CreateAndValidateApplicationFolder(tmpdir.ToString(), createSubFolder: true, errors: errors); + } + } + + if (result == null) + { + result = this.CreateAndValidateApplicationFolder(this.nonWindowsStorageProbePathVarTmp, createSubFolder: true, errors: errors); + } + + if (result == null) + { + result = this.CreateAndValidateApplicationFolder(this.nonWindowsStorageProbePathTmp, createSubFolder: true, errors: errors); } } @@ -92,6 +118,22 @@ this.ApplySecurityToDirectory = applySecurityToDirectory; } + internal static bool IsWindowsOperatingSystem() + { +#if NET45 + return true; +#else + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + return true; + } + else + { + return false; + } +#endif + } + private static string GetPathAccessFailureErrorMessage(Exception exp, string path) { return "Path: " + path + "; Error: " + exp.Message + Environment.NewLine; @@ -228,9 +270,9 @@ private bool SetSecurityPermissionsToAdminAndCurrentUserNonWindows(DirectoryInfo subdirectory) { - // For non-windows simply return false to indicate that security policy is not applied. + // For non-windows simply return true to skip security policy. // This is until .net core exposes an Api to do this. - return false; + return true; } private bool SetSecurityPermissionsToAdminAndCurrentUserWindows(DirectoryInfo subdirectory) diff --git a/BASE/src/ServerTelemetryChannel/Implementation/BackoffLogicManager.cs b/BASE/src/ServerTelemetryChannel/Implementation/BackoffLogicManager.cs index 1bc676195..b3aa0ab15 100644 --- a/BASE/src/ServerTelemetryChannel/Implementation/BackoffLogicManager.cs +++ b/BASE/src/ServerTelemetryChannel/Implementation/BackoffLogicManager.cs @@ -1,14 +1,10 @@ namespace Microsoft.ApplicationInsights.Channel.Implementation { using System; - using System.Runtime.Serialization; -#if NETSTANDARD1_3 - using Newtonsoft.Json; -#else using System.IO; + using System.Runtime.Serialization; using System.Runtime.Serialization.Json; using System.Text; -#endif using Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.Implementation; internal class BackoffLogicManager @@ -19,10 +15,7 @@ private const int DefaultBackoffEnabledReportingIntervalInMin = 30; private static readonly Random Random = new Random(); - -#if !NETSTANDARD1_3 private static readonly DataContractJsonSerializer Serializer = new DataContractJsonSerializer(typeof(BackendResponse)); -#endif private readonly object lockConsecutiveErrors = new object(); private readonly TimeSpan minIntervalToUpdateConsecutiveErrors; @@ -77,14 +70,10 @@ { if (!string.IsNullOrEmpty(responseContent)) { -#if NETSTANDARD1_3 - backendResponse = JsonConvert.DeserializeObject(responseContent); -#else using (MemoryStream ms = new MemoryStream(Encoding.Unicode.GetBytes(responseContent))) { backendResponse = Serializer.ReadObject(ms) as BackendResponse; - } -#endif + } } } catch (ArgumentException exp) @@ -102,18 +91,7 @@ TelemetryChannelEventSource.Log.BreezeResponseWasNotParsedWarning(exp.Message, responseContent); backendResponse = null; } -#if NETSTANDARD1_3 - catch (JsonReaderException exp) - { - TelemetryChannelEventSource.Log.BreezeResponseWasNotParsedWarning(exp.Message, responseContent); - backendResponse = null; - } - catch (JsonSerializationException exp) - { - TelemetryChannelEventSource.Log.BreezeResponseWasNotParsedWarning(exp.Message, responseContent); - backendResponse = null; - } -#endif + return backendResponse; } diff --git a/BASE/src/ServerTelemetryChannel/Implementation/TelemetryChannelEventSource.cs b/BASE/src/ServerTelemetryChannel/Implementation/TelemetryChannelEventSource.cs index a825c7b2c..602d095ca 100644 --- a/BASE/src/ServerTelemetryChannel/Implementation/TelemetryChannelEventSource.cs +++ b/BASE/src/ServerTelemetryChannel/Implementation/TelemetryChannelEventSource.cs @@ -549,11 +549,7 @@ string name; try { -#if !NETSTANDARD1_3 name = AppDomain.CurrentDomain.FriendlyName; -#else - name = string.Empty; -#endif } catch (Exception exp) { diff --git a/BASE/src/ServerTelemetryChannel/Implementation/TransmissionStorage.cs b/BASE/src/ServerTelemetryChannel/Implementation/TransmissionStorage.cs index 98e86f525..3290e9852 100644 --- a/BASE/src/ServerTelemetryChannel/Implementation/TransmissionStorage.cs +++ b/BASE/src/ServerTelemetryChannel/Implementation/TransmissionStorage.cs @@ -182,11 +182,7 @@ private static string GetUniqueFileName(string extension) { -#if NETSTANDARD1_3 - string fileName = Guid.NewGuid().ToString("N"); -#else string fileName = Guid.NewGuid().ToString("N", CultureInfo.InvariantCulture); -#endif return Path.ChangeExtension(fileName, extension); } diff --git a/BASE/src/ServerTelemetryChannel/Managed/Shared/Implementation/NonWindowsIdentityProvider.cs b/BASE/src/ServerTelemetryChannel/Managed/Shared/Implementation/NonWindowsIdentityProvider.cs index 9e5a7750d..40a32ec5a 100644 --- a/BASE/src/ServerTelemetryChannel/Managed/Shared/Implementation/NonWindowsIdentityProvider.cs +++ b/BASE/src/ServerTelemetryChannel/Managed/Shared/Implementation/NonWindowsIdentityProvider.cs @@ -1,32 +1,12 @@ namespace Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.Shared.Implementation { using System; - using System.Collections; - using System.Collections.Generic; - using System.Linq; - using System.Text; - using System.Threading.Tasks; internal class NonWindowsIdentityProvider : IIdentityProvider { - private IDictionary environment; - - public NonWindowsIdentityProvider(IDictionary environment) - { - this.environment = environment; - } - string IIdentityProvider.GetName() { - // This variable is not guaranteed to be present. eg: in Docker containers. - if (this.environment["USER"] != null) - { - return this.environment["USER"].ToString(); - } - else - { - return string.Empty; - } + return Environment.UserName; } } } diff --git a/BASE/src/ServerTelemetryChannel/TelemetryChannel.csproj b/BASE/src/ServerTelemetryChannel/TelemetryChannel.csproj index b12d62799..577f6c43c 100644 --- a/BASE/src/ServerTelemetryChannel/TelemetryChannel.csproj +++ b/BASE/src/ServerTelemetryChannel/TelemetryChannel.csproj @@ -6,12 +6,8 @@ Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel Microsoft.AI.ServerTelemetryChannel - net45;netstandard1.3;netstandard2.0 - netstandard1.3;netstandard2.0 - - - - $(DefineConstants);NETSTANDARD; + net45;netstandard2.0 + netstandard2.0 @@ -22,39 +18,15 @@ - TRACE;DEBUG;NETCORE;NETSTANDARD1_3 TRACE;DEBUG;NETCORE;NETSTANDARD2_0 TRACE;DEBUG;NET45 - + $(DefineConstants);NETSTANDARD True - - - - All - - - All - - - All - - - All - - - - - - - All - - - @@ -89,16 +61,5 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 66b4d3007..6f4bd44f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,17 @@ ## VNext + +## Version 2.15.0-beta2 +- [Read all properties of ApplicationInsightsServiceOptions from IConfiguration](https://github.com/microsoft/ApplicationInsights-dotnet/issues/1882) +- [End support for NetStandard 1.x, Add support for NetStandard 2.0](https://github.com/microsoft/ApplicationInsights-dotnet/issues/1160) +- [Add support for SourceLink.Github to all SDKs.](https://github.com/microsoft/ApplicationInsights-dotnet/issues/1760) +- [ServerTelemetryChannel by default uses local disk storage in non Windows, to store telemetry during transient errors](https://github.com/microsoft/ApplicationInsights-dotnet/issues/1792) + ## Version 2.15.0-beta1 - [WorkerService package is modified to depend on 2.1.1 on Microsoft.Extensions.DependencyInjection so that it can be used in .NET Core 2.1 projects without nuget errors.](https://github.com/microsoft/ApplicationInsights-dotnet/issues/1677) - [Adding a flag to EventCounterCollector to enable/disable storing the EventSource name in the MetricNamespace and simplify the metric name](https://github.com/microsoft/ApplicationInsights-dotnet/issues/1341) -- [New: EventCounter to track Ingestion Endpoint Response Time] (https://github.com/microsoft/ApplicationInsights-dotnet/pull/1796) +- [New: EventCounter to track Ingestion Endpoint Response Time](https://github.com/microsoft/ApplicationInsights-dotnet/pull/1796) ## Version 2.14.0 - no changes since beta. diff --git a/Directory.Build.props b/Directory.Build.props index 524f6f1c3..53106e49c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -26,7 +26,7 @@ $(EnlistmentRoot)\..\bin $([System.IO.Path]::GetFullPath( $(BinRoot) )) - + $(EnlistmentRoot)\..\obj $([System.IO.Path]::GetFullPath( $(ObjRoot) )) @@ -43,10 +43,9 @@ $(ObjRoot)\$(Configuration)\$(RelativeOutputPathBase) $([System.IO.Path]::GetFullPath( $(IntermediateOutputPath) ))\ - - true + \ No newline at end of file diff --git a/Everything.sln b/Everything.sln index e86b626f6..ef33316bb 100644 --- a/Everything.sln +++ b/Everything.sln @@ -91,34 +91,12 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestFramework.Shared.Base", EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestFramework.Shared.Web", "WEB\Src\TestFramework\Shared\TestFramework.Shared.Web.shproj", "{9718F051-147F-4F5F-9FF3-C926430EFCF7}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "DependencyCollector.Shared.Tests", "WEB\Src\DependencyCollector\Shared.Tests\DependencyCollector.Shared.Tests.shproj", "{ACE58393-3419-4FCA-87CC-C33EB756C7E4}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventCounterCollector.Tests", "WEB\Src\EventCounterCollector\EventCounterCollector.Tests\EventCounterCollector.Tests\EventCounterCollector.Tests.csproj", "{BECFC6B1-E04E-431C-A4D9-6F330F7DE22D}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Filtering.Shared", "WEB\Src\PerformanceCollector\Filtering.Shared\Filtering.Shared.shproj", "{568AEB4F-BA4C-47A5-9FA3-68F06CD11FED}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perf.NetCore.Tests", "WEB\Src\PerformanceCollector\NetCore.Tests\Perf.NetCore.Tests.csproj", "{8F641C0B-A57A-43EC-B91F-4258F6DC0CD5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perf-NetCore20.Tests", "WEB\Src\PerformanceCollector\NetCore20.Tests\Perf-NetCore20.Tests\Perf-NetCore20.Tests.csproj", "{07620299-B0E7-44BB-BE85-C4D1B25104F6}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perf.Net45.Tests", "WEB\Src\PerformanceCollector\Perf.Net45.Tests\Perf.Net45.Tests.csproj", "{F254D4FB-428D-408E-8251-39BCA7B4B5CE}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared", "WEB\Src\PerformanceCollector\Perf.Shared\Perf.Shared.shproj", "{A78F50D4-F518-4DCB-878B-526FD54CCA35}" -EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetFull", "WEB\Src\PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.shproj", "{0196259C-3582-4F4E-A01F-A8F9AE83B0F3}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetStandard", "WEB\Src\PerformanceCollector\Perf.Shared.NetStandard\Perf.Shared.NetStandard.shproj", "{D13C3EC7-B300-4158-9054-216156B203BE}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetStandard.Stubs", "WEB\Src\PerformanceCollector\Perf.Shared.NetStandard.Stubs\Perf.Shared.NetStandard.Stubs.shproj", "{30A45441-0849-48FE-AD37-5D29D0E3068A}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetStandard16.Stubs", "WEB\Src\PerformanceCollector\Perf.Shared.NetStandard16.Stubs\Perf.Shared.NetStandard16.Stubs.shproj", "{76B21FAA-270D-47DE-B14B-BEC87EDC34F1}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetStandard20", "WEB\Src\PerformanceCollector\Perf.Shared.NetStandard20\Perf.Shared.NetStandard20.shproj", "{A8BA3BD0-19CE-488D-B2BD-0B9B677F4E03}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetStandard20Net45", "WEB\Src\PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.shproj", "{054C25DC-E545-4712-95C4-81F30CF65CE8}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.Tests", "WEB\Src\PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.shproj", "{9B524BD3-682D-4B6F-9251-D4B2911DF0FD}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "L) GenericTests", "L) GenericTests", "{D2A0AA36-57F7-436C-A7AF-7322927F1734}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xdt.Tests", "LOGGING\test\Xdt.Tests\Xdt.Tests.csproj", "{262792BF-31A8-4FCD-BBC7-341EB29FAE96}" @@ -131,14 +109,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsigh EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsights.WorkerService.Tests", "NETCORE\test\Microsoft.ApplicationInsights.WorkerService.Tests\Microsoft.ApplicationInsights.WorkerService.Tests.csproj", "{B90EDEA5-3CC8-4282-80A0-7116905E2427}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmptyApp20.FunctionalTests20", "NETCORE\test\EmptyApp20.FunctionalTests\EmptyApp20.FunctionalTests20.csproj", "{8C764C9F-1078-47AF-87B8-AF62C7CD6447}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTestUtils20", "NETCORE\test\FunctionalTestUtils20\FunctionalTestUtils20.csproj", "{CF1818F5-CB8E-41A2-B3A8-344A80B79CEC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVCFramework20.FunctionalTests20", "NETCORE\test\MVCFramework20.FunctionalTests\MVCFramework20.FunctionalTests20.csproj", "{BCF933FA-3E6A-41C2-874A-E25195D6D0E8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApi20.FunctionalTests20", "NETCORE\test\WebApi20.FunctionalTests\WebApi20.FunctionalTests20.csproj", "{4871B8AC-FB79-4D3D-940D-80E796110359}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsightsTypes", "NETCORE\test\ApplicationInsightsTypes\ApplicationInsightsTypes.csproj", "{3D7258E3-5DDC-45A4-A457-9AA3BCC92DE7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsights.Tests", "BASE\Test\Microsoft.ApplicationInsights.Test\Microsoft.ApplicationInsights.Tests\Microsoft.ApplicationInsights.Tests.csproj", "{4BAA7AF2-3C5B-4C7C-9A9C-26F561218A86}" @@ -167,20 +137,27 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Tests", "WEB\Src\Web\We EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsServer.Tests", "WEB\Src\WindowsServer\WindowsServer.Tests\WindowsServer.Tests.csproj", "{5F40F661-DE59-4489-ABAC-BE6F2D730D9A}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.WebApi.Tests", "NETCORE\test\FunctionalTests.WebApi.Tests\FunctionalTests.WebApi.Tests.csproj", "{BB89365D-FFAA-4515-A277-D478A678D4B3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.Utils", "NETCORE\test\FunctionalTests.Utils\FunctionalTests.Utils.csproj", "{F677DF78-A630-464C-BEA9-3BBAEA97412F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.MVC.Tests", "NETCORE\test\FunctionalTests.MVC.Tests\FunctionalTests.MVC.Tests.csproj", "{43D6CB2E-6EE7-4B2B-A517-0D70298ACDBF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.EmptyApp.Tests", "NETCORE\test\FunctionalTests.EmptyApp.Tests\FunctionalTests.EmptyApp.Tests.csproj", "{00FC8932-554B-455F-9E02-E8A4B0DBFAA8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perf.Tests", "WEB\Src\PerformanceCollector\Perf.Tests\Perf.Tests.csproj", "{27B8D7BE-8CB7-48BF-97DA-0F031103C03D}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution WEB\Src\PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.projitems*{0196259c-3582-4f4e-a01f-a8f9ae83b0f3}*SharedItemsImports = 13 - WEB\Src\PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.projitems*{054c25dc-e545-4712-95c4-81f30cf65ce8}*SharedItemsImports = 13 - WEB\Src\PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{07620299-b0e7-44bb-be85-c4d1b25104f6}*SharedItemsImports = 5 - WEB\Src\TestFramework\Shared\TestFramework.Shared.projitems*{07620299-b0e7-44bb-be85-c4d1b25104f6}*SharedItemsImports = 5 WEB\Src\Common\Common.projitems*{13335eb8-3936-407a-9363-1c428318bea8}*SharedItemsImports = 5 LOGGING\src\CommonShared\CommonShared.projitems*{1b0f54bf-078a-421c-9708-2d817d4bce30}*SharedItemsImports = 5 LOGGING\src\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{1b0f54bf-078a-421c-9708-2d817d4bce30}*SharedItemsImports = 5 LOGGING\src\CommonShared\CommonShared.projitems*{2612ac44-5ff3-4533-b5a5-e5dbf96f5c83}*SharedItemsImports = 5 + WEB\Src\TestFramework\Shared\TestFramework.Shared.projitems*{27b8d7be-8cb7-48bf-97da-0f031103c03d}*SharedItemsImports = 5 LOGGING\src\CommonShared\CommonShared.projitems*{2e283031-425b-421f-9e81-34abfefab618}*SharedItemsImports = 5 LOGGING\test\CommonTestShared\CommonTestShared.projitems*{305f1c02-f984-43e7-a07e-e2514cfe29a0}*SharedItemsImports = 5 LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{305f1c02-f984-43e7-a07e-e2514cfe29a0}*SharedItemsImports = 5 - WEB\Src\PerformanceCollector\Perf.Shared.NetStandard.Stubs\Perf.Shared.NetStandard.Stubs.projitems*{30a45441-0849-48fe-ad37-5d29d0e3068a}*SharedItemsImports = 13 LOGGING\src\CommonShared\CommonShared.projitems*{3774003c-91fd-4d79-99c7-9beac5b9a48e}*SharedItemsImports = 5 LOGGING\test\CommonTestShared\CommonTestShared.projitems*{37e15186-87a4-42eb-ab59-cedb99ca2640}*SharedItemsImports = 5 LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{37e15186-87a4-42eb-ab59-cedb99ca2640}*SharedItemsImports = 5 @@ -188,18 +165,14 @@ Global NETCORE\src\Shared\Shared.projitems*{3cab7f66-3cc4-4b46-9b0d-765c460fe2bf}*SharedItemsImports = 5 LOGGING\src\CommonShared\CommonShared.projitems*{52b3c054-c686-4bb8-a4b7-9e8d6c49491f}*SharedItemsImports = 5 LOGGING\src\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{52b3c054-c686-4bb8-a4b7-9e8d6c49491f}*SharedItemsImports = 5 - WEB\Src\PerformanceCollector\Filtering.Shared\Filtering.Shared.projitems*{568aeb4f-ba4c-47a5-9fa3-68f06cd11fed}*SharedItemsImports = 13 LOGGING\src\CommonShared\CommonShared.projitems*{587b624b-8c64-498e-93d7-a2d2abc17eab}*SharedItemsImports = 13 WEB\Src\TestFramework\Shared\TestFramework.Shared.projitems*{5f40f661-de59-4489-abac-be6f2d730d9a}*SharedItemsImports = 5 LOGGING\src\CommonShared\CommonShared.projitems*{63b8fda7-2ff5-4a20-8de7-ebb036012a54}*SharedItemsImports = 5 LOGGING\src\CommonShared\CommonShared.projitems*{67291093-4b5f-4ca5-a811-b8a1dcbe3f1f}*SharedItemsImports = 5 - WEB\Src\PerformanceCollector\Perf.Shared.NetStandard16.Stubs\Perf.Shared.NetStandard16.Stubs.projitems*{76b21faa-270d-47de-b14b-bec87edc34f1}*SharedItemsImports = 13 LOGGING\test\CommonTestShared\CommonTestShared.projitems*{7a903abd-d7fb-4610-aed8-32eb2cbaeebf}*SharedItemsImports = 5 LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{7a903abd-d7fb-4610-aed8-32eb2cbaeebf}*SharedItemsImports = 5 WEB\Src\Common\Common.projitems*{7b5d95ee-50ee-4222-a03c-fae5905b3dfd}*SharedItemsImports = 5 WEB\Src\Common\Common.projitems*{8293bc71-7ddc-4dd1-8807-280eef7e752d}*SharedItemsImports = 5 - WEB\Src\PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{8f641c0b-a57a-43ec-b91f-4258f6dc0cd5}*SharedItemsImports = 5 - WEB\Src\TestFramework\Shared\TestFramework.Shared.projitems*{8f641c0b-a57a-43ec-b91f-4258f6dc0cd5}*SharedItemsImports = 5 BASE\src\Common\Common\Common.projitems*{936af739-4297-4016-9d70-4280042709be}*SharedItemsImports = 13 LOGGING\test\CommonTestShared\CommonTestShared.projitems*{93a35062-6aa4-4778-9769-428a942adcf9}*SharedItemsImports = 5 LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{93a35062-6aa4-4778-9769-428a942adcf9}*SharedItemsImports = 5 @@ -207,17 +180,10 @@ Global WEB\Src\TestFramework\Shared\TestFramework.Shared.projitems*{9718f051-147f-4f5f-9ff3-c926430efcf7}*SharedItemsImports = 13 LOGGING\test\CommonTestShared\CommonTestShared.projitems*{9ad802d5-ca3b-4367-bf52-a892fd7c3a0c}*SharedItemsImports = 5 LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{9ad802d5-ca3b-4367-bf52-a892fd7c3a0c}*SharedItemsImports = 5 - WEB\Src\PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{9b524bd3-682d-4b6f-9251-d4b2911df0fd}*SharedItemsImports = 13 WEB\Src\Common\Common.projitems*{9dc5c5e5-fc37-4e54-81fd-aa42bb934e9b}*SharedItemsImports = 5 - WEB\Src\PerformanceCollector\Filtering.Shared\Filtering.Shared.projitems*{9dc5c5e5-fc37-4e54-81fd-aa42bb934e9b}*SharedItemsImports = 5 WEB\Src\PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.projitems*{9dc5c5e5-fc37-4e54-81fd-aa42bb934e9b}*SharedItemsImports = 5 - WEB\Src\PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.projitems*{9dc5c5e5-fc37-4e54-81fd-aa42bb934e9b}*SharedItemsImports = 5 - WEB\Src\PerformanceCollector\Perf.Shared\Perf.Shared.projitems*{9dc5c5e5-fc37-4e54-81fd-aa42bb934e9b}*SharedItemsImports = 5 - WEB\Src\PerformanceCollector\Perf.Shared\Perf.Shared.projitems*{a78f50d4-f518-4dcb-878b-526fd54cca35}*SharedItemsImports = 13 - WEB\Src\PerformanceCollector\Perf.Shared.NetStandard20\Perf.Shared.NetStandard20.projitems*{a8ba3bd0-19ce-488d-b2bd-0b9b677f4e03}*SharedItemsImports = 13 LOGGING\src\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{a964de6d-9750-4013-8be2-79c2afc056e5}*SharedItemsImports = 13 NETCORE\src\Shared\Shared.projitems*{ac399f09-b465-4cfd-8d82-f1d1c5c9347e}*SharedItemsImports = 5 - WEB\Src\DependencyCollector\Shared.Tests\DependencyCollector.Shared.Tests.projitems*{ace58393-3419-4fca-87cc-c33eb756c7e4}*SharedItemsImports = 13 LOGGING\test\CommonTestShared\CommonTestShared.projitems*{b1650e9b-6764-4dc0-8c71-96f0ff335c80}*SharedItemsImports = 5 LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{b1650e9b-6764-4dc0-8c71-96f0ff335c80}*SharedItemsImports = 5 BASE\src\Common\Common\Common.projitems*{c30a7eb8-a86c-49ee-927e-7d9e03572e82}*SharedItemsImports = 5 @@ -229,11 +195,8 @@ Global NETCORE\src\Shared\Shared.projitems*{d56f2979-d6bc-4ef2-bb9b-4077b3290599}*SharedItemsImports = 13 WEB\Src\Common\Common.projitems*{deeaf599-83f9-4a05-add6-f612cdabe570}*SharedItemsImports = 5 BASE\src\Common\Common\Common.projitems*{e3d160e8-7f8c-416f-946f-6fdfc6787461}*SharedItemsImports = 5 - WEB\Src\PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{f254d4fb-428d-408e-8251-39bca7b4b5ce}*SharedItemsImports = 4 - WEB\Src\TestFramework\Shared\TestFramework.Shared.projitems*{f254d4fb-428d-408e-8251-39bca7b4b5ce}*SharedItemsImports = 4 BASE\Test\TestFramework\Shared\TestFramework.Shared.projitems*{f76c6cbd-29b0-4564-bdcb-c969f8fec136}*SharedItemsImports = 13 LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{fa775630-7917-4a99-a78c-fba46edf685c}*SharedItemsImports = 13 - WEB\Src\DependencyCollector\Shared.Tests\DependencyCollector.Shared.Tests.projitems*{fac049e4-7011-45ff-bd06-69aca28921e8}*SharedItemsImports = 5 WEB\Src\TestFramework\Shared\TestFramework.Shared.projitems*{fac049e4-7011-45ff-bd06-69aca28921e8}*SharedItemsImports = 5 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -325,18 +288,6 @@ Global {BECFC6B1-E04E-431C-A4D9-6F330F7DE22D}.Debug|Any CPU.Build.0 = Debug|Any CPU {BECFC6B1-E04E-431C-A4D9-6F330F7DE22D}.Release|Any CPU.ActiveCfg = Release|Any CPU {BECFC6B1-E04E-431C-A4D9-6F330F7DE22D}.Release|Any CPU.Build.0 = Release|Any CPU - {8F641C0B-A57A-43EC-B91F-4258F6DC0CD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F641C0B-A57A-43EC-B91F-4258F6DC0CD5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F641C0B-A57A-43EC-B91F-4258F6DC0CD5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F641C0B-A57A-43EC-B91F-4258F6DC0CD5}.Release|Any CPU.Build.0 = Release|Any CPU - {07620299-B0E7-44BB-BE85-C4D1B25104F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07620299-B0E7-44BB-BE85-C4D1B25104F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07620299-B0E7-44BB-BE85-C4D1B25104F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07620299-B0E7-44BB-BE85-C4D1B25104F6}.Release|Any CPU.Build.0 = Release|Any CPU - {F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Release|Any CPU.Build.0 = Release|Any CPU {262792BF-31A8-4FCD-BBC7-341EB29FAE96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {262792BF-31A8-4FCD-BBC7-341EB29FAE96}.Debug|Any CPU.Build.0 = Debug|Any CPU {262792BF-31A8-4FCD-BBC7-341EB29FAE96}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -349,22 +300,6 @@ Global {B90EDEA5-3CC8-4282-80A0-7116905E2427}.Debug|Any CPU.Build.0 = Debug|Any CPU {B90EDEA5-3CC8-4282-80A0-7116905E2427}.Release|Any CPU.ActiveCfg = Release|Any CPU {B90EDEA5-3CC8-4282-80A0-7116905E2427}.Release|Any CPU.Build.0 = Release|Any CPU - {8C764C9F-1078-47AF-87B8-AF62C7CD6447}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C764C9F-1078-47AF-87B8-AF62C7CD6447}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C764C9F-1078-47AF-87B8-AF62C7CD6447}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C764C9F-1078-47AF-87B8-AF62C7CD6447}.Release|Any CPU.Build.0 = Release|Any CPU - {CF1818F5-CB8E-41A2-B3A8-344A80B79CEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF1818F5-CB8E-41A2-B3A8-344A80B79CEC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF1818F5-CB8E-41A2-B3A8-344A80B79CEC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF1818F5-CB8E-41A2-B3A8-344A80B79CEC}.Release|Any CPU.Build.0 = Release|Any CPU - {BCF933FA-3E6A-41C2-874A-E25195D6D0E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCF933FA-3E6A-41C2-874A-E25195D6D0E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BCF933FA-3E6A-41C2-874A-E25195D6D0E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCF933FA-3E6A-41C2-874A-E25195D6D0E8}.Release|Any CPU.Build.0 = Release|Any CPU - {4871B8AC-FB79-4D3D-940D-80E796110359}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4871B8AC-FB79-4D3D-940D-80E796110359}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4871B8AC-FB79-4D3D-940D-80E796110359}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4871B8AC-FB79-4D3D-940D-80E796110359}.Release|Any CPU.Build.0 = Release|Any CPU {3D7258E3-5DDC-45A4-A457-9AA3BCC92DE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3D7258E3-5DDC-45A4-A457-9AA3BCC92DE7}.Debug|Any CPU.Build.0 = Debug|Any CPU {3D7258E3-5DDC-45A4-A457-9AA3BCC92DE7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -421,6 +356,26 @@ Global {5F40F661-DE59-4489-ABAC-BE6F2D730D9A}.Debug|Any CPU.Build.0 = Debug|Any CPU {5F40F661-DE59-4489-ABAC-BE6F2D730D9A}.Release|Any CPU.ActiveCfg = Release|Any CPU {5F40F661-DE59-4489-ABAC-BE6F2D730D9A}.Release|Any CPU.Build.0 = Release|Any CPU + {BB89365D-FFAA-4515-A277-D478A678D4B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BB89365D-FFAA-4515-A277-D478A678D4B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BB89365D-FFAA-4515-A277-D478A678D4B3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BB89365D-FFAA-4515-A277-D478A678D4B3}.Release|Any CPU.Build.0 = Release|Any CPU + {F677DF78-A630-464C-BEA9-3BBAEA97412F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F677DF78-A630-464C-BEA9-3BBAEA97412F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F677DF78-A630-464C-BEA9-3BBAEA97412F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F677DF78-A630-464C-BEA9-3BBAEA97412F}.Release|Any CPU.Build.0 = Release|Any CPU + {43D6CB2E-6EE7-4B2B-A517-0D70298ACDBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {43D6CB2E-6EE7-4B2B-A517-0D70298ACDBF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {43D6CB2E-6EE7-4B2B-A517-0D70298ACDBF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {43D6CB2E-6EE7-4B2B-A517-0D70298ACDBF}.Release|Any CPU.Build.0 = Release|Any CPU + {00FC8932-554B-455F-9E02-E8A4B0DBFAA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {00FC8932-554B-455F-9E02-E8A4B0DBFAA8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {00FC8932-554B-455F-9E02-E8A4B0DBFAA8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {00FC8932-554B-455F-9E02-E8A4B0DBFAA8}.Release|Any CPU.Build.0 = Release|Any CPU + {27B8D7BE-8CB7-48BF-97DA-0F031103C03D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {27B8D7BE-8CB7-48BF-97DA-0F031103C03D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {27B8D7BE-8CB7-48BF-97DA-0F031103C03D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {27B8D7BE-8CB7-48BF-97DA-0F031103C03D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -446,27 +401,12 @@ Global {4B0BC3B7-C7FC-4333-9E28-5790D9153F07} = {632FB9CE-540D-4451-9FF2-12E89C1492BD} {2759BC71-7F47-44DA-8579-AE2D8C8C684D} = {632FB9CE-540D-4451-9FF2-12E89C1492BD} {21CB9A8A-F25B-4DEB-92CB-ACB6920EB8BC} = {FBAFD313-0139-4DA3-BCB3-EE54DC3B6CCD} - {ACE58393-3419-4FCA-87CC-C33EB756C7E4} = {005BD823-60AF-406E-AC20-842D7653FE60} {BECFC6B1-E04E-431C-A4D9-6F330F7DE22D} = {DFCBB4ED-976C-4239-BCAF-8AA21E684E8C} - {568AEB4F-BA4C-47A5-9FA3-68F06CD11FED} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} - {8F641C0B-A57A-43EC-B91F-4258F6DC0CD5} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} - {07620299-B0E7-44BB-BE85-C4D1B25104F6} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} - {F254D4FB-428D-408E-8251-39BCA7B4B5CE} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} - {A78F50D4-F518-4DCB-878B-526FD54CCA35} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} {0196259C-3582-4F4E-A01F-A8F9AE83B0F3} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} {D13C3EC7-B300-4158-9054-216156B203BE} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} - {30A45441-0849-48FE-AD37-5D29D0E3068A} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} - {76B21FAA-270D-47DE-B14B-BEC87EDC34F1} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} - {A8BA3BD0-19CE-488D-B2BD-0B9B677F4E03} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} - {054C25DC-E545-4712-95C4-81F30CF65CE8} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} - {9B524BD3-682D-4B6F-9251-D4B2911DF0FD} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} {262792BF-31A8-4FCD-BBC7-341EB29FAE96} = {D2A0AA36-57F7-436C-A7AF-7322927F1734} {058A0843-A95F-4B0D-91DB-33B9D3FD7324} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0} {B90EDEA5-3CC8-4282-80A0-7116905E2427} = {D8483C3E-C386-48AD-B935-700A54FDCF31} - {8C764C9F-1078-47AF-87B8-AF62C7CD6447} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0} - {CF1818F5-CB8E-41A2-B3A8-344A80B79CEC} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0} - {BCF933FA-3E6A-41C2-874A-E25195D6D0E8} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0} - {4871B8AC-FB79-4D3D-940D-80E796110359} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0} {3D7258E3-5DDC-45A4-A457-9AA3BCC92DE7} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0} {4BAA7AF2-3C5B-4C7C-9A9C-26F561218A86} = {632FB9CE-540D-4451-9FF2-12E89C1492BD} {FAC049E4-7011-45FF-BD06-69ACA28921E8} = {005BD823-60AF-406E-AC20-842D7653FE60} @@ -481,6 +421,11 @@ Global {7A903ABD-D7FB-4610-AED8-32EB2CBAEEBF} = {477A1BA0-0155-404C-A6E0-C2409C0FFE70} {D12E8759-8C23-43DC-93D6-A63A8AAB910E} = {07076842-9CAA-4B4A-8AEF-88DE88CD37AC} {5F40F661-DE59-4489-ABAC-BE6F2D730D9A} = {11AC7235-167E-40B5-B2E3-9CBF08700064} + {BB89365D-FFAA-4515-A277-D478A678D4B3} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0} + {F677DF78-A630-464C-BEA9-3BBAEA97412F} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0} + {43D6CB2E-6EE7-4B2B-A517-0D70298ACDBF} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0} + {00FC8932-554B-455F-9E02-E8A4B0DBFAA8} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0} + {27B8D7BE-8CB7-48BF-97DA-0F031103C03D} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0E0415AF-37CC-4999-8E5B-DD36F75BFD4D} diff --git a/IntegrationTests.sln b/IntegrationTests.sln index fa160a9ad..79bfebc41 100644 --- a/IntegrationTests.sln +++ b/IntegrationTests.sln @@ -36,16 +36,11 @@ Global BASE\src\Common\Common\Common.projitems*{07f570e4-3a43-44d4-99a0-1d961b8e2a70}*SharedItemsImports = 5 WEB\Src\Common\Common.projitems*{33478fb4-05fc-4cbd-a04d-17d0d6ba5b13}*SharedItemsImports = 5 WEB\Src\Common\Common.projitems*{56c361c2-724c-4688-b4e1-f94c0681ec33}*SharedItemsImports = 5 - WEB\Src\DependencyCollector\Shared\DependencyCollector.Shared.projitems*{56c361c2-724c-4688-b4e1-f94c0681ec33}*SharedItemsImports = 5 BASE\src\Common\Common\Common.projitems*{893dfa71-0f4f-4bbf-ae8f-72208be237ba}*SharedItemsImports = 5 WEB\Src\Common\Common.projitems*{a8d39e66-af60-4f51-aedc-2464a2d86dea}*SharedItemsImports = 5 - WEB\Src\PerformanceCollector\Filtering.Shared\Filtering.Shared.projitems*{a8d39e66-af60-4f51-aedc-2464a2d86dea}*SharedItemsImports = 5 WEB\Src\PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.projitems*{a8d39e66-af60-4f51-aedc-2464a2d86dea}*SharedItemsImports = 5 - WEB\Src\PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.projitems*{a8d39e66-af60-4f51-aedc-2464a2d86dea}*SharedItemsImports = 5 - WEB\Src\PerformanceCollector\Perf.Shared\Perf.Shared.projitems*{a8d39e66-af60-4f51-aedc-2464a2d86dea}*SharedItemsImports = 5 LOGGING\src\CommonShared\CommonShared.projitems*{dd8682e9-bdcf-459b-b1a6-97966c3e9b6a}*SharedItemsImports = 5 WEB\Src\Common\Common.projitems*{e524a10f-7b80-481b-9b7a-a478d4ca264c}*SharedItemsImports = 5 - WEB\Src\WindowsServer\WindowsServer.Shared\WindowsServer.Shared.projitems*{e524a10f-7b80-481b-9b7a-a478d4ca264c}*SharedItemsImports = 5 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/LOGGING/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj b/LOGGING/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj index 7d9266243..a8cc418c0 100644 --- a/LOGGING/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj +++ b/LOGGING/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj @@ -1,6 +1,6 @@  - netstandard1.3;net45 + netstandard2.0;net45 Microsoft.ApplicationInsights.DiagnosticSourceListener Microsoft.ApplicationInsights.DiagnosticSourceListener @@ -22,29 +22,6 @@ - - - - All - - - All - - - All - - - All - - - - - - - All - - - diff --git a/LOGGING/src/EtwCollector/EtwCollector.csproj b/LOGGING/src/EtwCollector/EtwCollector.csproj index a2097502f..c93a498c8 100644 --- a/LOGGING/src/EtwCollector/EtwCollector.csproj +++ b/LOGGING/src/EtwCollector/EtwCollector.csproj @@ -26,29 +26,6 @@ - - - - All - - - All - - - All - - - All - - - - - - - All - - - All diff --git a/LOGGING/src/EventSourceListener/EventSourceListener.csproj b/LOGGING/src/EventSourceListener/EventSourceListener.csproj index 58c753648..278038a89 100644 --- a/LOGGING/src/EventSourceListener/EventSourceListener.csproj +++ b/LOGGING/src/EventSourceListener/EventSourceListener.csproj @@ -1,6 +1,6 @@  - netstandard1.3 + netstandard2.0 Microsoft.ApplicationInsights.EventSourceListener Microsoft.ApplicationInsights.EventSourceListener @@ -26,29 +26,6 @@ - - - - All - - - All - - - All - - - All - - - - - - - All - - - diff --git a/LOGGING/src/ILogger/ILogger.csproj b/LOGGING/src/ILogger/ILogger.csproj index 3c984cdec..1e9a4b920 100644 --- a/LOGGING/src/ILogger/ILogger.csproj +++ b/LOGGING/src/ILogger/ILogger.csproj @@ -25,35 +25,8 @@ $(PackageTags) ILogger ILoggerBuilder ILoggerProvider - - - - All - - - All - - - All - - - All - - - - - - - All - - - - - all - runtime; build; native; contentfiles; analyzers - diff --git a/LOGGING/src/Log4NetAppender/Log4NetAppender.csproj b/LOGGING/src/Log4NetAppender/Log4NetAppender.csproj index 138c1d329..134bf0f57 100644 --- a/LOGGING/src/Log4NetAppender/Log4NetAppender.csproj +++ b/LOGGING/src/Log4NetAppender/Log4NetAppender.csproj @@ -1,6 +1,6 @@  - net45;netstandard1.3 + net45;netstandard2.0 Microsoft.ApplicationInsights.Log4NetAppender Microsoft.ApplicationInsights.Log4NetAppender @@ -17,29 +17,6 @@ $(PackageTags) Log4Net - - - - All - - - All - - - All - - - All - - - - - - - All - - - All diff --git a/LOGGING/src/NLogTarget/NLogTarget.csproj b/LOGGING/src/NLogTarget/NLogTarget.csproj index e6a262c8a..9ca7c360c 100644 --- a/LOGGING/src/NLogTarget/NLogTarget.csproj +++ b/LOGGING/src/NLogTarget/NLogTarget.csproj @@ -1,6 +1,6 @@  - net45;netstandard2.0;netstandard1.3 + net45;netstandard2.0 Microsoft.ApplicationInsights.NLogTarget Microsoft.ApplicationInsights.NLogTarget @@ -17,33 +17,6 @@ $(PackageTags) NLog - - - - All - - - All - - - All - - - All - - - - - - - All - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - diff --git a/LOGGING/src/TraceListener/TraceListener.csproj b/LOGGING/src/TraceListener/TraceListener.csproj index ef7fd5ed7..cd8f6e2f6 100644 --- a/LOGGING/src/TraceListener/TraceListener.csproj +++ b/LOGGING/src/TraceListener/TraceListener.csproj @@ -1,6 +1,6 @@  - net45;netstandard1.3 + net45;netstandard2.0 Microsoft.ApplicationInsights.TraceListener Microsoft.ApplicationInsights.TraceListener @@ -17,29 +17,6 @@ $(PackageTags) TraceListener - - - - All - - - All - - - All - - - All - - - - - - - All - - - All @@ -47,7 +24,7 @@ - + diff --git a/LOGGING/test/DiagnosticSourceListener.Tests/DiagnosticSourceListener.Tests.csproj b/LOGGING/test/DiagnosticSourceListener.Tests/DiagnosticSourceListener.Tests.csproj index cd9cef2b3..780145afa 100644 --- a/LOGGING/test/DiagnosticSourceListener.Tests/DiagnosticSourceListener.Tests.csproj +++ b/LOGGING/test/DiagnosticSourceListener.Tests/DiagnosticSourceListener.Tests.csproj @@ -3,7 +3,7 @@ Microsoft.ApplicationInsights.DiagnosticSourceListener.Tests Microsoft.ApplicationInsights.DiagnosticSourceListener.Tests - netcoreapp1.1;netcoreapp2.1;netcoreapp3.1 + netcoreapp2.1;netcoreapp3.1 false diff --git a/LOGGING/test/EventSourceListener.Tests/EventSourceListener.Tests.csproj b/LOGGING/test/EventSourceListener.Tests/EventSourceListener.Tests.csproj index 461b7f882..7f7b411f6 100644 --- a/LOGGING/test/EventSourceListener.Tests/EventSourceListener.Tests.csproj +++ b/LOGGING/test/EventSourceListener.Tests/EventSourceListener.Tests.csproj @@ -3,7 +3,7 @@ Microsoft.ApplicationInsights.EventSourceListener.Tests Microsoft.ApplicationInsights.EventSourceListener.Tests - netcoreapp1.1;netcoreapp2.1;netcoreapp3.1 + netcoreapp2.1;netcoreapp3.1 false false diff --git a/LOGGING/test/Log4NetAppender.Tests/Log4NetAppender.Tests.csproj b/LOGGING/test/Log4NetAppender.Tests/Log4NetAppender.Tests.csproj index 1e9a0f4bf..77f9dda6e 100644 --- a/LOGGING/test/Log4NetAppender.Tests/Log4NetAppender.Tests.csproj +++ b/LOGGING/test/Log4NetAppender.Tests/Log4NetAppender.Tests.csproj @@ -3,7 +3,7 @@ Microsoft.ApplicationInsights.Log4NetAppender.Tests Microsoft.ApplicationInsights.Log4NetAppender.Tests - net45;netcoreapp1.1;netcoreapp2.1;netcoreapp3.1 + net45;netcoreapp2.1;netcoreapp3.1 false false diff --git a/LOGGING/test/NLogTarget.Tests/NLogTarget.Tests.csproj b/LOGGING/test/NLogTarget.Tests/NLogTarget.Tests.csproj index 090616488..b39af1359 100644 --- a/LOGGING/test/NLogTarget.Tests/NLogTarget.Tests.csproj +++ b/LOGGING/test/NLogTarget.Tests/NLogTarget.Tests.csproj @@ -3,7 +3,7 @@ Microsoft.ApplicationInsights.NLogTarget.Tests Microsoft.ApplicationInsights.NLogTarget.Tests - net45;netcoreapp1.1;netcoreapp2.1;netcoreapp3.1 + net45;netcoreapp2.1;netcoreapp3.1 false false diff --git a/LOGGING/test/TraceListener.Tests/TraceListener.Tests.csproj b/LOGGING/test/TraceListener.Tests/TraceListener.Tests.csproj index 43d943b5a..ec1aa4303 100644 --- a/LOGGING/test/TraceListener.Tests/TraceListener.Tests.csproj +++ b/LOGGING/test/TraceListener.Tests/TraceListener.Tests.csproj @@ -3,7 +3,7 @@ Microsoft.ApplicationInsights.TraceListener.Tests Microsoft.ApplicationInsights.TraceListener.Tests - net45;netcoreapp1.1;netcoreapp2.1;netcoreapp3.1 + net45;netcoreapp2.1;netcoreapp3.1 false false diff --git a/NETCORE/.vsts/linux-build.yml b/NETCORE/.vsts/linux-build.yml index 88edc9342..1613ab2d6 100644 --- a/NETCORE/.vsts/linux-build.yml +++ b/NETCORE/.vsts/linux-build.yml @@ -24,13 +24,21 @@ steps: arguments: "--configuration Release" - task: DotNetCoreCLI@1 - displayName: Functional Tests 3.0 + displayName: Integration Tests continueOnError: true inputs: command: "test" - projects: "NETCORE/test/**/TestApp30.Tests30.csproj" + projects: "NETCORE/test/**/IntegrationTests.Tests.csproj" arguments: "--configuration Release -l trx" +- task: DotNetCoreCLI@1 + displayName: Functional MVC Tests + continueOnError: true + inputs: + command: "test" + projects: "NETCORE/test/**/*FunctionalTests.MVC.Tests.csproj" + arguments: "--configuration Release --framework netcoreapp3.1 -l trx" + - task: DotNetCoreCLI@1 displayName: Unit Tests for AspNetCore 3.1 continueOnError: true @@ -55,12 +63,12 @@ steps: version: 2.2.x - task: DotNetCoreCLI@1 - displayName: Functional Tests 2.0 + displayName: Functional MVC Tests continueOnError: true inputs: command: "test" - projects: "NETCORE/test/**/*Tests20.csproj" - arguments: "--configuration Release -l trx" + projects: "NETCORE/test/**/*FunctionalTests.MVC.Tests.csproj" + arguments: "--configuration Release --framework netcoreapp2.1 -l trx" - task: DotNetCoreCLI@1 displayName: Unit Tests for AspNetCore 2.1 @@ -86,6 +94,7 @@ steps: inputs: testRunner: "VSTest" testResultsFiles: "**/*.trx" + failTaskOnFailedTests: true #- task: DotNetCoreCLI@1 # displayName: Package Nuget diff --git a/NETCORE/ApplicationInsights.AspNetCore.sln b/NETCORE/ApplicationInsights.AspNetCore.sln index af0cb6de3..49c4d65f6 100644 --- a/NETCORE/ApplicationInsights.AspNetCore.sln +++ b/NETCORE/ApplicationInsights.AspNetCore.sln @@ -28,14 +28,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsigh EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsights.AspNetCore.Tests", "test\Microsoft.ApplicationInsights.AspNetCore.Tests\Microsoft.ApplicationInsights.AspNetCore.Tests.csproj", "{2766D8AF-C20B-4F3A-8260-6C2D39B7A8A0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmptyApp20.FunctionalTests20", "test\EmptyApp20.FunctionalTests\EmptyApp20.FunctionalTests20.csproj", "{C47AFD8A-3326-4391-8115-69349C04C3DA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTestUtils20", "test\FunctionalTestUtils20\FunctionalTestUtils20.csproj", "{937AF006-898E-43FD-80A6-B20D7E3A1944}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVCFramework20.FunctionalTests20", "test\MVCFramework20.FunctionalTests\MVCFramework20.FunctionalTests20.csproj", "{51198C41-CD4A-4006-84D4-DE20A0A44363}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApi20.FunctionalTests20", "test\WebApi20.FunctionalTests\WebApi20.FunctionalTests20.csproj", "{C3B3F515-0305-4809-A9A8-37FD80428F74}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsightsTypes", "test\ApplicationInsightsTypes\ApplicationInsightsTypes.csproj", "{9DA7024F-216F-4FA5-9B6D-CE4216C2DD72}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.WebApp", "test\IntegrationTests.WebApp\IntegrationTests.WebApp.csproj", "{8E71FECF-E090-409E-8551-C597F9DFB91C}" @@ -64,16 +56,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelemetryChannel", "..\BASE EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsights", "..\BASE\src\Microsoft.ApplicationInsights\Microsoft.ApplicationInsights.csproj", "{2C7CEEDD-BB15-48DF-B12A-B268E9D74859}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.EmptyApp.Tests", "test\FunctionalTests.EmptyApp.Tests\FunctionalTests.EmptyApp.Tests.csproj", "{C7A8D822-CA6C-497D-AA26-C36F25BA61FD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.Utils", "test\FunctionalTests.Utils\FunctionalTests.Utils.csproj", "{63F64005-CDC7-4062-8CBC-A40B049E342A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.MVC.Tests", "test\FunctionalTests.MVC.Tests\FunctionalTests.MVC.Tests.csproj", "{9693CC30-A3E6-48A7-A68E-6E0DD098D779}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.WebApi.Tests", "test\FunctionalTests.WebApi.Tests\FunctionalTests.WebApi.Tests.csproj", "{E78404EA-CBAA-4366-B659-C3A46BC9DF15}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\BASE\src\Common\Common\Common.projitems*{0c91d961-b21e-4760-a192-14193f10b831}*SharedItemsImports = 5 ..\WEB\Src\Common\Common.projitems*{1056392c-387c-4530-ba3f-aa687ea453ae}*SharedItemsImports = 5 ..\BASE\src\Common\Common\Common.projitems*{2c7ceedd-bb15-48df-b12a-b268e9d74859}*SharedItemsImports = 5 ..\WEB\Src\Common\Common.projitems*{3c157fc2-2e52-45fc-87e8-76e4fced4260}*SharedItemsImports = 5 - ..\WEB\Src\PerformanceCollector\Filtering.Shared\Filtering.Shared.projitems*{3c157fc2-2e52-45fc-87e8-76e4fced4260}*SharedItemsImports = 5 ..\WEB\Src\PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.projitems*{3c157fc2-2e52-45fc-87e8-76e4fced4260}*SharedItemsImports = 5 - ..\WEB\Src\PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.projitems*{3c157fc2-2e52-45fc-87e8-76e4fced4260}*SharedItemsImports = 5 - ..\WEB\Src\PerformanceCollector\Perf.Shared\Perf.Shared.projitems*{3c157fc2-2e52-45fc-87e8-76e4fced4260}*SharedItemsImports = 5 ..\LOGGING\src\CommonShared\CommonShared.projitems*{4a9ec531-f8b2-4cd1-bd6b-745f33e52e7b}*SharedItemsImports = 5 ..\WEB\Src\Common\Common.projitems*{8d13f3c8-d938-44fd-a0d8-b5d1712c95db}*SharedItemsImports = 5 src\Shared\Shared.projitems*{95ec3635-22e4-4c3a-a066-f5823a0648da}*SharedItemsImports = 5 @@ -94,22 +91,6 @@ Global {2766D8AF-C20B-4F3A-8260-6C2D39B7A8A0}.Debug|Any CPU.Build.0 = Debug|Any CPU {2766D8AF-C20B-4F3A-8260-6C2D39B7A8A0}.Release|Any CPU.ActiveCfg = Release|Any CPU {2766D8AF-C20B-4F3A-8260-6C2D39B7A8A0}.Release|Any CPU.Build.0 = Release|Any CPU - {C47AFD8A-3326-4391-8115-69349C04C3DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C47AFD8A-3326-4391-8115-69349C04C3DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C47AFD8A-3326-4391-8115-69349C04C3DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C47AFD8A-3326-4391-8115-69349C04C3DA}.Release|Any CPU.Build.0 = Release|Any CPU - {937AF006-898E-43FD-80A6-B20D7E3A1944}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {937AF006-898E-43FD-80A6-B20D7E3A1944}.Debug|Any CPU.Build.0 = Debug|Any CPU - {937AF006-898E-43FD-80A6-B20D7E3A1944}.Release|Any CPU.ActiveCfg = Release|Any CPU - {937AF006-898E-43FD-80A6-B20D7E3A1944}.Release|Any CPU.Build.0 = Release|Any CPU - {51198C41-CD4A-4006-84D4-DE20A0A44363}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51198C41-CD4A-4006-84D4-DE20A0A44363}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51198C41-CD4A-4006-84D4-DE20A0A44363}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51198C41-CD4A-4006-84D4-DE20A0A44363}.Release|Any CPU.Build.0 = Release|Any CPU - {C3B3F515-0305-4809-A9A8-37FD80428F74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3B3F515-0305-4809-A9A8-37FD80428F74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C3B3F515-0305-4809-A9A8-37FD80428F74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C3B3F515-0305-4809-A9A8-37FD80428F74}.Release|Any CPU.Build.0 = Release|Any CPU {9DA7024F-216F-4FA5-9B6D-CE4216C2DD72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9DA7024F-216F-4FA5-9B6D-CE4216C2DD72}.Debug|Any CPU.Build.0 = Debug|Any CPU {9DA7024F-216F-4FA5-9B6D-CE4216C2DD72}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -158,6 +139,22 @@ Global {2C7CEEDD-BB15-48DF-B12A-B268E9D74859}.Debug|Any CPU.Build.0 = Debug|Any CPU {2C7CEEDD-BB15-48DF-B12A-B268E9D74859}.Release|Any CPU.ActiveCfg = Release|Any CPU {2C7CEEDD-BB15-48DF-B12A-B268E9D74859}.Release|Any CPU.Build.0 = Release|Any CPU + {C7A8D822-CA6C-497D-AA26-C36F25BA61FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C7A8D822-CA6C-497D-AA26-C36F25BA61FD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C7A8D822-CA6C-497D-AA26-C36F25BA61FD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C7A8D822-CA6C-497D-AA26-C36F25BA61FD}.Release|Any CPU.Build.0 = Release|Any CPU + {63F64005-CDC7-4062-8CBC-A40B049E342A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {63F64005-CDC7-4062-8CBC-A40B049E342A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {63F64005-CDC7-4062-8CBC-A40B049E342A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {63F64005-CDC7-4062-8CBC-A40B049E342A}.Release|Any CPU.Build.0 = Release|Any CPU + {9693CC30-A3E6-48A7-A68E-6E0DD098D779}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9693CC30-A3E6-48A7-A68E-6E0DD098D779}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9693CC30-A3E6-48A7-A68E-6E0DD098D779}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9693CC30-A3E6-48A7-A68E-6E0DD098D779}.Release|Any CPU.Build.0 = Release|Any CPU + {E78404EA-CBAA-4366-B659-C3A46BC9DF15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E78404EA-CBAA-4366-B659-C3A46BC9DF15}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E78404EA-CBAA-4366-B659-C3A46BC9DF15}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E78404EA-CBAA-4366-B659-C3A46BC9DF15}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -166,10 +163,6 @@ Global {16B44D67-6214-4DDE-B419-93EF073E2E69} = {8B5230E5-8138-44D6-839F-DF9248F195EE} {95EC3635-22E4-4C3A-A066-F5823A0648DA} = {2E6DDE9E-8C75-4F9C-8906-08EBDD6E73EF} {2766D8AF-C20B-4F3A-8260-6C2D39B7A8A0} = {8B5230E5-8138-44D6-839F-DF9248F195EE} - {C47AFD8A-3326-4391-8115-69349C04C3DA} = {8B5230E5-8138-44D6-839F-DF9248F195EE} - {937AF006-898E-43FD-80A6-B20D7E3A1944} = {8B5230E5-8138-44D6-839F-DF9248F195EE} - {51198C41-CD4A-4006-84D4-DE20A0A44363} = {8B5230E5-8138-44D6-839F-DF9248F195EE} - {C3B3F515-0305-4809-A9A8-37FD80428F74} = {8B5230E5-8138-44D6-839F-DF9248F195EE} {9DA7024F-216F-4FA5-9B6D-CE4216C2DD72} = {8B5230E5-8138-44D6-839F-DF9248F195EE} {8E71FECF-E090-409E-8551-C597F9DFB91C} = {8B5230E5-8138-44D6-839F-DF9248F195EE} {FE9DB9A7-D9AE-4188-945C-393D70022D9A} = {8B5230E5-8138-44D6-839F-DF9248F195EE} @@ -183,6 +176,10 @@ Global {8D13F3C8-D938-44FD-A0D8-B5D1712C95DB} = {042C2916-4BB7-4CCB-BD61-A8BAAB0129B9} {0C91D961-B21E-4760-A192-14193F10B831} = {042C2916-4BB7-4CCB-BD61-A8BAAB0129B9} {2C7CEEDD-BB15-48DF-B12A-B268E9D74859} = {042C2916-4BB7-4CCB-BD61-A8BAAB0129B9} + {C7A8D822-CA6C-497D-AA26-C36F25BA61FD} = {8B5230E5-8138-44D6-839F-DF9248F195EE} + {63F64005-CDC7-4062-8CBC-A40B049E342A} = {8B5230E5-8138-44D6-839F-DF9248F195EE} + {9693CC30-A3E6-48A7-A68E-6E0DD098D779} = {8B5230E5-8138-44D6-839F-DF9248F195EE} + {E78404EA-CBAA-4366-B659-C3A46BC9DF15} = {8B5230E5-8138-44D6-839F-DF9248F195EE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {047855A4-470F-43B1-8B74-69651DD6B8A6} diff --git a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/DefaultApplicationInsightsServiceConfigureOptions.cs b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/DefaultApplicationInsightsServiceConfigureOptions.cs index f6b53a9c9..62ba60da3 100644 --- a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/DefaultApplicationInsightsServiceConfigureOptions.cs +++ b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/DefaultApplicationInsightsServiceConfigureOptions.cs @@ -15,24 +15,34 @@ internal class DefaultApplicationInsightsServiceConfigureOptions : IConfigureOptions { private readonly IHostingEnvironment hostingEnvironment; + private readonly IConfiguration userConfiguration; /// /// Initializes a new instance of the class. /// /// to use for retreiving ContentRootPath. - public DefaultApplicationInsightsServiceConfigureOptions(IHostingEnvironment hostingEnvironment) + /// from an application. + public DefaultApplicationInsightsServiceConfigureOptions(IHostingEnvironment hostingEnvironment, IConfiguration configuration = null) { this.hostingEnvironment = hostingEnvironment; + this.userConfiguration = configuration; } /// public void Configure(ApplicationInsightsServiceOptions options) { var configBuilder = new ConfigurationBuilder() - .SetBasePath(this.hostingEnvironment.ContentRootPath ?? Directory.GetCurrentDirectory()) - .AddJsonFile("appsettings.json", true) - .AddJsonFile(string.Format(CultureInfo.InvariantCulture, "appsettings.{0}.json", this.hostingEnvironment.EnvironmentName), true) - .AddEnvironmentVariables(); + .SetBasePath(this.hostingEnvironment.ContentRootPath ?? Directory.GetCurrentDirectory()); +#if NETSTANDARD2_0 || NET461 + if (this.userConfiguration != null) + { + configBuilder.AddConfiguration(this.userConfiguration); + } +#endif + configBuilder.AddJsonFile("appsettings.json", true) + .AddJsonFile(string.Format(CultureInfo.InvariantCulture, "appsettings.{0}.json", this.hostingEnvironment.EnvironmentName), true) + .AddEnvironmentVariables(); + ApplicationInsightsExtensions.AddTelemetryConfiguration(configBuilder.Build(), options); if (Debugger.IsAttached) diff --git a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj index a4dee2d74..f958e6818 100644 --- a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj +++ b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj @@ -15,10 +15,9 @@ Microsoft.ApplicationInsights.AspNetCore 7.2 - netstandard2.0;net451;net46;net461;netstandard1.6 + netstandard2.0;net451;net46;net461 - netstandard1.6;netstandard2.0 - 1.6.1 + netstandard2.0 $(DefineConstants);AI_ASPNETCORE_WEB; @@ -35,29 +34,6 @@ 1701;1702 - - - - All - - - All - - - All - - - All - - - - - - - All - - - @@ -89,7 +65,7 @@ - + diff --git a/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj b/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj index cf2467e25..cc7dc2456 100644 --- a/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj +++ b/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj @@ -28,29 +28,6 @@ $(PackageTags)worker;console;backgroundtasks; - - - - All - - - All - - - All - - - All - - - - - - - All - - - diff --git a/NETCORE/src/Shared/Extensions/ApplicationInsightsExtensions.cs b/NETCORE/src/Shared/Extensions/ApplicationInsightsExtensions.cs index 997afe311..d36b88f29 100644 --- a/NETCORE/src/Shared/Extensions/ApplicationInsightsExtensions.cs +++ b/NETCORE/src/Shared/Extensions/ApplicationInsightsExtensions.cs @@ -59,6 +59,11 @@ private const string DeveloperModeForWebSites = "APPINSIGHTS_DEVELOPER_MODE"; private const string EndpointAddressForWebSites = "APPINSIGHTS_ENDPOINTADDRESS"; +#if NETSTANDARD2_0 || NET461 + private const string ApplicationInsightsSectionFromConfig = "ApplicationInsights"; + private const string TelemetryChannelSectionFromConfig = "ApplicationInsights:TelemetryChannel"; +#endif + [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Used in NetStandard2.0 build.")] private const string EventSourceNameForSystemRuntime = "System.Runtime"; @@ -193,11 +198,7 @@ { telemetryConfigValues.Add(new KeyValuePair( DeveloperModeForWebSites, -#if !NETSTANDARD1_6 developerMode.Value.ToString(System.Globalization.CultureInfo.InvariantCulture))); -#else - developerMode.Value.ToString())); -#endif wasAnythingSet = true; } @@ -228,26 +229,9 @@ } /// - /// Read from configuration - /// Config.json will look like this: - /// - /// "ApplicationInsights": { - /// "InstrumentationKey": "11111111-2222-3333-4444-555555555555", - /// "TelemetryChannel": { - /// "EndpointAddress": "http://dc.services.visualstudio.com/v2/track", - /// "DeveloperMode": true - /// } - /// }. - /// - /// Or. - /// - /// "ApplicationInsights": { - /// "ConnectionString" : "InstrumentationKey=11111111-2222-3333-4444-555555555555;IngestionEndpoint=http://dc.services.visualstudio.com" - /// "TelemetryChannel": { - /// "DeveloperMode": true - /// } - /// }. - /// + /// Read configuration from appSettings.json, appsettings.{env.EnvironmentName}.json, + /// IConfiguation used in an application and EnvironmentVariables. + /// Bind configuration to ApplicationInsightsServiceOptions. /// Values can also be read from environment variables to support azure web sites configuration. /// /// Configuration to read variables from. @@ -258,6 +242,11 @@ { try { +#if NETSTANDARD2_0 || NET461 + config.GetSection(ApplicationInsightsSectionFromConfig).Bind(serviceOptions); + config.GetSection(TelemetryChannelSectionFromConfig).Bind(serviceOptions); +#endif + if (config.TryGetValue(primaryKey: ConnectionStringEnvironmentVariable, backupKey: ConnectionStringFromConfig, value: out string connectionStringValue)) { serviceOptions.ConnectionString = connectionStringValue; diff --git a/NETCORE/src/Shared/Extensions/ApplicationInsightsServiceOptions.cs b/NETCORE/src/Shared/Extensions/ApplicationInsightsServiceOptions.cs index 2f746f9de..49e511375 100644 --- a/NETCORE/src/Shared/Extensions/ApplicationInsightsServiceOptions.cs +++ b/NETCORE/src/Shared/Extensions/ApplicationInsightsServiceOptions.cs @@ -12,77 +12,49 @@ /// public class ApplicationInsightsServiceOptions { - /// - /// Initializes a new instance of the class. - /// Application Insights service options that controls the default behavior of application insights features. - /// - public ApplicationInsightsServiceOptions() - { - this.EnablePerformanceCounterCollectionModule = true; - this.EnableQuickPulseMetricStream = true; - this.EnableAdaptiveSampling = true; - this.EnableDebugLogger = true; - this.EnableHeartbeat = true; - this.AddAutoCollectedMetricExtractor = true; -#if AI_ASPNETCORE_WEB - this.EnableRequestTrackingTelemetryModule = true; - this.EnableAuthenticationTrackingJavaScript = false; - this.RequestCollectionOptions = new RequestCollectionOptions(); -#endif - -#if NETSTANDARD2_0 - this.EnableEventCounterCollectionModule = true; -#endif - this.EnableDependencyTrackingTelemetryModule = true; - this.EnableAzureInstanceMetadataTelemetryModule = true; - this.EnableAppServicesHeartbeatTelemetryModule = true; - this.DependencyCollectionOptions = new DependencyCollectionOptions(); - this.ApplicationVersion = Assembly.GetEntryAssembly()?.GetName().Version.ToString(); - } - /// /// Gets or sets a value indicating whether QuickPulseTelemetryModule and QuickPulseTelemetryProcessor are registered with the configuration. /// Setting EnableQuickPulseMetricStream to false, will disable the default quick pulse metric stream. Defaults to true. /// - public bool EnableQuickPulseMetricStream { get; set; } + public bool EnableQuickPulseMetricStream { get; set; } = true; /// /// Gets or sets a value indicating whether PerformanceCollectorModule should be enabled. /// Defaults to true. /// - public bool EnablePerformanceCounterCollectionModule { get; set; } + public bool EnablePerformanceCounterCollectionModule { get; set; } = true; /// /// Gets or sets a value indicating whether AppServicesHeartbeatTelemetryModule should be enabled. /// Defaults to true. /// - public bool EnableAppServicesHeartbeatTelemetryModule { get; set; } + public bool EnableAppServicesHeartbeatTelemetryModule { get; set; } = true; /// /// Gets or sets a value indicating whether AzureInstanceMetadataTelemetryModule should be enabled. /// Defaults to true. /// - public bool EnableAzureInstanceMetadataTelemetryModule { get; set; } + public bool EnableAzureInstanceMetadataTelemetryModule { get; set; } = true; /// /// Gets or sets a value indicating whether DependencyTrackingTelemetryModule should be enabled. /// Defaults to true. /// - public bool EnableDependencyTrackingTelemetryModule { get; set; } + public bool EnableDependencyTrackingTelemetryModule { get; set; } = true; #if NETSTANDARD2_0 /// /// Gets or sets a value indicating whether EventCounterCollectionModule should be enabled. /// Defaults to true. /// - public bool EnableEventCounterCollectionModule { get; set; } + public bool EnableEventCounterCollectionModule { get; set; } = true; #endif /// /// Gets or sets a value indicating whether telemetry processor that controls sampling is added to the service. /// Setting EnableAdaptiveSampling to false, will disable the default adaptive sampling feature. Defaults to true. /// - public bool EnableAdaptiveSampling { get; set; } + public bool EnableAdaptiveSampling { get; set; } = true; /// /// Gets or sets the default instrumentation key for the application. @@ -97,7 +69,7 @@ /// /// Gets or sets the application version reported with telemetries. /// - public string ApplicationVersion { get; set; } + public string ApplicationVersion { get; set; } = Assembly.GetEntryAssembly()?.GetName().Version.ToString(); /// /// Gets or sets a value indicating whether telemetry channel should be set to developer mode. @@ -112,42 +84,42 @@ /// /// Gets or sets a value indicating whether a logger would be registered automatically in debug mode. /// - public bool EnableDebugLogger { get; set; } + public bool EnableDebugLogger { get; set; } = true; /// /// Gets or sets a value indicating whether heartbeats are enabled. /// - public bool EnableHeartbeat { get; set; } + public bool EnableHeartbeat { get; set; } = true; /// /// Gets or sets a value indicating whether AutoCollectedMetricExtractors are added or not. /// Defaults to true. /// - public bool AddAutoCollectedMetricExtractor { get; set; } + public bool AddAutoCollectedMetricExtractor { get; set; } = true; #if AI_ASPNETCORE_WEB /// /// Gets that allow to manage . /// - public RequestCollectionOptions RequestCollectionOptions { get; } + public RequestCollectionOptions RequestCollectionOptions { get; } = new RequestCollectionOptions(); /// /// Gets or sets a value indicating whether RequestTrackingTelemetryModule should be enabled. /// Defaults to true. /// - public bool EnableRequestTrackingTelemetryModule { get; set; } + public bool EnableRequestTrackingTelemetryModule { get; set; } = true; /// /// Gets or sets a value indicating whether a JavaScript snippet to track the current authenticated user should /// be printed along with the main ApplicationInsights tracking script. /// - public bool EnableAuthenticationTrackingJavaScript { get; set; } + public bool EnableAuthenticationTrackingJavaScript { get; set; } = false; #endif /// /// Gets that allow to manage . /// - public DependencyCollectionOptions DependencyCollectionOptions { get; } + public DependencyCollectionOptions DependencyCollectionOptions { get; } = new DependencyCollectionOptions(); /// /// Copy the properties from this to a target instance. @@ -170,7 +142,11 @@ target.InstrumentationKey = this.InstrumentationKey; } - target.ConnectionString = this.ConnectionString; + if (!string.IsNullOrEmpty(this.ConnectionString)) + { + target.ConnectionString = this.ConnectionString; + } + target.ApplicationVersion = this.ApplicationVersion; target.EnableAdaptiveSampling = this.EnableAdaptiveSampling; target.EnableDebugLogger = this.EnableDebugLogger; diff --git a/NETCORE/test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj b/NETCORE/test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj index 87ff3086e..2ea5f2eea 100644 --- a/NETCORE/test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj +++ b/NETCORE/test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj @@ -2,8 +2,8 @@ 1.0.2 - net461;netstandard1.6 - netstandard1.6 + net461;netstandard2.0 + netstandard2.0 true true ApplicationInsightsTypes diff --git a/NETCORE/test/EmptyApp20.FunctionalTests/EmptyApp20.FunctionalTests20.csproj b/NETCORE/test/EmptyApp20.FunctionalTests/EmptyApp20.FunctionalTests20.csproj deleted file mode 100644 index b3ec76fb8..000000000 --- a/NETCORE/test/EmptyApp20.FunctionalTests/EmptyApp20.FunctionalTests20.csproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - 2.0.0 - netcoreapp2.0;net461 - netcoreapp2.0 - win7-x86 - true - EmptyApp20.FunctionalTests20.Tests - EmptyApp20.FunctionalTests - true - 2.0.0 - pdbonly - true - true - - - - - - - - - - - - - - - - - - - - - - - Always - SettingsSingleFileGenerator - - - - - - - diff --git a/NETCORE/test/FunctionalTests.EmptyApp.Tests/App.Designer.cs b/NETCORE/test/FunctionalTests.EmptyApp.Tests/App.Designer.cs new file mode 100644 index 000000000..8e789fe15 --- /dev/null +++ b/NETCORE/test/FunctionalTests.EmptyApp.Tests/App.Designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace FunctionalTests.EmptyApp.Tests { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")] + internal sealed partial class App : global::System.Configuration.ApplicationSettingsBase { + + private static App defaultInstance = ((App)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new App()))); + + public static App Default { + get { + return defaultInstance; + } + } + } +} diff --git a/NETCORE/test/EmptyApp20.FunctionalTests/App.config b/NETCORE/test/FunctionalTests.EmptyApp.Tests/App.config similarity index 100% rename from NETCORE/test/EmptyApp20.FunctionalTests/App.config rename to NETCORE/test/FunctionalTests.EmptyApp.Tests/App.config diff --git a/NETCORE/test/EmptyApp20.FunctionalTests/FunctionalTest/ExceptionTelemetryEmptyAppTests.cs b/NETCORE/test/FunctionalTests.EmptyApp.Tests/FunctionalTest/ExceptionTelemetryEmptyAppTests.cs similarity index 95% rename from NETCORE/test/EmptyApp20.FunctionalTests/FunctionalTest/ExceptionTelemetryEmptyAppTests.cs rename to NETCORE/test/FunctionalTests.EmptyApp.Tests/FunctionalTest/ExceptionTelemetryEmptyAppTests.cs index 63aa2e4cc..f86cef047 100644 --- a/NETCORE/test/EmptyApp20.FunctionalTests/FunctionalTest/ExceptionTelemetryEmptyAppTests.cs +++ b/NETCORE/test/FunctionalTests.EmptyApp.Tests/FunctionalTest/ExceptionTelemetryEmptyAppTests.cs @@ -3,11 +3,11 @@ using Xunit; using Xunit.Abstractions; [assembly: CollectionBehavior(DisableTestParallelization = true)] -namespace EmptyApp20.FunctionalTests.FunctionalTest +namespace FunctionalTests.EmptyApp.Tests.FunctionalTest { using System; using System.Reflection; - using FunctionalTestUtils; + using FunctionalTests.Utils; using Microsoft.ApplicationInsights.DataContracts; public class ExceptionTelemetryEmptyAppTests : TelemetryTestsBase diff --git a/NETCORE/test/EmptyApp20.FunctionalTests/FunctionalTest/RequestTelemetryEmptyAppTests.cs b/NETCORE/test/FunctionalTests.EmptyApp.Tests/FunctionalTest/RequestTelemetryEmptyAppTests.cs similarity index 97% rename from NETCORE/test/EmptyApp20.FunctionalTests/FunctionalTest/RequestTelemetryEmptyAppTests.cs rename to NETCORE/test/FunctionalTests.EmptyApp.Tests/FunctionalTest/RequestTelemetryEmptyAppTests.cs index 771c25243..c88f7cd68 100644 --- a/NETCORE/test/EmptyApp20.FunctionalTests/FunctionalTest/RequestTelemetryEmptyAppTests.cs +++ b/NETCORE/test/FunctionalTests.EmptyApp.Tests/FunctionalTest/RequestTelemetryEmptyAppTests.cs @@ -1,11 +1,11 @@ -namespace EmptyApp20.FunctionalTests.FunctionalTest +namespace FunctionalTests.EmptyApp.Tests.FunctionalTest { using System.Collections.Generic; using System.Linq; using System.Net.Http; using System.Reflection; using AI; - using FunctionalTestUtils; + using FunctionalTests.Utils; using Microsoft.ApplicationInsights.DataContracts; using Xunit; using Xunit.Abstractions; diff --git a/NETCORE/test/EmptyApp20.FunctionalTests/FunctionalTest/TelemetryModuleWorkingEmptyAppTests.cs b/NETCORE/test/FunctionalTests.EmptyApp.Tests/FunctionalTest/TelemetryModuleWorkingEmptyAppTests.cs similarity index 93% rename from NETCORE/test/EmptyApp20.FunctionalTests/FunctionalTest/TelemetryModuleWorkingEmptyAppTests.cs rename to NETCORE/test/FunctionalTests.EmptyApp.Tests/FunctionalTest/TelemetryModuleWorkingEmptyAppTests.cs index 3dd302054..c8d78e83e 100644 --- a/NETCORE/test/EmptyApp20.FunctionalTests/FunctionalTest/TelemetryModuleWorkingEmptyAppTests.cs +++ b/NETCORE/test/FunctionalTests.EmptyApp.Tests/FunctionalTest/TelemetryModuleWorkingEmptyAppTests.cs @@ -1,7 +1,7 @@ -namespace EmptyApp20.FunctionalTests.FunctionalTest +namespace FunctionalTests.EmptyApp.Tests.FunctionalTest { using System.Reflection; - using FunctionalTestUtils; + using FunctionalTests.Utils; using Microsoft.ApplicationInsights.DataContracts; using Xunit; using Xunit.Abstractions; diff --git a/NETCORE/test/FunctionalTests.EmptyApp.Tests/FunctionalTests.EmptyApp.Tests.csproj b/NETCORE/test/FunctionalTests.EmptyApp.Tests/FunctionalTests.EmptyApp.Tests.csproj new file mode 100644 index 000000000..a99016f0d --- /dev/null +++ b/NETCORE/test/FunctionalTests.EmptyApp.Tests/FunctionalTests.EmptyApp.Tests.csproj @@ -0,0 +1,54 @@ + + + + netcoreapp2.1;netcoreapp3.1;net461 + netcoreapp2.1;netcoreapp3.1 + win7-x86 + FunctionalTests.EmptyApp.Tests + FunctionalTests.EmptyApp.Tests + true + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + Always + SettingsSingleFileGenerator + App.Designer.cs + + + + + + + + + + True + True + App.config + + + diff --git a/NETCORE/test/EmptyApp20.FunctionalTests/Properties/launchSettings.json b/NETCORE/test/FunctionalTests.EmptyApp.Tests/Properties/launchSettings.json similarity index 100% rename from NETCORE/test/EmptyApp20.FunctionalTests/Properties/launchSettings.json rename to NETCORE/test/FunctionalTests.EmptyApp.Tests/Properties/launchSettings.json diff --git a/NETCORE/test/EmptyApp20.FunctionalTests/Startup.cs b/NETCORE/test/FunctionalTests.EmptyApp.Tests/Startup.cs similarity index 96% rename from NETCORE/test/EmptyApp20.FunctionalTests/Startup.cs rename to NETCORE/test/FunctionalTests.EmptyApp.Tests/Startup.cs index 964d21e20..b1581c3ce 100644 --- a/NETCORE/test/EmptyApp20.FunctionalTests/Startup.cs +++ b/NETCORE/test/FunctionalTests.EmptyApp.Tests/Startup.cs @@ -1,8 +1,8 @@ -namespace EmptyApp.FunctionalTests +namespace FunctionalTests.EmptyApp.Tests { using System; - using FunctionalTestUtils; + using FunctionalTests.Utils; using Microsoft.ApplicationInsights; using Microsoft.ApplicationInsights.AspNetCore.Extensions; using Microsoft.ApplicationInsights.Channel; diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/.bowerrc b/NETCORE/test/FunctionalTests.MVC.Tests/.bowerrc similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/.bowerrc rename to NETCORE/test/FunctionalTests.MVC.Tests/.bowerrc diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/Controllers/HomeController.cs b/NETCORE/test/FunctionalTests.MVC.Tests/Controllers/HomeController.cs similarity index 89% rename from NETCORE/test/MVCFramework20.FunctionalTests/Controllers/HomeController.cs rename to NETCORE/test/FunctionalTests.MVC.Tests/Controllers/HomeController.cs index 34d50b569..bb78ef685 100644 --- a/NETCORE/test/MVCFramework20.FunctionalTests/Controllers/HomeController.cs +++ b/NETCORE/test/FunctionalTests.MVC.Tests/Controllers/HomeController.cs @@ -1,14 +1,11 @@ using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using MVCFramework20.FunctionalTests.Models; using Microsoft.ApplicationInsights; using Microsoft.ApplicationInsights.DataContracts; +using FunctionalTests.MVC.Tests.Models; -namespace MVCFramework20.FunctionalTests.Controllers +namespace FunctionalTests.MVC.Tests.Controllers { public class HomeController : Controller { diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/CorrelationMvcTests.cs b/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/CorrelationMvcTests.cs similarity index 91% rename from NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/CorrelationMvcTests.cs rename to NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/CorrelationMvcTests.cs index b5a82f39c..1684c94cc 100644 --- a/NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/CorrelationMvcTests.cs +++ b/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/CorrelationMvcTests.cs @@ -1,6 +1,6 @@ -namespace MVC20.FuncTests +namespace FunctionalTests.MVC.Tests.FunctionalTest { - using FunctionalTestUtils; + using FunctionalTests.Utils; using Microsoft.ApplicationInsights.DataContracts; using System; using System.Linq; @@ -11,7 +11,7 @@ public class CorrelationMvcTests : TelemetryTestsBase { - private const string assemblyName = "MVCFramework20.FunctionalTests20"; + private const string assemblyName = "FunctionalTests.MVC.Tests"; public CorrelationMvcTests(ITestOutputHelper output) : base(output) { diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/DependencyTelemetryMvcTests.cs b/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/DependencyTelemetryMvcTests.cs similarity index 98% rename from NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/DependencyTelemetryMvcTests.cs rename to NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/DependencyTelemetryMvcTests.cs index aa3f77276..8caa56940 100644 --- a/NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/DependencyTelemetryMvcTests.cs +++ b/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/DependencyTelemetryMvcTests.cs @@ -1,4 +1,4 @@ -namespace MVC20.FuncTests +namespace FunctionalTests.MVC.Tests.FunctionalTest { using System; using System.Linq; @@ -7,7 +7,7 @@ using System.Text; using AI; - using FunctionalTestUtils; + using FunctionalTests.Utils; using Microsoft.ApplicationInsights.DependencyCollector; using Microsoft.ApplicationInsights.Extensibility; using Microsoft.Extensions.DependencyInjection; diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/ExceptionTelemetryMvcTests.cs b/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/ExceptionTelemetryMvcTests.cs similarity index 95% rename from NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/ExceptionTelemetryMvcTests.cs rename to NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/ExceptionTelemetryMvcTests.cs index dcf5917da..12f99d59a 100644 --- a/NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/ExceptionTelemetryMvcTests.cs +++ b/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/ExceptionTelemetryMvcTests.cs @@ -1,11 +1,11 @@ using Xunit; [assembly: CollectionBehavior(DisableTestParallelization = true)] -namespace MVC20.FuncTests +namespace FunctionalTests.MVC.Tests.FunctionalTest { using System; using System.Reflection; - using FunctionalTestUtils; + using FunctionalTests.Utils; using Microsoft.ApplicationInsights.DataContracts; using Xunit; using Xunit.Abstractions; diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/RequestTelemetryMvcTests.cs b/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/RequestTelemetryMvcTests.cs similarity index 98% rename from NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/RequestTelemetryMvcTests.cs rename to NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/RequestTelemetryMvcTests.cs index 0891ef768..41c511d66 100644 --- a/NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/RequestTelemetryMvcTests.cs +++ b/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/RequestTelemetryMvcTests.cs @@ -1,11 +1,11 @@ -namespace MVC20.FuncTests +namespace FunctionalTests.MVC.Tests.FunctionalTest { using System.Collections.Generic; using System.Linq; using System.Net.Http; using System.Reflection; using AI; - using FunctionalTestUtils; + using FunctionalTests.Utils; using Microsoft.ApplicationInsights.DataContracts; using Xunit; using Xunit.Abstractions; diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/TelemetryModuleWorkingMvcTests.cs b/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/TelemetryModuleWorkingMvcTests.cs similarity index 94% rename from NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/TelemetryModuleWorkingMvcTests.cs rename to NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/TelemetryModuleWorkingMvcTests.cs index 09f9790b1..3a05c85f8 100644 --- a/NETCORE/test/MVCFramework20.FunctionalTests/FunctionalTest/TelemetryModuleWorkingMvcTests.cs +++ b/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/TelemetryModuleWorkingMvcTests.cs @@ -1,7 +1,7 @@ -namespace MVC20.FuncTests +namespace FunctionalTests.MVC.Tests.FunctionalTest { using System.Reflection; - using FunctionalTestUtils; + using FunctionalTests.Utils; using Microsoft.ApplicationInsights.DataContracts; using Xunit; using Xunit.Abstractions; diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/MVCFramework20.FunctionalTests20.csproj b/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTests.MVC.Tests.csproj similarity index 78% rename from NETCORE/test/MVCFramework20.FunctionalTests/MVCFramework20.FunctionalTests20.csproj rename to NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTests.MVC.Tests.csproj index 2f15f3602..8f63790b4 100644 --- a/NETCORE/test/MVCFramework20.FunctionalTests/MVCFramework20.FunctionalTests20.csproj +++ b/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTests.MVC.Tests.csproj @@ -2,25 +2,18 @@ 2.0.0 - netcoreapp2.0;net461 - netcoreapp2.0 - win7-x86 + netcoreapp2.1;netcoreapp3.1;net461 + netcoreapp2.1;netcoreapp3.1 + win7-x86 true - MVCFramework20.FunctionalTests20.Tests - MVCFramework.FunctionalTests - true + FunctionalTests.MVC.Tests + FunctionalTests.MVC.Tests aspnet-MVCFramework45.FunctionalTests-60cfc765-2dc9-454c-bb34-dc379ed92cd0 - 2.0.0 true true - pdbonly - true - - Library - - + Always SettingsSingleFileGenerator @@ -37,12 +30,12 @@ - + - - - + + + diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/Models/ErrorViewModel.cs b/NETCORE/test/FunctionalTests.MVC.Tests/Models/ErrorViewModel.cs similarity index 78% rename from NETCORE/test/MVCFramework20.FunctionalTests/Models/ErrorViewModel.cs rename to NETCORE/test/FunctionalTests.MVC.Tests/Models/ErrorViewModel.cs index e4e25cf78..5a34c1fd3 100644 --- a/NETCORE/test/MVCFramework20.FunctionalTests/Models/ErrorViewModel.cs +++ b/NETCORE/test/FunctionalTests.MVC.Tests/Models/ErrorViewModel.cs @@ -1,6 +1,6 @@ using System; -namespace MVCFramework20.FunctionalTests.Models +namespace FunctionalTests.MVC.Tests.Models { public class ErrorViewModel { diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/Properties/launchSettings.json b/NETCORE/test/FunctionalTests.MVC.Tests/Properties/launchSettings.json similarity index 93% rename from NETCORE/test/MVCFramework20.FunctionalTests/Properties/launchSettings.json rename to NETCORE/test/FunctionalTests.MVC.Tests/Properties/launchSettings.json index ab5b1233a..8ba517fc1 100644 --- a/NETCORE/test/MVCFramework20.FunctionalTests/Properties/launchSettings.json +++ b/NETCORE/test/FunctionalTests.MVC.Tests/Properties/launchSettings.json @@ -15,7 +15,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "MVCFramework20.FunctionalTests": { + "FunctionalTests.MVC.Tests": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/Startup.cs b/NETCORE/test/FunctionalTests.MVC.Tests/Startup.cs similarity index 97% rename from NETCORE/test/MVCFramework20.FunctionalTests/Startup.cs rename to NETCORE/test/FunctionalTests.MVC.Tests/Startup.cs index 92c6358d6..5d7db3ca1 100644 --- a/NETCORE/test/MVCFramework20.FunctionalTests/Startup.cs +++ b/NETCORE/test/FunctionalTests.MVC.Tests/Startup.cs @@ -7,10 +7,10 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.ApplicationInsights.Channel; -using FunctionalTestUtils; +using FunctionalTests.Utils; using Microsoft.ApplicationInsights.AspNetCore.Extensions; -namespace MVCFramework20.FunctionalTests +namespace FunctionalTests.MVC.Tests { public class Startup { diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/Views/Home/About.cshtml b/NETCORE/test/FunctionalTests.MVC.Tests/Views/Home/About.cshtml similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/Views/Home/About.cshtml rename to NETCORE/test/FunctionalTests.MVC.Tests/Views/Home/About.cshtml diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/Views/Home/Contact.cshtml b/NETCORE/test/FunctionalTests.MVC.Tests/Views/Home/Contact.cshtml similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/Views/Home/Contact.cshtml rename to NETCORE/test/FunctionalTests.MVC.Tests/Views/Home/Contact.cshtml diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/Views/Home/Index.cshtml b/NETCORE/test/FunctionalTests.MVC.Tests/Views/Home/Index.cshtml similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/Views/Home/Index.cshtml rename to NETCORE/test/FunctionalTests.MVC.Tests/Views/Home/Index.cshtml diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/Views/Shared/Error.cshtml b/NETCORE/test/FunctionalTests.MVC.Tests/Views/Shared/Error.cshtml similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/Views/Shared/Error.cshtml rename to NETCORE/test/FunctionalTests.MVC.Tests/Views/Shared/Error.cshtml diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/Views/Shared/_Layout.cshtml b/NETCORE/test/FunctionalTests.MVC.Tests/Views/Shared/_Layout.cshtml similarity index 94% rename from NETCORE/test/MVCFramework20.FunctionalTests/Views/Shared/_Layout.cshtml rename to NETCORE/test/FunctionalTests.MVC.Tests/Views/Shared/_Layout.cshtml index 7d7c6ab8c..04c5764c8 100644 --- a/NETCORE/test/MVCFramework20.FunctionalTests/Views/Shared/_Layout.cshtml +++ b/NETCORE/test/FunctionalTests.MVC.Tests/Views/Shared/_Layout.cshtml @@ -3,7 +3,7 @@ - @ViewData["Title"] - MVCFramework20.FunctionalTests + @ViewData["Title"] - FunctionalTests.MVC.Tests @@ -26,7 +26,7 @@ - MVCFramework20.FunctionalTests + FunctionalTests.MVC.Tests
    @@ -41,7 +41,7 @@ @RenderBody()
    -

    © 2017 - MVCFramework20.FunctionalTests

    +

    © 2017 - FunctionalTests.MVC.Tests

diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/Views/Shared/_ValidationScriptsPartial.cshtml b/NETCORE/test/FunctionalTests.MVC.Tests/Views/Shared/_ValidationScriptsPartial.cshtml similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/Views/Shared/_ValidationScriptsPartial.cshtml rename to NETCORE/test/FunctionalTests.MVC.Tests/Views/Shared/_ValidationScriptsPartial.cshtml diff --git a/NETCORE/test/FunctionalTests.MVC.Tests/Views/_ViewImports.cshtml b/NETCORE/test/FunctionalTests.MVC.Tests/Views/_ViewImports.cshtml new file mode 100644 index 000000000..5f3c7260c --- /dev/null +++ b/NETCORE/test/FunctionalTests.MVC.Tests/Views/_ViewImports.cshtml @@ -0,0 +1,3 @@ +@using FunctionalTests.MVC.Tests.FunctionalTest +@using FunctionalTests.MVC.Tests.Models +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/Views/_ViewStart.cshtml b/NETCORE/test/FunctionalTests.MVC.Tests/Views/_ViewStart.cshtml similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/Views/_ViewStart.cshtml rename to NETCORE/test/FunctionalTests.MVC.Tests/Views/_ViewStart.cshtml diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/appsettings.Development.json b/NETCORE/test/FunctionalTests.MVC.Tests/appsettings.Development.json similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/appsettings.Development.json rename to NETCORE/test/FunctionalTests.MVC.Tests/appsettings.Development.json diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/appsettings.json b/NETCORE/test/FunctionalTests.MVC.Tests/appsettings.json similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/appsettings.json rename to NETCORE/test/FunctionalTests.MVC.Tests/appsettings.json diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/bower.json b/NETCORE/test/FunctionalTests.MVC.Tests/bower.json similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/bower.json rename to NETCORE/test/FunctionalTests.MVC.Tests/bower.json diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/bundleconfig.json b/NETCORE/test/FunctionalTests.MVC.Tests/bundleconfig.json similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/bundleconfig.json rename to NETCORE/test/FunctionalTests.MVC.Tests/bundleconfig.json diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/css/site.css b/NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/css/site.css similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/css/site.css rename to NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/css/site.css diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/css/site.min.css b/NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/css/site.min.css similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/css/site.min.css rename to NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/css/site.min.css diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/favicon.ico b/NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/favicon.ico similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/favicon.ico rename to NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/favicon.ico diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/images/banner1.svg b/NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/images/banner1.svg similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/images/banner1.svg rename to NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/images/banner1.svg diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/images/banner2.svg b/NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/images/banner2.svg similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/images/banner2.svg rename to NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/images/banner2.svg diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/images/banner3.svg b/NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/images/banner3.svg similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/images/banner3.svg rename to NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/images/banner3.svg diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/images/banner4.svg b/NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/images/banner4.svg similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/images/banner4.svg rename to NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/images/banner4.svg diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/js/site.js b/NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/js/site.js similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/js/site.js rename to NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/js/site.js diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/js/site.min.js b/NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/js/site.min.js similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/wwwroot/js/site.min.js rename to NETCORE/test/FunctionalTests.MVC.Tests/wwwroot/js/site.min.js diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/xunit.runner.json b/NETCORE/test/FunctionalTests.MVC.Tests/xunit.runner.json similarity index 100% rename from NETCORE/test/MVCFramework20.FunctionalTests/xunit.runner.json rename to NETCORE/test/FunctionalTests.MVC.Tests/xunit.runner.json diff --git a/NETCORE/test/FunctionalTestUtils20/FunctionalTestUtils20.csproj b/NETCORE/test/FunctionalTests.Utils/FunctionalTests.Utils.csproj similarity index 55% rename from NETCORE/test/FunctionalTestUtils20/FunctionalTestUtils20.csproj rename to NETCORE/test/FunctionalTests.Utils/FunctionalTests.Utils.csproj index 2bddf414b..9c41fd03e 100644 --- a/NETCORE/test/FunctionalTestUtils20/FunctionalTestUtils20.csproj +++ b/NETCORE/test/FunctionalTests.Utils/FunctionalTests.Utils.csproj @@ -1,13 +1,13 @@  - 1.0.2 - net461;netcoreapp2.0 - netcoreapp2.0 + net461;netcoreapp2.1;netcoreapp3.1 + netcoreapp2.1;netcoreapp3.1 true - FunctionalTestUtils20 - FunctionalTestUtils - 2.0.0 + FunctionalTests.Utils + FunctionalTests.Utils + false + false @@ -16,11 +16,9 @@ - - - - - + + + @@ -30,6 +28,7 @@ + diff --git a/NETCORE/test/FunctionalTestUtils20/HttpListenerObservableBase.cs b/NETCORE/test/FunctionalTests.Utils/HttpListenerObservableBase.cs similarity index 99% rename from NETCORE/test/FunctionalTestUtils20/HttpListenerObservableBase.cs rename to NETCORE/test/FunctionalTests.Utils/HttpListenerObservableBase.cs index e05feb7d8..f01fa2061 100644 --- a/NETCORE/test/FunctionalTestUtils20/HttpListenerObservableBase.cs +++ b/NETCORE/test/FunctionalTests.Utils/HttpListenerObservableBase.cs @@ -1,4 +1,4 @@ -namespace FunctionalTestUtils +namespace FunctionalTests.Utils { using System; using System.Collections.Generic; diff --git a/NETCORE/test/FunctionalTestUtils20/InProcessServer.cs b/NETCORE/test/FunctionalTests.Utils/InProcessServer.cs similarity index 99% rename from NETCORE/test/FunctionalTestUtils20/InProcessServer.cs rename to NETCORE/test/FunctionalTests.Utils/InProcessServer.cs index f8a9fe2fd..f4bb3e76c 100644 --- a/NETCORE/test/FunctionalTestUtils20/InProcessServer.cs +++ b/NETCORE/test/FunctionalTests.Utils/InProcessServer.cs @@ -2,7 +2,7 @@ using Microsoft.ApplicationInsights.Extensibility; using Microsoft.ApplicationInsights.Extensibility.Implementation.ApplicationId; -namespace FunctionalTestUtils +namespace FunctionalTests.Utils { using System; using System.IO; diff --git a/NETCORE/test/FunctionalTestUtils20/Properties/launchSettings.json b/NETCORE/test/FunctionalTests.Utils/Properties/launchSettings.json similarity index 100% rename from NETCORE/test/FunctionalTestUtils20/Properties/launchSettings.json rename to NETCORE/test/FunctionalTests.Utils/Properties/launchSettings.json diff --git a/NETCORE/test/FunctionalTestUtils20/TelemetryExtensions.cs b/NETCORE/test/FunctionalTests.Utils/TelemetryExtensions.cs similarity index 98% rename from NETCORE/test/FunctionalTestUtils20/TelemetryExtensions.cs rename to NETCORE/test/FunctionalTests.Utils/TelemetryExtensions.cs index 9211b336b..421bba358 100644 --- a/NETCORE/test/FunctionalTestUtils20/TelemetryExtensions.cs +++ b/NETCORE/test/FunctionalTests.Utils/TelemetryExtensions.cs @@ -4,7 +4,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace FunctionalTestUtils +namespace FunctionalTests.Utils { using System; using System.IO; diff --git a/NETCORE/test/FunctionalTestUtils20/TelemetryHttpListenerObservable.cs b/NETCORE/test/FunctionalTests.Utils/TelemetryHttpListenerObservable.cs similarity index 94% rename from NETCORE/test/FunctionalTestUtils20/TelemetryHttpListenerObservable.cs rename to NETCORE/test/FunctionalTests.Utils/TelemetryHttpListenerObservable.cs index e55efb930..22924991c 100644 --- a/NETCORE/test/FunctionalTestUtils20/TelemetryHttpListenerObservable.cs +++ b/NETCORE/test/FunctionalTests.Utils/TelemetryHttpListenerObservable.cs @@ -1,4 +1,4 @@ -namespace FunctionalTestUtils +namespace FunctionalTests.Utils { using System; using System.Collections.Generic; @@ -6,10 +6,8 @@ using System.IO; using System.IO.Compression; using System.Net; - using System.Net.Http; - using System.Text; - using System.Threading.Tasks; using AI; + using FunctionalTests.Utils; using Xunit.Abstractions; public class TelemetryHttpListenerObservable : HttpListenerObservableBase diff --git a/NETCORE/test/FunctionalTestUtils20/TelemetryItemFactory.cs b/NETCORE/test/FunctionalTests.Utils/TelemetryItemFactory.cs similarity index 98% rename from NETCORE/test/FunctionalTestUtils20/TelemetryItemFactory.cs rename to NETCORE/test/FunctionalTests.Utils/TelemetryItemFactory.cs index fb066d14a..7659b45da 100644 --- a/NETCORE/test/FunctionalTestUtils20/TelemetryItemFactory.cs +++ b/NETCORE/test/FunctionalTests.Utils/TelemetryItemFactory.cs @@ -1,4 +1,4 @@ -namespace FunctionalTestUtils +namespace FunctionalTests.Utils { using System; using System.Collections.Generic; diff --git a/NETCORE/test/FunctionalTestUtils20/TelemetryTestsBase.cs b/NETCORE/test/FunctionalTests.Utils/TelemetryTestsBase.cs similarity index 99% rename from NETCORE/test/FunctionalTestUtils20/TelemetryTestsBase.cs rename to NETCORE/test/FunctionalTests.Utils/TelemetryTestsBase.cs index cf213001f..9bae62bdb 100644 --- a/NETCORE/test/FunctionalTestUtils20/TelemetryTestsBase.cs +++ b/NETCORE/test/FunctionalTests.Utils/TelemetryTestsBase.cs @@ -1,4 +1,4 @@ -namespace FunctionalTestUtils +namespace FunctionalTests.Utils { using System; using System.Diagnostics; diff --git a/NETCORE/test/WebApi20.FunctionalTests/Controllers/DependencyController.cs b/NETCORE/test/FunctionalTests.WebApi.Tests/Controllers/DependencyController.cs similarity index 91% rename from NETCORE/test/WebApi20.FunctionalTests/Controllers/DependencyController.cs rename to NETCORE/test/FunctionalTests.WebApi.Tests/Controllers/DependencyController.cs index bb0d8eeb4..fea057dd0 100644 --- a/NETCORE/test/WebApi20.FunctionalTests/Controllers/DependencyController.cs +++ b/NETCORE/test/FunctionalTests.WebApi.Tests/Controllers/DependencyController.cs @@ -5,7 +5,7 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -namespace WebApi20.FunctionalTests.Controllers +namespace FunctionalTests.WebApi.Tests.Controllers { [Route("api/[controller]")] public class DependencyController : Controller diff --git a/NETCORE/test/WebApi20.FunctionalTests/Controllers/ExceptionController.cs b/NETCORE/test/FunctionalTests.WebApi.Tests/Controllers/ExceptionController.cs similarity index 87% rename from NETCORE/test/WebApi20.FunctionalTests/Controllers/ExceptionController.cs rename to NETCORE/test/FunctionalTests.WebApi.Tests/Controllers/ExceptionController.cs index b36145701..65ab62473 100644 --- a/NETCORE/test/WebApi20.FunctionalTests/Controllers/ExceptionController.cs +++ b/NETCORE/test/FunctionalTests.WebApi.Tests/Controllers/ExceptionController.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Mvc; -namespace WebApi20.FunctionalTests.Controllers +namespace FunctionalTests.WebApi.Tests.Controllers { [Route("api/[controller]")] public class ExceptionController : Controller diff --git a/NETCORE/test/WebApi20.FunctionalTests/Controllers/ValuesController.cs b/NETCORE/test/FunctionalTests.WebApi.Tests/Controllers/ValuesController.cs similarity index 96% rename from NETCORE/test/WebApi20.FunctionalTests/Controllers/ValuesController.cs rename to NETCORE/test/FunctionalTests.WebApi.Tests/Controllers/ValuesController.cs index 626965abf..1204394e1 100644 --- a/NETCORE/test/WebApi20.FunctionalTests/Controllers/ValuesController.cs +++ b/NETCORE/test/FunctionalTests.WebApi.Tests/Controllers/ValuesController.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -namespace WebApi20.FunctionalTests.Controllers +namespace FunctionalTests.WebApi.Tests.Controllers { [Route("api/[controller]")] public class ValuesController : Controller diff --git a/NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/LoggerTests.cs b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/LoggerTests.cs similarity index 95% rename from NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/LoggerTests.cs rename to NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/LoggerTests.cs index 84397ed27..3045965b4 100644 --- a/NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/LoggerTests.cs +++ b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/LoggerTests.cs @@ -1,4 +1,4 @@ -namespace WebApi20.FuncTests +namespace FunctionalTests.WebApi.Tests.FunctionalTest { using System; using System.Collections.Generic; @@ -6,7 +6,6 @@ using System.Linq; using System.Text.RegularExpressions; - using FunctionalTestUtils; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.ApplicationInsights.DataContracts; @@ -16,6 +15,7 @@ using AI; using Microsoft.Extensions.Logging; using System.Reflection; + using global::FunctionalTests.Utils; /// /// These are Functional Tests validating E2E ILogger integration. Though filtering mechanism is done by the ILogger framework itself, we @@ -35,8 +35,6 @@ [Fact] public void TestIloggerWarningOrAboveIsCapturedByDefault() { - -#if NETCOREAPP2_0 || NET461 using (var server = new InProcessServer(assemblyName, this.output)) { // Make request to this path, which sents one log of each severity Error, Warning, Information, Trace @@ -52,14 +50,11 @@ ValidateMessage(actual[0], new string[] {"error", "warning" }); ValidateMessage(actual[1], new string[] { "error", "warning" }); } -#endif } [Fact] public void TestIloggerDefaultsCanBeOverridenByUserForAllCategories() { - -#if NETCOREAPP2_0 || NET461 void ConfigureServices(IServiceCollection services) { // ARRANGE @@ -81,19 +76,16 @@ ValidateMessage(actual[0], new string[] { "error"}); } -#endif } [Fact] public void TestIloggerDefaultsCanBeOverridenByUserForSpecificCategory() { - -#if NETCOREAPP2_0 || NET461 void ConfigureServices(IServiceCollection services) { // ARRANGE // AddFilter to capture Trace or above for user category. This is expected to override default behavior. - services.AddLogging(builder => builder.AddFilter("WebApi20.FunctionalTests.Controllers", LogLevel.Trace)); + services.AddLogging(builder => builder.AddFilter("FunctionalTests.WebApi.Tests.Controllers", LogLevel.Trace)); } using (var server = new InProcessServer(assemblyName, this.output, null, ConfigureServices)) @@ -114,7 +106,6 @@ ValidateMessage(actual[2], new string[] { "information" }); ValidateMessage(actual[3], new string[] { "trace" }); } -#endif } diff --git a/NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/MultipleWebHostsTests.cs b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/MultipleWebHostsTests.cs similarity index 98% rename from NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/MultipleWebHostsTests.cs rename to NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/MultipleWebHostsTests.cs index bbfe36d2a..11c903452 100644 --- a/NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/MultipleWebHostsTests.cs +++ b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/MultipleWebHostsTests.cs @@ -2,13 +2,13 @@ using System.Reflection; using System.Runtime.InteropServices; using AI; -using FunctionalTestUtils; +using FunctionalTests.Utils; using Microsoft.ApplicationInsights; using Microsoft.ApplicationInsights.Extensibility; using Xunit; using Xunit.Abstractions; -namespace WebApi20.FuncTests +namespace FunctionalTests.WebApi.Tests.FunctionalTest { public class MultipleWebHostsTests : TelemetryTestsBase { diff --git a/NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/RequestCollectionTests.cs b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/RequestCollectionTests.cs similarity index 98% rename from NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/RequestCollectionTests.cs rename to NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/RequestCollectionTests.cs index 72ac81ddf..4dea2a8ac 100644 --- a/NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/RequestCollectionTests.cs +++ b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/RequestCollectionTests.cs @@ -1,15 +1,15 @@ -namespace WebApi20.FuncTests +namespace FunctionalTests.WebApi.Tests.FunctionalTest { using System; using System.Collections.Generic; using System.Diagnostics; - using FunctionalTestUtils; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.ApplicationInsights.DataContracts; using Xunit; using Xunit.Abstractions; using System.Reflection; + using global::FunctionalTests.Utils; public class RequestCollectionTests : TelemetryTestsBase { diff --git a/NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/RequestCorrelationTests.cs b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/RequestCorrelationTests.cs similarity index 99% rename from NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/RequestCorrelationTests.cs rename to NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/RequestCorrelationTests.cs index 8ec4c17bb..988c5ce65 100644 --- a/NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/RequestCorrelationTests.cs +++ b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/RequestCorrelationTests.cs @@ -1,9 +1,8 @@ -namespace WebApi20.FuncTests +namespace FunctionalTests.WebApi.Tests.FunctionalTest { using System; using System.Collections.Generic; using System.Diagnostics; - using FunctionalTestUtils; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.ApplicationInsights.DataContracts; @@ -14,6 +13,7 @@ using System.Text.RegularExpressions; using Microsoft.ApplicationInsights.AspNetCore.Extensions; using System.Reflection; + using global::FunctionalTests.Utils; public class RequestCorrelationTests : TelemetryTestsBase { diff --git a/NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/RequestDependencyCorrelationTests.cs b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/RequestDependencyCorrelationTests.cs similarity index 97% rename from NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/RequestDependencyCorrelationTests.cs rename to NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/RequestDependencyCorrelationTests.cs index 88b34a8a4..6124b4da0 100644 --- a/NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/RequestDependencyCorrelationTests.cs +++ b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/RequestDependencyCorrelationTests.cs @@ -1,6 +1,5 @@ -namespace WebApi20.FuncTests +namespace FunctionalTests.WebApi.Tests.FunctionalTest { - using FunctionalTestUtils; using System; using System.Diagnostics; using System.Linq; @@ -11,6 +10,7 @@ using Xunit; using Xunit.Abstractions; using System.Reflection; + using global::FunctionalTests.Utils; public class RequestDependencyCorrelationTests : TelemetryTestsBase, IDisposable { diff --git a/NETCORE/test/WebApi20.FunctionalTests/WebApi20.FunctionalTests20.csproj b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTests.WebApi.Tests.csproj similarity index 55% rename from NETCORE/test/WebApi20.FunctionalTests/WebApi20.FunctionalTests20.csproj rename to NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTests.WebApi.Tests.csproj index 57e5630c2..6e6178dbe 100644 --- a/NETCORE/test/WebApi20.FunctionalTests/WebApi20.FunctionalTests20.csproj +++ b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTests.WebApi.Tests.csproj @@ -1,17 +1,13 @@  - 2.0.0 - netcoreapp2.0;net461 - netcoreapp2.0 - win7-x86 - true - WebApi20.FunctionalTests20.Tests - WebApi20.FunctionalTests - true - 2.0.0 - pdbonly - true + netcoreapp2.1;netcoreapp3.1;net461 + netcoreapp2.1;netcoreapp3.1 + win7-x86 + FunctionalTests.WebApi.Tests + FunctionalTests.WebApi.Tests + false + false @@ -23,19 +19,19 @@ PreserveNewest - + - + - + - - - + + + @@ -43,7 +39,7 @@ - + diff --git a/NETCORE/test/WebApi20.FunctionalTests/Properties/launchSettings.json b/NETCORE/test/FunctionalTests.WebApi.Tests/Properties/launchSettings.json similarity index 94% rename from NETCORE/test/WebApi20.FunctionalTests/Properties/launchSettings.json rename to NETCORE/test/FunctionalTests.WebApi.Tests/Properties/launchSettings.json index 78aa70bab..e70e6d2ca 100644 --- a/NETCORE/test/WebApi20.FunctionalTests/Properties/launchSettings.json +++ b/NETCORE/test/FunctionalTests.WebApi.Tests/Properties/launchSettings.json @@ -16,7 +16,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "WebApi20.FunctionalTests": { + "FunctionalTests.WebApi.Tests": { "commandName": "Project", "launchBrowser": true, "launchUrl": "api/values", diff --git a/NETCORE/test/WebApi20.FunctionalTests/Startup.cs b/NETCORE/test/FunctionalTests.WebApi.Tests/Startup.cs similarity index 96% rename from NETCORE/test/WebApi20.FunctionalTests/Startup.cs rename to NETCORE/test/FunctionalTests.WebApi.Tests/Startup.cs index c5278906f..f4493c879 100644 --- a/NETCORE/test/WebApi20.FunctionalTests/Startup.cs +++ b/NETCORE/test/FunctionalTests.WebApi.Tests/Startup.cs @@ -2,10 +2,10 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using FunctionalTestUtils; using Microsoft.ApplicationInsights.Channel; +using FunctionalTests.Utils; -namespace WebApi20.FunctionalTests +namespace FunctionalTests.WebApi.Tests { public class Startup { diff --git a/NETCORE/test/WebApi20.FunctionalTests/appsettings.Development.json b/NETCORE/test/FunctionalTests.WebApi.Tests/appsettings.Development.json similarity index 100% rename from NETCORE/test/WebApi20.FunctionalTests/appsettings.Development.json rename to NETCORE/test/FunctionalTests.WebApi.Tests/appsettings.Development.json diff --git a/NETCORE/test/WebApi20.FunctionalTests/appsettings.json b/NETCORE/test/FunctionalTests.WebApi.Tests/appsettings.json similarity index 100% rename from NETCORE/test/WebApi20.FunctionalTests/appsettings.json rename to NETCORE/test/FunctionalTests.WebApi.Tests/appsettings.json diff --git a/NETCORE/test/WebApi20.FunctionalTests/xunit.runner.json b/NETCORE/test/FunctionalTests.WebApi.Tests/xunit.runner.json similarity index 100% rename from NETCORE/test/WebApi20.FunctionalTests/xunit.runner.json rename to NETCORE/test/FunctionalTests.WebApi.Tests/xunit.runner.json diff --git a/NETCORE/test/MVCFramework20.FunctionalTests/Views/_ViewImports.cshtml b/NETCORE/test/MVCFramework20.FunctionalTests/Views/_ViewImports.cshtml deleted file mode 100644 index 086b3f51c..000000000 --- a/NETCORE/test/MVCFramework20.FunctionalTests/Views/_ViewImports.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@using MVCFramework20.FunctionalTests -@using MVCFramework20.FunctionalTests.Models -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests.cs b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests.cs deleted file mode 100644 index 236915a5a..000000000 --- a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests.cs +++ /dev/null @@ -1,1505 +0,0 @@ -using Xunit; - -[assembly: CollectionBehavior(DisableTestParallelization = true)] -namespace Microsoft.Extensions.DependencyInjection.Test -{ - using System; - using System.Diagnostics; - using System.IO; - using System.Linq; - using System.Reflection; - using Logging; - using Microsoft.ApplicationInsights; - using Microsoft.ApplicationInsights.AspNetCore; - using Microsoft.ApplicationInsights.AspNetCore.DiagnosticListeners; - using Microsoft.ApplicationInsights.AspNetCore.Extensions; - using Microsoft.ApplicationInsights.AspNetCore.Logging; - using Microsoft.ApplicationInsights.AspNetCore.TelemetryInitializers; - using Microsoft.ApplicationInsights.AspNetCore.Tests; - using Microsoft.ApplicationInsights.AspNetCore.Tests.Helpers; - using Microsoft.ApplicationInsights.Channel; - using Microsoft.ApplicationInsights.DataContracts; - using Microsoft.ApplicationInsights.DependencyCollector; - using Microsoft.ApplicationInsights.Extensibility; -#if NETCOREAPP - using Microsoft.ApplicationInsights.Extensibility.EventCounterCollector; -#endif - using Microsoft.ApplicationInsights.Extensibility.Implementation; - using Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing; - using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector; - using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.QuickPulse; - using Microsoft.ApplicationInsights.Extensibility.W3C; - using Microsoft.ApplicationInsights.WindowsServer; - using Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel; - using Microsoft.AspNetCore.Hosting; - using Microsoft.AspNetCore.Hosting.Internal; - using Microsoft.AspNetCore.Http; - using Microsoft.AspNetCore.Http.Internal; - using Microsoft.Extensions.Configuration; - using Microsoft.Extensions.Options; - -#pragma warning disable CS0618 // TelemetryConfiguration.Active is obsolete. We still test with this for backwards compatibility. - public static class ApplicationInsightsExtensionsTests - { - /// Constant instrumentation key value for testintg. - public const string TestInstrumentationKey = "11111111-2222-3333-4444-555555555555"; - private const string TestConnectionString = "InstrumentationKey=11111111-2222-3333-4444-555555555555;IngestionEndpoint=http://127.0.0.1"; - private const string InstrumentationKeyFromConfig = "ApplicationInsights:InstrumentationKey"; - private const string ConnectionStringEnvironmentVariable = "APPLICATIONINSIGHTS_CONNECTION_STRING"; - - public static ServiceCollection GetServiceCollectionWithContextAccessor() - { - var services = new ServiceCollection(); - services.AddSingleton(new HostingEnvironment() { ContentRootPath = Directory.GetCurrentDirectory()}); - services.AddSingleton(new DiagnosticListener("TestListener")); - return services; - } - - public static class AddApplicationInsightsTelemetry - { - [Theory] - [InlineData(typeof(ITelemetryInitializer), typeof(ApplicationInsights.AspNetCore.TelemetryInitializers.DomainNameRoleInstanceTelemetryInitializer), ServiceLifetime.Singleton)] - [InlineData(typeof(ITelemetryInitializer), typeof(AzureAppServiceRoleNameFromHostNameHeaderInitializer), ServiceLifetime.Singleton)] - [InlineData(typeof(ITelemetryInitializer), typeof(ComponentVersionTelemetryInitializer), ServiceLifetime.Singleton)] - [InlineData(typeof(ITelemetryInitializer), typeof(ClientIpHeaderTelemetryInitializer), ServiceLifetime.Singleton)] - [InlineData(typeof(ITelemetryInitializer), typeof(OperationNameTelemetryInitializer), ServiceLifetime.Singleton)] - [InlineData(typeof(ITelemetryInitializer), typeof(SyntheticTelemetryInitializer), ServiceLifetime.Singleton)] - [InlineData(typeof(ITelemetryInitializer), typeof(WebSessionTelemetryInitializer), ServiceLifetime.Singleton)] - [InlineData(typeof(ITelemetryInitializer), typeof(WebUserTelemetryInitializer), ServiceLifetime.Singleton)] - [InlineData(typeof(ITelemetryInitializer), typeof(HttpDependenciesParsingTelemetryInitializer), ServiceLifetime.Singleton)] - [InlineData(typeof(TelemetryConfiguration), null, ServiceLifetime.Singleton)] - [InlineData(typeof(TelemetryClient), typeof(TelemetryClient), ServiceLifetime.Singleton)] - public static void RegistersExpectedServices(Type serviceType, Type implementationType, ServiceLifetime lifecycle) - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, null); - ServiceDescriptor service = services.Single(s => s.ServiceType == serviceType && s.ImplementationType == implementationType); - Assert.Equal(lifecycle, service.Lifetime); - } - - [Theory] - [InlineData(typeof(ITelemetryInitializer), typeof(ApplicationInsights.AspNetCore.TelemetryInitializers.DomainNameRoleInstanceTelemetryInitializer), ServiceLifetime.Singleton)] - [InlineData(typeof(ITelemetryInitializer), typeof(AzureAppServiceRoleNameFromHostNameHeaderInitializer), ServiceLifetime.Singleton)] - [InlineData(typeof(ITelemetryInitializer), typeof(ComponentVersionTelemetryInitializer), ServiceLifetime.Singleton)] - [InlineData(typeof(ITelemetryInitializer), typeof(ClientIpHeaderTelemetryInitializer), ServiceLifetime.Singleton)] - [InlineData(typeof(ITelemetryInitializer), typeof(OperationNameTelemetryInitializer), ServiceLifetime.Singleton)] - [InlineData(typeof(ITelemetryInitializer), typeof(SyntheticTelemetryInitializer), ServiceLifetime.Singleton)] - [InlineData(typeof(ITelemetryInitializer), typeof(WebSessionTelemetryInitializer), ServiceLifetime.Singleton)] - [InlineData(typeof(ITelemetryInitializer), typeof(WebUserTelemetryInitializer), ServiceLifetime.Singleton)] - [InlineData(typeof(ITelemetryInitializer), typeof(HttpDependenciesParsingTelemetryInitializer), ServiceLifetime.Singleton)] - [InlineData(typeof(TelemetryConfiguration), null, ServiceLifetime.Singleton)] - [InlineData(typeof(TelemetryClient), typeof(TelemetryClient), ServiceLifetime.Singleton)] - public static void RegistersExpectedServicesOnlyOnce(Type serviceType, Type implementationType, ServiceLifetime lifecycle) - { - var services = GetServiceCollectionWithContextAccessor(); - services.AddApplicationInsightsTelemetry(); - services.AddApplicationInsightsTelemetry(); - ServiceDescriptor service = services.Single(s => s.ServiceType == serviceType && s.ImplementationType == implementationType); - Assert.Equal(lifecycle, service.Lifetime); - } - - [Fact] - public static void DoesNotThrowWithoutInstrumentationKey() - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, null); - } - - [Fact] - public static void RegistersTelemetryConfigurationFactoryMethodThatCreatesDefaultInstance() - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, null); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Contains(telemetryConfiguration.TelemetryInitializers, t => t is OperationNameTelemetryInitializer); - } - - /// - /// Tests that the instrumentation key configuration can be read from a JSON file by the configuration factory. - /// - [Fact] - public static void RegistersTelemetryConfigurationFactoryMethodThatReadsInstrumentationKeyFromConfiguration() - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(Path.Combine("content", "config-instrumentation-key.json"), null); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); - } - - /// - /// Tests that the connection string can be read from a JSON file by the configuration factory. - /// - [Fact] - [Trait("Trait", "ConnectionString")] - public static void RegistersTelemetryConfigurationFactoryMethodThatReadsConnectionStringFromConfiguration() - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(Path.Combine("content", "config-connection-string.json"), null); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal(TestConnectionString, telemetryConfiguration.ConnectionString); - Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); - Assert.Equal("http://127.0.0.1/", telemetryConfiguration.EndpointContainer.Ingestion.AbsoluteUri); - } - - /// - /// Tests that the connection string can be read from a JSON file by the configuration factory. - /// This config has both a connection string and an instrumentation key. It is expected to use the ikey from the connection string. - /// - [Fact] - [Trait("Trait", "ConnectionString")] - public static void RegistersTelemetryConfigurationFactoryMethodThatReadsConnectionStringAndInstrumentationKeyFromConfiguration() - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(Path.Combine("content", "config-connection-string-and-instrumentation-key.json"), null); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal(TestConnectionString, telemetryConfiguration.ConnectionString); - Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); - Assert.Equal("http://127.0.0.1/", telemetryConfiguration.EndpointContainer.Ingestion.AbsoluteUri); - } - - /// - /// Tests that the Active configuration singleton is updated, but another instance of telemetry configuration is created for dependency injection. - /// ASP.NET Core developers should always use Dependency Injection instead of static singleton approach. - /// See Microsoft/ApplicationInsights-dotnet#613 - /// - [Fact] - public static void ConfigurationFactoryMethodUpdatesTheActiveConfigurationSingletonByDefault() - { - // Clear off Active before beginning test to avoid being affected by previous tests. - TelemetryConfiguration.Active.InstrumentationKey = ""; - TelemetryConfiguration.Active.TelemetryInitializers.Clear(); - - var activeConfig = TelemetryConfiguration.Active; - var services = CreateServicesAndAddApplicationinsightsTelemetry(Path.Combine("content","config-instrumentation-key.json"), null); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - TelemetryConfiguration telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); - Assert.Equal(TestInstrumentationKey, activeConfig.InstrumentationKey); - Assert.NotEqual(activeConfig, telemetryConfiguration); - } - - /// - /// We determine if Active telemetry needs to be configured based on the assumptions that 'default' configuration - // created by base SDK has single preset ITelemetryInitializer. If it ever changes, change TelemetryConfigurationOptions.IsActiveConfigured method as well. - /// - [Fact] - public static void DefaultTelemetryConfigurationHasOneTelemetryInitializer() - { - // - var defaultConfig = TelemetryConfiguration.CreateDefault(); - Assert.Equal(1, defaultConfig.TelemetryInitializers.Count); - } - - [Fact] - public static void RegistersTelemetryConfigurationFactoryMethodThatReadsDeveloperModeFromConfiguration() - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(Path.Combine("content", "config-developer-mode.json"), null); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.True(telemetryConfiguration.TelemetryChannel.DeveloperMode); - } - - [Fact] - public static void RegistersTelemetryConfigurationFactoryMethodThatReadsEndpointAddressFromConfiguration() - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(Path.Combine("content", "config-endpoint-address.json"), null); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal("http://localhost:1234/v2/track/", telemetryConfiguration.TelemetryChannel.EndpointAddress); - } - - [Fact] - public static void RegistersTelemetryConfigurationFactoryMethodThatReadsInstrumentationKeyFromEnvironment() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddSingleton(new InMemoryChannel()); - Environment.SetEnvironmentVariable("APPINSIGHTS_INSTRUMENTATIONKEY", TestInstrumentationKey); - var config = new ConfigurationBuilder().AddEnvironmentVariables().Build(); - try - { - services.AddApplicationInsightsTelemetry(config); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); - } - finally - { - Environment.SetEnvironmentVariable("APPINSIGHTS_INSTRUMENTATIONKEY", null); - } - } - - /// - /// Validates that while using services.AddApplicationInsightsTelemetry(); ikey is read from - /// Environment - /// - [Fact] - [Trait("Trait", "ConnectionString")] - public static void AddApplicationInsightsTelemetry_ReadsConnectionString_FromEnvironment() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - Environment.SetEnvironmentVariable(ConnectionStringEnvironmentVariable, TestConnectionString); - try - { - services.AddApplicationInsightsTelemetry(); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal(TestConnectionString, telemetryConfiguration.ConnectionString); - Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); - Assert.Equal("http://127.0.0.1/", telemetryConfiguration.EndpointContainer.Ingestion.AbsoluteUri); - } - finally - { - Environment.SetEnvironmentVariable(ConnectionStringEnvironmentVariable, null); - } - } - - /// - /// Validates that while using services.AddApplicationInsightsTelemetry(); ikey is read from - /// Environment - /// - [Fact] - public static void AddApplicationInsightsTelemetryReadsInstrumentationKeyFromEnvironment() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - Environment.SetEnvironmentVariable("APPINSIGHTS_INSTRUMENTATIONKEY", TestInstrumentationKey); - try - { - services.AddApplicationInsightsTelemetry(); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); - } - finally - { - Environment.SetEnvironmentVariable("APPINSIGHTS_INSTRUMENTATIONKEY", null); - } - } - - /// - /// Validates that while using services.AddApplicationInsightsTelemetry(ikey), supplied ikey is - /// used instead of one from Environment - /// - [Fact] - public static void AddApplicationInsightsTelemetryDoesNotReadInstrumentationKeyFromEnvironmentIfSupplied() - { - Environment.SetEnvironmentVariable("APPINSIGHTS_INSTRUMENTATIONKEY", TestInstrumentationKey); - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - string ikeyExpected = Guid.NewGuid().ToString(); - - try - { - services.AddApplicationInsightsTelemetry(ikeyExpected); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal(ikeyExpected, telemetryConfiguration.InstrumentationKey); - } - finally - { - Environment.SetEnvironmentVariable("APPINSIGHTS_INSTRUMENTATIONKEY", null); - } - } - - /// - /// Validates that while using services.AddApplicationInsightsTelemetry(); reads ikey/other settings from - /// appsettings.json - /// - [Fact] - public static void AddApplicationInsightsTelemetryReadsInstrumentationKeyFromDefaultAppsettingsFile() - { - string ikeyExpected = Guid.NewGuid().ToString(); - string hostExpected = "http://ainewhost/v2/track/"; - string text = File.ReadAllText("appsettings.json"); - string originalText = text; - try - { - text = text.Replace("ikeyhere", ikeyExpected); - text = text.Replace("http://hosthere/v2/track/", hostExpected); - File.WriteAllText("appsettings.json", text); - - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddApplicationInsightsTelemetry(); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal(ikeyExpected, telemetryConfiguration.InstrumentationKey); - Assert.Equal(hostExpected, telemetryConfiguration.TelemetryChannel.EndpointAddress); - } - finally - { - File.WriteAllText("appsettings.json", originalText); - } - } - - /// - /// Validates that while using services.AddApplicationInsightsTelemetry(ikey), supplied ikey is - /// used instead of one from appsettings.json - /// - [Fact] - public static void AddApplicationInsightsTelemetryDoesNotReadInstrumentationKeyFromDefaultAppsettingsIfSupplied() - { - string suppliedIKey = "suppliedikey"; - string ikey = Guid.NewGuid().ToString(); - string text = File.ReadAllText("appsettings.json"); - try - { - text = text.Replace("ikeyhere", ikey); - File.WriteAllText("appsettings.json", text); - - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddApplicationInsightsTelemetry(suppliedIKey); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal(suppliedIKey, telemetryConfiguration.InstrumentationKey); - } - finally - { - text = text.Replace(ikey, "ikeyhere"); - File.WriteAllText("appsettings.json", text); - } - } - - /// - /// Validates that while using services.AddApplicationInsightsTelemetry(ApplicationInsightsServiceOptions), supplied ikey is - /// used instead of one from appsettings.json - /// - [Fact] - public static void AddApplicationInsightsTelemetryDoesNotReadInstrumentationKeyFromDefaultAppsettingsIfSuppliedViaOptions() - { - string suppliedIKey = "suppliedikey"; - var options = new ApplicationInsightsServiceOptions() { InstrumentationKey = suppliedIKey }; - string ikey = Guid.NewGuid().ToString(); - string text = File.ReadAllText("appsettings.json"); - try - { - text = text.Replace("ikeyhere", ikey); - File.WriteAllText("appsettings.json", text); - - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddApplicationInsightsTelemetry(options); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal(suppliedIKey, telemetryConfiguration.InstrumentationKey); - } - finally - { - text = text.Replace(ikey, "ikeyhere"); - File.WriteAllText("appsettings.json", text); - } - } - - /// - /// Validates that while using services.AddApplicationInsightsTelemetry(ApplicationInsightsServiceOptions), with null ikey - /// and endpoint, ikey and endpoint from AppSettings.Json is NOT overwritten with the null/empty ones from - /// ApplicationInsightsServiceOptions - /// - [Fact] - public static void AddApplicationInsightsTelemetryDoesNotOverrideEmptyInstrumentationKeyFromAiOptions() - { - // Create new options, which will be default have null ikey and endpoint. - var options = new ApplicationInsightsServiceOptions(); - string ikey = Guid.NewGuid().ToString(); - string text = File.ReadAllText("appsettings.json"); - try - { - text = text.Replace("ikeyhere", ikey); - text = text.Replace("hosthere", "newhost"); - File.WriteAllText("appsettings.json", text); - - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddApplicationInsightsTelemetry(options); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal(ikey, telemetryConfiguration.InstrumentationKey); - Assert.Equal("http://newhost/v2/track/", telemetryConfiguration.DefaultTelemetrySink.TelemetryChannel.EndpointAddress); - } - finally - { - text = text.Replace(ikey, "ikeyhere"); - text = text.Replace("newhost", "hosthere"); - File.WriteAllText("appsettings.json", text); - } - } - - [Fact] - public static void RegistersTelemetryConfigurationFactoryMethodThatReadsDeveloperModeFromEnvironment() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddSingleton(new InMemoryChannel()); - Environment.SetEnvironmentVariable("APPINSIGHTS_DEVELOPER_MODE", "true"); - var config = new ConfigurationBuilder().AddEnvironmentVariables().Build(); - try - { - services.AddApplicationInsightsTelemetry(config); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.True(telemetryConfiguration.TelemetryChannel.DeveloperMode); - } - finally - { - Environment.SetEnvironmentVariable("APPINSIGHTS_DEVELOPER_MODE", null); - } - } - - [Fact] - public static void RegistersTelemetryConfigurationFactoryMethodThatReadsEndpointAddressFromEnvironment() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddSingleton(new InMemoryChannel()); - Environment.SetEnvironmentVariable("APPINSIGHTS_ENDPOINTADDRESS", "http://localhost:1234/v2/track/"); - var config = new ConfigurationBuilder().AddEnvironmentVariables().Build(); - try - { - services.AddApplicationInsightsTelemetry(config); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal("http://localhost:1234/v2/track/", telemetryConfiguration.TelemetryChannel.EndpointAddress); - } - finally - { - Environment.SetEnvironmentVariable("APPINSIGHTS_ENDPOINTADDRESS", null); - } - } - - [Fact] - public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesItWithTelemetryInitializersFromContainer() - { - var telemetryInitializer = new FakeTelemetryInitializer(); - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddSingleton(telemetryInitializer); - services.AddSingleton(new InMemoryChannel()); - - services.AddApplicationInsightsTelemetry(new ConfigurationBuilder().Build()); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Contains(telemetryInitializer, telemetryConfiguration.TelemetryInitializers); - } - - [Fact] - public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesItWithTelemetryChannelFromContainer() - { - var telemetryChannel = new FakeTelemetryChannel(); - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddSingleton(telemetryChannel); - - services.AddApplicationInsightsTelemetry(new ConfigurationBuilder().Build()); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Same(telemetryChannel, telemetryConfiguration.TelemetryChannel); - } - - [Fact] - public static void DoesNotOverrideDefaultTelemetryChannelIfTelemetryChannelServiceIsNotRegistered() - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, null); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.NotNull(telemetryConfiguration.TelemetryChannel); - } - - [Fact] - public static void RegistersTelemetryClientToGetTelemetryConfigurationFromContainerAndNotGlobalInstance() - { - ITelemetry sentTelemetry = null; - var telemetryChannel = new FakeTelemetryChannel { OnSend = telemetry => sentTelemetry = telemetry }; - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, null); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var configuration = serviceProvider.GetTelemetryConfiguration(); - configuration.InstrumentationKey = Guid.NewGuid().ToString(); - ITelemetryChannel oldChannel = configuration.TelemetryChannel; - try - { - configuration.TelemetryChannel = telemetryChannel; - - var telemetryClient = serviceProvider.GetRequiredService(); - telemetryClient.TrackEvent("myevent"); - - // We want to check that configuration from container was used but configuration is a private field so we check instrumentation key instead. - Assert.Equal(configuration.InstrumentationKey, sentTelemetry.Context.InstrumentationKey); - } - finally - { - configuration.TelemetryChannel = oldChannel; - } - } - - [Fact] - public static void AddApplicationInsightsTelemetryDoesNotThrowOnNullServiceOptions() - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", null, false); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - } - - [Fact] - public static void AppApplicationInsightsTelemetryFromApplicationInsightsServiceOptionsCopiesAllSettings() - { - ServiceCollection services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - ApplicationInsightsServiceOptions options = new ApplicationInsightsServiceOptions() - { - ApplicationVersion = "test", - DeveloperMode = true, - EnableAdaptiveSampling = false, - EnableAuthenticationTrackingJavaScript = false, - EnableDebugLogger = true, - EnableQuickPulseMetricStream = false, - EndpointAddress = "http://test", - EnableHeartbeat = false, - InstrumentationKey = "test", - ConnectionString = "InstrumentationKey=00000000-0000-0000-0000-000000000000" - }; - services.AddApplicationInsightsTelemetry(options); - ApplicationInsightsServiceOptions servicesOptions = null; - services.Configure((ApplicationInsightsServiceOptions o) => - { - servicesOptions = o; - }); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - TelemetryConfiguration telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - - Type optionsType = typeof(ApplicationInsightsServiceOptions); - PropertyInfo[] properties = optionsType.GetProperties(BindingFlags.Public | BindingFlags.Instance); - Assert.True(properties.Length > 0); - foreach (PropertyInfo property in properties) - { - Assert.Equal(property.GetValue(options).ToString(), property.GetValue(servicesOptions).ToString()); - } - } - - - [Fact] - public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesItWithModulesFromContainer() - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, null, null, false); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var modules = serviceProvider.GetServices(); - Assert.NotNull(modules); - -#if NETCOREAPP - Assert.Equal(7, modules.Count()); -#else - Assert.Equal(6, modules.Count()); -#endif - - var perfCounterModule = modules.OfType().Single(); - Assert.NotNull(perfCounterModule); - -#if NETCOREAPP - var eventCounterModule = modules.OfType().Single(); - Assert.NotNull(eventCounterModule); -#endif - - - var dependencyModuleDescriptor = modules.OfType().Single(); - Assert.NotNull(dependencyModuleDescriptor); - - var reqModuleDescriptor = modules.OfType().Single(); - Assert.NotNull(reqModuleDescriptor); - - var appServiceHeartBeatModuleDescriptor = modules.OfType().Single(); - Assert.NotNull(appServiceHeartBeatModuleDescriptor); - - var azureMetadataHeartBeatModuleDescriptor = modules.OfType().Single(); - Assert.NotNull(azureMetadataHeartBeatModuleDescriptor); - - var quickPulseModuleDescriptor = modules.OfType().Single(); - Assert.NotNull(quickPulseModuleDescriptor); - } - -#if NETCOREAPP - [Fact] - public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesEventCounterCollectorWithDefaultListOfCounters() - { - //ARRANGE - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, null, null, false); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var modules = serviceProvider.GetServices(); - - //ACT - - // Requesting TelemetryConfiguration from services trigger constructing the TelemetryConfiguration - // which in turn trigger configuration of all modules. - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - var eventCounterModule = modules.OfType().Single(); - - //VALIDATE - Assert.Equal(19, eventCounterModule.Counters.Count); - - // sanity check with a sample counter. - var cpuCounterRequest = eventCounterModule.Counters.FirstOrDefault( - eventCounterCollectionRequest => eventCounterCollectionRequest.EventSourceName == "System.Runtime" - && eventCounterCollectionRequest.EventCounterName == "cpu-usage"); - Assert.NotNull(cpuCounterRequest); - } -#endif - - [Fact] - public static void UserCanDisablePerfCollectorModule() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - var aiOptions = new ApplicationInsightsServiceOptions(); - aiOptions.EnablePerformanceCounterCollectionModule = false; - services.AddApplicationInsightsTelemetry(aiOptions); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var modules = serviceProvider.GetServices(); - Assert.NotNull(modules); - - // Even if a module is disabled its still added to DI. - Assert.NotEmpty(modules.OfType()); - - // TODO add unit test to validate that module.isInitialized is false. - // similar to being done in UserCanDisableRequestCounterCollectorModule - // It requires some restructuring as internals are not accessible - // to this test project - } - -#if NETCOREAPP - [Fact] - public static void UserCanDisableEventCounterCollectorModule() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - var aiOptions = new ApplicationInsightsServiceOptions(); - aiOptions.EnableEventCounterCollectionModule = false; - services.AddApplicationInsightsTelemetry(aiOptions); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var modules = serviceProvider.GetServices(); - Assert.NotNull(modules); - - // Even if a module is disabled its still added to DI. - Assert.NotEmpty(modules.OfType()); - - // TODO add unit test to validate that module.isInitialized is false. - // similar to being done in UserCanDisableRequestCounterCollectorModule - // It requires some restructuring as internals are not accessible - // to this test project - } -#endif - - [Fact] - public static void UserCanDisableRequestCounterCollectorModule() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - var aiOptions = new ApplicationInsightsServiceOptions(); - aiOptions.EnableRequestTrackingTelemetryModule = false; - services.AddApplicationInsightsTelemetry(aiOptions); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - // Get telemetry client to trigger TelemetryConfig setup. - var tc = serviceProvider.GetService(); - var modules = serviceProvider.GetServices(); - Assert.NotNull(modules); - - // Even if a module is disabled its still added to DI. - Assert.NotEmpty(modules.OfType()); - var req = modules.OfType().First(); - - // But the module will not be initialized. - Assert.False(req.IsInitialized); - } - - [Fact] - public static void UserCanDisableDependencyCollectorModule() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - var aiOptions = new ApplicationInsightsServiceOptions(); - aiOptions.EnableDependencyTrackingTelemetryModule = false; - services.AddApplicationInsightsTelemetry(aiOptions); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var modules = serviceProvider.GetServices(); - Assert.NotNull(modules); - - // Even if a module is disabled its still added to DI. - Assert.NotEmpty(modules.OfType()); - - // TODO add unit test to validate that module.isInitialized is false. - // similar to being done in UserCanDisableRequestCounterCollectorModule - // It requires some restructuring as internals are not accessible - // to this test project - } - - [Fact] - public static void UserCanDisableQuickPulseCollectorModule() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - var aiOptions = new ApplicationInsightsServiceOptions(); - aiOptions.EnableQuickPulseMetricStream = false; - services.AddApplicationInsightsTelemetry(aiOptions); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var modules = serviceProvider.GetServices(); - Assert.NotNull(modules); - - // Even if a module is disabled its still added to DI. - Assert.NotEmpty(modules.OfType()); - - // TODO add unit test to validate that module.isInitialized is false. - // similar to being done in UserCanDisableRequestCounterCollectorModule - // It requires some restructuring as internals are not accessible - // to this test project - } - - [Fact] - public static void UserCanDisableAppServiceHeartbeatModule() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - var aiOptions = new ApplicationInsightsServiceOptions(); - aiOptions.EnableAppServicesHeartbeatTelemetryModule = false; - services.AddApplicationInsightsTelemetry(aiOptions); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var modules = serviceProvider.GetServices(); - Assert.NotNull(modules); - - // Even if a module is disabled its still added to DI. - Assert.NotEmpty(modules.OfType()); - - // TODO add unit test to validate that module.isInitialized is false. - // similar to being done in UserCanDisableRequestCounterCollectorModule - // It requires some restructuring as internals are not accessible - // to this test project - } - - [Fact] - public static void UserCanDisableAzureInstanceMetadataModule() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - var aiOptions = new ApplicationInsightsServiceOptions(); - aiOptions.EnableAzureInstanceMetadataTelemetryModule = false; - services.AddApplicationInsightsTelemetry(aiOptions); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var modules = serviceProvider.GetServices(); - Assert.NotNull(modules); - - // Even if a module is disabled its still added to DI. - Assert.NotEmpty(modules.OfType()); - - // TODO add unit test to validate that module.isInitialized is false. - // similar to being done in UserCanDisableRequestCounterCollectorModule - // It requires some restructuring as internals are not accessible - // to this test project - } - - [Fact] - public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesDependencyCollectorWithDefaultValues() - { - //ARRANGE - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, null, null, false); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var modules = serviceProvider.GetServices(); - - //ACT - - // Requesting TelemetryConfiguration from services trigger constructing the TelemetryConfiguration - // which in turn trigger configuration of all modules. - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - var dependencyModule = modules.OfType().Single(); - - //VALIDATE - Assert.Equal(4, dependencyModule.ExcludeComponentCorrelationHttpHeadersOnDomains.Count); - Assert.False(dependencyModule.ExcludeComponentCorrelationHttpHeadersOnDomains.Contains("localhost")); - Assert.False(dependencyModule.ExcludeComponentCorrelationHttpHeadersOnDomains.Contains("127.0.0.1")); - } - - [Fact] - public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesDependencyCollectorWithCustomValues() - { - //ARRANGE - var services = CreateServicesAndAddApplicationinsightsTelemetry( - null, - null, - o => { o.DependencyCollectionOptions.EnableLegacyCorrelationHeadersInjection = true; }, - false); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var modules = serviceProvider.GetServices(); - - // Requesting TelemetryConfiguration from services trigger constructing the TelemetryConfiguration - // which in turn trigger configuration of all modules. - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - - //ACT - var dependencyModule = modules.OfType().Single(); - - //VALIDATE - Assert.Equal(6, dependencyModule.ExcludeComponentCorrelationHttpHeadersOnDomains.Count); - Assert.True(dependencyModule.ExcludeComponentCorrelationHttpHeadersOnDomains.Contains("localhost")); - Assert.True(dependencyModule.ExcludeComponentCorrelationHttpHeadersOnDomains.Contains("127.0.0.1")); - } - - [Fact] - public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesItWithTelemetryProcessorFactoriesFromContainer() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddApplicationInsightsTelemetryProcessor(); - - services.AddApplicationInsightsTelemetry(new ConfigurationBuilder().Build()); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - // TP added via AddApplicationInsightsTelemetryProcessor is added to the default sink. - FakeTelemetryProcessor telemetryProcessor = telemetryConfiguration.DefaultTelemetrySink.TelemetryProcessors.OfType().FirstOrDefault(); - Assert.NotNull(telemetryProcessor); - Assert.True(telemetryProcessor.IsInitialized); - } - - [Fact] - public static void AddApplicationInsightsTelemetryProcessorWithNullTelemetryProcessorTypeThrows() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - Assert.Throws(() => services.AddApplicationInsightsTelemetryProcessor(null)); - } - - [Fact] - public static void AddApplicationInsightsTelemetryProcessorWithNonTelemetryProcessorTypeThrows() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - Assert.Throws(() => services.AddApplicationInsightsTelemetryProcessor(typeof(string))); - Assert.Throws(() => services.AddApplicationInsightsTelemetryProcessor(typeof(ITelemetryProcessor))); - } - - [Fact] - public static void AddApplicationInsightsTelemetryProcessorWithImportingConstructor() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddApplicationInsightsTelemetryProcessor(); - services.AddApplicationInsightsTelemetry(new ConfigurationBuilder().Build()); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - - // TP added via AddApplicationInsightsTelemetryProcessor is added to the default sink. - FakeTelemetryProcessorWithImportingConstructor telemetryProcessor = telemetryConfiguration.DefaultTelemetrySink.TelemetryProcessors.OfType().FirstOrDefault(); - Assert.NotNull(telemetryProcessor); - Assert.Same(serviceProvider.GetService(), telemetryProcessor.HostingEnvironment); - } - - [Fact] - public static void ConfigureApplicationInsightsTelemetryModuleWorks() - { - //ARRANGE - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddSingleton(); - - //ACT - services.ConfigureTelemetryModule - ((module, o) => module.CustomProperty = "mycustomvalue"); - services.AddApplicationInsightsTelemetry(new ConfigurationBuilder().Build()); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - - // Requesting TelemetryConfiguration from services trigger constructing the TelemetryConfiguration - // which in turn trigger configuration of all modules. - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - - //VALIDATE - var modules = serviceProvider.GetServices(); - var testTelemetryModule = modules.OfType().Single(); - - //The module should be initialized and configured as instructed. - Assert.NotNull(testTelemetryModule); - Assert.Equal("mycustomvalue", testTelemetryModule.CustomProperty); - Assert.True(testTelemetryModule.IsInitialized); - } - - [Fact] - public static void ConfigureApplicationInsightsTelemetryModuleWorksWithOptions() - { - //ARRANGE - Action serviceOptions = options => options.ApplicationVersion = "123"; - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddSingleton(); - - //ACT - services.ConfigureTelemetryModule - ((module, o) => module.CustomProperty = o.ApplicationVersion); - services.AddApplicationInsightsTelemetry(serviceOptions); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - - // Requesting TelemetryConfiguration from services trigger constructing the TelemetryConfiguration - // which in turn trigger configuration of all modules. - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - - //VALIDATE - var modules = serviceProvider.GetServices(); - var testTelemetryModule = modules.OfType().Single(); - - //The module should be initialized and configured as instructed. - Assert.NotNull(testTelemetryModule); - Assert.Equal("123", testTelemetryModule.CustomProperty); - Assert.True(testTelemetryModule.IsInitialized); - } - - [Fact] - public static void ConfigureApplicationInsightsTelemetryModuleWorksWithoutOptions() - { - //ARRANGE - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddSingleton(); - - //ACT - services.ConfigureTelemetryModule - (module => module.CustomProperty = "mycustomproperty"); - services.AddApplicationInsightsTelemetry(); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - - // Requesting TelemetryConfiguration from services trigger constructing the TelemetryConfiguration - // which in turn trigger configuration of all modules. - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - - //VALIDATE - var modules = serviceProvider.GetServices(); - var testTelemetryModule = modules.OfType().Single(); - - //The module should be initialized and configured as instructed. - Assert.NotNull(testTelemetryModule); - Assert.Equal("mycustomproperty", testTelemetryModule.CustomProperty); - Assert.True(testTelemetryModule.IsInitialized); - } - - [Fact] - public static void ConfigureRequestTrackingTelemetryDefaultOptions() - { - //ARRANGE - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - - //ACT - services.AddApplicationInsightsTelemetry(); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - - //VALIDATE - var requestTrackingModule = (RequestTrackingTelemetryModule)serviceProvider.GetServices().FirstOrDefault(x => x.GetType() - == typeof(RequestTrackingTelemetryModule)); - - Assert.True(requestTrackingModule.CollectionOptions.InjectResponseHeaders); -#if NETCOREAPP || NET461 - Assert.False(requestTrackingModule.CollectionOptions.TrackExceptions); -#else - Assert.True(requestTrackingModule.CollectionOptions.TrackExceptions); -#endif - } - - [Fact] - public static void ConfigureRequestTrackingTelemetryCustomOptions() - { - //ARRANGE - Action serviceOptions = options => - { - options.RequestCollectionOptions.InjectResponseHeaders = false; - options.RequestCollectionOptions.TrackExceptions = false; - }; - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - - //ACT - services.AddApplicationInsightsTelemetry(serviceOptions); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - - //VALIDATE - var requestTrackingModule = (RequestTrackingTelemetryModule) serviceProvider - .GetServices().FirstOrDefault(x => x.GetType() == typeof(RequestTrackingTelemetryModule)); - - Assert.False(requestTrackingModule.CollectionOptions.InjectResponseHeaders); - Assert.False(requestTrackingModule.CollectionOptions.TrackExceptions); - } - - [Fact] - public static void ConfigureApplicationInsightsTelemetryModuleThrowsIfConfigureIsNull() - { - //ARRANGE - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddSingleton(); - - //ACT and VALIDATE - Assert.Throws(() => services.ConfigureTelemetryModule((Action)null)); - Assert.Throws(() => services.ConfigureTelemetryModule((Action)null)); - } - - [Fact] - public static void ConfigureApplicationInsightsTelemetryModuleDoesNotThrowIfModuleNotFound() - { - //ARRANGE - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - // Intentionally NOT adding the module - // services.AddSingleton(); - - //ACT - services.ConfigureTelemetryModule - ((module, options) => module.CustomProperty = "mycustomvalue"); - services.AddApplicationInsightsTelemetry(new ConfigurationBuilder().Build()); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - - // Requesting TelemetryConfiguration from services trigger constructing the TelemetryConfiguration - // which in turn trigger configuration of all modules. - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - - //VALIDATE - var modules = serviceProvider.GetServices(); - var testTelemetryModule = modules.OfType().FirstOrDefault(); - - // No exceptions thrown here. - Assert.Null(testTelemetryModule); - } - - - [Fact] - public static void AddsAddaptiveSamplingServiceToTheConfigurationByDefault() - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", null, false); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - var adaptiveSamplingProcessorCount = GetTelemetryProcessorsCountInConfigurationDefaultSink(telemetryConfiguration); - - // There will be 2 separate SamplingTelemetryProcessors - one for Events, and other for everything else. - Assert.Equal(2, adaptiveSamplingProcessorCount); - } - - [Fact] - public static void DoesNotAddSamplingToConfigurationIfExplicitlyControlledThroughParameter() - { - Action serviceOptions = options => options.EnableAdaptiveSampling = false; - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", serviceOptions, false); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - var qpProcessorCount = GetTelemetryProcessorsCountInConfigurationDefaultSink(telemetryConfiguration); - Assert.Equal(0, qpProcessorCount); - } - - [Fact] - public static void AddsAddaptiveSamplingServiceToTheConfigurationWithServiceOptions() - { - Action serviceOptions = options => options.EnableAdaptiveSampling = true; - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", serviceOptions, false); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - var adaptiveSamplingProcessorCount = GetTelemetryProcessorsCountInConfigurationDefaultSink(telemetryConfiguration); - // There will be 2 separate SamplingTelemetryProcessors - one for Events, and other for everything else. - Assert.Equal(2, adaptiveSamplingProcessorCount); - } - - [Fact] - public static void AddsServerTelemetryChannelByDefault() - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", null, false); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal(typeof(ServerTelemetryChannel), telemetryConfiguration.TelemetryChannel.GetType()); - } - - [Fact] - [Trait("Trait", "ConnectionString")] - public static void AddApplicationInsightsSettings_SetsConnectionString() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddSingleton(new InMemoryChannel()); - var config = new ConfigurationBuilder().AddApplicationInsightsSettings(connectionString: TestConnectionString).Build(); - services.AddApplicationInsightsTelemetry(config); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal(TestConnectionString, telemetryConfiguration.ConnectionString); - Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); - Assert.Equal("http://127.0.0.1/", telemetryConfiguration.EndpointContainer.Ingestion.AbsoluteUri); - } - - [Fact] - [Trait("Trait", "Endpoints")] - public static void DoesNotOverWriteExistingChannel() - { - var testEndpoint = "http://localhost:1234/v2/track/"; - - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddSingleton(); - var config = new ConfigurationBuilder().AddApplicationInsightsSettings(endpointAddress: testEndpoint).Build(); - services.AddApplicationInsightsTelemetry(config); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal(typeof(InMemoryChannel), telemetryConfiguration.TelemetryChannel.GetType()); - Assert.Equal(testEndpoint, telemetryConfiguration.TelemetryChannel.EndpointAddress); - } - - [Fact] - public static void FallbacktoDefaultChannelWhenNoChannelFoundInDI() - { - var testEndpoint = "http://localhost:1234/v2/track/"; - - // ARRANGE - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - var config = new ConfigurationBuilder().AddApplicationInsightsSettings(endpointAddress: testEndpoint).Build(); - services.AddApplicationInsightsTelemetry(config); - - // Remove all ITelemetryChannel to simulate scenario where customer remove all channel from DI but forgot to add new one. - // This should not crash application startup, and should fall back to default channel supplied by base sdk. - for (var i = services.Count - 1; i >= 0; i--) - { - var descriptor = services[i]; - if (descriptor.ServiceType == typeof(ITelemetryChannel)) - { - services.RemoveAt(i); - } - } - - // VERIFY that default channel is configured when nothing is present in DI - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal(typeof(InMemoryChannel), telemetryConfiguration.TelemetryChannel.GetType()); - Assert.Equal(testEndpoint, telemetryConfiguration.TelemetryChannel.EndpointAddress); - } - - [Fact] - public static void VerifyNoExceptionWhenAppIdProviderNotFoundInDI() - { - // ARRANGE - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - var config = new ConfigurationBuilder().AddApplicationInsightsSettings(endpointAddress: "http://localhost:1234/v2/track/").Build(); - services.AddApplicationInsightsTelemetry(config); - - for (var i = services.Count - 1; i >= 0; i--) - { - var descriptor = services[i]; - if (descriptor.ServiceType == typeof(IApplicationIdProvider)) - { - services.RemoveAt(i); - } - } - - // ACT - IServiceProvider serviceProvider = services.BuildServiceProvider(); - - - // VERIFY - var requestTrackingModule = serviceProvider.GetServices().FirstOrDefault(x => x.GetType() - == typeof(RequestTrackingTelemetryModule)); - - Assert.NotNull(requestTrackingModule); // this verifies the instance was created without exception - } - - [Fact] - public static void VerifyUserCanOverrideAppIdProvider() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddSingleton(); // assume user tries to define own implementation - var config = new ConfigurationBuilder().AddApplicationInsightsSettings(endpointAddress: "http://localhost:1234/v2/track/").Build(); - services.AddApplicationInsightsTelemetry(config); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var applicationIdProvider = serviceProvider.GetRequiredService(); - - Assert.Equal(typeof(MockApplicationIdProvider), applicationIdProvider.GetType()); - } - - - [Fact] - public static void ValidatesThatOnlyPassThroughProcessorIsAddedToCommonPipeline() - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", null, false); - services.AddSingleton(); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - - // All default TelemetryProcessors are expected to be on the default sink. There should be - // none on the main pipeline except the PassThrough. - - var qpProcessorCount = GetTelemetryProcessorsCountInConfiguration(telemetryConfiguration); - Assert.Equal(0, qpProcessorCount); - - var metricExtractorProcessorCount = GetTelemetryProcessorsCountInConfiguration(telemetryConfiguration); - Assert.Equal(0, metricExtractorProcessorCount); - - var samplingProcessorCount = GetTelemetryProcessorsCountInConfiguration(telemetryConfiguration); - Assert.Equal(0, samplingProcessorCount); - - var passThroughProcessorCount = telemetryConfiguration.TelemetryProcessors.Count; - Assert.Equal(1, passThroughProcessorCount); - - Assert.Equal("PassThroughProcessor", telemetryConfiguration.TelemetryProcessors[0].GetType().Name); - } - - [Fact] - public static void AddsQuickPulseProcessorToTheConfigurationByDefault() - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", null, false); - services.AddSingleton(); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - var qpProcessorCount = GetTelemetryProcessorsCountInConfigurationDefaultSink(telemetryConfiguration); - Assert.Equal(1, qpProcessorCount); - } - - [Fact] - public static void AddsAutoCollectedMetricsExtractorProcessorToTheConfigurationByDefault() - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", null, false); - services.AddSingleton(); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - var metricExtractorProcessorCount = GetTelemetryProcessorsCountInConfigurationDefaultSink(telemetryConfiguration); - Assert.Equal(1, metricExtractorProcessorCount); - } - - [Fact] - public static void DoesNotAddAutoCollectedMetricsExtractorToConfigurationIfExplicitlyControlledThroughParameter() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - ApplicationInsightsServiceOptions serviceOptions = new ApplicationInsightsServiceOptions(); - serviceOptions.AddAutoCollectedMetricExtractor = false; - - services.AddApplicationInsightsTelemetry(serviceOptions); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - var metricExtractorProcessorCount = GetTelemetryProcessorsCountInConfigurationDefaultSink(telemetryConfiguration); - Assert.Equal(0, metricExtractorProcessorCount); - } - - [Fact] - public static void DoesNotAddQuickPulseProcessorToConfigurationIfExplicitlyControlledThroughParameter() - { - Action serviceOptions = options => options.EnableQuickPulseMetricStream = false; - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", serviceOptions, false); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - var qpProcessorCount = GetTelemetryProcessorsCountInConfigurationDefaultSink(telemetryConfiguration); - Assert.Equal(0, qpProcessorCount); - } - - [Fact] - public static void AddsQuickPulseProcessorToTheConfigurationWithServiceOptions() - { - Action< ApplicationInsightsServiceOptions> serviceOptions = options => options.EnableQuickPulseMetricStream = true; - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", serviceOptions, false); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - var qpProcessorCount = GetTelemetryProcessorsCountInConfigurationDefaultSink(telemetryConfiguration); - Assert.Equal(1, qpProcessorCount); - } - - [Fact] - public static void AddsHeartbeatModulesToTheConfigurationByDefault() - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", null, false); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - var modules = serviceProvider.GetServices(); - Assert.NotNull(modules.OfType().Single()); - Assert.NotNull(modules.OfType().Single()); - } - - [Fact] - public static void HeartbeatIsDisabledWithServiceOptions() - { - var heartbeatModulePRE = TelemetryModules.Instance.Modules.OfType().First(); - Assert.True(heartbeatModulePRE.IsHeartbeatEnabled); - - Action serviceOptions = options => options.EnableHeartbeat = false; - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", serviceOptions, false); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - var heartbeatModule = TelemetryModules.Instance.Modules.OfType().First(); - Assert.NotNull(heartbeatModule); - Assert.False(heartbeatModule.IsHeartbeatEnabled); - } - - [Fact] - public static void W3CIsEnabledByDefault() - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/"); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - - Assert.DoesNotContain(telemetryConfiguration.TelemetryInitializers, t => t is W3COperationCorrelationTelemetryInitializer); - Assert.DoesNotContain(TelemetryConfiguration.Active.TelemetryInitializers, t => t is W3COperationCorrelationTelemetryInitializer); - - var modules = serviceProvider.GetServices().ToList(); - - var requestTracking = modules.OfType().ToList(); - var dependencyTracking = modules.OfType().ToList(); - Assert.Single(requestTracking); - Assert.Single(dependencyTracking); - - Assert.True(Activity.DefaultIdFormat == ActivityIdFormat.W3C); - Assert.True(Activity.ForceDefaultIdFormat); - } - - private static int GetTelemetryProcessorsCountInConfiguration(TelemetryConfiguration telemetryConfiguration) - { - return telemetryConfiguration.TelemetryProcessors.Where(processor => processor.GetType() == typeof(T)).Count(); - } - - private static int GetTelemetryProcessorsCountInConfigurationDefaultSink(TelemetryConfiguration telemetryConfiguration) - { - return telemetryConfiguration.DefaultTelemetrySink.TelemetryProcessors.Where(processor => processor.GetType() == typeof(T)).Count(); - } - - [Fact] - public static void LoggerCallbackIsInvoked() - { - var services = new ServiceCollection(); - services.AddSingleton(); - var serviceProvider = services.BuildServiceProvider(); - - var loggerProvider = new MockLoggingFactory(); - - bool firstLoggerCallback = false; - bool secondLoggerCallback = false; - - loggerProvider.AddApplicationInsights(serviceProvider, (s, level) => true, () => firstLoggerCallback = true); - loggerProvider.AddApplicationInsights(serviceProvider, (s, level) => true, () => secondLoggerCallback = true); - - Assert.True(firstLoggerCallback); - Assert.False(secondLoggerCallback); - } - - [Fact] - public static void NullLoggerCallbackAlowed() - { - var services = new ServiceCollection(); - services.AddSingleton(); - var serviceProvider = services.BuildServiceProvider(); - - var loggerProvider = new MockLoggingFactory(); - - loggerProvider.AddApplicationInsights(serviceProvider, (s, level) => true, null); - loggerProvider.AddApplicationInsights(serviceProvider, (s, level) => true, null); - } - } - - public static class AddApplicationInsightsSettings - { - [Fact] - public static void RegistersTelemetryConfigurationFactoryMethodThatReadsInstrumentationKeyFromSettings() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddSingleton(new InMemoryChannel()); - var config = new ConfigurationBuilder().AddApplicationInsightsSettings(instrumentationKey: TestInstrumentationKey).Build(); - services.AddApplicationInsightsTelemetry(config); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); - } - - [Fact] - public static void RegistersTelemetryConfigurationFactoryMethodThatReadsDeveloperModeFromSettings() - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddSingleton(new InMemoryChannel()); - var config = new ConfigurationBuilder().AddApplicationInsightsSettings(developerMode: true).Build(); - services.AddApplicationInsightsTelemetry(config); - - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.True(telemetryConfiguration.TelemetryChannel.DeveloperMode); - } - - [Fact] - public static void RegistersTelemetryConfigurationFactoryMethodThatReadsEndpointAddressFromSettings() - { - var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/"); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); - Assert.Equal("http://localhost:1234/v2/track/", telemetryConfiguration.TelemetryChannel.EndpointAddress); - } - - /// - /// Sanity check to validate that node name and roleinstance are populated - /// - [Fact] - public static void SanityCheckRoleInstance() - { - // ARRANGE - string expected = Environment.MachineName; - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - services.AddApplicationInsightsTelemetry(); - IServiceProvider serviceProvider = services.BuildServiceProvider(); - - // Request TC from DI which would be made with the default TelemetryConfiguration which should - // contain the telemetry initializer capable of populate node name and role instance name. - var tc = serviceProvider.GetRequiredService(); - var mockItem = new EventTelemetry(); - - // ACT - // This is expected to run all TI and populate the node name and role instance. - tc.Initialize(mockItem); - - // VERIFY - Assert.Contains(expected,mockItem.Context.Cloud.RoleInstance, StringComparison.CurrentCultureIgnoreCase); - } - } - - public static TelemetryConfiguration GetTelemetryConfiguration(this IServiceProvider serviceProvider) - { - return serviceProvider.GetRequiredService>().Value; - } - - public static ServiceCollection CreateServicesAndAddApplicationinsightsTelemetry(string jsonPath, string channelEndPointAddress, Action serviceOptions = null, bool addChannel = true) - { - var services = ApplicationInsightsExtensionsTests.GetServiceCollectionWithContextAccessor(); - if (addChannel) - { - services.AddSingleton(new InMemoryChannel()); - } - - IConfigurationRoot config = null; - - if (jsonPath != null) - { - var jsonFullPath = Path.Combine(Directory.GetCurrentDirectory(), jsonPath); - Console.WriteLine("json:" + jsonFullPath); - Trace.WriteLine("json:" + jsonFullPath); - try - { - config = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory()).AddJsonFile(jsonFullPath).Build(); - } - catch(Exception) - { - throw new Exception("Unable to build with json:" + jsonFullPath); - } - } - else if (channelEndPointAddress != null) - { - config = new ConfigurationBuilder().AddApplicationInsightsSettings(endpointAddress: channelEndPointAddress).Build(); - } - else - { - config = new ConfigurationBuilder().Build(); - } - - services.AddApplicationInsightsTelemetry(config); - if (serviceOptions != null) - { - services.Configure(serviceOptions); - } - return services; - } - - private class MockLoggingFactory : ILoggerFactory - { - public void Dispose() - { - } - - public ILogger CreateLogger(string categoryName) - { - return null; - } - - public void AddProvider(ILoggerProvider provider) - { - } - } - } -#pragma warning restore CS0618 // TelemetryConfiguration.Active is obsolete. We still test with this for backwards compatibility. -} \ No newline at end of file diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/AddApplicationInsightsSettingsTests.cs b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/AddApplicationInsightsSettingsTests.cs new file mode 100644 index 000000000..19ccc095a --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/AddApplicationInsightsSettingsTests.cs @@ -0,0 +1,75 @@ +using Xunit; + +namespace Microsoft.Extensions.DependencyInjection.Test +{ + using System; + + using Microsoft.ApplicationInsights; + using Microsoft.ApplicationInsights.Channel; + using Microsoft.ApplicationInsights.DataContracts; + + using Microsoft.Extensions.Configuration; + + public class AddApplicationInsightsSettings : BaseTestClass + { + [Fact] + public static void RegistersTelemetryConfigurationFactoryMethodThatReadsInstrumentationKeyFromSettings() + { + var services = GetServiceCollectionWithContextAccessor(); + services.AddSingleton(new InMemoryChannel()); + var config = new ConfigurationBuilder().AddApplicationInsightsSettings(instrumentationKey: TestInstrumentationKey).Build(); + services.AddApplicationInsightsTelemetry(config); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); + } + + [Fact] + public static void RegistersTelemetryConfigurationFactoryMethodThatReadsDeveloperModeFromSettings() + { + var services = GetServiceCollectionWithContextAccessor(); + services.AddSingleton(new InMemoryChannel()); + var config = new ConfigurationBuilder().AddApplicationInsightsSettings(developerMode: true).Build(); + services.AddApplicationInsightsTelemetry(config); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.True(telemetryConfiguration.TelemetryChannel.DeveloperMode); + } + + [Fact] + public static void RegistersTelemetryConfigurationFactoryMethodThatReadsEndpointAddressFromSettings() + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/"); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Equal("http://localhost:1234/v2/track/", telemetryConfiguration.TelemetryChannel.EndpointAddress); + } + + /// + /// Sanity check to validate that node name and roleinstance are populated + /// + [Fact] + public static void SanityCheckRoleInstance() + { + // ARRANGE + string expected = Environment.MachineName; + var services = GetServiceCollectionWithContextAccessor(); + services.AddApplicationInsightsTelemetry(); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + + // Request TC from DI which would be made with the default TelemetryConfiguration which should + // contain the telemetry initializer capable of populate node name and role instance name. + var tc = serviceProvider.GetRequiredService(); + var mockItem = new EventTelemetry(); + + // ACT + // This is expected to run all TI and populate the node name and role instance. + tc.Initialize(mockItem); + + // VERIFY + Assert.Contains(expected, mockItem.Context.Cloud.RoleInstance, StringComparison.CurrentCultureIgnoreCase); + } + } +} diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/AddApplicationInsightsTelemetryTests.cs b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/AddApplicationInsightsTelemetryTests.cs new file mode 100644 index 000000000..d26c19ef1 --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/AddApplicationInsightsTelemetryTests.cs @@ -0,0 +1,2005 @@ +using Xunit; + +namespace Microsoft.Extensions.DependencyInjection.Test +{ + using System; + using System.Diagnostics; + using System.IO; + using System.Linq; + using System.Reflection; + + using Logging; + + using Microsoft.ApplicationInsights; + using Microsoft.ApplicationInsights.AspNetCore; + using Microsoft.ApplicationInsights.AspNetCore.Extensions; + using Microsoft.ApplicationInsights.AspNetCore.Logging; + using Microsoft.ApplicationInsights.AspNetCore.TelemetryInitializers; + using Microsoft.ApplicationInsights.AspNetCore.Tests; + using Microsoft.ApplicationInsights.AspNetCore.Tests.Helpers; + using Microsoft.ApplicationInsights.Channel; + using Microsoft.ApplicationInsights.DependencyCollector; + using Microsoft.ApplicationInsights.Extensibility; +#if NETCOREAPP + using Microsoft.ApplicationInsights.Extensibility.EventCounterCollector; +#endif + using Microsoft.ApplicationInsights.Extensibility.Implementation; + using Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing; + using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector; + using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.QuickPulse; + using Microsoft.ApplicationInsights.Extensibility.W3C; + using Microsoft.ApplicationInsights.WindowsServer; + using Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel; + using Microsoft.AspNetCore.Hosting; + using Microsoft.Extensions.Configuration; + using Microsoft.Extensions.Options; + +#pragma warning disable CS0618 // TelemetryConfiguration.Active is obsolete. We still test with this for backwards compatibility. + public class AddApplicationInsightsTelemetryTests : BaseTestClass + { + [Theory] + [InlineData(typeof(ITelemetryInitializer), typeof(ApplicationInsights.AspNetCore.TelemetryInitializers.DomainNameRoleInstanceTelemetryInitializer), ServiceLifetime.Singleton)] + [InlineData(typeof(ITelemetryInitializer), typeof(AzureAppServiceRoleNameFromHostNameHeaderInitializer), ServiceLifetime.Singleton)] + [InlineData(typeof(ITelemetryInitializer), typeof(ComponentVersionTelemetryInitializer), ServiceLifetime.Singleton)] + [InlineData(typeof(ITelemetryInitializer), typeof(ClientIpHeaderTelemetryInitializer), ServiceLifetime.Singleton)] + [InlineData(typeof(ITelemetryInitializer), typeof(OperationNameTelemetryInitializer), ServiceLifetime.Singleton)] + [InlineData(typeof(ITelemetryInitializer), typeof(SyntheticTelemetryInitializer), ServiceLifetime.Singleton)] + [InlineData(typeof(ITelemetryInitializer), typeof(WebSessionTelemetryInitializer), ServiceLifetime.Singleton)] + [InlineData(typeof(ITelemetryInitializer), typeof(WebUserTelemetryInitializer), ServiceLifetime.Singleton)] + [InlineData(typeof(ITelemetryInitializer), typeof(HttpDependenciesParsingTelemetryInitializer), ServiceLifetime.Singleton)] + [InlineData(typeof(TelemetryConfiguration), null, ServiceLifetime.Singleton)] + [InlineData(typeof(TelemetryClient), typeof(TelemetryClient), ServiceLifetime.Singleton)] + public static void RegistersExpectedServices(Type serviceType, Type implementationType, ServiceLifetime lifecycle) + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, null); + ServiceDescriptor service = services.Single(s => s.ServiceType == serviceType && s.ImplementationType == implementationType); + Assert.Equal(lifecycle, service.Lifetime); + } + + [Theory] + [InlineData(typeof(ITelemetryInitializer), typeof(ApplicationInsights.AspNetCore.TelemetryInitializers.DomainNameRoleInstanceTelemetryInitializer), ServiceLifetime.Singleton)] + [InlineData(typeof(ITelemetryInitializer), typeof(AzureAppServiceRoleNameFromHostNameHeaderInitializer), ServiceLifetime.Singleton)] + [InlineData(typeof(ITelemetryInitializer), typeof(ComponentVersionTelemetryInitializer), ServiceLifetime.Singleton)] + [InlineData(typeof(ITelemetryInitializer), typeof(ClientIpHeaderTelemetryInitializer), ServiceLifetime.Singleton)] + [InlineData(typeof(ITelemetryInitializer), typeof(OperationNameTelemetryInitializer), ServiceLifetime.Singleton)] + [InlineData(typeof(ITelemetryInitializer), typeof(SyntheticTelemetryInitializer), ServiceLifetime.Singleton)] + [InlineData(typeof(ITelemetryInitializer), typeof(WebSessionTelemetryInitializer), ServiceLifetime.Singleton)] + [InlineData(typeof(ITelemetryInitializer), typeof(WebUserTelemetryInitializer), ServiceLifetime.Singleton)] + [InlineData(typeof(ITelemetryInitializer), typeof(HttpDependenciesParsingTelemetryInitializer), ServiceLifetime.Singleton)] + [InlineData(typeof(TelemetryConfiguration), null, ServiceLifetime.Singleton)] + [InlineData(typeof(TelemetryClient), typeof(TelemetryClient), ServiceLifetime.Singleton)] + public static void RegistersExpectedServicesOnlyOnce(Type serviceType, Type implementationType, ServiceLifetime lifecycle) + { + var services = GetServiceCollectionWithContextAccessor(); + services.AddApplicationInsightsTelemetry(); + services.AddApplicationInsightsTelemetry(); + ServiceDescriptor service = services.Single(s => s.ServiceType == serviceType && s.ImplementationType == implementationType); + Assert.Equal(lifecycle, service.Lifetime); + } + + [Fact] + public static void DoesNotThrowWithoutInstrumentationKey() + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, null); + } + + [Fact] + public static void RegistersTelemetryConfigurationFactoryMethodThatCreatesDefaultInstance() + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, null); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Contains(telemetryConfiguration.TelemetryInitializers, t => t is OperationNameTelemetryInitializer); + } + + /// + /// Tests that the instrumentation key configuration can be read from a JSON file by the configuration factory. + /// + /// + /// Calls services.AddApplicationInsightsTelemetry() when the value is true and reads IConfiguration from user application automatically. + /// Else, it invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller. + /// + [Theory] +#if !NET46 + [InlineData(true)] +#endif + [InlineData(false)] + public static void RegistersTelemetryConfigurationFactoryMethodThatReadsInstrumentationKeyFromConfiguration(bool useDefaultConfig) + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(Path.Combine("content", "config-instrumentation-key.json"), null, null, true, useDefaultConfig); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + if (useDefaultConfig) + { + Assert.Equal(InstrumentationKeyInAppSettings, telemetryConfiguration.InstrumentationKey); + } + else + { + Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); + } + } + + /// + /// Tests that the connection string can be read from a JSON file by the configuration factory. + /// + /// + /// Calls services.AddApplicationInsightsTelemetry() when the value is true and reads IConfiguration from user application automatically. + /// Else, it invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller. + /// + [Theory] + [InlineData(true)] + [InlineData(false)] + [Trait("Trait", "ConnectionString")] + public static void RegistersTelemetryConfigurationFactoryMethodThatReadsConnectionStringFromConfiguration(bool useDefaultConfig) + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(Path.Combine("content", "config-connection-string.json"), null, null, true, useDefaultConfig); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Equal(TestConnectionString, telemetryConfiguration.ConnectionString); + Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); + Assert.Equal("http://127.0.0.1/", telemetryConfiguration.EndpointContainer.Ingestion.AbsoluteUri); + } + + /// + /// Tests that the connection string can be read from a JSON file by the configuration factory. + /// This config has both a connection string and an instrumentation key. It is expected to use the ikey from the connection string. + /// + [Fact] + [Trait("Trait", "ConnectionString")] + public static void RegistersTelemetryConfigurationFactoryMethodThatReadsConnectionStringAndInstrumentationKeyFromConfiguration() + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(Path.Combine("content", "config-connection-string-and-instrumentation-key.json"), null); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Equal(TestConnectionString, telemetryConfiguration.ConnectionString); + Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); + Assert.Equal("http://127.0.0.1/", telemetryConfiguration.EndpointContainer.Ingestion.AbsoluteUri); + } + + /// + /// Tests that the Active configuration singleton is updated, but another instance of telemetry configuration is created for dependency injection. + /// ASP.NET Core developers should always use Dependency Injection instead of static singleton approach. + /// See Microsoft/ApplicationInsights-dotnet#613 + /// + [Fact] + public static void ConfigurationFactoryMethodUpdatesTheActiveConfigurationSingletonByDefault() + { + // Clear off Active before beginning test to avoid being affected by previous tests. + TelemetryConfiguration.Active.InstrumentationKey = ""; + TelemetryConfiguration.Active.TelemetryInitializers.Clear(); + + var activeConfig = TelemetryConfiguration.Active; + var services = CreateServicesAndAddApplicationinsightsTelemetry(Path.Combine("content", "config-instrumentation-key.json"), null, null, true, false); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + TelemetryConfiguration telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); + Assert.Equal(TestInstrumentationKey, activeConfig.InstrumentationKey); + Assert.NotEqual(activeConfig, telemetryConfiguration); + } + + /// + /// We determine if Active telemetry needs to be configured based on the assumptions that 'default' configuration + // created by base SDK has single preset ITelemetryInitializer. If it ever changes, change TelemetryConfigurationOptions.IsActiveConfigured method as well. + /// + [Fact] + public static void DefaultTelemetryConfigurationHasOneTelemetryInitializer() + { + // + var defaultConfig = TelemetryConfiguration.CreateDefault(); + Assert.Equal(1, defaultConfig.TelemetryInitializers.Count); + } + + /// + /// Tests that the developer mode can be read from a JSON file by the configuration factory. + /// + /// + /// Calls services.AddApplicationInsightsTelemetry() when the value is true and reads IConfiguration from user application automatically. + /// Else, it invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller. + /// + [Theory] + [InlineData(true)] + [InlineData(false)] + public static void RegistersTelemetryConfigurationFactoryMethodThatReadsDeveloperModeFromConfiguration(bool useDefaultConfig) + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(Path.Combine("content", "config-developer-mode.json"), null, null, true, useDefaultConfig); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.True(telemetryConfiguration.TelemetryChannel.DeveloperMode); + } + + /// + /// Tests that the endpoint address can be read from a JSON file by the configuration factory. + /// + /// + /// Calls services.AddApplicationInsightsTelemetry() when the value is true and reads IConfiguration from user application automatically. + /// Else, it invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller. + /// + [Theory] +#if !NET46 + [InlineData(true)] +#endif + [InlineData(false)] + public static void RegistersTelemetryConfigurationFactoryMethodThatReadsEndpointAddressFromConfiguration(bool useDefaultConfig) + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(Path.Combine("content", "config-endpoint-address.json"), null, null, true, useDefaultConfig); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + + if (useDefaultConfig) + { + // Endpoint comes from appSettings + Assert.Equal("http://hosthere/v2/track/", telemetryConfiguration.TelemetryChannel.EndpointAddress); + } + else + { + Assert.Equal("http://localhost:1234/v2/track/", telemetryConfiguration.TelemetryChannel.EndpointAddress); + } + } + + [Fact] + public static void RegistersTelemetryConfigurationFactoryMethodThatReadsInstrumentationKeyFromEnvironment() + { + var services = GetServiceCollectionWithContextAccessor(); + services.AddSingleton(new InMemoryChannel()); + Environment.SetEnvironmentVariable("APPINSIGHTS_INSTRUMENTATIONKEY", TestInstrumentationKey); + var config = new ConfigurationBuilder().AddEnvironmentVariables().Build(); + try + { + services.AddApplicationInsightsTelemetry(config); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); + } + finally + { + Environment.SetEnvironmentVariable("APPINSIGHTS_INSTRUMENTATIONKEY", null); + } + } + + /// + /// Validates that while using services.AddApplicationInsightsTelemetry(); ikey is read from + /// Environment + /// + [Fact] + [Trait("Trait", "ConnectionString")] + public static void AddApplicationInsightsTelemetry_ReadsConnectionString_FromEnvironment() + { + var services = GetServiceCollectionWithContextAccessor(); + Environment.SetEnvironmentVariable(ConnectionStringEnvironmentVariable, TestConnectionString); + try + { + services.AddApplicationInsightsTelemetry(); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Equal(TestConnectionString, telemetryConfiguration.ConnectionString); + Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); + Assert.Equal("http://127.0.0.1/", telemetryConfiguration.EndpointContainer.Ingestion.AbsoluteUri); + } + finally + { + Environment.SetEnvironmentVariable(ConnectionStringEnvironmentVariable, null); + } + } + + /// + /// Validates that while using services.AddApplicationInsightsTelemetry(); ikey is read from + /// Environment + /// + [Fact] + public static void AddApplicationInsightsTelemetryReadsInstrumentationKeyFromEnvironment() + { + var services = GetServiceCollectionWithContextAccessor(); + Environment.SetEnvironmentVariable("APPINSIGHTS_INSTRUMENTATIONKEY", TestInstrumentationKey); + try + { + services.AddApplicationInsightsTelemetry(); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); + } + finally + { + Environment.SetEnvironmentVariable("APPINSIGHTS_INSTRUMENTATIONKEY", null); + } + } + + /// + /// Validates that while using services.AddApplicationInsightsTelemetry(ikey), supplied ikey is + /// used instead of one from Environment + /// + [Fact] + public static void AddApplicationInsightsTelemetryDoesNotReadInstrumentationKeyFromEnvironmentIfSupplied() + { + Environment.SetEnvironmentVariable("APPINSIGHTS_INSTRUMENTATIONKEY", TestInstrumentationKey); + var services = GetServiceCollectionWithContextAccessor(); + string ikeyExpected = Guid.NewGuid().ToString(); + + try + { + services.AddApplicationInsightsTelemetry(ikeyExpected); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Equal(ikeyExpected, telemetryConfiguration.InstrumentationKey); + } + finally + { + Environment.SetEnvironmentVariable("APPINSIGHTS_INSTRUMENTATIONKEY", null); + } + } + + /// + /// Validates that while using services.AddApplicationInsightsTelemetry(); reads ikey/other settings from + /// appsettings.json + /// + [Fact] + public static void AddApplicationInsightsTelemetryReadsInstrumentationKeyFromDefaultAppsettingsFile() + { + string ikeyExpected = Guid.NewGuid().ToString(); + string hostExpected = "http://ainewhost/v2/track/"; + string text = File.ReadAllText("appsettings.json"); + string originalText = text; + try + { + text = text.Replace(InstrumentationKeyInAppSettings, ikeyExpected); + text = text.Replace("http://hosthere/v2/track/", hostExpected); + File.WriteAllText("appsettings.json", text); + + var services = GetServiceCollectionWithContextAccessor(); + services.AddApplicationInsightsTelemetry(); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Equal(ikeyExpected, telemetryConfiguration.InstrumentationKey); + Assert.Equal(hostExpected, telemetryConfiguration.TelemetryChannel.EndpointAddress); + } + finally + { + File.WriteAllText("appsettings.json", originalText); + } + } + + /// + /// Validates that while using services.AddApplicationInsightsTelemetry(ikey), supplied ikey is + /// used instead of one from appsettings.json + /// + [Fact] + public static void AddApplicationInsightsTelemetryDoesNotReadInstrumentationKeyFromDefaultAppsettingsIfSupplied() + { + string suppliedIKey = "suppliedikey"; + string ikey = Guid.NewGuid().ToString(); + string text = File.ReadAllText("appsettings.json"); + try + { + text = text.Replace(InstrumentationKeyInAppSettings, ikey); + File.WriteAllText("appsettings.json", text); + + var services = GetServiceCollectionWithContextAccessor(); + services.AddApplicationInsightsTelemetry(suppliedIKey); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Equal(suppliedIKey, telemetryConfiguration.InstrumentationKey); + } + finally + { + text = text.Replace(ikey, InstrumentationKeyInAppSettings); + File.WriteAllText("appsettings.json", text); + } + } + + /// + /// Validates that while using services.AddApplicationInsightsTelemetry(ApplicationInsightsServiceOptions), supplied ikey is + /// used instead of one from appsettings.json + /// + [Fact] + public static void AddApplicationInsightsTelemetryDoesNotReadInstrumentationKeyFromDefaultAppsettingsIfSuppliedViaOptions() + { + string suppliedIKey = "suppliedikey"; + var options = new ApplicationInsightsServiceOptions() { InstrumentationKey = suppliedIKey }; + string ikey = Guid.NewGuid().ToString(); + string text = File.ReadAllText("appsettings.json"); + try + { + text = text.Replace(InstrumentationKeyInAppSettings, ikey); + File.WriteAllText("appsettings.json", text); + + var services = GetServiceCollectionWithContextAccessor(); + services.AddApplicationInsightsTelemetry(options); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Equal(suppliedIKey, telemetryConfiguration.InstrumentationKey); + } + finally + { + text = text.Replace(ikey, InstrumentationKeyInAppSettings); + File.WriteAllText("appsettings.json", text); + } + } + + /// + /// Validates that while using services.AddApplicationInsightsTelemetry(ApplicationInsightsServiceOptions), with null ikey + /// and endpoint, ikey and endpoint from AppSettings.Json is NOT overwritten with the null/empty ones from + /// ApplicationInsightsServiceOptions + /// + [Fact] + public static void AddApplicationInsightsTelemetryDoesNotOverrideEmptyInstrumentationKeyFromAiOptions() + { + // Create new options, which will be default have null ikey and endpoint. + var options = new ApplicationInsightsServiceOptions(); + string ikey = Guid.NewGuid().ToString(); + string text = File.ReadAllText("appsettings.json"); + try + { + text = text.Replace(InstrumentationKeyInAppSettings, ikey); + text = text.Replace("hosthere", "newhost"); + File.WriteAllText("appsettings.json", text); + + var services = GetServiceCollectionWithContextAccessor(); + services.AddApplicationInsightsTelemetry(options); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Equal(ikey, telemetryConfiguration.InstrumentationKey); + Assert.Equal("http://newhost/v2/track/", telemetryConfiguration.DefaultTelemetrySink.TelemetryChannel.EndpointAddress); + } + finally + { + text = text.Replace(ikey, InstrumentationKeyInAppSettings); + text = text.Replace("newhost", "hosthere"); + File.WriteAllText("appsettings.json", text); + } + } + + [Fact] + public static void RegistersTelemetryConfigurationFactoryMethodThatReadsDeveloperModeFromEnvironment() + { + var services = GetServiceCollectionWithContextAccessor(); + services.AddSingleton(new InMemoryChannel()); + Environment.SetEnvironmentVariable("APPINSIGHTS_DEVELOPER_MODE", "true"); + var config = new ConfigurationBuilder().AddEnvironmentVariables().Build(); + try + { + services.AddApplicationInsightsTelemetry(config); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.True(telemetryConfiguration.TelemetryChannel.DeveloperMode); + } + finally + { + Environment.SetEnvironmentVariable("APPINSIGHTS_DEVELOPER_MODE", null); + } + } + + [Fact] + public static void RegistersTelemetryConfigurationFactoryMethodThatReadsEndpointAddressFromEnvironment() + { + var services = GetServiceCollectionWithContextAccessor(); + services.AddSingleton(new InMemoryChannel()); + Environment.SetEnvironmentVariable("APPINSIGHTS_ENDPOINTADDRESS", "http://localhost:1234/v2/track/"); + var config = new ConfigurationBuilder().AddEnvironmentVariables().Build(); + try + { + services.AddApplicationInsightsTelemetry(config); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Equal("http://localhost:1234/v2/track/", telemetryConfiguration.TelemetryChannel.EndpointAddress); + } + finally + { + Environment.SetEnvironmentVariable("APPINSIGHTS_ENDPOINTADDRESS", null); + } + } + + [Fact] + public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesItWithTelemetryInitializersFromContainer() + { + var telemetryInitializer = new FakeTelemetryInitializer(); + var services = GetServiceCollectionWithContextAccessor(); + services.AddSingleton(telemetryInitializer); + services.AddSingleton(new InMemoryChannel()); + + services.AddApplicationInsightsTelemetry(new ConfigurationBuilder().Build()); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Contains(telemetryInitializer, telemetryConfiguration.TelemetryInitializers); + } + + [Fact] + public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesItWithTelemetryChannelFromContainer() + { + var telemetryChannel = new FakeTelemetryChannel(); + var services = GetServiceCollectionWithContextAccessor(); + services.AddSingleton(telemetryChannel); + + services.AddApplicationInsightsTelemetry(new ConfigurationBuilder().Build()); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Same(telemetryChannel, telemetryConfiguration.TelemetryChannel); + } + + [Fact] + public static void DoesNotOverrideDefaultTelemetryChannelIfTelemetryChannelServiceIsNotRegistered() + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, null); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.NotNull(telemetryConfiguration.TelemetryChannel); + } + + [Fact] + public static void RegistersTelemetryClientToGetTelemetryConfigurationFromContainerAndNotGlobalInstance() + { + ITelemetry sentTelemetry = null; + var telemetryChannel = new FakeTelemetryChannel { OnSend = telemetry => sentTelemetry = telemetry }; + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, null); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var configuration = serviceProvider.GetTelemetryConfiguration(); + configuration.InstrumentationKey = Guid.NewGuid().ToString(); + ITelemetryChannel oldChannel = configuration.TelemetryChannel; + try + { + configuration.TelemetryChannel = telemetryChannel; + + var telemetryClient = serviceProvider.GetRequiredService(); + telemetryClient.TrackEvent("myevent"); + + // We want to check that configuration from container was used but configuration is a private field so we check instrumentation key instead. + Assert.Equal(configuration.InstrumentationKey, sentTelemetry.Context.InstrumentationKey); + } + finally + { + configuration.TelemetryChannel = oldChannel; + } + } + + [Fact] + public static void AddApplicationInsightsTelemetryDoesNotThrowOnNullServiceOptions() + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", null, false); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + } + + [Fact] + public static void AppApplicationInsightsTelemetryFromApplicationInsightsServiceOptionsCopiesAllSettings() + { + ServiceCollection services = GetServiceCollectionWithContextAccessor(); + ApplicationInsightsServiceOptions options = new ApplicationInsightsServiceOptions() + { + ApplicationVersion = "test", + DeveloperMode = true, + EnableAdaptiveSampling = false, + EnableAuthenticationTrackingJavaScript = false, + EnableDebugLogger = true, + EnableQuickPulseMetricStream = false, + EndpointAddress = "http://test", + EnableHeartbeat = false, + InstrumentationKey = "test", + ConnectionString = "InstrumentationKey=00000000-0000-0000-0000-000000000000" + }; + services.AddApplicationInsightsTelemetry(options); + ApplicationInsightsServiceOptions servicesOptions = null; + services.Configure((ApplicationInsightsServiceOptions o) => + { + servicesOptions = o; + }); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + TelemetryConfiguration telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + + Type optionsType = typeof(ApplicationInsightsServiceOptions); + PropertyInfo[] properties = optionsType.GetProperties(BindingFlags.Public | BindingFlags.Instance); + Assert.True(properties.Length > 0); + foreach (PropertyInfo property in properties) + { + Assert.Equal(property.GetValue(options).ToString(), property.GetValue(servicesOptions).ToString()); + } + } + + + [Fact] + public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesItWithModulesFromContainer() + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, null, null, false); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var modules = serviceProvider.GetServices(); + Assert.NotNull(modules); + +#if NETCOREAPP + Assert.Equal(7, modules.Count()); +#else + Assert.Equal(6, modules.Count()); +#endif + + var perfCounterModule = modules.OfType().Single(); + Assert.NotNull(perfCounterModule); + +#if NETCOREAPP + var eventCounterModule = modules.OfType().Single(); + Assert.NotNull(eventCounterModule); +#endif + + + var dependencyModuleDescriptor = modules.OfType().Single(); + Assert.NotNull(dependencyModuleDescriptor); + + var reqModuleDescriptor = modules.OfType().Single(); + Assert.NotNull(reqModuleDescriptor); + + var appServiceHeartBeatModuleDescriptor = modules.OfType().Single(); + Assert.NotNull(appServiceHeartBeatModuleDescriptor); + + var azureMetadataHeartBeatModuleDescriptor = modules.OfType().Single(); + Assert.NotNull(azureMetadataHeartBeatModuleDescriptor); + + var quickPulseModuleDescriptor = modules.OfType().Single(); + Assert.NotNull(quickPulseModuleDescriptor); + } + +#if NETCOREAPP + [Fact] + public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesEventCounterCollectorWithDefaultListOfCounters() + { + //ARRANGE + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, null, null, false); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var modules = serviceProvider.GetServices(); + + //ACT + + // Requesting TelemetryConfiguration from services trigger constructing the TelemetryConfiguration + // which in turn trigger configuration of all modules. + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + var eventCounterModule = modules.OfType().Single(); + + //VALIDATE + Assert.Equal(19, eventCounterModule.Counters.Count); + + // sanity check with a sample counter. + var cpuCounterRequest = eventCounterModule.Counters.FirstOrDefault( + eventCounterCollectionRequest => eventCounterCollectionRequest.EventSourceName == "System.Runtime" + && eventCounterCollectionRequest.EventCounterName == "cpu-usage"); + Assert.NotNull(cpuCounterRequest); + } +#endif + /// + /// User could enable or disable PerformanceCounterCollectionModule by setting EnablePerformanceCounterCollectionModule. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetry() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property EnablePerformanceCounterCollectionModule. + [Theory] +#if !NET46 + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] +#endif + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void UserCanEnableAndDisablePerfCollectorModule(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-all-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.EnablePerformanceCounterCollectionModule = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsTelemetry(filePath, null, serviceOptions, true, configType == "DefaultConfiguration" ? true : false); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var modules = serviceProvider.GetServices(); + Assert.NotNull(modules); + + // Even if a module is disabled its still added to DI. + Assert.NotEmpty(modules.OfType()); + + // Get telemetry client to trigger TelemetryConfig setup. + var tc = serviceProvider.GetService(); + + Type perfModuleType = typeof(PerformanceCollectorModule); + PerformanceCollectorModule perfModule = (PerformanceCollectorModule)modules.FirstOrDefault(m => m.GetType() == perfModuleType); + // Get the PerformanceCollectorModule private field value for isInitialized. + FieldInfo isInitializedField = perfModuleType.GetField("isInitialized", BindingFlags.NonPublic | BindingFlags.Instance); + // PerformanceCollectorModule.isInitialized is set to true when EnablePerformanceCounterCollectionModule is enabled, else it is set to false. + Assert.Equal(isEnable, (bool)isInitializedField.GetValue(perfModule)); + } + +#if NETCOREAPP + /// + /// User could enable or disable EventCounterCollectionModule by setting EnableEventCounterCollectionModule. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetry() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property EnableEventCounterCollectionModule. + [Theory] + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void UserCanEnableAndDisableEventCounterCollectorModule(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-all-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.EnableEventCounterCollectionModule = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsTelemetry(filePath, null, serviceOptions, true, configType == "DefaultConfiguration" ? true : false); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var modules = serviceProvider.GetServices(); + Assert.NotNull(modules); + + // Even if a module is disabled its still added to DI. + Assert.NotEmpty(modules.OfType()); + + // Get telemetry client to trigger TelemetryConfig setup. + var tc = serviceProvider.GetService(); + + Type eventCollectorModuleType = typeof(EventCounterCollectionModule); + EventCounterCollectionModule eventCollectorModule = (EventCounterCollectionModule)modules.FirstOrDefault(m => m.GetType() == eventCollectorModuleType); + // Get the EventCounterCollectionModule private field value for isInitialized. + FieldInfo isInitializedField = eventCollectorModuleType.GetField("isInitialized", BindingFlags.NonPublic | BindingFlags.Instance); + // EventCounterCollectionModule.isInitialized is set to true when EnableEventCounterCollectionModule is enabled, else it is set to false. + Assert.Equal(isEnable, (bool)isInitializedField.GetValue(eventCollectorModule)); + } +#endif + + /// + /// User could enable or disable RequestTrackingTelemetryModule by setting EnableRequestTrackingTelemetryModule. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetry() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property EnableRequestTrackingTelemetryModule. + [Theory] +#if !NET46 + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] +#endif + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void UserCanEnableAndDisableRequestCounterCollectorModule(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-all-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.EnableRequestTrackingTelemetryModule = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsTelemetry(filePath, null, serviceOptions, true, configType == "DefaultConfiguration" ? true : false); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + // Get telemetry client to trigger TelemetryConfig setup. + var tc = serviceProvider.GetService(); + var modules = serviceProvider.GetServices(); + Assert.NotNull(modules); + + // Even if a module is disabled its still added to DI. + Assert.NotEmpty(modules.OfType()); + var req = modules.OfType().First(); + // RequestTrackingTelemetryModule.isInitialized is set to true when EnableRequestTrackingTelemetryModule is enabled, else it is set to false. + Assert.Equal(isEnable, req.IsInitialized); + } + + /// + /// User could enable or disable DependencyTrackingTelemetryModule by setting EnableDependencyTrackingTelemetryModule. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetry() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property EnableDependencyTrackingTelemetryModule. + [Theory] +#if !NET46 + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] +#endif + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void UserCanEnableAndDisableDependencyCollectorModule(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-all-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.EnableDependencyTrackingTelemetryModule = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsTelemetry(filePath, null, serviceOptions, true, configType == "DefaultConfiguration" ? true : false); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var modules = serviceProvider.GetServices(); + Assert.NotNull(modules); + + // Even if a module is disabled its still added to DI. + Assert.NotEmpty(modules.OfType()); + + // Get telemetry client to trigger TelemetryConfig setup. + var tc = serviceProvider.GetService(); + + Type dependencyModuleType = typeof(DependencyTrackingTelemetryModule); + DependencyTrackingTelemetryModule dependencyModule = (DependencyTrackingTelemetryModule)modules.FirstOrDefault(m => m.GetType() == dependencyModuleType); + // Get the DependencyTrackingTelemetryModule private field value for isInitialized. + FieldInfo isInitializedField = dependencyModuleType.GetField("isInitialized", BindingFlags.NonPublic | BindingFlags.Instance); + // DependencyTrackingTelemetryModule.isInitialized is set to true when EnableDependencyTrackingTelemetryModule is enabled, else it is set to false. + Assert.Equal(isEnable, (bool)isInitializedField.GetValue(dependencyModule)); + } + + /// + /// User could enable or disable QuickPulseCollectorModule by setting EnableQuickPulseMetricStream. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetry() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property EnableQuickPulseMetricStream. + [Theory] +#if !NET46 + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] +#endif + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void UserCanEnableAndDisableQuickPulseCollectorModule(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-all-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.EnableQuickPulseMetricStream = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsTelemetry(filePath, null, serviceOptions, true, configType == "DefaultConfiguration" ? true : false); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var modules = serviceProvider.GetServices(); + Assert.NotNull(modules); + + // Even if a module is disabled its still added to DI. + Assert.NotEmpty(modules.OfType()); + + // Get telemetry client to trigger TelemetryConfig setup. + var tc = serviceProvider.GetService(); + + Type quickPulseModuleType = typeof(QuickPulseTelemetryModule); + QuickPulseTelemetryModule quickPulseModule = (QuickPulseTelemetryModule)modules.FirstOrDefault(m => m.GetType() == quickPulseModuleType); + // Get the QuickPulseTelemetryModule private field value for isInitialized. + FieldInfo isInitializedField = quickPulseModuleType.GetField("isInitialized", BindingFlags.NonPublic | BindingFlags.Instance); + // QuickPulseTelemetryModule.isInitialized is set to true when EnableQuickPulseMetricStream is enabled, else it is set to false. + Assert.Equal(isEnable, (bool)isInitializedField.GetValue(quickPulseModule)); + } + + /// + /// User could enable or disable AppServiceHeartbeatModule by setting EnableAppServicesHeartbeatTelemetryModule. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetry() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property EnableAppServicesHeartbeatTelemetryModule. + [Theory] +#if !NET46 + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] +#endif + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void UserCanEnableAndDisableAppServiceHeartbeatModule(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-all-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.EnableAppServicesHeartbeatTelemetryModule = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsTelemetry(filePath, null, serviceOptions, true, configType == "DefaultConfiguration" ? true : false); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var modules = serviceProvider.GetServices(); + Assert.NotNull(modules); + + // Even if a module is disabled its still added to DI. + Assert.NotEmpty(modules.OfType()); + + // Get telemetry client to trigger TelemetryConfig setup. + var tc = serviceProvider.GetService(); + + AppServicesHeartbeatTelemetryModule appServHBModule = modules.OfType().Single(); + Assert.Equal(isEnable, appServHBModule.IsInitialized); + } + + /// + /// User could enable or disable AzureInstanceMetadataModule by setting EnableAzureInstanceMetadataTelemetryModule. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetry() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property EnableAzureInstanceMetadataTelemetryModule. + [Theory] +#if !NET46 + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] +#endif + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void UserCanEnableAndDisableAzureInstanceMetadataModule(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-all-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.EnableAzureInstanceMetadataTelemetryModule = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsTelemetry(filePath, null, serviceOptions, true, configType == "DefaultConfiguration" ? true : false); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var modules = serviceProvider.GetServices(); + Assert.NotNull(modules); + + // Even if a module is disabled its still added to DI. + Assert.NotEmpty(modules.OfType()); + + // Get telemetry client to trigger TelemetryConfig setup. + var tc = serviceProvider.GetService(); + + AzureInstanceMetadataTelemetryModule azureInstanceMetadataModule = modules.OfType().Single(); + Assert.Equal(isEnable, azureInstanceMetadataModule.IsInitialized); + } + + [Fact] + public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesDependencyCollectorWithDefaultValues() + { + //ARRANGE + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, null, null, false); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var modules = serviceProvider.GetServices(); + + //ACT + + // Requesting TelemetryConfiguration from services trigger constructing the TelemetryConfiguration + // which in turn trigger configuration of all modules. + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + var dependencyModule = modules.OfType().Single(); + + //VALIDATE + Assert.Equal(4, dependencyModule.ExcludeComponentCorrelationHttpHeadersOnDomains.Count); + Assert.False(dependencyModule.ExcludeComponentCorrelationHttpHeadersOnDomains.Contains("localhost")); + Assert.False(dependencyModule.ExcludeComponentCorrelationHttpHeadersOnDomains.Contains("127.0.0.1")); + } + + /// + /// User could enable or disable LegacyCorrelationHeadersInjection of DependencyCollectorOptions. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetry() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property EnableLegacyCorrelationHeadersInjection. + [Theory] +#if !NET46 + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] +#endif + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesDependencyCollectorWithCustomValues(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-req-dep-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.DependencyCollectionOptions.EnableLegacyCorrelationHeadersInjection = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsTelemetry(filePath, null, serviceOptions, true, configType == "DefaultConfiguration" ? true : false); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var modules = serviceProvider.GetServices(); + + // Requesting TelemetryConfiguration from services trigger constructing the TelemetryConfiguration + // which in turn trigger configuration of all modules. + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + + var dependencyModule = modules.OfType().Single(); + // Get telemetry client to trigger TelemetryConfig setup. + var tc = serviceProvider.GetService(); + + // VALIDATE + Assert.Equal(isEnable ? 6 : 4, dependencyModule.ExcludeComponentCorrelationHttpHeadersOnDomains.Count); + Assert.Equal(isEnable, dependencyModule.ExcludeComponentCorrelationHttpHeadersOnDomains.Contains("localhost") ? true : false); + Assert.Equal(isEnable, dependencyModule.ExcludeComponentCorrelationHttpHeadersOnDomains.Contains("127.0.0.1") ? true : false); + } + + [Fact] + public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesItWithTelemetryProcessorFactoriesFromContainer() + { + var services = GetServiceCollectionWithContextAccessor(); + services.AddApplicationInsightsTelemetryProcessor(); + + services.AddApplicationInsightsTelemetry(new ConfigurationBuilder().Build()); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + // TP added via AddApplicationInsightsTelemetryProcessor is added to the default sink. + FakeTelemetryProcessor telemetryProcessor = telemetryConfiguration.DefaultTelemetrySink.TelemetryProcessors.OfType().FirstOrDefault(); + Assert.NotNull(telemetryProcessor); + Assert.True(telemetryProcessor.IsInitialized); + } + + [Fact] + public static void AddApplicationInsightsTelemetryProcessorWithNullTelemetryProcessorTypeThrows() + { + var services = GetServiceCollectionWithContextAccessor(); + Assert.Throws(() => services.AddApplicationInsightsTelemetryProcessor(null)); + } + + [Fact] + public static void AddApplicationInsightsTelemetryProcessorWithNonTelemetryProcessorTypeThrows() + { + var services = GetServiceCollectionWithContextAccessor(); + Assert.Throws(() => services.AddApplicationInsightsTelemetryProcessor(typeof(string))); + Assert.Throws(() => services.AddApplicationInsightsTelemetryProcessor(typeof(ITelemetryProcessor))); + } + + [Fact] + public static void AddApplicationInsightsTelemetryProcessorWithImportingConstructor() + { + var services = GetServiceCollectionWithContextAccessor(); + services.AddApplicationInsightsTelemetryProcessor(); + services.AddApplicationInsightsTelemetry(new ConfigurationBuilder().Build()); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + + // TP added via AddApplicationInsightsTelemetryProcessor is added to the default sink. + FakeTelemetryProcessorWithImportingConstructor telemetryProcessor = telemetryConfiguration.DefaultTelemetrySink.TelemetryProcessors.OfType().FirstOrDefault(); + Assert.NotNull(telemetryProcessor); + Assert.Same(serviceProvider.GetService(), telemetryProcessor.HostingEnvironment); + } + + [Fact] + public static void ConfigureApplicationInsightsTelemetryModuleWorks() + { + //ARRANGE + var services = GetServiceCollectionWithContextAccessor(); + services.AddSingleton(); + + //ACT + services.ConfigureTelemetryModule + ((module, o) => module.CustomProperty = "mycustomvalue"); + services.AddApplicationInsightsTelemetry(new ConfigurationBuilder().Build()); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + + // Requesting TelemetryConfiguration from services trigger constructing the TelemetryConfiguration + // which in turn trigger configuration of all modules. + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + + //VALIDATE + var modules = serviceProvider.GetServices(); + var testTelemetryModule = modules.OfType().Single(); + + //The module should be initialized and configured as instructed. + Assert.NotNull(testTelemetryModule); + Assert.Equal("mycustomvalue", testTelemetryModule.CustomProperty); + Assert.True(testTelemetryModule.IsInitialized); + } + + [Fact] + public static void ConfigureApplicationInsightsTelemetryModuleWorksWithOptions() + { + //ARRANGE + Action serviceOptions = options => options.ApplicationVersion = "123"; + var services = GetServiceCollectionWithContextAccessor(); + services.AddSingleton(); + + //ACT + services.ConfigureTelemetryModule + ((module, o) => module.CustomProperty = o.ApplicationVersion); + services.AddApplicationInsightsTelemetry(serviceOptions); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + + // Requesting TelemetryConfiguration from services trigger constructing the TelemetryConfiguration + // which in turn trigger configuration of all modules. + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + + //VALIDATE + var modules = serviceProvider.GetServices(); + var testTelemetryModule = modules.OfType().Single(); + + //The module should be initialized and configured as instructed. + Assert.NotNull(testTelemetryModule); + Assert.Equal("123", testTelemetryModule.CustomProperty); + Assert.True(testTelemetryModule.IsInitialized); + } + + [Fact] + public static void ConfigureApplicationInsightsTelemetryModuleWorksWithoutOptions() + { + //ARRANGE + var services = GetServiceCollectionWithContextAccessor(); + services.AddSingleton(); + + //ACT + services.ConfigureTelemetryModule + (module => module.CustomProperty = "mycustomproperty"); + services.AddApplicationInsightsTelemetry(); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + + // Requesting TelemetryConfiguration from services trigger constructing the TelemetryConfiguration + // which in turn trigger configuration of all modules. + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + + //VALIDATE + var modules = serviceProvider.GetServices(); + var testTelemetryModule = modules.OfType().Single(); + + //The module should be initialized and configured as instructed. + Assert.NotNull(testTelemetryModule); + Assert.Equal("mycustomproperty", testTelemetryModule.CustomProperty); + Assert.True(testTelemetryModule.IsInitialized); + } + + [Fact] + public static void ConfigureRequestTrackingTelemetryDefaultOptions() + { + //ARRANGE + var services = GetServiceCollectionWithContextAccessor(); + + //ACT + services.AddApplicationInsightsTelemetry(); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + + //VALIDATE + var requestTrackingModule = (RequestTrackingTelemetryModule)serviceProvider.GetServices().FirstOrDefault(x => x.GetType() + == typeof(RequestTrackingTelemetryModule)); + + Assert.True(requestTrackingModule.CollectionOptions.InjectResponseHeaders); +#if NETCOREAPP || NET461 + Assert.False(requestTrackingModule.CollectionOptions.TrackExceptions); +#else + Assert.True(requestTrackingModule.CollectionOptions.TrackExceptions); +#endif + } + + /// + /// User could enable or disable RequestCollectionOptions by setting InjectResponseHeaders, TrackExceptions and EnableW3CDistributedTracing. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetry() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property InjectResponseHeaders, TrackExceptions and EnableW3CDistributedTracing. + [Theory] +#if !NET46 + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] +#endif + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void ConfigureRequestTrackingTelemetryCustomOptions(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-req-dep-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => + { + o.RequestCollectionOptions.InjectResponseHeaders = isEnable; + o.RequestCollectionOptions.TrackExceptions = isEnable; + o.RequestCollectionOptions.EnableW3CDistributedTracing = isEnable; + }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsTelemetry(filePath, null, serviceOptions, true, configType == "DefaultConfiguration" ? true : false); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + + var requestTrackingModule = (RequestTrackingTelemetryModule)serviceProvider + .GetServices().FirstOrDefault(x => x.GetType() == typeof(RequestTrackingTelemetryModule)); + + Assert.Equal(isEnable, requestTrackingModule.CollectionOptions.InjectResponseHeaders); + Assert.Equal(isEnable, requestTrackingModule.CollectionOptions.TrackExceptions); + Assert.Equal(isEnable, requestTrackingModule.CollectionOptions.EnableW3CDistributedTracing); + } + + [Fact] + public static void ConfigureApplicationInsightsTelemetryModuleThrowsIfConfigureIsNull() + { + //ARRANGE + var services = GetServiceCollectionWithContextAccessor(); + services.AddSingleton(); + + //ACT and VALIDATE + Assert.Throws(() => services.ConfigureTelemetryModule((Action)null)); + Assert.Throws(() => services.ConfigureTelemetryModule((Action)null)); + } + + [Fact] + public static void ConfigureApplicationInsightsTelemetryModuleDoesNotThrowIfModuleNotFound() + { + //ARRANGE + var services = GetServiceCollectionWithContextAccessor(); + // Intentionally NOT adding the module + // services.AddSingleton(); + + //ACT + services.ConfigureTelemetryModule + ((module, options) => module.CustomProperty = "mycustomvalue"); + services.AddApplicationInsightsTelemetry(new ConfigurationBuilder().Build()); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + + // Requesting TelemetryConfiguration from services trigger constructing the TelemetryConfiguration + // which in turn trigger configuration of all modules. + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + + //VALIDATE + var modules = serviceProvider.GetServices(); + var testTelemetryModule = modules.OfType().FirstOrDefault(); + + // No exceptions thrown here. + Assert.Null(testTelemetryModule); + } + + + [Fact] + public static void AddsAddaptiveSamplingServiceToTheConfigurationByDefault() + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", null, false); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + var adaptiveSamplingProcessorCount = GetTelemetryProcessorsCountInConfigurationDefaultSink(telemetryConfiguration); + + // There will be 2 separate SamplingTelemetryProcessors - one for Events, and other for everything else. + Assert.Equal(2, adaptiveSamplingProcessorCount); + } + + /// + /// User could enable or disable sampling by setting EnableAdaptiveSampling. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetry() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property EnableAdaptiveSampling. + [Theory] +#if !NET46 + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] +#endif + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void DoesNotAddSamplingToConfigurationIfExplicitlyControlledThroughParameter(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-all-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.EnableAdaptiveSampling = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsTelemetry(filePath, null, serviceOptions, true, configType == "DefaultConfiguration" ? true : false); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + var qpProcessorCount = GetTelemetryProcessorsCountInConfigurationDefaultSink(telemetryConfiguration); + // There will be 2 separate SamplingTelemetryProcessors - one for Events, and other for everything else. + Assert.Equal(isEnable ? 2 : 0, qpProcessorCount); + } + + [Fact] + public static void AddsAddaptiveSamplingServiceToTheConfigurationWithServiceOptions() + { + Action serviceOptions = options => options.EnableAdaptiveSampling = true; + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", serviceOptions, false); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + var adaptiveSamplingProcessorCount = GetTelemetryProcessorsCountInConfigurationDefaultSink(telemetryConfiguration); + // There will be 2 separate SamplingTelemetryProcessors - one for Events, and other for everything else. + Assert.Equal(2, adaptiveSamplingProcessorCount); + } + + [Fact] + public static void AddsServerTelemetryChannelByDefault() + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", null, false); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Equal(typeof(ServerTelemetryChannel), telemetryConfiguration.TelemetryChannel.GetType()); + } + + [Fact] + [Trait("Trait", "ConnectionString")] + public static void AddApplicationInsightsSettings_SetsConnectionString() + { + var services = GetServiceCollectionWithContextAccessor(); + services.AddSingleton(new InMemoryChannel()); + var config = new ConfigurationBuilder().AddApplicationInsightsSettings(connectionString: TestConnectionString).Build(); + services.AddApplicationInsightsTelemetry(config); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Equal(TestConnectionString, telemetryConfiguration.ConnectionString); + Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); + Assert.Equal("http://127.0.0.1/", telemetryConfiguration.EndpointContainer.Ingestion.AbsoluteUri); + } + + [Fact] + [Trait("Trait", "Endpoints")] + public static void DoesNotOverWriteExistingChannel() + { + var testEndpoint = "http://localhost:1234/v2/track/"; + + var services = GetServiceCollectionWithContextAccessor(); + services.AddSingleton(); + var config = new ConfigurationBuilder().AddApplicationInsightsSettings(endpointAddress: testEndpoint).Build(); + services.AddApplicationInsightsTelemetry(config); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Equal(typeof(InMemoryChannel), telemetryConfiguration.TelemetryChannel.GetType()); + Assert.Equal(testEndpoint, telemetryConfiguration.TelemetryChannel.EndpointAddress); + } + + [Fact] + public static void FallbacktoDefaultChannelWhenNoChannelFoundInDI() + { + var testEndpoint = "http://localhost:1234/v2/track/"; + + // ARRANGE + var services = GetServiceCollectionWithContextAccessor(); + var config = new ConfigurationBuilder().AddApplicationInsightsSettings(endpointAddress: testEndpoint).Build(); + services.AddApplicationInsightsTelemetry(config); + + // Remove all ITelemetryChannel to simulate scenario where customer remove all channel from DI but forgot to add new one. + // This should not crash application startup, and should fall back to default channel supplied by base sdk. + for (var i = services.Count - 1; i >= 0; i--) + { + var descriptor = services[i]; + if (descriptor.ServiceType == typeof(ITelemetryChannel)) + { + services.RemoveAt(i); + } + } + + // VERIFY that default channel is configured when nothing is present in DI + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + Assert.Equal(typeof(InMemoryChannel), telemetryConfiguration.TelemetryChannel.GetType()); + Assert.Equal(testEndpoint, telemetryConfiguration.TelemetryChannel.EndpointAddress); + } + + [Fact] + public static void VerifyNoExceptionWhenAppIdProviderNotFoundInDI() + { + // ARRANGE + var services = GetServiceCollectionWithContextAccessor(); + var config = new ConfigurationBuilder().AddApplicationInsightsSettings(endpointAddress: "http://localhost:1234/v2/track/").Build(); + services.AddApplicationInsightsTelemetry(config); + + for (var i = services.Count - 1; i >= 0; i--) + { + var descriptor = services[i]; + if (descriptor.ServiceType == typeof(IApplicationIdProvider)) + { + services.RemoveAt(i); + } + } + + // ACT + IServiceProvider serviceProvider = services.BuildServiceProvider(); + + + // VERIFY + var requestTrackingModule = serviceProvider.GetServices().FirstOrDefault(x => x.GetType() + == typeof(RequestTrackingTelemetryModule)); + + Assert.NotNull(requestTrackingModule); // this verifies the instance was created without exception + } + + [Fact] + public static void VerifyUserCanOverrideAppIdProvider() + { + var services = GetServiceCollectionWithContextAccessor(); + services.AddSingleton(); // assume user tries to define own implementation + var config = new ConfigurationBuilder().AddApplicationInsightsSettings(endpointAddress: "http://localhost:1234/v2/track/").Build(); + services.AddApplicationInsightsTelemetry(config); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var applicationIdProvider = serviceProvider.GetRequiredService(); + + Assert.Equal(typeof(MockApplicationIdProvider), applicationIdProvider.GetType()); + } + + + [Fact] + public static void ValidatesThatOnlyPassThroughProcessorIsAddedToCommonPipeline() + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", null, false); + services.AddSingleton(); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + + // All default TelemetryProcessors are expected to be on the default sink. There should be + // none on the main pipeline except the PassThrough. + + var qpProcessorCount = GetTelemetryProcessorsCountInConfiguration(telemetryConfiguration); + Assert.Equal(0, qpProcessorCount); + + var metricExtractorProcessorCount = GetTelemetryProcessorsCountInConfiguration(telemetryConfiguration); + Assert.Equal(0, metricExtractorProcessorCount); + + var samplingProcessorCount = GetTelemetryProcessorsCountInConfiguration(telemetryConfiguration); + Assert.Equal(0, samplingProcessorCount); + + var passThroughProcessorCount = telemetryConfiguration.TelemetryProcessors.Count; + Assert.Equal(1, passThroughProcessorCount); + + Assert.Equal("PassThroughProcessor", telemetryConfiguration.TelemetryProcessors[0].GetType().Name); + } + + [Fact] + public static void AddsQuickPulseProcessorToTheConfigurationByDefault() + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", null, false); + services.AddSingleton(); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + var qpProcessorCount = GetTelemetryProcessorsCountInConfigurationDefaultSink(telemetryConfiguration); + Assert.Equal(1, qpProcessorCount); + } + + [Fact] + public static void AddsAutoCollectedMetricsExtractorProcessorToTheConfigurationByDefault() + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", null, false); + services.AddSingleton(); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + var metricExtractorProcessorCount = GetTelemetryProcessorsCountInConfigurationDefaultSink(telemetryConfiguration); + Assert.Equal(1, metricExtractorProcessorCount); + } + + /// + /// User could enable or disable auto collected metrics by setting AddAutoCollectedMetricExtractor. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetry() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property AddAutoCollectedMetricExtractor. + [Theory] +#if !NET46 + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] +#endif + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void DoesNotAddAutoCollectedMetricsExtractorToConfigurationIfExplicitlyControlledThroughParameter(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-all-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.AddAutoCollectedMetricExtractor = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsTelemetry(filePath, null, serviceOptions, true, configType == "DefaultConfiguration" ? true : false); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + var metricExtractorProcessorCount = GetTelemetryProcessorsCountInConfigurationDefaultSink(telemetryConfiguration); + Assert.Equal(isEnable ? 1 : 0, metricExtractorProcessorCount); + } + + [Fact] + public static void DoesNotAddQuickPulseProcessorToConfigurationIfExplicitlyControlledThroughParameter() + { + Action serviceOptions = options => options.EnableQuickPulseMetricStream = false; + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", serviceOptions, false); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + var qpProcessorCount = GetTelemetryProcessorsCountInConfigurationDefaultSink(telemetryConfiguration); + Assert.Equal(0, qpProcessorCount); + } + + /// + /// User could enable or disable AuthenticationTrackingJavaScript by setting EnableAuthenticationTrackingJavaScript. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetry() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property EnableAuthenticationTrackingJavaScript. + [Theory] +#if !NET46 + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] +#endif + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void UserCanEnableAndDisableAuthenticationTrackingJavaScript(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-all-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.EnableAuthenticationTrackingJavaScript = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsTelemetry(filePath, null, serviceOptions, true, configType == "DefaultConfiguration" ? true : false); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + + // VALIDATE + // Get telemetry client to trigger TelemetryConfig setup. + var tc = serviceProvider.GetService(); + + Type javaScriptSnippetType = typeof(JavaScriptSnippet); + var javaScriptSnippet = serviceProvider.GetService(); + // Get the JavaScriptSnippet private field value for enableAuthSnippet. + FieldInfo enableAuthSnippetField = javaScriptSnippetType.GetField("enableAuthSnippet", BindingFlags.NonPublic | BindingFlags.Instance); + // JavaScriptSnippet.enableAuthSnippet is set to true when EnableAuthenticationTrackingJavaScript is enabled, else it is set to false. + Assert.Equal(isEnable, (bool)enableAuthSnippetField.GetValue(javaScriptSnippet)); + } + + [Fact] + public static void AddsQuickPulseProcessorToTheConfigurationWithServiceOptions() + { + Action serviceOptions = options => options.EnableQuickPulseMetricStream = true; + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", serviceOptions, false); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + var qpProcessorCount = GetTelemetryProcessorsCountInConfigurationDefaultSink(telemetryConfiguration); + Assert.Equal(1, qpProcessorCount); + } + + [Fact] + public static void AddsHeartbeatModulesToTheConfigurationByDefault() + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/", null, false); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + var modules = serviceProvider.GetServices(); + Assert.NotNull(modules.OfType().Single()); + Assert.NotNull(modules.OfType().Single()); + } + + /// + /// User could enable or disable heartbeat by setting EnableHeartbeat. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetry() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + [Theory] +#if !NET46 + [InlineData("DefaultConfiguration")] + [InlineData("SuppliedConfiguration")] +#endif + [InlineData("Code")] + public static void UserCanDisableHeartbeat(string configType) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-all-settings-false.json"); + + if (configType == "Code") + { + serviceOptions = o => { o.EnableHeartbeat = false; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsTelemetry(filePath, null, serviceOptions, true, configType == "DefaultConfiguration" ? true : false); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + var modules = serviceProvider.GetServices(); + var heartbeatModule = TelemetryModules.Instance.Modules.OfType().First(); + + Assert.NotNull(heartbeatModule); + Assert.False(heartbeatModule.IsHeartbeatEnabled); + } + + [Fact] + public static void W3CIsEnabledByDefault() + { + var services = CreateServicesAndAddApplicationinsightsTelemetry(null, "http://localhost:1234/v2/track/"); + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration(); + + Assert.DoesNotContain(telemetryConfiguration.TelemetryInitializers, t => t is W3COperationCorrelationTelemetryInitializer); + Assert.DoesNotContain(TelemetryConfiguration.Active.TelemetryInitializers, t => t is W3COperationCorrelationTelemetryInitializer); + + var modules = serviceProvider.GetServices().ToList(); + + var requestTracking = modules.OfType().ToList(); + var dependencyTracking = modules.OfType().ToList(); + Assert.Single(requestTracking); + Assert.Single(dependencyTracking); + + Assert.True(Activity.DefaultIdFormat == ActivityIdFormat.W3C); + Assert.True(Activity.ForceDefaultIdFormat); + } + + private static int GetTelemetryProcessorsCountInConfiguration(TelemetryConfiguration telemetryConfiguration) + { + return telemetryConfiguration.TelemetryProcessors.Where(processor => processor.GetType() == typeof(T)).Count(); + } + + private static int GetTelemetryProcessorsCountInConfigurationDefaultSink(TelemetryConfiguration telemetryConfiguration) + { + return telemetryConfiguration.DefaultTelemetrySink.TelemetryProcessors.Where(processor => processor.GetType() == typeof(T)).Count(); + } + + [Fact] + public static void LoggerCallbackIsInvoked() + { + var services = new ServiceCollection(); + services.AddSingleton(); + var serviceProvider = services.BuildServiceProvider(); + + var loggerProvider = new MockLoggingFactory(); + + bool firstLoggerCallback = false; + bool secondLoggerCallback = false; + + loggerProvider.AddApplicationInsights(serviceProvider, (s, level) => true, () => firstLoggerCallback = true); + loggerProvider.AddApplicationInsights(serviceProvider, (s, level) => true, () => secondLoggerCallback = true); + + Assert.True(firstLoggerCallback); + Assert.False(secondLoggerCallback); + } + + [Fact] + public static void NullLoggerCallbackAlowed() + { + var services = new ServiceCollection(); + services.AddSingleton(); + var serviceProvider = services.BuildServiceProvider(); + + var loggerProvider = new MockLoggingFactory(); + + loggerProvider.AddApplicationInsights(serviceProvider, (s, level) => true, null); + loggerProvider.AddApplicationInsights(serviceProvider, (s, level) => true, null); + } + +#if NETCOREAPP || NET461 + + /// + /// Creates two copies of ApplicationInsightsServiceOptions. First object is created by calling services.AddApplicationInsightsTelemetry() or services.AddApplicationInsightsTelemetry(config). + /// Second object is created directly from configuration file without using any of SDK functionality. + /// Compares ApplicationInsightsServiceOptions object from dependency container and one created directly from configuration. + /// This proves all that SDK read configuration successfully from configuration file. + /// Properties from appSettings.json, appsettings.{env.EnvironmentName}.json and Environmental Variables are read if no IConfiguration is supplied or used in an application. + /// + /// If this is set, read value from appsettings.json, else from passed file. + /// + /// Calls services.AddApplicationInsightsTelemetry() when the value is true and reads IConfiguration from user application automatically. + /// Else, it invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller. + /// + [Theory] + [InlineData(true, true)] + [InlineData(true, false)] + [InlineData(false, true)] + [InlineData(false, false)] + public static void ReadsSettingsFromDefaultAndSuppliedConfiguration(bool readFromAppSettings, bool useDefaultConfig) + { + // ARRANGE + IConfigurationBuilder configBuilder = null; + var fileName = "config-all-default.json"; + + // ACT + var services = CreateServicesAndAddApplicationinsightsTelemetry( + readFromAppSettings ? null : Path.Combine("content", fileName), + null, null, true, useDefaultConfig); + + // VALIDATE + + // Generate config and don't pass to services + // this is directly generated from config file + // which could be used to validate the data from dependency container + + if (!readFromAppSettings) + { + configBuilder = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) + .AddJsonFile(Path.Combine("content", fileName)); + if (useDefaultConfig) + { + configBuilder.AddJsonFile("appsettings.json", false); + } + } + else + { + configBuilder = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) + .AddJsonFile("appsettings.json", false); + } + + var config = configBuilder.Build(); + + // Compare ApplicationInsightsServiceOptions from dependency container and configuration + IServiceProvider serviceProvider = services.BuildServiceProvider(); + // ApplicationInsightsServiceOptions from dependency container + var servicesOptions = serviceProvider.GetRequiredService>().Value; + + // Create ApplicationInsightsServiceOptions from configuration for validation. + var aiOptions = new ApplicationInsightsServiceOptions(); + config.GetSection("ApplicationInsights").Bind(aiOptions); + config.GetSection("ApplicationInsights:TelemetryChannel").Bind(aiOptions); + + Type optionsType = typeof(ApplicationInsightsServiceOptions); + PropertyInfo[] properties = optionsType.GetProperties(BindingFlags.Public | BindingFlags.Instance); + Assert.True(properties.Length > 0); + foreach (PropertyInfo property in properties) + { + Assert.Equal(property.GetValue(aiOptions)?.ToString(), property.GetValue(servicesOptions)?.ToString()); + } + } + + [Fact] + public static void ReadsSettingsFromDefaultConfigurationWithEnvOverridingConfig() + { + // Host.CreateDefaultBuilder() in .NET Core 3.0 adds appsetting.json and env variable + // to configuration and is made available for constructor injection. + // this test validates that SDK reads settings from this configuration by default + // and gives priority to the ENV variables than the one from config. + + // ARRANGE + Environment.SetEnvironmentVariable(InstrumentationKeyEnvironmentVariable, TestInstrumentationKey); + Environment.SetEnvironmentVariable(ConnectionStringEnvironmentVariable, TestConnectionString); + Environment.SetEnvironmentVariable(TestEndPointEnvironmentVariable, TestEndPoint); + Environment.SetEnvironmentVariable(DeveloperModeEnvironmentVariable, "true"); + + try + { + var jsonFullPath = Path.Combine(Directory.GetCurrentDirectory(), "content", "config-all-default.json"); + + // This config will have ikey,endpoint from json and env. ENV one is expected to win. + var config = new ConfigurationBuilder().AddJsonFile(jsonFullPath).AddEnvironmentVariables().Build(); + var services = GetServiceCollectionWithContextAccessor(); + + // This line mimics the default behavior by CreateDefaultBuilder + services.AddSingleton(config); + + // ACT + services.AddApplicationInsightsTelemetry(); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetRequiredService(); + Assert.Equal(TestInstrumentationKey, telemetryConfiguration.InstrumentationKey); + Assert.Equal(TestConnectionString, telemetryConfiguration.ConnectionString); + Assert.Equal(TestEndPoint, telemetryConfiguration.TelemetryChannel.EndpointAddress); + Assert.True(telemetryConfiguration.TelemetryChannel.DeveloperMode); + } + finally + { + Environment.SetEnvironmentVariable("APPINSIGHTS_INSTRUMENTATIONKEY", null); + Environment.SetEnvironmentVariable("APPLICATIONINSIGHTS_CONNECTION_STRING", null); + Environment.SetEnvironmentVariable("APPINSIGHTS_ENDPOINTADDRESS", null); + Environment.SetEnvironmentVariable("APPINSIGHTS_DEVELOPER_MODE", null); + } + } + + [Fact] + public static void VerifiesIkeyProvidedInAddApplicationInsightsAlwaysWinsOverOtherOptions() + { + // ARRANGE + Environment.SetEnvironmentVariable("APPINSIGHTS_INSTRUMENTATIONKEY", TestInstrumentationKey); + try + { + var jsonFullPath = Path.Combine(Directory.GetCurrentDirectory(), "content", "config-instrumentation-key.json"); + + // This config will have ikey,endpoint from json and env. But the one + // user explicitly provider is expected to win. + var config = new ConfigurationBuilder().AddJsonFile(jsonFullPath).AddEnvironmentVariables().Build(); + var services = GetServiceCollectionWithContextAccessor(); + + // This line mimics the default behavior by CreateDefaultBuilder + services.AddSingleton(config); + + // ACT + services.AddApplicationInsightsTelemetry("userkey"); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetRequiredService(); + Assert.Equal("userkey", telemetryConfiguration.InstrumentationKey); + } + finally + { + Environment.SetEnvironmentVariable("APPINSIGHTS_INSTRUMENTATIONKEY", null); + } + } + + [Fact] + public static void VerifiesIkeyProvidedInAppSettingsWinsOverOtherConfigurationOptions() + { + // ARRANGE + var filePath = Path.Combine(Directory.GetCurrentDirectory(), "content", "config-instrumentation-key.json"); + + // ACT + // Calls services.AddApplicationInsightsTelemetry(), which by default reads from appSettings.json + var services = CreateServicesAndAddApplicationinsightsTelemetry(filePath, null, null, true, true); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetRequiredService(); + Assert.Equal(InstrumentationKeyInAppSettings, telemetryConfiguration.InstrumentationKey); + } + + [Fact] + public static void ReadsFromAppSettingsIfNoSettingsFoundInDefaultConfiguration() + { + // Host.CreateDefaultBuilder() in .NET Core 3.0 adds appsetting.json and env variable + // to configuration and is made available for constructor injection. + // This test validates that SDK does not throw any error if it cannot find + // application insights configuration in default IConfiguration. + // ARRANGE + var jsonFullPath = Path.Combine(Directory.GetCurrentDirectory(), "content", "sample-appsettings_dontexist.json"); + var config = new ConfigurationBuilder().AddJsonFile(jsonFullPath, true).Build(); + var services = GetServiceCollectionWithContextAccessor(); + // This line mimics the default behavior by CreateDefaultBuilder + services.AddSingleton(config); + + // ACT + services.AddApplicationInsightsTelemetry(); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetRequiredService(); + // Create a configuration from appSettings.json for validation. + var appSettingsConfig = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) + .AddJsonFile("appsettings.json", false).Build(); + + Assert.Equal(appSettingsConfig["ApplicationInsights:InstrumentationKey"], telemetryConfiguration.InstrumentationKey); + } +#endif + } +#pragma warning restore CS0618 // TelemetryConfiguration.Active is obsolete. We still test with this for backwards compatibility. +} diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/BaseTestClass.cs b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/BaseTestClass.cs new file mode 100644 index 000000000..7661757b5 --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/BaseTestClass.cs @@ -0,0 +1,91 @@ + +using Xunit; + +[assembly: CollectionBehavior(DisableTestParallelization = true)] // this is an XUnit api setting +namespace Microsoft.Extensions.DependencyInjection.Test +{ + using System; + using System.Diagnostics; + using System.IO; + + using Microsoft.ApplicationInsights.AspNetCore.Extensions; + using Microsoft.ApplicationInsights.Channel; + using Microsoft.AspNetCore.Hosting; + using Microsoft.AspNetCore.Hosting.Internal; + using Microsoft.Extensions.Configuration; + + public abstract class BaseTestClass + { + internal const string TestInstrumentationKey = "11111111-2222-3333-4444-555555555555"; + internal const string TestConnectionString = "InstrumentationKey=11111111-2222-3333-4444-555555555555;IngestionEndpoint=http://127.0.0.1"; + internal const string InstrumentationKeyInAppSettings = "33333333-2222-3333-4444-555555555555"; + internal const string InstrumentationKeyFromConfig = "ApplicationInsights:InstrumentationKey"; + internal const string InstrumentationKeyEnvironmentVariable = "APPINSIGHTS_INSTRUMENTATIONKEY"; + internal const string ConnectionStringEnvironmentVariable = "APPLICATIONINSIGHTS_CONNECTION_STRING"; + internal const string TestEndPointEnvironmentVariable = "APPINSIGHTS_ENDPOINTADDRESS"; + internal const string DeveloperModeEnvironmentVariable = "APPINSIGHTS_DEVELOPER_MODE"; + internal const string TestEndPoint = "http://127.0.0.1/v2/track"; + + public static ServiceCollection CreateServicesAndAddApplicationinsightsTelemetry(string jsonPath, string channelEndPointAddress, Action serviceOptions = null, bool addChannel = true, bool useDefaultConfig = true) + { + var services = GetServiceCollectionWithContextAccessor(); + if (addChannel) + { + services.AddSingleton(new InMemoryChannel()); + } + + IConfigurationRoot config = null; + + if (jsonPath != null) + { + var jsonFullPath = Path.Combine(Directory.GetCurrentDirectory(), jsonPath); + Console.WriteLine("json:" + jsonFullPath); + Trace.WriteLine("json:" + jsonFullPath); + try + { + config = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory()).AddJsonFile(jsonFullPath).Build(); + } + catch (Exception) + { + throw new Exception("Unable to build with json:" + jsonFullPath); + } + } + else if (channelEndPointAddress != null) + { + config = new ConfigurationBuilder().AddApplicationInsightsSettings(endpointAddress: channelEndPointAddress).Build(); + } + else + { + config = new ConfigurationBuilder().Build(); + } + +#if NET46 + // In NET46, we don't read from default configuration or bind configuration. + services.AddApplicationInsightsTelemetry(config); +#else + if (useDefaultConfig) + { + services.AddSingleton(config); + services.AddApplicationInsightsTelemetry(); + } + else + { + services.AddApplicationInsightsTelemetry(config); + } +#endif + if (serviceOptions != null) + { + services.Configure(serviceOptions); + } + return services; + } + + public static ServiceCollection GetServiceCollectionWithContextAccessor() + { + var services = new ServiceCollection(); + services.AddSingleton(new HostingEnvironment() { ContentRootPath = Directory.GetCurrentDirectory() }); + services.AddSingleton(new DiagnosticListener("TestListener")); + return services; + } + } +} diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/IServiceProviderExtensions.cs b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/IServiceProviderExtensions.cs new file mode 100644 index 000000000..3e4f9bd9d --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/IServiceProviderExtensions.cs @@ -0,0 +1,16 @@ +namespace Microsoft.Extensions.DependencyInjection.Test +{ + using System; + + using Microsoft.ApplicationInsights.Extensibility; + + using Microsoft.Extensions.Options; + + internal static class IServiceProviderExtensions + { + public static TelemetryConfiguration GetTelemetryConfiguration(this IServiceProvider serviceProvider) + { + return serviceProvider.GetRequiredService>().Value; + } + } +} \ No newline at end of file diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/MockLoggingFactory.cs b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/MockLoggingFactory.cs new file mode 100644 index 000000000..b5b548655 --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/MockLoggingFactory.cs @@ -0,0 +1,20 @@ +namespace Microsoft.Extensions.DependencyInjection.Test +{ + using Logging; + + internal class MockLoggingFactory : ILoggerFactory + { + public void Dispose() + { + } + + public ILogger CreateLogger(string categoryName) + { + return null; + } + + public void AddProvider(ILoggerProvider provider) + { + } + } +} \ No newline at end of file diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/HostingDiagnosticListenerTest.cs b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/HostingDiagnosticListenerTest.cs index 0093ead22..dddeb7efa 100644 --- a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/HostingDiagnosticListenerTest.cs +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/HostingDiagnosticListenerTest.cs @@ -24,6 +24,8 @@ using Xunit.Abstractions; using AspNetCoreMajorVersion = Microsoft.ApplicationInsights.AspNetCore.Tests.AspNetCoreMajorVersion; + using RequestResponseHeaders = Microsoft.ApplicationInsights.AspNetCore.DiagnosticListeners.RequestResponseHeaders; + public class HostingDiagnosticListenerTest : IDisposable { diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj index b75959ff4..57128b9af 100644 --- a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj @@ -11,7 +11,6 @@ Microsoft.ApplicationInsights.AspNetCore.Tests Microsoft.ApplicationInsights.AspNetCore.Tests true - 1.1.5 pdbonly true @@ -76,6 +75,15 @@ Always SettingsSingleFileGenerator + + Always + + + Always + + + Always + Always @@ -97,6 +105,12 @@ Always + + Always + + + Always + diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/appsettings.json b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/appsettings.json index 58e380123..0ab6b527b 100644 --- a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/appsettings.json +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/appsettings.json @@ -1,8 +1,9 @@ { "ApplicationInsights": { - "InstrumentationKey": "ikeyhere", + "InstrumentationKey": "33333333-2222-3333-4444-555555555555", "TelemetryChannel": { - "EndpointAddress": "http://hosthere/v2/track/" + "EndpointAddress": "http://hosthere/v2/track/", + "DeveloperMode": true } } } \ No newline at end of file diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/content/config-all-default.json b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/content/config-all-default.json new file mode 100644 index 000000000..aeac384fd --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/content/config-all-default.json @@ -0,0 +1,31 @@ +{ + "ApplicationInsights": { + "InstrumentationKey": "11111111-2222-3333-4444-555555555555", + "ConnectionString": "InstrumentationKey=11111111-2222-3333-4444-555555555555;IngestionEndpoint=http://testendpoint", + "EnableAdaptiveSampling": false, + "EnablePerformanceCounterCollectionModule": true, + "EnableAzureInstanceMetadataTelemetryModule": true, + "EnableRequestTrackingTelemetryModule": true, + "EnableDependencyTrackingTelemetryModule": true, + "EnableAppServicesHeartbeatTelemetryModule": true, + "EnableEventCounterCollectionModule": true, + "AddAutoCollectedMetricExtractor": true, + "EnableQuickPulseMetricStream": true, + "EnableDebugLogger": true, + "EnableHeartbeat": true, + "EnableAuthenticationTrackingJavaScript": false, + "ApplicationVersion": "Version", + "RequestCollectionOptions": { + "InjectResponseHeaders": true, + "TrackExceptions": false, + "EnableW3CDistributedTracing": true + }, + "DependencyCollectionOptions": { + "EnableLegacyCorrelationHeadersInjection": false + }, + "TelemetryChannel": { + "EndpointAddress": "http://testendpoint/v2/track", + "DeveloperMode": true + } + } +} \ No newline at end of file diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/content/config-all-settings-false.json b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/content/config-all-settings-false.json new file mode 100644 index 000000000..71a9ac3b8 --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/content/config-all-settings-false.json @@ -0,0 +1,30 @@ +{ + "ApplicationInsights": { + "InstrumentationKey": "22222222-2222-3333-4444-555555555555", + "ConnectionString": "InstrumentationKey=22222222-2222-3333-4444-555555555555;IngestionEndpoint=http://testendpoint", + "EnableAdaptiveSampling": false, + "EnablePerformanceCounterCollectionModule": false, + "EnableAzureInstanceMetadataTelemetryModule": false, + "EnableRequestTrackingTelemetryModule": false, + "EnableDependencyTrackingTelemetryModule": false, + "EnableAppServicesHeartbeatTelemetryModule": false, + "EnableEventCounterCollectionModule": false, + "AddAutoCollectedMetricExtractor": false, + "EnableQuickPulseMetricStream": false, + "EnableDebugLogger": true, + "EnableHeartbeat": false, + "EnableAuthenticationTrackingJavaScript": false, + "RequestCollectionOptions": { + "InjectResponseHeaders": false, + "TrackExceptions": false, + "EnableW3CDistributedTracing": false + }, + "DependencyCollectionOptions": { + "EnableLegacyCorrelationHeadersInjection": false + }, + "TelemetryChannel": { + "EndpointAddress": "http://testendpoint/v2/track", + "DeveloperMode": false + } + } +} \ No newline at end of file diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/content/config-all-settings-true.json b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/content/config-all-settings-true.json new file mode 100644 index 000000000..4b6ec1c62 --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/content/config-all-settings-true.json @@ -0,0 +1,30 @@ +{ + "ApplicationInsights": { + "InstrumentationKey": "22222222-2222-3333-4444-555555555555", + "ConnectionString": "InstrumentationKey=22222222-2222-3333-4444-555555555555;IngestionEndpoint=http://testendpoint", + "EnableAdaptiveSampling": true, + "EnablePerformanceCounterCollectionModule": true, + "EnableAzureInstanceMetadataTelemetryModule": true, + "EnableRequestTrackingTelemetryModule": true, + "EnableDependencyTrackingTelemetryModule": true, + "EnableAppServicesHeartbeatTelemetryModule": true, + "EnableEventCounterCollectionModule": true, + "AddAutoCollectedMetricExtractor": true, + "EnableQuickPulseMetricStream": true, + "EnableDebugLogger": true, + "EnableHeartbeat": true, + "EnableAuthenticationTrackingJavaScript": true, + "RequestCollectionOptions": { + "InjectResponseHeaders": true, + "TrackExceptions": true, + "EnableW3CDistributedTracing": true + }, + "DependencyCollectionOptions": { + "EnableLegacyCorrelationHeadersInjection": true + }, + "TelemetryChannel": { + "EndpointAddress": "http://testendpoint/v2/track", + "DeveloperMode": true + } + } +} \ No newline at end of file diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/content/config-req-dep-settings-false.json b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/content/config-req-dep-settings-false.json new file mode 100644 index 000000000..05d85d554 --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/content/config-req-dep-settings-false.json @@ -0,0 +1,12 @@ +{ + "ApplicationInsights": { + "RequestCollectionOptions": { + "InjectResponseHeaders": false, + "TrackExceptions": false, + "EnableW3CDistributedTracing": false + }, + "DependencyCollectionOptions": { + "EnableLegacyCorrelationHeadersInjection": false + } + } +} \ No newline at end of file diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/content/config-req-dep-settings-true.json b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/content/config-req-dep-settings-true.json new file mode 100644 index 000000000..63676789a --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/content/config-req-dep-settings-true.json @@ -0,0 +1,12 @@ +{ + "ApplicationInsights": { + "RequestCollectionOptions": { + "InjectResponseHeaders": true, + "TrackExceptions": true, + "EnableW3CDistributedTracing": true + }, + "DependencyCollectionOptions": { + "EnableLegacyCorrelationHeadersInjection": true + } + } +} \ No newline at end of file diff --git a/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/ExtensionsTest.cs b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/ExtensionsTest.cs index 4ea7186a3..3dc9a7ddd 100644 --- a/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/ExtensionsTest.cs +++ b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/ExtensionsTest.cs @@ -16,6 +16,8 @@ using System.IO; using System.Linq; using Xunit; using Xunit.Abstractions; +using System.Reflection; +using Microsoft.Extensions.Options; namespace Microsoft.ApplicationInsights.WorkerService.Tests { @@ -33,6 +35,50 @@ namespace Microsoft.ApplicationInsights.WorkerService.Tests this.output.WriteLine("Initialized"); } + public static ServiceCollection CreateServicesAndAddApplicationinsightsWorker(string jsonPath, Action serviceOptions = null, bool useDefaultConfig = true) + { + IConfigurationRoot config; + var services = new ServiceCollection(); + + if (jsonPath != null) + { + var jsonFullPath = Path.Combine(Directory.GetCurrentDirectory(), jsonPath); + Console.WriteLine("json:" + jsonFullPath); + try + { + config = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory()).AddJsonFile(jsonFullPath).Build(); + } + catch (Exception) + { + throw new Exception("Unable to build with json:" + jsonFullPath); + } + } + else + { + var configBuilder = new ConfigurationBuilder() + .AddJsonFile(Path.Combine(Directory.GetCurrentDirectory(), "appsettings.json"), true) + .AddEnvironmentVariables(); + config = configBuilder.Build(); + } + + if (useDefaultConfig) + { + services.AddSingleton(config); + services.AddApplicationInsightsTelemetryWorkerService(); + } + else + { + services.AddApplicationInsightsTelemetryWorkerService(config); + } + + if (serviceOptions != null) + { + services.Configure(serviceOptions); + } + + return services; + } + private static ServiceCollection CreateServicesAndAddApplicationinsightsWorker(Action serviceOptions = null) { var services = new ServiceCollection(); @@ -126,15 +172,22 @@ namespace Microsoft.ApplicationInsights.WorkerService.Tests /// /// Tests that the connection string can be read from a JSON file by the configuration factory. /// - [Fact] + /// + /// Calls services.AddApplicationInsightsTelemetryWorkerService() when the value is true and reads IConfiguration from user application automatically. + /// Else, it invokes services.AddApplicationInsightsTelemetryWorkerService(configuration) where IConfiguration object is supplied by caller. + /// + [Theory] + [InlineData(true)] + [InlineData(false)] [Trait("Trait", "ConnectionString")] - public void ReadsConnectionStringFromConfiguration() + public void ReadsConnectionStringFromConfiguration(bool useDefaultConfig) { var jsonFullPath = Path.Combine(Directory.GetCurrentDirectory(), "content", "config-connection-string.json"); this.output.WriteLine("json:" + jsonFullPath); var config = new ConfigurationBuilder().AddJsonFile(jsonFullPath).Build(); - var services = new ServiceCollection(); + + var services = CreateServicesAndAddApplicationinsightsWorker(jsonFullPath, null, useDefaultConfig); services.AddApplicationInsightsTelemetryWorkerService(config); IServiceProvider serviceProvider = services.BuildServiceProvider(); @@ -414,6 +467,470 @@ namespace Microsoft.ApplicationInsights.WorkerService.Tests // VERIFY Assert.Contains(expected, mockItem.Context.Cloud.RoleInstance, StringComparison.CurrentCultureIgnoreCase); } + + /// + /// User could enable or disable PerformanceCounterCollectionModule by setting EnablePerformanceCounterCollectionModule. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetryWorkerService() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetryWorkerService(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property EnablePerformanceCounterCollectionModule. + [Theory] + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void UserCanEnableAndDisablePerfCollectorModule(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine(Directory.GetCurrentDirectory(), "content", "config-all-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.EnablePerformanceCounterCollectionModule = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsWorker(filePath, serviceOptions, configType == "DefaultConfiguration" ? true : false); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var modules = serviceProvider.GetServices(); + Assert.NotNull(modules); + + // Even if a module is disabled its still added to DI. + Assert.NotEmpty(modules.OfType()); + + // Get telemetry client to trigger TelemetryConfig setup. + var tc = serviceProvider.GetService(); + + Type perfModuleType = typeof(PerformanceCollectorModule); + PerformanceCollectorModule perfModule = (PerformanceCollectorModule)modules.FirstOrDefault(m => m.GetType() == perfModuleType); + // Get the PerformanceCollectorModule private field value for isInitialized. + FieldInfo isInitializedField = perfModuleType.GetField("isInitialized", BindingFlags.NonPublic | BindingFlags.Instance); + // PerformanceCollectorModule.isInitialized is set to true when EnablePerformanceCounterCollectionModule is enabled, else it is set to false. + Assert.Equal(isEnable, (bool)isInitializedField.GetValue(perfModule)); + } + + /// + /// User could enable or disable EventCounterCollectionModule by setting EnableEventCounterCollectionModule. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetryWorkerService() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetryWorkerService(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property EnableEventCounterCollectionModule. + [Theory] + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void UserCanEnableAndDisableEventCounterCollectorModule(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine(Directory.GetCurrentDirectory(), "content", "config-all-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.EnableEventCounterCollectionModule = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsWorker(filePath, serviceOptions, configType == "DefaultConfiguration" ? true : false); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var modules = serviceProvider.GetServices(); + Assert.NotNull(modules); + + // Even if a module is disabled its still added to DI. + Assert.NotEmpty(modules.OfType()); + + // Get telemetry client to trigger TelemetryConfig setup. + var tc = serviceProvider.GetService(); + + Type eventCollectorModuleType = typeof(EventCounterCollectionModule); + EventCounterCollectionModule eventCollectorModule = (EventCounterCollectionModule)modules.FirstOrDefault(m => m.GetType() == eventCollectorModuleType); + // Get the EventCounterCollectionModule private field value for isInitialized. + FieldInfo isInitializedField = eventCollectorModuleType.GetField("isInitialized", BindingFlags.NonPublic | BindingFlags.Instance); + // EventCounterCollectionModule.isInitialized is set to true when EnableEventCounterCollectionModule is enabled, else it is set to false. + Assert.Equal(isEnable, (bool)isInitializedField.GetValue(eventCollectorModule)); + } + + /// + /// User could enable or disable DependencyTrackingTelemetryModule by setting EnableDependencyTrackingTelemetryModule. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetryWorkerService() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetryWorkerService(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property EnableDependencyTrackingTelemetryModule. + [Theory] + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void UserCanEnableAndDisableDependencyCollectorModule(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-all-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.EnableDependencyTrackingTelemetryModule = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsWorker(filePath, serviceOptions, configType == "DefaultConfiguration" ? true : false); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var modules = serviceProvider.GetServices(); + Assert.NotNull(modules); + + // Even if a module is disabled its still added to DI. + Assert.NotEmpty(modules.OfType()); + + // Get telemetry client to trigger TelemetryConfig setup. + var tc = serviceProvider.GetService(); + + Type dependencyModuleType = typeof(DependencyTrackingTelemetryModule); + DependencyTrackingTelemetryModule dependencyModule = (DependencyTrackingTelemetryModule)modules.FirstOrDefault(m => m.GetType() == dependencyModuleType); + // Get the DependencyTrackingTelemetryModule private field value for isInitialized. + FieldInfo isInitializedField = dependencyModuleType.GetField("isInitialized", BindingFlags.NonPublic | BindingFlags.Instance); + // DependencyTrackingTelemetryModule.isInitialized is set to true when EnableDependencyTrackingTelemetryModule is enabled, else it is set to false. + Assert.Equal(isEnable, (bool)isInitializedField.GetValue(dependencyModule)); + } + + /// + /// User could enable or disable QuickPulseCollectorModule by setting EnableQuickPulseMetricStream. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetryWorkerService() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetryWorkerService(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property EnableQuickPulseMetricStream. + [Theory] + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void UserCanEnableAndDisableQuickPulseCollectorModule(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-all-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.EnableQuickPulseMetricStream = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsWorker(filePath, serviceOptions, configType == "DefaultConfiguration" ? true : false); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var modules = serviceProvider.GetServices(); + Assert.NotNull(modules); + + // Even if a module is disabled its still added to DI. + Assert.NotEmpty(modules.OfType()); + + // Get telemetry client to trigger TelemetryConfig setup. + var tc = serviceProvider.GetService(); + + Type quickPulseModuleType = typeof(QuickPulseTelemetryModule); + QuickPulseTelemetryModule quickPulseModule = (QuickPulseTelemetryModule)modules.FirstOrDefault(m => m.GetType() == quickPulseModuleType); + // Get the QuickPulseTelemetryModule private field value for isInitialized. + FieldInfo isInitializedField = quickPulseModuleType.GetField("isInitialized", BindingFlags.NonPublic | BindingFlags.Instance); + // QuickPulseTelemetryModule.isInitialized is set to true when EnableQuickPulseMetricStream is enabled, else it is set to false. + Assert.Equal(isEnable, (bool)isInitializedField.GetValue(quickPulseModule)); + } + + /// + /// User could enable or disable AzureInstanceMetadataModule by setting EnableAzureInstanceMetadataTelemetryModule. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetryWorkerService() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetryWorkerService(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property EnableAzureInstanceMetadataTelemetryModule. + [Theory] + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void UserCanEnableAndDisableAzureInstanceMetadataModule(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-all-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.EnableAzureInstanceMetadataTelemetryModule = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsWorker(filePath, serviceOptions, configType == "DefaultConfiguration" ? true : false); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var modules = serviceProvider.GetServices(); + Assert.NotNull(modules); + + // Even if a module is disabled its still added to DI. + Assert.NotEmpty(modules.OfType()); + + // Get telemetry client to trigger TelemetryConfig setup. + var tc = serviceProvider.GetService(); + + AzureInstanceMetadataTelemetryModule azureInstanceMetadataModule = modules.OfType().Single(); + Assert.Equal(isEnable, azureInstanceMetadataModule.IsInitialized); + } + + /// + /// User could enable or disable LegacyCorrelationHeadersInjection of DependencyCollectorOptions. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetryWorkerService() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetryWorkerService(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property EnableLegacyCorrelationHeadersInjection. + [Theory] + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesDependencyCollectorWithCustomValues(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-req-dep-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.DependencyCollectionOptions.EnableLegacyCorrelationHeadersInjection = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsWorker(filePath, serviceOptions, configType == "DefaultConfiguration" ? true : false); + + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var modules = serviceProvider.GetServices(); + + // Requesting TelemetryConfiguration from services trigger constructing the TelemetryConfiguration + // which in turn trigger configuration of all modules. + var telemetryConfiguration = serviceProvider.GetRequiredService>().Value; + + var dependencyModule = modules.OfType().Single(); + // Get telemetry client to trigger TelemetryConfig setup. + var tc = serviceProvider.GetService(); + + // VALIDATE + Assert.Equal(isEnable ? 6 : 4, dependencyModule.ExcludeComponentCorrelationHttpHeadersOnDomains.Count); + Assert.Equal(isEnable, dependencyModule.ExcludeComponentCorrelationHttpHeadersOnDomains.Contains("localhost") ? true : false); + Assert.Equal(isEnable, dependencyModule.ExcludeComponentCorrelationHttpHeadersOnDomains.Contains("127.0.0.1") ? true : false); + } + + /// + /// User could enable or disable sampling by setting EnableAdaptiveSampling. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetryWorkerService() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetryWorkerService(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property EnableAdaptiveSampling. + [Theory] + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void DoesNotAddSamplingToConfigurationIfExplicitlyControlledThroughParameter(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-all-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.EnableAdaptiveSampling = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsWorker(filePath, serviceOptions, configType == "DefaultConfiguration" ? true : false); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetRequiredService>().Value; + var qpProcessorCount = GetTelemetryProcessorsCountInConfigurationDefaultSink(telemetryConfiguration); + // There will be 2 separate SamplingTelemetryProcessors - one for Events, and other for everything else. + Assert.Equal(isEnable ? 2 : 0, qpProcessorCount); + } + + /// + /// User could enable or disable auto collected metrics by setting AddAutoCollectedMetricExtractor. + /// This configuration can be read from a JSON file by the configuration factory or through code by passing ApplicationInsightsServiceOptions. + /// + /// + /// DefaultConfiguration - calls services.AddApplicationInsightsTelemetryWorkerService() which reads IConfiguration from user application automatically. + /// SuppliedConfiguration - invokes services.AddApplicationInsightsTelemetryWorkerService(configuration) where IConfiguration object is supplied by caller. + /// Code - Caller creates an instance of ApplicationInsightsServiceOptions and passes it. This option overrides all configuration being used in JSON file. + /// There is a special case where NULL values in these properties - InstrumentationKey, ConnectionString, EndpointAddress and DeveloperMode are overwritten. We check IConfiguration object to see if these properties have values, if values are present then we override it. + /// + /// Sets the value for property AddAutoCollectedMetricExtractor. + [Theory] + [InlineData("DefaultConfiguration", true)] + [InlineData("DefaultConfiguration", false)] + [InlineData("SuppliedConfiguration", true)] + [InlineData("SuppliedConfiguration", false)] + [InlineData("Code", true)] + [InlineData("Code", false)] + public static void DoesNotAddAutoCollectedMetricsExtractorToConfigurationIfExplicitlyControlledThroughParameter(string configType, bool isEnable) + { + // ARRANGE + Action serviceOptions = null; + var filePath = Path.Combine("content", "config-all-settings-" + isEnable.ToString().ToLower() + ".json"); + + if (configType == "Code") + { + serviceOptions = o => { o.AddAutoCollectedMetricExtractor = isEnable; }; + filePath = null; + } + + // ACT + var services = CreateServicesAndAddApplicationinsightsWorker(filePath, serviceOptions, configType == "DefaultConfiguration" ? true : false); + + // VALIDATE + IServiceProvider serviceProvider = services.BuildServiceProvider(); + var telemetryConfiguration = serviceProvider.GetRequiredService>().Value; + var metricExtractorProcessorCount = GetTelemetryProcessorsCountInConfigurationDefaultSink(telemetryConfiguration); + Assert.Equal(isEnable ? 1 : 0, metricExtractorProcessorCount); + } + + /// + /// Creates two copies of ApplicationInsightsServiceOptions. First object is created by calling services.AddApplicationInsightsTelemetryWorkerService() or services.AddApplicationInsightsTelemetryWorkerService(config). + /// Second object is created directly from configuration file without using any of SDK functionality. + /// Compares ApplicationInsightsServiceOptions object from dependency container and one created directly from configuration. + /// This proves all that SDK read configuration successfully from configuration file. + /// Properties from appSettings.json, appsettings.{env.EnvironmentName}.json and Environmental Variables are read if no IConfiguration is supplied or used in an application. + /// + /// If this is set, read value from appsettings.json, else from passed file. + /// + /// Calls services.AddApplicationInsightsTelemetryWorkerService() when the value is true and reads IConfiguration from user application automatically. + /// Else, it invokes services.AddApplicationInsightsTelemetryWorkerService(configuration) where IConfiguration object is supplied by caller. + /// + [Theory] + [InlineData(true, true)] + [InlineData(true, false)] + [InlineData(false, true)] + [InlineData(false, false)] + public static void ReadsSettingsFromDefaultAndSuppliedConfiguration(bool readFromAppSettings, bool useDefaultConfig) + { + // ARRANGE + IConfigurationBuilder configBuilder = null; + var fileName = "config-all-default.json"; + + // ACT + var services = CreateServicesAndAddApplicationinsightsWorker( + readFromAppSettings ? null : Path.Combine("content", fileName), + null, useDefaultConfig); + + // VALIDATE + + // Generate config and don't pass to services + // this is directly generated from config file + // which could be used to validate the data from dependency container + + if (!readFromAppSettings) + { + configBuilder = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()); + if (useDefaultConfig) + { + configBuilder.AddJsonFile("appsettings.json", false); + } + configBuilder.AddJsonFile(Path.Combine("content", fileName)); + } + else + { + configBuilder = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) + .AddJsonFile("appsettings.json", false); + } + + var config = configBuilder.Build(); + + // Compare ApplicationInsightsServiceOptions from dependency container and configuration + IServiceProvider serviceProvider = services.BuildServiceProvider(); + // ApplicationInsightsServiceOptions from dependency container + var servicesOptions = serviceProvider.GetRequiredService>().Value; + + // Create ApplicationInsightsServiceOptions from configuration for validation. + var aiOptions = new ApplicationInsightsServiceOptions(); + config.GetSection("ApplicationInsights").Bind(aiOptions); + config.GetSection("ApplicationInsights:TelemetryChannel").Bind(aiOptions); + + Type optionsType = typeof(ApplicationInsightsServiceOptions); + PropertyInfo[] properties = optionsType.GetProperties(BindingFlags.Public | BindingFlags.Instance); + Assert.True(properties.Length > 0); + foreach (PropertyInfo property in properties) + { + Assert.Equal(property.GetValue(aiOptions)?.ToString(), property.GetValue(servicesOptions)?.ToString()); + } + } + + private static int GetTelemetryProcessorsCountInConfigurationDefaultSink(TelemetryConfiguration telemetryConfiguration) + { + return telemetryConfiguration.DefaultTelemetrySink.TelemetryProcessors.Where(processor => processor.GetType() == typeof(T)).Count(); + } } internal class FakeTelemetryInitializer : ITelemetryInitializer diff --git a/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/Microsoft.ApplicationInsights.WorkerService.Tests.csproj b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/Microsoft.ApplicationInsights.WorkerService.Tests.csproj index 2b03d67c9..f13bb1b0c 100644 --- a/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/Microsoft.ApplicationInsights.WorkerService.Tests.csproj +++ b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/Microsoft.ApplicationInsights.WorkerService.Tests.csproj @@ -1,5 +1,7 @@  + + netcoreapp2.1;netcoreapp3.1 @@ -25,12 +27,42 @@ + + Always + + + Always + + + Always + + + Always + + + Always + Always + + Always + + + Always + Always + + Always + + + Always + + + Always + Always diff --git a/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/appsettings.json b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/appsettings.json new file mode 100644 index 000000000..0ab6b527b --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/appsettings.json @@ -0,0 +1,9 @@ +{ + "ApplicationInsights": { + "InstrumentationKey": "33333333-2222-3333-4444-555555555555", + "TelemetryChannel": { + "EndpointAddress": "http://hosthere/v2/track/", + "DeveloperMode": true + } + } +} \ No newline at end of file diff --git a/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-all-default.json b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-all-default.json new file mode 100644 index 000000000..aeac384fd --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-all-default.json @@ -0,0 +1,31 @@ +{ + "ApplicationInsights": { + "InstrumentationKey": "11111111-2222-3333-4444-555555555555", + "ConnectionString": "InstrumentationKey=11111111-2222-3333-4444-555555555555;IngestionEndpoint=http://testendpoint", + "EnableAdaptiveSampling": false, + "EnablePerformanceCounterCollectionModule": true, + "EnableAzureInstanceMetadataTelemetryModule": true, + "EnableRequestTrackingTelemetryModule": true, + "EnableDependencyTrackingTelemetryModule": true, + "EnableAppServicesHeartbeatTelemetryModule": true, + "EnableEventCounterCollectionModule": true, + "AddAutoCollectedMetricExtractor": true, + "EnableQuickPulseMetricStream": true, + "EnableDebugLogger": true, + "EnableHeartbeat": true, + "EnableAuthenticationTrackingJavaScript": false, + "ApplicationVersion": "Version", + "RequestCollectionOptions": { + "InjectResponseHeaders": true, + "TrackExceptions": false, + "EnableW3CDistributedTracing": true + }, + "DependencyCollectionOptions": { + "EnableLegacyCorrelationHeadersInjection": false + }, + "TelemetryChannel": { + "EndpointAddress": "http://testendpoint/v2/track", + "DeveloperMode": true + } + } +} \ No newline at end of file diff --git a/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-all-settings-false.json b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-all-settings-false.json new file mode 100644 index 000000000..71a9ac3b8 --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-all-settings-false.json @@ -0,0 +1,30 @@ +{ + "ApplicationInsights": { + "InstrumentationKey": "22222222-2222-3333-4444-555555555555", + "ConnectionString": "InstrumentationKey=22222222-2222-3333-4444-555555555555;IngestionEndpoint=http://testendpoint", + "EnableAdaptiveSampling": false, + "EnablePerformanceCounterCollectionModule": false, + "EnableAzureInstanceMetadataTelemetryModule": false, + "EnableRequestTrackingTelemetryModule": false, + "EnableDependencyTrackingTelemetryModule": false, + "EnableAppServicesHeartbeatTelemetryModule": false, + "EnableEventCounterCollectionModule": false, + "AddAutoCollectedMetricExtractor": false, + "EnableQuickPulseMetricStream": false, + "EnableDebugLogger": true, + "EnableHeartbeat": false, + "EnableAuthenticationTrackingJavaScript": false, + "RequestCollectionOptions": { + "InjectResponseHeaders": false, + "TrackExceptions": false, + "EnableW3CDistributedTracing": false + }, + "DependencyCollectionOptions": { + "EnableLegacyCorrelationHeadersInjection": false + }, + "TelemetryChannel": { + "EndpointAddress": "http://testendpoint/v2/track", + "DeveloperMode": false + } + } +} \ No newline at end of file diff --git a/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-all-settings-true.json b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-all-settings-true.json new file mode 100644 index 000000000..4b6ec1c62 --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-all-settings-true.json @@ -0,0 +1,30 @@ +{ + "ApplicationInsights": { + "InstrumentationKey": "22222222-2222-3333-4444-555555555555", + "ConnectionString": "InstrumentationKey=22222222-2222-3333-4444-555555555555;IngestionEndpoint=http://testendpoint", + "EnableAdaptiveSampling": true, + "EnablePerformanceCounterCollectionModule": true, + "EnableAzureInstanceMetadataTelemetryModule": true, + "EnableRequestTrackingTelemetryModule": true, + "EnableDependencyTrackingTelemetryModule": true, + "EnableAppServicesHeartbeatTelemetryModule": true, + "EnableEventCounterCollectionModule": true, + "AddAutoCollectedMetricExtractor": true, + "EnableQuickPulseMetricStream": true, + "EnableDebugLogger": true, + "EnableHeartbeat": true, + "EnableAuthenticationTrackingJavaScript": true, + "RequestCollectionOptions": { + "InjectResponseHeaders": true, + "TrackExceptions": true, + "EnableW3CDistributedTracing": true + }, + "DependencyCollectionOptions": { + "EnableLegacyCorrelationHeadersInjection": true + }, + "TelemetryChannel": { + "EndpointAddress": "http://testendpoint/v2/track", + "DeveloperMode": true + } + } +} \ No newline at end of file diff --git a/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-connection-string-and-instrumentation-key.json b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-connection-string-and-instrumentation-key.json new file mode 100644 index 000000000..4d837ba82 --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-connection-string-and-instrumentation-key.json @@ -0,0 +1,6 @@ +{ + "ApplicationInsights": { + "ConnectionString": "InstrumentationKey=11111111-2222-3333-4444-555555555555;IngestionEndpoint=http://127.0.0.1", + "InstrumentationKey": "33333333-4444-5555-6666-777777777777" + } + } \ No newline at end of file diff --git a/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-developer-mode.json b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-developer-mode.json new file mode 100644 index 000000000..9e7541ca0 --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-developer-mode.json @@ -0,0 +1,7 @@ +{ + "ApplicationInsights": { + "TelemetryChannel": { + "DeveloperMode": true + } + } +} \ No newline at end of file diff --git a/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-endpoint-address.json b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-endpoint-address.json new file mode 100644 index 000000000..7fd7c6b27 --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-endpoint-address.json @@ -0,0 +1,7 @@ +{ + "ApplicationInsights": { + "TelemetryChannel": { + "EndpointAddress": "http://localhost:1234/v2/track/" + } + } +} \ No newline at end of file diff --git a/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-instrumentation-key.json b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-instrumentation-key.json new file mode 100644 index 000000000..253df2343 --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-instrumentation-key.json @@ -0,0 +1,5 @@ +{ + "ApplicationInsights": { + "InstrumentationKey": "11111111-2222-3333-4444-555555555555" + } +} \ No newline at end of file diff --git a/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-req-dep-settings-false.json b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-req-dep-settings-false.json new file mode 100644 index 000000000..05d85d554 --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-req-dep-settings-false.json @@ -0,0 +1,12 @@ +{ + "ApplicationInsights": { + "RequestCollectionOptions": { + "InjectResponseHeaders": false, + "TrackExceptions": false, + "EnableW3CDistributedTracing": false + }, + "DependencyCollectionOptions": { + "EnableLegacyCorrelationHeadersInjection": false + } + } +} \ No newline at end of file diff --git a/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-req-dep-settings-true.json b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-req-dep-settings-true.json new file mode 100644 index 000000000..63676789a --- /dev/null +++ b/NETCORE/test/Microsoft.ApplicationInsights.WorkerService.Tests/content/config-req-dep-settings-true.json @@ -0,0 +1,12 @@ +{ + "ApplicationInsights": { + "RequestCollectionOptions": { + "InjectResponseHeaders": true, + "TrackExceptions": true, + "EnableW3CDistributedTracing": true + }, + "DependencyCollectionOptions": { + "EnableLegacyCorrelationHeadersInjection": true + } + } +} \ No newline at end of file diff --git a/ProjectsForSigning.sln b/ProjectsForSigning.sln index dda2b65fd..5913ce6ee 100644 --- a/ProjectsForSigning.sln +++ b/ProjectsForSigning.sln @@ -81,58 +81,31 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "C) WorkerService", "C) Work EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Common.NetCore", "NETCORE\src\Shared\Common.NetCore.shproj", "{D56F2979-D6BC-4EF2-BB9B-4077B3290599}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "DependencyCollector.Shared", "WEB\Src\DependencyCollector\Shared\DependencyCollector.Shared.shproj", "{669E7E58-072D-4B0A-A4DD-4EB2AE2EA4D4}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Filtering.Shared", "WEB\Src\PerformanceCollector\Filtering.Shared\Filtering.Shared.shproj", "{568AEB4F-BA4C-47A5-9FA3-68F06CD11FED}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared", "WEB\Src\PerformanceCollector\Perf.Shared\Perf.Shared.shproj", "{A78F50D4-F518-4DCB-878B-526FD54CCA35}" -EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetFull", "WEB\Src\PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.shproj", "{0196259C-3582-4F4E-A01F-A8F9AE83B0F3}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetStandard", "WEB\Src\PerformanceCollector\Perf.Shared.NetStandard\Perf.Shared.NetStandard.shproj", "{D13C3EC7-B300-4158-9054-216156B203BE}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetStandard20", "WEB\Src\PerformanceCollector\Perf.Shared.NetStandard20\Perf.Shared.NetStandard20.shproj", "{A8BA3BD0-19CE-488D-B2BD-0B9B677F4E03}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetStandard20Net45", "WEB\Src\PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.shproj", "{054C25DC-E545-4712-95C4-81F30CF65CE8}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Web.Shared", "WEB\Src\Web\Web.Shared.Net\Web.Shared.shproj", "{395E03BB-D061-4C9D-9D47-18676566444D}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "WindowsServer.Shared", "WEB\Src\WindowsServer\WindowsServer.Shared\WindowsServer.Shared.shproj", "{579F42E8-B711-411E-BE52-4A3FD208507F}" -EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution WEB\Src\PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.projitems*{0196259c-3582-4f4e-a01f-a8f9ae83b0f3}*SharedItemsImports = 13 - WEB\Src\PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.projitems*{054c25dc-e545-4712-95c4-81f30cf65ce8}*SharedItemsImports = 13 WEB\Src\Common\Common.projitems*{13335eb8-3936-407a-9363-1c428318bea8}*SharedItemsImports = 5 LOGGING\src\CommonShared\CommonShared.projitems*{1b0f54bf-078a-421c-9708-2d817d4bce30}*SharedItemsImports = 5 LOGGING\src\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{1b0f54bf-078a-421c-9708-2d817d4bce30}*SharedItemsImports = 5 LOGGING\src\CommonShared\CommonShared.projitems*{2612ac44-5ff3-4533-b5a5-e5dbf96f5c83}*SharedItemsImports = 5 LOGGING\src\CommonShared\CommonShared.projitems*{2e283031-425b-421f-9e81-34abfefab618}*SharedItemsImports = 5 LOGGING\src\CommonShared\CommonShared.projitems*{3774003c-91fd-4d79-99c7-9beac5b9a48e}*SharedItemsImports = 5 - WEB\Src\Web\Web.Shared.Net\Web.Shared.Net.projitems*{395e03bb-d061-4c9d-9d47-18676566444d}*SharedItemsImports = 13 NETCORE\src\Shared\Shared.projitems*{3cab7f66-3cc4-4b46-9b0d-765c460fe2bf}*SharedItemsImports = 5 LOGGING\src\CommonShared\CommonShared.projitems*{52b3c054-c686-4bb8-a4b7-9e8d6c49491f}*SharedItemsImports = 5 LOGGING\src\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{52b3c054-c686-4bb8-a4b7-9e8d6c49491f}*SharedItemsImports = 5 - WEB\Src\PerformanceCollector\Filtering.Shared\Filtering.Shared.projitems*{568aeb4f-ba4c-47a5-9fa3-68f06cd11fed}*SharedItemsImports = 13 - WEB\Src\WindowsServer\WindowsServer.Shared\WindowsServer.Shared.projitems*{579f42e8-b711-411e-be52-4a3fd208507f}*SharedItemsImports = 13 LOGGING\src\CommonShared\CommonShared.projitems*{587b624b-8c64-498e-93d7-a2d2abc17eab}*SharedItemsImports = 13 LOGGING\src\CommonShared\CommonShared.projitems*{63b8fda7-2ff5-4a20-8de7-ebb036012a54}*SharedItemsImports = 5 - WEB\Src\DependencyCollector\Shared\DependencyCollector.Shared.projitems*{669e7e58-072d-4b0a-a4dd-4eb2ae2ea4d4}*SharedItemsImports = 13 LOGGING\src\CommonShared\CommonShared.projitems*{67291093-4b5f-4ca5-a811-b8a1dcbe3f1f}*SharedItemsImports = 5 WEB\Src\Common\Common.projitems*{7b5d95ee-50ee-4222-a03c-fae5905b3dfd}*SharedItemsImports = 5 - WEB\Src\WindowsServer\WindowsServer.Shared\WindowsServer.Shared.projitems*{7b5d95ee-50ee-4222-a03c-fae5905b3dfd}*SharedItemsImports = 5 WEB\Src\Common\Common.projitems*{8293bc71-7ddc-4dd1-8807-280eef7e752d}*SharedItemsImports = 5 - WEB\Src\Web\Web.Shared.Net\Web.Shared.Net.projitems*{8293bc71-7ddc-4dd1-8807-280eef7e752d}*SharedItemsImports = 5 BASE\src\Common\Common\Common.projitems*{936af739-4297-4016-9d70-4280042709be}*SharedItemsImports = 13 WEB\Src\Common\Common.projitems*{96a6e04e-ceda-4c30-8eca-48113382afba}*SharedItemsImports = 5 - WEB\Src\DependencyCollector\Shared\DependencyCollector.Shared.projitems*{96a6e04e-ceda-4c30-8eca-48113382afba}*SharedItemsImports = 5 WEB\Src\Common\Common.projitems*{9dc5c5e5-fc37-4e54-81fd-aa42bb934e9b}*SharedItemsImports = 5 - WEB\Src\PerformanceCollector\Filtering.Shared\Filtering.Shared.projitems*{9dc5c5e5-fc37-4e54-81fd-aa42bb934e9b}*SharedItemsImports = 5 WEB\Src\PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.projitems*{9dc5c5e5-fc37-4e54-81fd-aa42bb934e9b}*SharedItemsImports = 5 - WEB\Src\PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.projitems*{9dc5c5e5-fc37-4e54-81fd-aa42bb934e9b}*SharedItemsImports = 5 - WEB\Src\PerformanceCollector\Perf.Shared\Perf.Shared.projitems*{9dc5c5e5-fc37-4e54-81fd-aa42bb934e9b}*SharedItemsImports = 5 - WEB\Src\PerformanceCollector\Perf.Shared\Perf.Shared.projitems*{a78f50d4-f518-4dcb-878b-526fd54cca35}*SharedItemsImports = 13 - WEB\Src\PerformanceCollector\Perf.Shared.NetStandard20\Perf.Shared.NetStandard20.projitems*{a8ba3bd0-19ce-488d-b2bd-0b9b677f4e03}*SharedItemsImports = 13 LOGGING\src\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{a964de6d-9750-4013-8be2-79c2afc056e5}*SharedItemsImports = 13 NETCORE\src\Shared\Shared.projitems*{ac399f09-b465-4cfd-8d82-f1d1c5c9347e}*SharedItemsImports = 5 BASE\src\Common\Common\Common.projitems*{c30a7eb8-a86c-49ee-927e-7d9e03572e82}*SharedItemsImports = 5 @@ -237,15 +210,8 @@ Global {2612AC44-5FF3-4533-B5A5-E5DBF96F5C83} = {AFEB7CAA-A8BF-4D03-A5CB-BFC5AE378201} {AC399F09-B465-4CFD-8D82-F1D1C5C9347E} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0} {3CAB7F66-3CC4-4B46-9B0D-765C460FE2BF} = {D8483C3E-C386-48AD-B935-700A54FDCF31} - {669E7E58-072D-4B0A-A4DD-4EB2AE2EA4D4} = {005BD823-60AF-406E-AC20-842D7653FE60} - {568AEB4F-BA4C-47A5-9FA3-68F06CD11FED} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} - {A78F50D4-F518-4DCB-878B-526FD54CCA35} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} {0196259C-3582-4F4E-A01F-A8F9AE83B0F3} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} {D13C3EC7-B300-4158-9054-216156B203BE} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} - {A8BA3BD0-19CE-488D-B2BD-0B9B677F4E03} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} - {054C25DC-E545-4712-95C4-81F30CF65CE8} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96} - {395E03BB-D061-4C9D-9D47-18676566444D} = {07076842-9CAA-4B4A-8AEF-88DE88CD37AC} - {579F42E8-B711-411E-BE52-4A3FD208507F} = {11AC7235-167E-40B5-B2E3-9CBF08700064} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0E0415AF-37CC-4999-8E5B-DD36F75BFD4D} diff --git a/Readme.md b/Readme.md index b01e889de..bd20237be 100644 --- a/Readme.md +++ b/Readme.md @@ -1,153 +1,74 @@ -# Please pardon our progress -We are currently in the process of consolidating our repos. -This Readme will be updated as we make significant changes. +# Application Insights for .NET Apps +This is the .NET SDK for sending data to [Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/overview) & [Application Insights](https://docs.microsoft.com/azure/azure-monitor/app/app-insights-overview). + + + +## Getting Started +Please review our How-to guides to review which packages are appropriate for your project: +- [Console App](https://docs.microsoft.com/azure/azure-monitor/app/console) +- [ASP.NET](https://docs.microsoft.com/azure/azure-monitor/app/asp-net) +- [ASP.NET Core](https://docs.microsoft.com/azure/azure-monitor/app/asp-net-core) +- [ILogger](https://docs.microsoft.com/azure/azure-monitor/app/ilogger) +- [WorkerService](https://docs.microsoft.com/azure/azure-monitor/app/worker-service) + + + +### Understanding our SDK +We've gathered a list of concepts, code examples, and links to full guides [here](.docs/concepts.md). + + + +## Contributing +We strongly welcome and encourage contributions to this project. +Please review our [Contributing guide](.github/CONTRIBUTING.md). + + + +## Branches +- [master](https://github.com/Microsoft/ApplicationInsights-dotnet/tree/master) contains the *latest* published release located on [NuGet](https://www.nuget.org/packages/Microsoft.ApplicationInsights). +- [develop](https://github.com/Microsoft/ApplicationInsights-dotnet/tree/develop) contains the code for the *next* release. -As of October 25, The contents of each former repo can be found in the sub folders; BASE, WEB, LOGGING, NETCORE. ## NuGet packages +The following packages are published from this repository: -**Base SDKs** -- [Microsoft.ApplicationInsights](https://www.nuget.org/packages/Microsoft.ApplicationInsights/) -[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.svg)](https://www.nuget.org/packages/Microsoft.ApplicationInsights/) -- [Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel](https://www.nuget.org/packages/Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel) -[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.svg)](https://www.nuget.org/packages/Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel/) - -**Web SDKs** -- [Microsoft.ApplicationInsights.Web](https://www.nuget.org/packages/Microsoft.ApplicationInsights.Web/) -[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.Web.svg)](https://nuget.org/packages/Microsoft.ApplicationInsights.Web) -- [Microsoft.ApplicationInsights.DependencyCollector](https://www.nuget.org/packages/Microsoft.ApplicationInsights.DependencyCollector/) -[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.DependencyCollector.svg)](https://nuget.org/packages/Microsoft.ApplicationInsights.DependencyCollector) -- [Microsoft.ApplicationInsights.EventCounterCollector](https://www.nuget.org/packages/Microsoft.ApplicationInsights.EventCounterCollector) -[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.EventCounterCollector.svg)](https://nuget.org/packages/Microsoft.ApplicationInsights.EventCounterCollector) -- [Microsoft.ApplicationInsights.PerfCounterCollector](https://www.nuget.org/packages/Microsoft.ApplicationInsights.PerfCounterCollector/) -[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.PerfCounterCollector.svg)](https://nuget.org/packages/Microsoft.ApplicationInsights.PerfCounterCollector) -- [Microsoft.ApplicationInsights.WindowsServer](https://www.nuget.org/packages/Microsoft.ApplicationInsights.WindowsServer/) -[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.WindowsServer.svg)](https://nuget.org/packages/Microsoft.ApplicationInsights.WindowsServer) -- [Microsoft.AspNet.ApplicationInsights.HostingStartup](https://www.nuget.org/packages/Microsoft.AspNet.ApplicationInsights.HostingStartup/) -[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.AspNet.ApplicationInsights.HostingStartup.svg)](https://nuget.org/packages/Microsoft.AspNet.ApplicationInsights.HostingStartup) - -**Logging Adapters** -- For ILogger: - [Microsoft.Extensions.Logging.ApplicationInsights](https://www.nuget.org/packages/Microsoft.Extensions.Logging.ApplicationInsights/) -[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.Extensions.Logging.ApplicationInsights.svg)](https://www.nuget.org/packages/Microsoft.Extensions.Logging.ApplicationInsights/) -- For NLog: - [Microsoft.ApplicationInsights.NLogTarget](http://www.nuget.org/packages/Microsoft.ApplicationInsights.NLogTarget/) -[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.NLogTarget.svg)](https://www.nuget.org/packages/Microsoft.ApplicationInsights.NLogTarget/) -- For Log4Net: [Microsoft.ApplicationInsights.Log4NetAppender](http://www.nuget.org/packages/Microsoft.ApplicationInsights.Log4NetAppender/) -[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.Log4NetAppender.svg)](https://www.nuget.org/packages/Microsoft.ApplicationInsights.Log4NetAppender/) -- For System.Diagnostics: [Microsoft.ApplicationInsights.TraceListener](http://www.nuget.org/packages/Microsoft.ApplicationInsights.TraceListener/) -[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.TraceListener.svg)](https://www.nuget.org/packages/Microsoft.ApplicationInsights.TraceListener/) -- [Microsoft.ApplicationInsights.DiagnosticSourceListener](http://www.nuget.org/packages/Microsoft.ApplicationInsights.DiagnosticSourceListener/) -[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.DiagnosticSourceListener.svg)](https://www.nuget.org/packages/Microsoft.ApplicationInsights.DiagnosticSourceListener/) -- [Microsoft.ApplicationInsights.EtwCollector](http://www.nuget.org/packages/Microsoft.ApplicationInsights.EtwCollector/) -[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.EtwCollector.svg)](https://www.nuget.org/packages/Microsoft.ApplicationInsights.EtwCollector/) -- [Microsoft.ApplicationInsights.EventSourceListener](http://www.nuget.org/packages/Microsoft.ApplicationInsights.EventSourceListener/) -[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.EventSourceListener.svg)](https://www.nuget.org/packages/Microsoft.ApplicationInsights.EventSourceListener/) - -**NetCore SDKs** -- [Microsoft.ApplicationInsights.AspNetCore](https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore/) -[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.AspNetCore.svg)](https://nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore) -- [Microsoft.ApplicationInsights.WorkerService](https://www.nuget.org/packages/Microsoft.ApplicationInsights.WorkerService/) -[![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.WorkerService.svg)](https://nuget.org/packages/Microsoft.ApplicationInsights.WorkerService) +| | Nightly Build | Latest Official Release | +|--------------------------------------------------------------------------------------------------------------------------------------------------------------- |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| **Base SDKs** | | | +| - [Microsoft.ApplicationInsights](https://www.nuget.org/packages/Microsoft.ApplicationInsights/) | [![Nightly](https://img.shields.io/myget/applicationinsights-dotnet-nightly/v/Microsoft.ApplicationInsights?label=)](https://www.myget.org/feed/applicationinsights-dotnet-nightly/package/nuget/Microsoft.ApplicationInsights) | [![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.svg)](https://www.nuget.org/packages/Microsoft.ApplicationInsights/) | +| - [Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel](https://www.nuget.org/packages/Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel) | [![Nightly](https://img.shields.io/myget/applicationinsights-dotnet-nightly/v/Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel?label=)](https://www.myget.org/feed/applicationinsights-dotnet-nightly/package/nuget/Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel) | [![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.svg)](https://www.nuget.org/packages/Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel/) | +| **Web SDKs** | | | +| - [Microsoft.ApplicationInsights.Web](https://www.nuget.org/packages/Microsoft.ApplicationInsights.Web/) | [![Nightly](https://img.shields.io/myget/applicationinsights-dotnet-nightly/v/Microsoft.ApplicationInsights.Web?label=)](https://www.myget.org/feed/applicationinsights-dotnet-nightly/package/nuget/Microsoft.ApplicationInsights.Web) | [![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.Web.svg)](https://nuget.org/packages/Microsoft.ApplicationInsights.Web) | +| - [Microsoft.ApplicationInsights.DependencyCollector](https://www.nuget.org/packages/Microsoft.ApplicationInsights.DependencyCollector/) | [![Nightly](https://img.shields.io/myget/applicationinsights-dotnet-nightly/v/Microsoft.ApplicationInsights.DependencyCollector?label=)](https://www.myget.org/feed/applicationinsights-dotnet-nightly/package/nuget/Microsoft.ApplicationInsights.DependencyCollector) | [![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.DependencyCollector.svg)](https://nuget.org/packages/Microsoft.ApplicationInsights.DependencyCollector) | +| - [Microsoft.ApplicationInsights.EventCounterCollector](https://www.nuget.org/packages/Microsoft.ApplicationInsights.EventCounterCollector) | [![Nightly](https://img.shields.io/myget/applicationinsights-dotnet-nightly/v/Microsoft.ApplicationInsights.EventCounterCollector?label=)](https://www.myget.org/feed/applicationinsights-dotnet-nightly/package/nuget/Microsoft.ApplicationInsights.EventCounterCollector) | [![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.EventCounterCollector.svg)](https://nuget.org/packages/Microsoft.ApplicationInsights.EventCounterCollector) | +| - [Microsoft.ApplicationInsights.PerfCounterCollector](https://www.nuget.org/packages/Microsoft.ApplicationInsights.PerfCounterCollector/) | [![Nightly](https://img.shields.io/myget/applicationinsights-dotnet-nightly/v/Microsoft.ApplicationInsights.PerfCounterCollector?label=)](https://www.myget.org/feed/applicationinsights-dotnet-nightly/package/nuget/Microsoft.ApplicationInsights.PerfCounterCollector) | [![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.PerfCounterCollector.svg)](https://nuget.org/packages/Microsoft.ApplicationInsights.PerfCounterCollector) | +| - [Microsoft.ApplicationInsights.WindowsServer](https://www.nuget.org/packages/Microsoft.ApplicationInsights.WindowsServer/) | [![Nightly](https://img.shields.io/myget/applicationinsights-dotnet-nightly/v/Microsoft.ApplicationInsights.WindowsServer?label=)](https://www.myget.org/feed/applicationinsights-dotnet-nightly/package/nuget/Microsoft.ApplicationInsights.WindowsServer) | [![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.WindowsServer.svg)](https://nuget.org/packages/Microsoft.ApplicationInsights.WindowsServer) | +| - [Microsoft.AspNet.ApplicationInsights.HostingStartup](https://www.nuget.org/packages/Microsoft.AspNet.ApplicationInsights.HostingStartup/) | [![Nightly](https://img.shields.io/myget/applicationinsights-dotnet-nightly/v/Microsoft.AspNet.ApplicationInsights.HostingStartup?label=)](https://www.myget.org/feed/applicationinsights-dotnet-nightly/package/nuget/Microsoft.AspNet.ApplicationInsights.HostingStartup) | [![Nuget](https://img.shields.io/nuget/vpre/Microsoft.AspNet.ApplicationInsights.HostingStartup.svg)](https://nuget.org/packages/Microsoft.AspNet.ApplicationInsights.HostingStartup) | +| **NetCore SDKs** | | | +| - [Microsoft.ApplicationInsights.AspNetCore](https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore/) | [![Nightly](https://img.shields.io/myget/applicationinsights-dotnet-nightly/v/Microsoft.ApplicationInsights.AspNetCore?label=)](https://www.myget.org/feed/applicationinsights-dotnet-nightly/package/nuget/Microsoft.ApplicationInsights.AspNetCore) | [![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.AspNetCore.svg)](https://nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore) | +| - [Microsoft.ApplicationInsights.WorkerService](https://www.nuget.org/packages/Microsoft.ApplicationInsights.WorkerService/) | [![Nightly](https://img.shields.io/myget/applicationinsights-dotnet-nightly/v/Microsoft.ApplicationInsights.WorkerService?label=)](https://www.myget.org/feed/applicationinsights-dotnet-nightly/package/nuget/Microsoft.ApplicationInsights.WorkerService) | [![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.WorkerService.svg)](https://nuget.org/packages/Microsoft.ApplicationInsights.WorkerService) | +| **Logging Adapters** | | | +| - For ILogger: [Microsoft.Extensions.Logging.ApplicationInsights](https://www.nuget.org/packages/Microsoft.Extensions.Logging.ApplicationInsights/) | [![Nightly](https://img.shields.io/myget/applicationinsights-dotnet-nightly/v/Microsoft.Extensions.Logging.ApplicationInsights?label=)](https://www.myget.org/feed/applicationinsights-dotnet-nightly/package/nuget/Microsoft.Extensions.Logging.ApplicationInsights) | [![Nuget](https://img.shields.io/nuget/vpre/Microsoft.Extensions.Logging.ApplicationInsights.svg)](https://www.nuget.org/packages/Microsoft.Extensions.Logging.ApplicationInsights/) | +| - For NLog: [Microsoft.ApplicationInsights.NLogTarget](http://www.nuget.org/packages/Microsoft.ApplicationInsights.NLogTarget/) | [![Nightly](https://img.shields.io/myget/applicationinsights-dotnet-nightly/v/Microsoft.ApplicationInsights.NLogTarget?label=)](https://www.myget.org/feed/applicationinsights-dotnet-nightly/package/nuget/Microsoft.ApplicationInsights.NLogTarget) | [![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.NLogTarget.svg)](https://www.nuget.org/packages/Microsoft.ApplicationInsights.NLogTarget/) | +| - For Log4Net: [Microsoft.ApplicationInsights.Log4NetAppender](http://www.nuget.org/packages/Microsoft.ApplicationInsights.Log4NetAppender/) | [![Nightly](https://img.shields.io/myget/applicationinsights-dotnet-nightly/v/Microsoft.ApplicationInsights.Log4NetAppender?label=)](https://www.myget.org/feed/applicationinsights-dotnet-nightly/package/nuget/Microsoft.ApplicationInsights.Log4NetAppender) | [![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.Log4NetAppender.svg)](https://www.nuget.org/packages/Microsoft.ApplicationInsights.Log4NetAppender/) | +| - For System.Diagnostics: [Microsoft.ApplicationInsights.TraceListener](http://www.nuget.org/packages/Microsoft.ApplicationInsights.TraceListener/) | [![Nightly](https://img.shields.io/myget/applicationinsights-dotnet-nightly/v/Microsoft.ApplicationInsights.TraceListener?label=)](https://www.myget.org/feed/applicationinsights-dotnet-nightly/package/nuget/Microsoft.ApplicationInsights.TraceListener) | [![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.TraceListener.svg)](https://www.nuget.org/packages/Microsoft.ApplicationInsights.TraceListener/) | +| - [Microsoft.ApplicationInsights.DiagnosticSourceListener](http://www.nuget.org/packages/Microsoft.ApplicationInsights.DiagnosticSourceListener/) | [![Nightly](https://img.shields.io/myget/applicationinsights-dotnet-nightly/v/Microsoft.ApplicationInsights.DiagnosticSourceListener?label=)](https://www.myget.org/feed/applicationinsights-dotnet-nightly/package/nuget/Microsoft.ApplicationInsights.DiagnosticSourceListener) | [![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.DiagnosticSourceListener.svg)](https://www.nuget.org/packages/Microsoft.ApplicationInsights.DiagnosticSourceListener/) | +| - [Microsoft.ApplicationInsights.EtwCollector](http://www.nuget.org/packages/Microsoft.ApplicationInsights.EtwCollector/) | [![Nightly](https://img.shields.io/myget/applicationinsights-dotnet-nightly/v/Microsoft.ApplicationInsights.EtwCollector?label=)](https://www.myget.org/feed/applicationinsights-dotnet-nightly/package/nuget/Microsoft.ApplicationInsights.EtwCollector) | [![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.EtwCollector.svg)](https://www.nuget.org/packages/Microsoft.ApplicationInsights.EtwCollector/) | +| - [Microsoft.ApplicationInsights.EventSourceListener](http://www.nuget.org/packages/Microsoft.ApplicationInsights.EventSourceListener/) | [![Nightly](https://img.shields.io/myget/applicationinsights-dotnet-nightly/v/Microsoft.ApplicationInsights.EventSourceListener?label=)](https://www.myget.org/feed/applicationinsights-dotnet-nightly/package/nuget/Microsoft.ApplicationInsights.EventSourceListener) | [![Nuget](https://img.shields.io/nuget/vpre/Microsoft.ApplicationInsights.EventSourceListener.svg)](https://www.nuget.org/packages/Microsoft.ApplicationInsights.EventSourceListener/) | +Nightly Builds are available on our MyGet feed: +`https://www.myget.org/F/applicationinsights-dotnet-nightly/api/v3/index.json` +These builds come from the develop branch. These are not signed and are not intended for production workloads. - - - - -# Application Insights for .NET - -This repository has code for the base .NET SDK for Application Insights. [Application Insights][AILandingPage] is a service that allows developers ensure their application are available, performing, and succeeding. This SDK provides the base ability to send all Application Insights types from any .NET project. - -## Getting Started - -If developing for a .Net project that is supported by one of our platform specific packages, [Web][WebGetStarted] or [Windows Apps][WinAppGetStarted], we strongly recommend to use one of those packages instead of this base library. If your project does not fall into one of those platforms you can use this library for any .Net code. This library should have no dependencies outside of the .Net framework. If you are building a [Desktop][DesktopGetStarted] or any other .Net project type this library will enable you to utilize Application Insights. More on SDK layering and extensibility [later](#sdk-layering). - -### Get an Instrumentation Key - -To use the Application Insights SDK you will need to provide it with an Instrumentation Key which can be [obtained from the portal][AIKey]. This Instrumentation Key will identify all the data flowing from your application instances as belonging to your account and specific application. - -### Add the SDK library - -We recommend consuming the library as a NuGet package. Make sure to look for the [Microsoft.ApplicationInsights][NuGetCore] package. Use the NuGet package manager to add a reference to your application code. - -### Initialize a TelemetryClient - -The `TelemetryClient` object is the primary root object for the library. Almost all functionality around telemetry sending is located on this object. You must initialize an instance of this object and populate it with your Instrumentation Key to identify your data. - -```C# -using Microsoft.ApplicationInsights; - -var tc = new TelemetryClient(); -tc.InstrumentationKey = "INSERT YOUR KEY"; -``` - -### Use the TelemetryClient to send telemetry - -This "base" library does not provide any automatic telemetry collection or any automatic meta-data properties. You can populate common context on the `TelemetryClient.context` property which will be automatically attached to each telemetry item sent. You can also attach additional property data to each telemetry item sent. The `TelemetryClient` also exposes a number of `Track...()` methods that can be used to send all telemetry types understood by the Application Insights service. Some example use cases are shown below. - -```C# -tc.Context.User.Id = Environment.GetUserName(); // This is probably a bad idea from a PII perspective. -tc.Context.Device.OperatingSystem = Environment.OSVersion.ToString(); - -tc.TrackPageView("Form1"); - -tc.TrackEvent("PurchaseOrderSubmitted", new Dictionary() { {"CouponCode", "JULY2015" } }, new Dictionary() { {"OrderTotal", 68.99 }, {"ItemsOrdered", 5} }); - -try -{ - ... -} -catch(Exception e) -{ - tc.TrackException(e); -} -``` - -### Ensure you don't lose telemetry - -This library makes use of the InMemoryChannel to send telemetry data. This is a very lightweight channel implementation. It stores all telemetry to an in-memory queue and batches and sends telemetry. As a result, if the process is terminated suddenly, you could lose telemetry that is stored in the queue but not yet sent. It is recommended to track the closing of your process and call the `TelemetryClient.Flush()` method to ensure no telemetry is lost. - -### Full API Overview - -Read about [how to use the API and see the results in the portal][api-overview]. - -## Branches - -- [master][master] contains the *latest* published release located on [NuGet][NuGetCore]. -- [develop][develop] contains the code for the *next* release. - -## Contributing - -We strongly welcome and encourage contributions to this project. Please read the general [contributor's guide][ContribGuide] located in the ApplicationInsights-Home repository and the [contributing guide](https://github.com/Microsoft/ApplicationInsights-dotnet/blob/develop/.github/CONTRIBUTING.md) for this SDK. If making a large change we request that you open an [issue][GitHubIssue] first. We follow the [Git Flow][GitFlow] approach to branching. - -This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. - -[AILandingPage]: http://azure.microsoft.com/services/application-insights/ -[api-overview]: https://azure.microsoft.com/documentation/articles/app-insights-api-custom-events-metrics/ -[ContribGuide]: https://github.com/Microsoft/ApplicationInsights-Home/blob/master/CONTRIBUTING.md -[GitFlow]: http://nvie.com/posts/a-successful-git-branching-model/ -[GitHubIssue]: https://github.com/Microsoft/ApplicationInsights-dotnet/issues -[master]: https://github.com/Microsoft/ApplicationInsights-dotnet/tree/master -[develop]: https://github.com/Microsoft/ApplicationInsights-dotnet/tree/development -[NuGetCore]: https://www.nuget.org/packages/Microsoft.ApplicationInsights -[WebGetStarted]: https://azure.microsoft.com/documentation/articles/app-insights-start-monitoring-app-health-usage/ -[WinAppGetStarted]: https://azure.microsoft.com/documentation/articles/app-insights-windows-get-started/ -[DesktopGetStarted]: https://azure.microsoft.com/documentation/articles/app-insights-windows-desktop/ -[AIKey]: https://github.com/Microsoft/ApplicationInsights-Home/wiki#getting-an-application-insights-instrumentation-key - ## Release Schedule - The following is our tentative release schedule for 2020. -| **2019H2** | | | | | +| **Release Schedule** | | | | | |----------- |------- |--- |------------ |------------- | -| December | Early | | | 2.12 Stable | -| | Mid | | 2.13 Beta1 | | | **2020H1** | | | | | | January | Early | | 2.13 Beta2 | | | | Mid | | 2.13 Beta3 | | @@ -156,7 +77,7 @@ The following is our tentative release schedule for 2020. | March | Early | | 2.14 Beta2 | | | | Mid | | 2.14 Beta3 | | | April | Early | | | 2.14 Stable | -| | Mid | | | | +| | Mid | | | | | May | Early | | 2.15 Beta1 | | | | Mid | | 2.15 Beta2 | | | June | Early | | | 2.15 Stable | diff --git a/WEB/Src/Common/AppMapCorrelationEventSource.cs b/WEB/Src/Common/AppMapCorrelationEventSource.cs index 805589a66..750a640c6 100644 --- a/WEB/Src/Common/AppMapCorrelationEventSource.cs +++ b/WEB/Src/Common/AppMapCorrelationEventSource.cs @@ -3,9 +3,6 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Tracing; -#if NETSTANDARD1_6 - using System.Reflection; -#endif using Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing; /// diff --git a/WEB/Src/Common/ApplicationNameProvider.cs b/WEB/Src/Common/ApplicationNameProvider.cs index e0bf8a419..af299f582 100644 --- a/WEB/Src/Common/ApplicationNameProvider.cs +++ b/WEB/Src/Common/ApplicationNameProvider.cs @@ -1,9 +1,6 @@ namespace Microsoft.ApplicationInsights.Common { using System; -#if NETSTANDARD1_6 - using System.Reflection; -#endif internal sealed class ApplicationNameProvider { @@ -19,11 +16,7 @@ string name; try { -#if NETSTANDARD1_6 - name = Assembly.GetEntryAssembly().FullName; -#else name = AppDomain.CurrentDomain.FriendlyName; -#endif } catch (Exception exp) { diff --git a/WEB/Src/Common/GuidExtensions.cs b/WEB/Src/Common/GuidExtensions.cs index ae2ac6357..64f078509 100644 --- a/WEB/Src/Common/GuidExtensions.cs +++ b/WEB/Src/Common/GuidExtensions.cs @@ -13,11 +13,7 @@ /// public static string ToStringInvariant(this Guid guid, string format) { -#if NETSTANDARD1_6 - return guid.ToString(format); -#else return guid.ToString(format, CultureInfo.InvariantCulture); -#endif } } } diff --git a/WEB/Src/Common/SdkVersionUtils.cs b/WEB/Src/Common/SdkVersionUtils.cs index b517f85f3..30b512645 100644 --- a/WEB/Src/Common/SdkVersionUtils.cs +++ b/WEB/Src/Common/SdkVersionUtils.cs @@ -4,9 +4,6 @@ using System.Globalization; using System.Linq; using System.Reflection; -#if NETSTANDARD1_6 - using System.Collections.Generic; -#endif internal class SdkVersionUtils { @@ -16,11 +13,7 @@ // For directly using TrackDependency(), version will be simply what is set by core Type sdkVersionUtilsType = typeof(SdkVersionUtils); -#if NETSTANDARD1_6 - IEnumerable assemblyCustomAttributes = sdkVersionUtilsType.GetTypeInfo().Assembly.GetCustomAttributes(); -#else object[] assemblyCustomAttributes = sdkVersionUtilsType.Assembly.GetCustomAttributes(false); -#endif string versionStr = assemblyCustomAttributes .OfType() .First() diff --git a/WEB/Src/DependencyCollector/Shared.Tests/ActiveSubsciptionManagerTests.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/ActiveSubsciptionManagerTests.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/ActiveSubsciptionManagerTests.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/ActiveSubsciptionManagerTests.cs diff --git a/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyCollector.Tests.csproj b/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyCollector.Tests.csproj index 5c3157b90..e2c4cb61a 100644 --- a/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyCollector.Tests.csproj +++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyCollector.Tests.csproj @@ -8,13 +8,13 @@ false false - - + + - net45;netcoreapp2.1 + net45;netcoreapp2.1;netcoreapp3.1 Microsoft.ApplicationInsights.DependencyCollector.NetCore.Tests Microsoft.AI.DependencyCollector.Tests - + true 1701;1702;1705;1591 @@ -42,7 +42,7 @@ - + @@ -72,8 +72,6 @@ - - diff --git a/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyTrackingTelemetryModuleTest.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyTrackingTelemetryModuleTest.cs index 1c9bd9412..ed9354e1d 100644 --- a/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyTrackingTelemetryModuleTest.cs +++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyTrackingTelemetryModuleTest.cs @@ -81,6 +81,23 @@ } } + [TestMethod] + public void DependencyTrackingTelemetryModuleIsNotInitializedTwiceToPreventProfilerAttachFailure() + { + using (var module = new DependencyTrackingTelemetryModule()) + { + PrivateObject privateObject = new PrivateObject(module); + + module.Initialize(TelemetryConfiguration.CreateDefault()); + object config1 = privateObject.GetField("telemetryConfiguration"); + + module.Initialize(TelemetryConfiguration.CreateDefault()); + object config2 = privateObject.GetField("telemetryConfiguration"); + + Assert.AreSame(config1, config2); + } + } + internal class TestableDependencyTrackingTelemetryModule : DependencyTrackingTelemetryModule { public TestableDependencyTrackingTelemetryModule() diff --git a/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyTrackingTelemetryModuleTestNetCore.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyTrackingTelemetryModuleTestNetCore.cs index 6d1c20de3..2c9714acb 100644 --- a/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyTrackingTelemetryModuleTestNetCore.cs +++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyTrackingTelemetryModuleTestNetCore.cs @@ -346,16 +346,16 @@ Assert.IsTrue(SpinWait.SpinUntil(() => this.sentTelemetry != null, TimeSpan.FromSeconds(1))); this.ValidateTelemetryForDiagnosticSource( - this.sentTelemetry.Single(), - url, - request, - true, - "200", - false, - true, - false, + item: this.sentTelemetry.Single(), + url: url, + request: request, + success: true, + resultCode: "200", + expectLegacyHeaders: false, + expectW3CHeaders: true, + expectRequestId: false, responseExpected: true, - parent); + parentActivity: parent); parent.Stop(); } @@ -465,16 +465,18 @@ if (request != null) { +#if DEBUG var requestIdHeader = request.Headers.GetValues(RequestResponseHeaders.RequestIdHeader).Single(); +#endif if (expectW3CHeaders) { var traceId = item.Context.Operation.Id; var spanId = item.Id; - var expectedTraceparent = $"00-{traceId}-{spanId}-00"; + var expectedTraceParentHeader = $"00-{traceId}-{spanId}-00"; var expectedRequestId = $"|{traceId}.{spanId}."; - Assert.AreEqual(expectedTraceparent, request.Headers.GetValues(W3C.W3CConstants.TraceParentHeader).Single()); + Assert.AreEqual(expectedTraceParentHeader, request.Headers.GetValues(W3C.W3CConstants.TraceParentHeader).Single()); if (parentActivity?.TraceStateString != null) { Assert.AreEqual(parentActivity.TraceStateString, request.Headers.GetValues(W3C.W3CConstants.TraceStateHeader).Single()); @@ -486,10 +488,14 @@ } else { - // even though we don't inject back-compatible request-id, .NET Core 2.0 will inject one - // that will look like traceparent - var traceparent = request.Headers.GetValues(W3C.W3CConstants.TraceParentHeader).Single(); - Assert.AreEqual(traceparent, request.Headers.GetValues(RequestResponseHeaders.RequestIdHeader).Single()); +#if NETCOREAPP2_1 + // even though we don't inject back-compatible request-id, .NET Core 2.0 will inject one that will look like traceparent + Assert.AreEqual(expectedTraceParentHeader, request.Headers.GetValues(RequestResponseHeaders.RequestIdHeader).Single()); +#elif NETCOREAPP3_1 + // It appears that .NET CORE 3 does not inject a Request-Id header. Need to verify with Liudmila. +#else +#error This condition is unexpected +#endif } } else @@ -578,4 +584,4 @@ } } #endif -} + } diff --git a/WEB/Src/DependencyCollector/Shared.Tests/HeaderCollectionManipulationTests.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/HeaderCollectionManipulationTests.cs similarity index 99% rename from WEB/Src/DependencyCollector/Shared.Tests/HeaderCollectionManipulationTests.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/HeaderCollectionManipulationTests.cs index e380fc247..d8514103d 100644 --- a/WEB/Src/DependencyCollector/Shared.Tests/HeaderCollectionManipulationTests.cs +++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/HeaderCollectionManipulationTests.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NET45 +namespace Microsoft.ApplicationInsights.Tests { using System; using System.Collections.Generic; @@ -508,3 +509,4 @@ } } } +#endif \ No newline at end of file diff --git a/WEB/Src/DependencyCollector/Shared.Tests/HttpDependenciesParsingTelemetryInitializerTest.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/HttpDependenciesParsingTelemetryInitializerTest.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/HttpDependenciesParsingTelemetryInitializerTest.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/HttpDependenciesParsingTelemetryInitializerTest.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/HttpWebRequestUtils.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/HttpWebRequestUtils.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/HttpWebRequestUtils.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/HttpWebRequestUtils.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/ApplicationInsightsUrlFilterTests.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/ApplicationInsightsUrlFilterTests.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/ApplicationInsightsUrlFilterTests.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/ApplicationInsightsUrlFilterTests.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/ClientServerDependencyTrackerTests.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/ClientServerDependencyTrackerTests.cs similarity index 99% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/ClientServerDependencyTrackerTests.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/ClientServerDependencyTrackerTests.cs index 029204e8f..7ca837211 100644 --- a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/ClientServerDependencyTrackerTests.cs +++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/ClientServerDependencyTrackerTests.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NET45 +namespace Microsoft.ApplicationInsights.Tests { using System; using System.Collections.Generic; @@ -16,6 +17,7 @@ /// Tests for client server dependency tracker. /// [TestClass] + [Ignore("Test class out of date. Github Issue 1830")] public class ClientServerDependencyTrackerTests : IDisposable { private List sendItems; @@ -357,3 +359,4 @@ } } } +#endif \ No newline at end of file diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/DependencyCollectorDiagnosticListenerTests.Netcore20.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/DependencyCollectorDiagnosticListenerTests.Netcore20.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/DependencyCollectorDiagnosticListenerTests.Netcore20.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/DependencyCollectorDiagnosticListenerTests.Netcore20.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/DependencyCollectorDiagnosticListenerTests.Netcore30.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/DependencyCollectorDiagnosticListenerTests.Netcore30.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/DependencyCollectorDiagnosticListenerTests.Netcore30.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/DependencyCollectorDiagnosticListenerTests.Netcore30.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/DependencyCollectorDiagnosticListenerTests.Netstandard16.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/DependencyCollectorDiagnosticListenerTests.Netstandard16.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/DependencyCollectorDiagnosticListenerTests.Netstandard16.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/DependencyCollectorDiagnosticListenerTests.Netstandard16.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/DependencyCollectorEventSourceTest.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/DependencyCollectorEventSourceTest.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/DependencyCollectorEventSourceTest.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/DependencyCollectorEventSourceTest.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/DependencyCollectorTestHelpers.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/DependencyCollectorTestHelpers.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/DependencyCollectorTestHelpers.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/DependencyCollectorTestHelpers.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/DependencyTargetNameHelperTest.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/DependencyTargetNameHelperTest.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/DependencyTargetNameHelperTest.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/DependencyTargetNameHelperTest.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/DesktopDiagnosticSourceHttpProcessingTests.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/DesktopDiagnosticSourceHttpProcessingTests.cs similarity index 99% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/DesktopDiagnosticSourceHttpProcessingTests.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/DesktopDiagnosticSourceHttpProcessingTests.cs index ecf5e826d..d9dd09f0c 100644 --- a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/DesktopDiagnosticSourceHttpProcessingTests.cs +++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/DesktopDiagnosticSourceHttpProcessingTests.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NET45 +namespace Microsoft.ApplicationInsights.Tests { using System; using System.Collections.Generic; @@ -20,6 +21,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] + [Ignore("Test class out of date. Github Issue 1830")] public class DesktopDiagnosticSourceHttpProcessingTests { #region Fields @@ -471,3 +473,4 @@ } } } +#endif \ No newline at end of file diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/EnumerableAssert.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/EnumerableAssert.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/EnumerableAssert.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/EnumerableAssert.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/EventHubsDiagnosticListenerTests.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/EventHubsDiagnosticListenerTests.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/EventHubsDiagnosticListenerTests.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/EventHubsDiagnosticListenerTests.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/FrameworkHttpProcessingTest.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/FrameworkHttpProcessingTest.cs similarity index 95% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/FrameworkHttpProcessingTest.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/FrameworkHttpProcessingTest.cs index b22dd037d..0c5e3a294 100644 --- a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/FrameworkHttpProcessingTest.cs +++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/FrameworkHttpProcessingTest.cs @@ -1,9 +1,10 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NET45 +namespace Microsoft.ApplicationInsights.Tests { using System; using System.Collections.Generic; using System.Diagnostics; - using System.Globalization; + using System.Globalization; using System.Net; using System.Threading; using Microsoft.ApplicationInsights.Channel; @@ -18,16 +19,17 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] + [Ignore("Test class out of date. Github Issue 1830")] public sealed class FrameworkHttpProcessingTest : IDisposable { -#region Fields + #region Fields private const string RandomAppIdEndpoint = "http://app.id.endpoint"; // appIdEndpoint - this really won't be used for tests because of the app id provider override. private const int TimeAccuracyMilliseconds = 50; private const string TestInstrumentationKey = nameof(TestInstrumentationKey); private const string TestApplicationId = nameof(TestApplicationId); private Uri testUrl = new Uri("http://www.microsoft.com/"); private Uri testUrlNonStandardPort = new Uri("http://www.microsoft.com:911/"); - private int sleepTimeMsecBetweenBeginAndEnd = 100; + private int sleepTimeMsecBetweenBeginAndEnd = 100; private TelemetryConfiguration configuration; private List sendItems = new List(); private FrameworkHttpProcessing httpProcessingFramework; @@ -58,9 +60,9 @@ Activity.Current = null; DependencyTableStore.IsDesktopHttpDiagnosticSourceActivated = false; } -#endregion //TestInitiliaze + #endregion //TestInitiliaze -#region BeginEndCallBacks + #region BeginEndCallBacks [TestMethod] public void OnBeginDoesNotThrowForIncorrectUrl() @@ -76,8 +78,8 @@ public void RddTestHttpProcessingFrameworkOnBeginHttpCallback() { var id = 100; - this.httpProcessingFramework.OnBeginHttpCallback(id, this.testUrl.OriginalString); - Assert.AreEqual(0, this.sendItems.Count, "No telemetry item should be processed without calling End"); + this.httpProcessingFramework.OnBeginHttpCallback(id, this.testUrl.OriginalString); + Assert.AreEqual(0, this.sendItems.Count, "No telemetry item should be processed without calling End"); } /// @@ -89,7 +91,7 @@ { var id = 100; Stopwatch stopwatch = Stopwatch.StartNew(); - this.httpProcessingFramework.OnBeginHttpCallback(id, this.testUrl.OriginalString); + this.httpProcessingFramework.OnBeginHttpCallback(id, this.testUrl.OriginalString); Thread.Sleep(this.sleepTimeMsecBetweenBeginAndEnd); Assert.AreEqual(0, this.sendItems.Count, "No telemetry item should be processed without calling End"); this.httpProcessingFramework.OnEndHttpCallback(id, 200); @@ -99,8 +101,8 @@ ValidateTelemetryPacketForOnBeginHttpCallback( this.sendItems[0] as DependencyTelemetry, this.testUrl, - RemoteDependencyConstants.HTTP, - true, + RemoteDependencyConstants.HTTP, + true, stopwatch.Elapsed.TotalMilliseconds, "200", null); @@ -204,8 +206,8 @@ Assert.AreEqual(1, this.sendItems.Count, "Only one telemetry item should be sent"); ValidateTelemetryPacketForOnBeginHttpCallback( this.sendItems[0] as DependencyTelemetry, - this.testUrl, - RemoteDependencyConstants.HTTP, + this.testUrl, + RemoteDependencyConstants.HTTP, false, stopwatch.Elapsed.TotalMilliseconds, "500", @@ -262,7 +264,7 @@ HttpWebRequest request = (HttpWebRequest)WebRequest.Create(this.testUrl); var id1 = ClientServerDependencyTracker.GetIdForRequestObject(request); var id2 = 200; - this.httpProcessingFramework.OnBeginHttpCallback(id1, this.testUrl.ToString()); + this.httpProcessingFramework.OnBeginHttpCallback(id1, this.testUrl.ToString()); Thread.Sleep(this.sleepTimeMsecBetweenBeginAndEnd); Assert.AreEqual(0, this.sendItems.Count, "No telemetry item should be processed without calling End"); @@ -278,7 +280,7 @@ HttpWebRequest request = (HttpWebRequest)WebRequest.Create(this.testUrl); var id = ClientServerDependencyTracker.GetIdForRequestObject(request); - this.httpProcessingFramework.OnBeginHttpCallback(id, this.testUrl.ToString()); + this.httpProcessingFramework.OnBeginHttpCallback(id, this.testUrl.ToString()); this.httpProcessingFramework.OnEndHttpCallback(id, statusCode); Assert.AreEqual(1, this.sendItems.Count, "Only one telemetry item should be sent"); @@ -294,7 +296,7 @@ HttpWebRequest request = (HttpWebRequest)WebRequest.Create(this.testUrl); var id = ClientServerDependencyTracker.GetIdForRequestObject(request); - this.httpProcessingFramework.OnBeginHttpCallback(id, this.testUrl.ToString()); + this.httpProcessingFramework.OnBeginHttpCallback(id, this.testUrl.ToString()); this.httpProcessingFramework.OnEndHttpCallback(id, statusCode); Assert.AreEqual(1, this.sendItems.Count, "Only one telemetry item should be sent"); @@ -360,7 +362,7 @@ { HttpWebRequest request = (HttpWebRequest)WebRequest.Create(this.testUrlNonStandardPort); var id = ClientServerDependencyTracker.GetIdForRequestObject(request); - this.httpProcessingFramework.OnBeginHttpCallback(id, this.testUrlNonStandardPort.ToString()); + this.httpProcessingFramework.OnBeginHttpCallback(id, this.testUrlNonStandardPort.ToString()); this.httpProcessingFramework.OnEndHttpCallback(id, 500); Assert.AreEqual(1, this.sendItems.Count, "Exactly one telemetry item should be sent"); @@ -369,9 +371,9 @@ Assert.AreEqual(expectedTarget, receivedItem.Target, "HttpProcessingFramework returned incorrect target for non standard port."); } -#endregion //BeginEndCallBacks + #endregion //BeginEndCallBacks -#region AsyncScenarios + #region AsyncScenarios /// /// Validates HttpProcessingFramework calculates startTime from the start of very first OnRequestSend if any @@ -388,7 +390,7 @@ Stopwatch stopwatch = Stopwatch.StartNew(); HttpWebRequest request = (HttpWebRequest)WebRequest.Create(this.testUrl); var id1 = ClientServerDependencyTracker.GetIdForRequestObject(request); - this.httpProcessingFramework.OnBeginHttpCallback(id1, this.testUrl.ToString()); + this.httpProcessingFramework.OnBeginHttpCallback(id1, this.testUrl.ToString()); Thread.Sleep(this.sleepTimeMsecBetweenBeginAndEnd); this.httpProcessingFramework.OnBeginHttpCallback(id1, this.testUrl.ToString()); Thread.Sleep(this.sleepTimeMsecBetweenBeginAndEnd); @@ -398,32 +400,32 @@ Assert.AreEqual(1, this.sendItems.Count, "Exactly one telemetry item should be sent"); ValidateTelemetryPacketForOnBeginHttpCallback( - this.sendItems[0] as DependencyTelemetry, + this.sendItems[0] as DependencyTelemetry, this.testUrl, - RemoteDependencyConstants.HTTP, + RemoteDependencyConstants.HTTP, true, stopwatch.Elapsed.TotalMilliseconds, "200", null); - } + } -#endregion AsyncScenarios - -#region Disposable + #endregion AsyncScenarios + + #region Disposable public void Dispose() - { + { this.configuration.Dispose(); GC.SuppressFinalize(this); } -#endregion Disposable + #endregion Disposable -#region Helpers + #region Helpers private static void ValidateTelemetryPacketForOnBeginHttpCallback( DependencyTelemetry remoteDependencyTelemetryActual, - Uri url, + Uri url, string kind, - bool? success, - double valueMin, + bool? success, + double valueMin, string statusCode, Activity parentActivity) { @@ -436,8 +438,8 @@ DependencyTelemetry remoteDependencyTelemetryActual, Uri url, string kind, - bool? success, - double valueMin, + bool? success, + double valueMin, string statusCode, string expectedVersion, Activity parentActivity) @@ -491,4 +493,5 @@ #endregion Helpers } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/FrameworkSqlProcessingTest.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/FrameworkSqlProcessingTest.cs similarity index 95% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/FrameworkSqlProcessingTest.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/FrameworkSqlProcessingTest.cs index a6d718c63..9b3079018 100644 --- a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/FrameworkSqlProcessingTest.cs +++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/FrameworkSqlProcessingTest.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NET45 +namespace Microsoft.ApplicationInsights.Tests { using System; using System.Collections.Generic; @@ -16,8 +17,9 @@ using Microsoft.ApplicationInsights.TestFramework; using Microsoft.ApplicationInsights.Web.TestFramework; using Microsoft.VisualStudio.TestTools.UnitTesting; - + [TestClass] + [Ignore("Test class out of date. Github Issue 1830")] public sealed class FrameworkSqlProcessingTest : IDisposable { private const int TimeAccuracyMilliseconds = 50; @@ -33,7 +35,7 @@ Activity.ForceDefaultIdFormat = true; this.configuration = new TelemetryConfiguration(); - this.sendItems = new List(); + this.sendItems = new List(); this.configuration.TelemetryChannel = new StubTelemetryChannel { OnSend = item => this.sendItems.Add(item) }; this.configuration.InstrumentationKey = Guid.NewGuid().ToString(); this.configuration.TelemetryInitializers.Add(new OperationCorrelationTelemetryInitializer()); @@ -49,7 +51,7 @@ } } -#region ExecuteReader + #region ExecuteReader /// /// Validates SQLProcessingFramework sends correct telemetry for non stored procedure in async call. @@ -58,9 +60,9 @@ [Description("Validates SQLProcessingFramework sends correct telemetry for non stored procedure in async call.")] public void RddTestSqlProcessingFrameworkSendsCorrectTelemetrySqlQuerySuccess() { - Stopwatch stopwatchMax = Stopwatch.StartNew(); + Stopwatch stopwatchMax = Stopwatch.StartNew(); this.sqlProcessingFramework.OnBeginExecuteCallback( - id: 1111, + id: 1111, database: "mydatabase", dataSource: "ourdatabase.database.windows.net", commandText: string.Empty); @@ -281,9 +283,9 @@ { Stopwatch stopwatchMax = Stopwatch.StartNew(); this.sqlProcessingFramework.OnBeginExecuteCallback( - id: 1111, - dataSource: "ourdatabase.database.windows.net", - database: "mydatabase", + id: 1111, + dataSource: "ourdatabase.database.windows.net", + database: "mydatabase", commandText: "apm.MyFavouriteStoredProcedure"); Stopwatch stopwatchMin = Stopwatch.StartNew(); @@ -302,27 +304,27 @@ RemoteDependencyConstants.SQL, true, stopwatchMin.Elapsed.TotalMilliseconds, - stopwatchMax.Elapsed.TotalMilliseconds, + stopwatchMax.Elapsed.TotalMilliseconds, string.Empty, null); } -#endregion + #endregion -#region Disposable + #region Disposable public void Dispose() { - this.configuration.Dispose(); + this.configuration.Dispose(); GC.SuppressFinalize(this); } -#endregion Disposable + #endregion Disposable -#region Helpers + #region Helpers private static void ValidateTelemetryPacket( - DependencyTelemetry remoteDependencyTelemetryActual, - string target, - string name, - string type, + DependencyTelemetry remoteDependencyTelemetryActual, + string target, + string name, + string type, bool success, double minDependencyDurationMs, double maxDependencyDurationMs, @@ -375,6 +377,7 @@ } } -#endregion Helpers + #endregion Helpers } } +#endif \ No newline at end of file diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/HttpHeadersUtilitiesTests.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/HttpHeadersUtilitiesTests.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/HttpHeadersUtilitiesTests.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/HttpHeadersUtilitiesTests.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/HttpParsers/AzureBlobHttpParserTests.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/HttpParsers/AzureBlobHttpParserTests.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/HttpParsers/AzureBlobHttpParserTests.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/HttpParsers/AzureBlobHttpParserTests.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/HttpParsers/AzureSearchHttpParserTests.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/HttpParsers/AzureSearchHttpParserTests.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/HttpParsers/AzureSearchHttpParserTests.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/HttpParsers/AzureSearchHttpParserTests.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/HttpParsers/AzureServiceBusHttpParserTests.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/HttpParsers/AzureServiceBusHttpParserTests.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/HttpParsers/AzureServiceBusHttpParserTests.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/HttpParsers/AzureServiceBusHttpParserTests.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/HttpParsers/DocumentDbHttpParserTests.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/HttpParsers/DocumentDbHttpParserTests.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/HttpParsers/DocumentDbHttpParserTests.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/HttpParsers/DocumentDbHttpParserTests.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/HttpParsers/HttpParsingHelperTests.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/HttpParsers/HttpParsingHelperTests.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/HttpParsers/HttpParsingHelperTests.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/HttpParsers/HttpParsingHelperTests.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/MockTelemetryInitializer.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/MockTelemetryInitializer.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/MockTelemetryInitializer.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/MockTelemetryInitializer.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/Operation/CacheBasedOperationHolderTests.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/Operation/CacheBasedOperationHolderTests.cs similarity index 98% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/Operation/CacheBasedOperationHolderTests.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/Operation/CacheBasedOperationHolderTests.cs index 822025e9c..60f8543bc 100644 --- a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/Operation/CacheBasedOperationHolderTests.cs +++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/Operation/CacheBasedOperationHolderTests.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NET45 +namespace Microsoft.ApplicationInsights.Tests { using System; using System.Threading; @@ -142,3 +143,4 @@ } } } +#endif \ No newline at end of file diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/Operation/ObjectInstanceBasedOperationHolderTests.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/Operation/ObjectInstanceBasedOperationHolderTests.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/Operation/ObjectInstanceBasedOperationHolderTests.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/Operation/ObjectInstanceBasedOperationHolderTests.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/ProfilerHttpProcessingTest.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/ProfilerHttpProcessingTest.cs similarity index 99% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/ProfilerHttpProcessingTest.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/ProfilerHttpProcessingTest.cs index 35278b2e4..cf9a64c41 100644 --- a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/ProfilerHttpProcessingTest.cs +++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/ProfilerHttpProcessingTest.cs @@ -1,11 +1,10 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NET45 +namespace Microsoft.ApplicationInsights.Tests { using System; using System.Collections.Generic; using System.Diagnostics; -#if NET45 using System.Diagnostics.Tracing; -#endif using System.Globalization; using System.Linq; using System.Net; @@ -24,6 +23,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] + [Ignore("Test class out of date. Github Issue 1830")] public sealed class ProfilerHttpProcessingTest : IDisposable { #region Fields @@ -66,7 +66,7 @@ this.httpProcessingProfiler = new ProfilerHttpProcessing( this.configuration, null, - new ObjectInstanceBasedOperationHolder(), + new ObjectInstanceBasedOperationHolder(), setCorrelationHeaders: true, correlationDomainExclusionList: new List(), injectLegacyHeaders: false, @@ -186,7 +186,7 @@ var httpProcessingLegacyHeaders = new ProfilerHttpProcessing( this.configuration, null, - new ObjectInstanceBasedOperationHolder(), + new ObjectInstanceBasedOperationHolder(), setCorrelationHeaders: true, correlationDomainExclusionList: new List(), injectLegacyHeaders: true, @@ -414,7 +414,7 @@ var httpProcessingProfiler = new ProfilerHttpProcessing( this.configuration, null, - new ObjectInstanceBasedOperationHolder(), + new ObjectInstanceBasedOperationHolder(), setCorrelationHeaders: false, correlationDomainExclusionList: new List(), injectLegacyHeaders: true, @@ -427,7 +427,7 @@ httpProcessingProfiler = new ProfilerHttpProcessing( this.configuration, null, - new ObjectInstanceBasedOperationHolder(), + new ObjectInstanceBasedOperationHolder(), setCorrelationHeaders: true, correlationDomainExclusionList: exclusionList, injectLegacyHeaders: true, @@ -1064,3 +1064,4 @@ #endregion Helpers } } +#endif \ No newline at end of file diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/ProfilerSqlProcessingTest.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/ProfilerSqlProcessingTest.cs similarity index 99% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/ProfilerSqlProcessingTest.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/ProfilerSqlProcessingTest.cs index cf6b48956..c7d839e08 100644 --- a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/ProfilerSqlProcessingTest.cs +++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/ProfilerSqlProcessingTest.cs @@ -1,13 +1,12 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NET45 +namespace Microsoft.ApplicationInsights.Tests { using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.Diagnostics; -#if NET45 using System.Diagnostics.Tracing; -#endif using System.Globalization; using System.Linq; using System.Threading; @@ -53,10 +52,9 @@ this.sendItems = new List(); this.configuration.TelemetryChannel = new StubTelemetryChannel { OnSend = item => this.sendItems.Add(item) }; this.configuration.InstrumentationKey = Guid.NewGuid().ToString(); - this.sqlCommandProcessingProfiler = new ProfilerSqlCommandProcessing(this.configuration, null, new ObjectInstanceBasedOperationHolder()); - this.sqlCommandProcessingProfiler = new ProfilerSqlCommandProcessing(this.configuration, null, new ObjectInstanceBasedOperationHolder(), true); - this.sqlCommandProcessingProfilerWithDisabledCommandText = new ProfilerSqlCommandProcessing(this.configuration, null, new ObjectInstanceBasedOperationHolder(), false); - this.sqlConnectionProcessingProfiler = new ProfilerSqlConnectionProcessing(this.configuration, null, new ObjectInstanceBasedOperationHolder()); + this.sqlCommandProcessingProfiler = new ProfilerSqlCommandProcessing(this.configuration, null, new ObjectInstanceBasedOperationHolder(), true); + this.sqlCommandProcessingProfilerWithDisabledCommandText = new ProfilerSqlCommandProcessing(this.configuration, null, new ObjectInstanceBasedOperationHolder(), false); + this.sqlConnectionProcessingProfiler = new ProfilerSqlConnectionProcessing(this.configuration, null, new ObjectInstanceBasedOperationHolder()); } [TestCleanup] @@ -791,3 +789,4 @@ } } } +#endif \ No newline at end of file diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/RetryPolicyTest.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/RetryPolicyTest.cs similarity index 97% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/RetryPolicyTest.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/RetryPolicyTest.cs index 35805ea26..a8f1c012f 100644 --- a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/RetryPolicyTest.cs +++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/RetryPolicyTest.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NET45 +namespace Microsoft.ApplicationInsights.Tests { using System; using Microsoft.ApplicationInsights.DependencyCollector.Implementation; @@ -76,3 +77,4 @@ } } } +#endif \ No newline at end of file diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/ServiceBusDiagnosticListenerTests.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/ServiceBusDiagnosticListenerTests.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/ServiceBusDiagnosticListenerTests.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/ServiceBusDiagnosticListenerTests.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/SqlClientDiagnosticSourceListenerTests.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/SqlClientDiagnosticSourceListenerTests.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/SqlClientDiagnosticSourceListenerTests.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/SqlClientDiagnosticSourceListenerTests.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/SqlClientDiagnosticSourceListenerTestsCopy.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/SqlClientDiagnosticSourceListenerTestsCopy.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/SqlClientDiagnosticSourceListenerTestsCopy.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/SqlClientDiagnosticSourceListenerTestsCopy.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/TelemetryDiagnosticSourceListenerTests.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/TelemetryDiagnosticSourceListenerTests.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/TelemetryDiagnosticSourceListenerTests.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/TelemetryDiagnosticSourceListenerTests.cs diff --git a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/TestUtils.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/TestUtils.cs similarity index 98% rename from WEB/Src/DependencyCollector/Shared.Tests/Implementation/TestUtils.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/TestUtils.cs index f7b1f273e..a827892ab 100644 --- a/WEB/Src/DependencyCollector/Shared.Tests/Implementation/TestUtils.cs +++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/TestUtils.cs @@ -1,11 +1,10 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NET45 +namespace Microsoft.ApplicationInsights.Tests { using System.Collections; using System.Collections.Generic; using System.Data.SqlClient; -#if NET45 using System.Diagnostics.Tracing; -#endif using System.Globalization; using System.Linq; using System.Net; @@ -103,3 +102,4 @@ } } } +#endif \ No newline at end of file diff --git a/WEB/Src/DependencyCollector/Shared.Tests/OperationDetailsInitializer.cs b/WEB/Src/DependencyCollector/DependencyCollector.Tests/OperationDetailsInitializer.cs similarity index 100% rename from WEB/Src/DependencyCollector/Shared.Tests/OperationDetailsInitializer.cs rename to WEB/Src/DependencyCollector/DependencyCollector.Tests/OperationDetailsInitializer.cs diff --git a/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj b/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj index 1f24566fb..04e78cd26 100644 --- a/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj +++ b/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj @@ -6,14 +6,14 @@ Microsoft.ApplicationInsights.DependencyCollector Microsoft.AI.DependencyCollector - net45;netstandard1.6;netstandard2.0 - netstandard1.6;netstandard2.0 + net45;netstandard2.0 + netstandard2.0 false $(DefineConstants);DEPENDENCY_COLLECTOR;ALLOW_AGGRESSIVE_INLIGNING_ATTRIBUTE; - + $(DefineConstants);NETSTANDARD; @@ -25,29 +25,6 @@ Azure Monitoring Analytics ApplicationInsights Telemetry AppInsights - - - - All - - - All - - - All - - - All - - - - - - - All - - - @@ -62,7 +39,7 @@ - + diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AppMapCorrelationEventSource.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AppMapCorrelationEventSource.cs index a2bed2148..9a1ffc0bb 100644 --- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AppMapCorrelationEventSource.cs +++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AppMapCorrelationEventSource.cs @@ -2,9 +2,6 @@ { using System; using System.Diagnostics.Tracing; -#if NETSTANDARD1_6 - using System.Reflection; -#endif using Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing; /// diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DependencyCollectorEventSource.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DependencyCollectorEventSource.cs index 1b8cc55e0..13ae8b034 100644 --- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DependencyCollectorEventSource.cs +++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DependencyCollectorEventSource.cs @@ -4,9 +4,6 @@ using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Tracing; using System.Globalization; -#if NETSTANDARD1_6 - using System.Reflection; -#endif using Microsoft.ApplicationInsights.Common; using Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing; diff --git a/WEB/Src/DependencyCollector/Shared.Tests/DependencyCollector.Shared.Tests.projitems b/WEB/Src/DependencyCollector/Shared.Tests/DependencyCollector.Shared.Tests.projitems deleted file mode 100644 index 9bf4cd537..000000000 --- a/WEB/Src/DependencyCollector/Shared.Tests/DependencyCollector.Shared.Tests.projitems +++ /dev/null @@ -1,53 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - ace58393-3419-4fca-87cc-c33eb756c7e4 - - - Microsoft.ApplicationInsights.DependencyCollector - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/WEB/Src/DependencyCollector/Shared.Tests/DependencyCollector.Shared.Tests.shproj b/WEB/Src/DependencyCollector/Shared.Tests/DependencyCollector.Shared.Tests.shproj deleted file mode 100644 index 3daf7e2f1..000000000 --- a/WEB/Src/DependencyCollector/Shared.Tests/DependencyCollector.Shared.Tests.shproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - ace58393-3419-4fca-87cc-c33eb756c7e4 - - - - - - - - - - diff --git a/WEB/Src/DependencyCollector/Shared.Tests/DependencyTrackingTelemetryModuleTest.cs b/WEB/Src/DependencyCollector/Shared.Tests/DependencyTrackingTelemetryModuleTest.cs deleted file mode 100644 index f6f44e447..000000000 --- a/WEB/Src/DependencyCollector/Shared.Tests/DependencyTrackingTelemetryModuleTest.cs +++ /dev/null @@ -1,30 +0,0 @@ -namespace Microsoft.ApplicationInsights.Tests -{ - using Microsoft.ApplicationInsights.DependencyCollector; - using Microsoft.ApplicationInsights.Extensibility; - using Microsoft.VisualStudio.TestTools.UnitTesting; - - /// - /// Shared DependencyTrackingTelemetryModuleTest class. - /// - [TestClass] - public partial class DependencyTrackingTelemetryModuleTest - { - [TestMethod] - public void DependencyTrackingTelemetryModuleIsNotInitializedTwiceToPreventProfilerAttachFailure() - { - using (var module = new DependencyTrackingTelemetryModule()) - { - PrivateObject privateObject = new PrivateObject(module); - - module.Initialize(TelemetryConfiguration.CreateDefault()); - object config1 = privateObject.GetField("telemetryConfiguration"); - - module.Initialize(TelemetryConfiguration.CreateDefault()); - object config2 = privateObject.GetField("telemetryConfiguration"); - - Assert.AreSame(config1, config2); - } - } - } -} diff --git a/WEB/Src/DependencyCollector/Shared.Tests/GlobalSuppressions.cs b/WEB/Src/DependencyCollector/Shared.Tests/GlobalSuppressions.cs deleted file mode 100644 index 2bbcb0386..000000000 --- a/WEB/Src/DependencyCollector/Shared.Tests/GlobalSuppressions.cs +++ /dev/null @@ -1,5 +0,0 @@ -// This file is used by Code Analysis to maintain SuppressMessage -// attributes that are applied to this project. -// Project-level suppressions either have no target or are given -// a specific target and scoped to a namespace, type, member, etc. -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1303:Const field names must begin with upper-case letter", Justification = "Pre-existing condition")] diff --git a/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollector.csproj b/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollector.csproj index 41b21c029..d230b8925 100644 --- a/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollector.csproj +++ b/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollector.csproj @@ -17,29 +17,6 @@ Azure Monitoring Analytics ApplicationInsights Telemetry ASP.NET aspnetcore Web Azure Server Services ASPX Websites Event Counters Performance Collection - - - - All - - - All - - - All - - - All - - - - - - - All - - - diff --git a/WEB/Src/HostingStartup/HostingStartup/HostingStartup.csproj b/WEB/Src/HostingStartup/HostingStartup/HostingStartup.csproj index 899a4ebdd..5734385e6 100644 --- a/WEB/Src/HostingStartup/HostingStartup/HostingStartup.csproj +++ b/WEB/Src/HostingStartup/HostingStartup/HostingStartup.csproj @@ -19,29 +19,6 @@ Azure Monitoring Analytics ApplicationInsights Telemetry AppInsights - - - - All - - - All - - - All - - - All - - - - - - - All - - - diff --git a/WEB/Src/Microsoft.ApplicationInsights.Web.sln b/WEB/Src/Microsoft.ApplicationInsights.Web.sln index 1e27ee195..b0d15fc8f 100644 --- a/WEB/Src/Microsoft.ApplicationInsights.Web.sln +++ b/WEB/Src/Microsoft.ApplicationInsights.Web.sln @@ -14,14 +14,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DependencyCollector", "Depe EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowsServer", "WindowsServer", "{D87119AF-CD35-46F2-84A6-ED54CC42027E}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "DependencyCollector.Shared.Tests", "DependencyCollector\Shared.Tests\DependencyCollector.Shared.Tests.shproj", "{ACE58393-3419-4FCA-87CC-C33EB756C7E4}" -EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestFramework.Shared.Web", "TestFramework\Shared\TestFramework.Shared.Web.shproj", "{9718F051-147F-4F5F-9FF3-C926430EFCF7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PerformanceCollector", "PerformanceCollector", "{A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perf.Net45.Tests", "PerformanceCollector\Perf.Net45.Tests\Perf.Net45.Tests.csproj", "{F254D4FB-428D-408E-8251-39BCA7B4B5CE}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xdt.Tests", "PerformanceCollector\Xdt.Tests\Xdt.Tests.csproj", "{C6B569BC-6F19-42C9-A951-DA611BB0F4BE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Solution Items", ".Solution Items", "{0828A19C-C62C-4B5E-9160-5A6F992F2000}" @@ -37,14 +33,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Common.Web", "Common\Common EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HostingStartup", "HostingStartup", "{701D2D4F-B581-45A2-AF29-4F34EC5F047B}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared", "PerformanceCollector\Perf.Shared\Perf.Shared.shproj", "{A78F50D4-F518-4DCB-878B-526FD54CCA35}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Filtering.Shared", "PerformanceCollector\Filtering.Shared\Filtering.Shared.shproj", "{568AEB4F-BA4C-47A5-9FA3-68F06CD11FED}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perf.NetCore.Tests", "PerformanceCollector\NetCore.Tests\Perf.NetCore.Tests.csproj", "{D5EFA02A-971E-477C-896B-C3AA93093267}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.Tests", "PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.shproj", "{9B524BD3-682D-4B6F-9251-D4B2911DF0FD}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostingStartup", "HostingStartup\HostingStartup\HostingStartup.csproj", "{80F0481A-66C7-4442-96D3-5FD841132C4B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsServer", "WindowsServer\WindowsServer\WindowsServer.csproj", "{94127FD9-E516-4891-98D4-EF7523117F32}" @@ -53,20 +41,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web", "Web\Web\Web.csproj", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyCollector", "DependencyCollector\DependencyCollector\DependencyCollector.csproj", "{95D90911-2909-4914-920E-7710F7BB6C32}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetStandard16.Stubs", "PerformanceCollector\Perf.Shared.NetStandard16.Stubs\Perf.Shared.NetStandard16.Stubs.shproj", "{76B21FAA-270D-47DE-B14B-BEC87EDC34F1}" -EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetStandard", "PerformanceCollector\Perf.Shared.NetStandard\Perf.Shared.NetStandard.shproj", "{D13C3EC7-B300-4158-9054-216156B203BE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perf", "PerformanceCollector\PerformanceCollector\Perf.csproj", "{00BF736C-B562-4251-9836-EF80282956AF}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetStandard.Stubs", "PerformanceCollector\Perf.Shared.NetStandard.Stubs\Perf.Shared.NetStandard.Stubs.shproj", "{30A45441-0849-48FE-AD37-5D29D0E3068A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perf-NetCore20.Tests", "PerformanceCollector\NetCore20.Tests\Perf-NetCore20.Tests\Perf-NetCore20.Tests.csproj", "{AC7D8533-C823-4E93-B008-51B3C4744E2E}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetStandard20Net45", "PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.shproj", "{054C25DC-E545-4712-95C4-81F30CF65CE8}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetStandard20", "PerformanceCollector\Perf.Shared.NetStandard20\Perf.Shared.NetStandard20.shproj", "{A8BA3BD0-19CE-488D-B2BD-0B9B677F4E03}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventCounterCollector", "EventCounterCollector\EventCounterCollector\EventCounterCollector.csproj", "{30AE1A5D-775A-4DEC-9F87-849D8AE93E3A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventCounterCollector.Tests", "EventCounterCollector\EventCounterCollector.Tests\EventCounterCollector.Tests\EventCounterCollector.Tests.csproj", "{6ABC0D66-F577-44A7-8F61-B23882B7A1FF}" @@ -87,42 +65,27 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Tests", "Web\Web.Tests\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsServer.Tests", "WindowsServer\WindowsServer.Tests\WindowsServer.Tests.csproj", "{CAF98D8B-9202-4CC3-83EC-C384D8EEA792}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perf.Tests", "PerformanceCollector\Perf.Tests\Perf.Tests.csproj", "{E31B7A59-5E13-48BB-8127-D11D41EF16C5}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution Common\Common.projitems*{00bf736c-b562-4251-9836-ef80282956af}*SharedItemsImports = 5 - PerformanceCollector\Filtering.Shared\Filtering.Shared.projitems*{00bf736c-b562-4251-9836-ef80282956af}*SharedItemsImports = 5 PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.projitems*{00bf736c-b562-4251-9836-ef80282956af}*SharedItemsImports = 5 - PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.projitems*{00bf736c-b562-4251-9836-ef80282956af}*SharedItemsImports = 5 - PerformanceCollector\Perf.Shared\Perf.Shared.projitems*{00bf736c-b562-4251-9836-ef80282956af}*SharedItemsImports = 5 PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.projitems*{0196259c-3582-4f4e-a01f-a8f9ae83b0f3}*SharedItemsImports = 13 - PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.projitems*{054c25dc-e545-4712-95c4-81f30cf65ce8}*SharedItemsImports = 13 TestFramework\Shared\TestFramework.Shared.projitems*{1231d63b-e7fa-4ba7-9916-fa7325db936d}*SharedItemsImports = 5 ..\..\BASE\src\Common\Common\Common.projitems*{2bb7f06b-f094-417f-8c1b-7fcca1192e17}*SharedItemsImports = 5 - PerformanceCollector\Perf.Shared.NetStandard.Stubs\Perf.Shared.NetStandard.Stubs.projitems*{30a45441-0849-48fe-ad37-5d29d0e3068a}*SharedItemsImports = 13 Common\Common.projitems*{30ae1a5d-775a-4dec-9f87-849d8ae93e3a}*SharedItemsImports = 5 ..\..\BASE\src\Common\Common\Common.projitems*{41301181-f4be-4c36-b78d-a29c55cb0469}*SharedItemsImports = 5 - PerformanceCollector\Filtering.Shared\Filtering.Shared.projitems*{568aeb4f-ba4c-47a5-9fa3-68f06cd11fed}*SharedItemsImports = 13 - PerformanceCollector\Perf.Shared.NetStandard16.Stubs\Perf.Shared.NetStandard16.Stubs.projitems*{76b21faa-270d-47de-b14b-bec87edc34f1}*SharedItemsImports = 13 Common\Common.projitems*{80f0481a-66c7-4442-96d3-5fd841132c4b}*SharedItemsImports = 5 Common\Common.projitems*{94127fd9-e516-4891-98d4-ef7523117f32}*SharedItemsImports = 5 Common\Common.projitems*{95d90911-2909-4914-920e-7710f7bb6c32}*SharedItemsImports = 5 TestFramework\Shared\TestFramework.Shared.projitems*{9718f051-147f-4f5f-9ff3-c926430efcf7}*SharedItemsImports = 13 - DependencyCollector\Shared.Tests\DependencyCollector.Shared.Tests.projitems*{9853a2a5-fd6c-4743-927e-0bfe807ad21c}*SharedItemsImports = 5 TestFramework\Shared\TestFramework.Shared.projitems*{9853a2a5-fd6c-4743-927e-0bfe807ad21c}*SharedItemsImports = 5 - PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{9b524bd3-682d-4b6f-9251-d4b2911df0fd}*SharedItemsImports = 13 - PerformanceCollector\Perf.Shared\Perf.Shared.projitems*{a78f50d4-f518-4dcb-878b-526fd54cca35}*SharedItemsImports = 13 - PerformanceCollector\Perf.Shared.NetStandard20\Perf.Shared.NetStandard20.projitems*{a8ba3bd0-19ce-488d-b2bd-0b9b677f4e03}*SharedItemsImports = 13 - PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{ac7d8533-c823-4e93-b008-51b3c4744e2e}*SharedItemsImports = 5 - TestFramework\Shared\TestFramework.Shared.projitems*{ac7d8533-c823-4e93-b008-51b3c4744e2e}*SharedItemsImports = 5 - DependencyCollector\Shared.Tests\DependencyCollector.Shared.Tests.projitems*{ace58393-3419-4fca-87cc-c33eb756c7e4}*SharedItemsImports = 13 TestFramework\Shared\TestFramework.Shared.projitems*{caf98d8b-9202-4cc3-83ec-c384d8eea792}*SharedItemsImports = 5 Common\Common.projitems*{ccab7a34-8dc5-4a6f-b637-46ceba93c687}*SharedItemsImports = 13 PerformanceCollector\Perf.Shared.NetStandard\Perf.Shared.NetStandard.projitems*{d13c3ec7-b300-4158-9054-216156b203be}*SharedItemsImports = 13 - PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{d5efa02a-971e-477c-896b-c3aa93093267}*SharedItemsImports = 5 - TestFramework\Shared\TestFramework.Shared.projitems*{d5efa02a-971e-477c-896b-c3aa93093267}*SharedItemsImports = 5 Common\Common.projitems*{e166d200-0687-4e6d-b836-029ae690aeab}*SharedItemsImports = 5 - PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{f254d4fb-428d-408e-8251-39bca7b4b5ce}*SharedItemsImports = 4 - TestFramework\Shared\TestFramework.Shared.projitems*{f254d4fb-428d-408e-8251-39bca7b4b5ce}*SharedItemsImports = 4 + TestFramework\Shared\TestFramework.Shared.projitems*{e31b7a59-5e13-48bb-8127-d11d41ef16c5}*SharedItemsImports = 5 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -131,14 +94,6 @@ Global Release|Mixed Platforms = Release|Mixed Platforms EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Release|Any CPU.Build.0 = Release|Any CPU - {F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Release|Mixed Platforms.Build.0 = Release|Any CPU {C6B569BC-6F19-42C9-A951-DA611BB0F4BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C6B569BC-6F19-42C9-A951-DA611BB0F4BE}.Debug|Any CPU.Build.0 = Debug|Any CPU {C6B569BC-6F19-42C9-A951-DA611BB0F4BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -147,14 +102,6 @@ Global {C6B569BC-6F19-42C9-A951-DA611BB0F4BE}.Release|Any CPU.Build.0 = Release|Any CPU {C6B569BC-6F19-42C9-A951-DA611BB0F4BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {C6B569BC-6F19-42C9-A951-DA611BB0F4BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {D5EFA02A-971E-477C-896B-C3AA93093267}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5EFA02A-971E-477C-896B-C3AA93093267}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5EFA02A-971E-477C-896B-C3AA93093267}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D5EFA02A-971E-477C-896B-C3AA93093267}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {D5EFA02A-971E-477C-896B-C3AA93093267}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5EFA02A-971E-477C-896B-C3AA93093267}.Release|Any CPU.Build.0 = Release|Any CPU - {D5EFA02A-971E-477C-896B-C3AA93093267}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {D5EFA02A-971E-477C-896B-C3AA93093267}.Release|Mixed Platforms.Build.0 = Release|Any CPU {80F0481A-66C7-4442-96D3-5FD841132C4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {80F0481A-66C7-4442-96D3-5FD841132C4B}.Debug|Any CPU.Build.0 = Debug|Any CPU {80F0481A-66C7-4442-96D3-5FD841132C4B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -195,14 +142,6 @@ Global {00BF736C-B562-4251-9836-EF80282956AF}.Release|Any CPU.Build.0 = Release|Any CPU {00BF736C-B562-4251-9836-EF80282956AF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {00BF736C-B562-4251-9836-EF80282956AF}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {AC7D8533-C823-4E93-B008-51B3C4744E2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC7D8533-C823-4E93-B008-51B3C4744E2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC7D8533-C823-4E93-B008-51B3C4744E2E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {AC7D8533-C823-4E93-B008-51B3C4744E2E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {AC7D8533-C823-4E93-B008-51B3C4744E2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC7D8533-C823-4E93-B008-51B3C4744E2E}.Release|Any CPU.Build.0 = Release|Any CPU - {AC7D8533-C823-4E93-B008-51B3C4744E2E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {AC7D8533-C823-4E93-B008-51B3C4744E2E}.Release|Mixed Platforms.Build.0 = Release|Any CPU {30AE1A5D-775A-4DEC-9F87-849D8AE93E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {30AE1A5D-775A-4DEC-9F87-849D8AE93E3A}.Debug|Any CPU.Build.0 = Debug|Any CPU {30AE1A5D-775A-4DEC-9F87-849D8AE93E3A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -267,30 +206,27 @@ Global {CAF98D8B-9202-4CC3-83EC-C384D8EEA792}.Release|Any CPU.Build.0 = Release|Any CPU {CAF98D8B-9202-4CC3-83EC-C384D8EEA792}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {CAF98D8B-9202-4CC3-83EC-C384D8EEA792}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {E31B7A59-5E13-48BB-8127-D11D41EF16C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E31B7A59-5E13-48BB-8127-D11D41EF16C5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E31B7A59-5E13-48BB-8127-D11D41EF16C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E31B7A59-5E13-48BB-8127-D11D41EF16C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E31B7A59-5E13-48BB-8127-D11D41EF16C5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E31B7A59-5E13-48BB-8127-D11D41EF16C5}.Release|Any CPU.Build.0 = Release|Any CPU + {E31B7A59-5E13-48BB-8127-D11D41EF16C5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {E31B7A59-5E13-48BB-8127-D11D41EF16C5}.Release|Mixed Platforms.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {ACE58393-3419-4FCA-87CC-C33EB756C7E4} = {DF56FBAD-8745-404B-94A1-E83BFC4AD7CB} {9718F051-147F-4F5F-9FF3-C926430EFCF7} = {8CA9F9C9-DA39-4159-86F3-C52F1636715E} - {F254D4FB-428D-408E-8251-39BCA7B4B5CE} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} {C6B569BC-6F19-42C9-A951-DA611BB0F4BE} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} - {A78F50D4-F518-4DCB-878B-526FD54CCA35} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} - {568AEB4F-BA4C-47A5-9FA3-68F06CD11FED} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} - {D5EFA02A-971E-477C-896B-C3AA93093267} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} - {9B524BD3-682D-4B6F-9251-D4B2911DF0FD} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} {80F0481A-66C7-4442-96D3-5FD841132C4B} = {701D2D4F-B581-45A2-AF29-4F34EC5F047B} {94127FD9-E516-4891-98D4-EF7523117F32} = {D87119AF-CD35-46F2-84A6-ED54CC42027E} {E166D200-0687-4E6D-B836-029AE690AEAB} = {1A75535C-B8E5-4C31-BC6E-50456C8C4052} {95D90911-2909-4914-920E-7710F7BB6C32} = {DF56FBAD-8745-404B-94A1-E83BFC4AD7CB} - {76B21FAA-270D-47DE-B14B-BEC87EDC34F1} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} {D13C3EC7-B300-4158-9054-216156B203BE} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} {00BF736C-B562-4251-9836-EF80282956AF} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} - {30A45441-0849-48FE-AD37-5D29D0E3068A} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} - {AC7D8533-C823-4E93-B008-51B3C4744E2E} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} - {054C25DC-E545-4712-95C4-81F30CF65CE8} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} - {A8BA3BD0-19CE-488D-B2BD-0B9B677F4E03} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} {2BB7F06B-F094-417F-8C1B-7FCCA1192E17} = {85C7566E-98C3-479D-AC4F-0D4B161B7D42} {41301181-F4BE-4C36-B78D-A29C55CB0469} = {85C7566E-98C3-479D-AC4F-0D4B161B7D42} {9853A2A5-FD6C-4743-927E-0BFE807AD21C} = {DF56FBAD-8745-404B-94A1-E83BFC4AD7CB} @@ -298,6 +234,7 @@ Global {7592A20A-1775-4479-B624-7275173E9821} = {701D2D4F-B581-45A2-AF29-4F34EC5F047B} {1231D63B-E7FA-4BA7-9916-FA7325DB936D} = {1A75535C-B8E5-4C31-BC6E-50456C8C4052} {CAF98D8B-9202-4CC3-83EC-C384D8EEA792} = {D87119AF-CD35-46F2-84A6-ED54CC42027E} + {E31B7A59-5E13-48BB-8127-D11D41EF16C5} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F99E0A07-C363-49BF-BFA7-C748391CE38E} diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/Filtering.Shared.projitems b/WEB/Src/PerformanceCollector/Filtering.Shared/Filtering.Shared.projitems deleted file mode 100644 index 7a8b3e800..000000000 --- a/WEB/Src/PerformanceCollector/Filtering.Shared/Filtering.Shared.projitems +++ /dev/null @@ -1,31 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - 568aeb4f-ba4c-47a5-9fa3-68f06cd11fed - - - Microsoft.ApplicationInsights.Extensibility.Filtering - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/Filtering.Shared.shproj b/WEB/Src/PerformanceCollector/Filtering.Shared/Filtering.Shared.shproj deleted file mode 100644 index 0a21a50b6..000000000 --- a/WEB/Src/PerformanceCollector/Filtering.Shared/Filtering.Shared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - 568aeb4f-ba4c-47a5-9fa3-68f06cd11fed - 15.0 - - - - - - - - diff --git a/WEB/Src/PerformanceCollector/NetCore.Tests/Perf.NetCore.Tests.csproj b/WEB/Src/PerformanceCollector/NetCore.Tests/Perf.NetCore.Tests.csproj deleted file mode 100644 index 200a80730..000000000 --- a/WEB/Src/PerformanceCollector/NetCore.Tests/Perf.NetCore.Tests.csproj +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - netcoreapp1.0 - Microsoft.AI.PerformanceCollector.NetCore.Tests - Microsoft.AI.DependencyCollector.Tests - true - 1.0.4 - Microsoft.ApplicationInsights.Tests - - - - 1701;1702;1705;1591;8002 - TRACE;DEBUG;NETCORE;NETCOREAPP1_0 - - - - 1701;1702;1705;1591;8002 - TRACE;RELEASE;NETCORE;NETCOREAPP1_0 - - - - - - - - - - - - - - - - - - - - - - diff --git a/WEB/Src/PerformanceCollector/NetCore20.Tests/Perf-NetCore20.Tests/Perf-NetCore20.Tests.csproj b/WEB/Src/PerformanceCollector/NetCore20.Tests/Perf-NetCore20.Tests/Perf-NetCore20.Tests.csproj deleted file mode 100644 index d620cbb5e..000000000 --- a/WEB/Src/PerformanceCollector/NetCore20.Tests/Perf-NetCore20.Tests/Perf-NetCore20.Tests.csproj +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - netcoreapp2.0 - Microsoft.AI.PerformanceCollector.NetCore20.Tests - Microsoft.AI.PerformanceCollector.Tests - true - Microsoft.ApplicationInsights.Tests - - - - 1701;1702;1705;1591;8002 - TRACE;DEBUG;NETCORE;NETCOREAPP2_0 - - - - 1701;1702;1705;1591;8002 - TRACE;RELEASE;NETCORE;NETCOREAPP2_0 - - - - - - - - - - - - - - - - - - - - - diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/Perf.Net45.Tests.csproj b/WEB/Src/PerformanceCollector/Perf.Net45.Tests/Perf.Net45.Tests.csproj deleted file mode 100644 index 3dcd1d9b4..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/Perf.Net45.Tests.csproj +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - Debug - AnyCPU - {F254D4FB-428D-408E-8251-39BCA7B4B5CE} - Library - Microsoft.ApplicationInsights.Tests - Microsoft.AI.PerformanceCollector.Net45.Tests - v4.5 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), PerformanceCollectorTests.sln)) - - - - - true - full - false - DEBUG;TRACE;NET45 - prompt - 4 - - - pdbonly - true - TRACE;NET45 - prompt - 4 - - - - - - ..\..\..\..\..\packages\System.Buffers.4.5.1\lib\netstandard1.1\System.Buffers.dll - - - ..\..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net45\System.Diagnostics.DiagnosticSource.dll - - - ..\..\..\..\..\packages\System.Memory.4.5.4\lib\netstandard1.1\System.Memory.dll - - - - - ..\..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll - - - - - - - - - - - - - - - - - - - - - - Designer - - - - - - - - {e3d160e8-7f8c-416f-946f-6fdfc6787461} - Microsoft.ApplicationInsights - - - {00bf736c-b562-4251-9836-ef80282956af} - Perf - - - - - - - \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/Settings.StyleCop b/WEB/Src/PerformanceCollector/Perf.Net45.Tests/Settings.StyleCop deleted file mode 100644 index dd11cfc2c..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/Settings.StyleCop +++ /dev/null @@ -1,104 +0,0 @@ - - - NoMerge - False - - - - - False - - \.g\.cs$ - \.generated\.cs$ - \.g\.i\.cs$ - TemporaryGeneratedFile_.*\.cs$ - - - - - - - - - - True - - - - - True - - - - - True - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - False - - - - - Microsoft - Copyright © Microsoft. All Rights Reserved. - - - - - - - False - - - - - False - - - - - - - - - if - is - on - to - - - - - \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/Test.Common.Sdk.Net45.targets b/WEB/Src/PerformanceCollector/Perf.Net45.Tests/Test.Common.Sdk.Net45.targets deleted file mode 100644 index 2a044bc72..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/Test.Common.Sdk.Net45.targets +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - $(BinRoot)\$(Configuration)\Src\Web\Web.Net45\Microsoft.ApplicationInsights.dll - - - $(BinRoot)\$(Configuration)\Src\Web\Web.Net45\Microsoft.AI.Web.dll - - - $(BinRoot)\$(Configuration)\Src\WindowsServer\WindowsServer.Net45\Microsoft.AI.WindowsServer.dll - - - - - - <_CustomFiles Include=" - $(BinRoot)\$(Configuration)\Src\WindowsServer\WindowsServer.Net45\*.dll; - $(BinRoot)\$(Configuration)\Src\Web\Web.Net45\*.dll; - " /> - - %(RecursiveDir)bin\%(Filename)%(Extension) - - - - - - - - CopyAppInsightsSdkFiles; - $(CopyAllFilesToSingleFolderForPackageDependsOn); - - - - - CopyAppInsightsSdkFiles; - $(CopyAllFilesToSingleFolderForPackageDependsOn); - - - - \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/Test.Common.props b/WEB/Src/PerformanceCollector/Perf.Net45.Tests/Test.Common.props deleted file mode 100644 index 3ebf665c4..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/Test.Common.props +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/app.config b/WEB/Src/PerformanceCollector/Perf.Net45.Tests/app.config deleted file mode 100644 index c1ad40612..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/app.config +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/packages.config b/WEB/Src/PerformanceCollector/Perf.Net45.Tests/packages.config deleted file mode 100644 index 223d45b94..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard.Stubs/Perf.Shared.NetStandard.Stubs.projitems b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard.Stubs/Perf.Shared.NetStandard.Stubs.projitems deleted file mode 100644 index c9633e683..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard.Stubs/Perf.Shared.NetStandard.Stubs.projitems +++ /dev/null @@ -1,16 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - 30a45441-0849-48fe-ad37-5d29d0e3068a - - - Perf.Shared.NetStandard.Stubs - - - - - - - \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard.Stubs/Perf.Shared.NetStandard.Stubs.shproj b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard.Stubs/Perf.Shared.NetStandard.Stubs.shproj deleted file mode 100644 index a71270759..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard.Stubs/Perf.Shared.NetStandard.Stubs.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - 30a45441-0849-48fe-ad37-5d29d0e3068a - 14.0 - - - - - - - - diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/AssemblyInfo.cs b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/AssemblyInfo.cs deleted file mode 100644 index 32bb97e2b..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/AssemblyInfo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Microsoft.AI.PerformanceCollector.NetCore.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard.Stubs/Implementaion/QuickPulse/Process/PerfLib/NativeMethods.cs b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Implementation/QuickPulse/Process/PerfLib/NativeMethods.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.NetStandard.Stubs/Implementaion/QuickPulse/Process/PerfLib/NativeMethods.cs rename to WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Implementation/QuickPulse/Process/PerfLib/NativeMethods.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard.Stubs/Implementaion/QuickPulse/Process/PerfLib/PerformanceMonitor.cs b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Implementation/QuickPulse/Process/PerfLib/PerformanceMonitor.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.NetStandard.Stubs/Implementaion/QuickPulse/Process/PerfLib/PerformanceMonitor.cs rename to WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Implementation/QuickPulse/Process/PerfLib/PerformanceMonitor.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard.Stubs/Implementaion/QuickPulse/Process/QuickPulseTopCpuCollector.cs b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Implementation/QuickPulse/Process/QuickPulseTopCpuCollector.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.NetStandard.Stubs/Implementaion/QuickPulse/Process/QuickPulseTopCpuCollector.cs rename to WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Implementation/QuickPulse/Process/QuickPulseTopCpuCollector.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20/CounterFactoryXPlatform.cs b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Implementation/XPlatform/CounterFactoryXPlatform.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20/CounterFactoryXPlatform.cs rename to WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Implementation/XPlatform/CounterFactoryXPlatform.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20/PerformanceCollectorXPlatform.cs b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Implementation/XPlatform/PerformanceCollectorXPlatform.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20/PerformanceCollectorXPlatform.cs rename to WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Implementation/XPlatform/PerformanceCollectorXPlatform.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20/XPlatProcessCPUPerformanceCounter.cs b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Implementation/XPlatform/XPlatProcessCPUPerformanceCounter.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20/XPlatProcessCPUPerformanceCounter.cs rename to WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Implementation/XPlatform/XPlatProcessCPUPerformanceCounter.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20/XPlatProcessCPUPerformanceCounterNormalized.cs b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Implementation/XPlatform/XPlatProcessCPUPerformanceCounterNormalized.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20/XPlatProcessCPUPerformanceCounterNormalized.cs rename to WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Implementation/XPlatform/XPlatProcessCPUPerformanceCounterNormalized.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20/XPlatProcessMemoryPerformanceCounter.cs b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Implementation/XPlatform/XPlatProcessMemoryPerformanceCounter.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20/XPlatProcessMemoryPerformanceCounter.cs rename to WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Implementation/XPlatform/XPlatProcessMemoryPerformanceCounter.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Perf.Shared.NetStandard.projitems b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Perf.Shared.NetStandard.projitems index 14409264e..3cf1073ce 100644 --- a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Perf.Shared.NetStandard.projitems +++ b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard/Perf.Shared.NetStandard.projitems @@ -9,8 +9,18 @@ Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector - + + + + + + + + + + + \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard16.Stubs/AssemblyInfo.cs b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard16.Stubs/AssemblyInfo.cs deleted file mode 100644 index 33c457c22..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard16.Stubs/AssemblyInfo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Microsoft.AI.PerformanceCollector.NetCore.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard16.Stubs/Implementation/StandardPerformanceCollector/StandardPerformanceCollector.cs b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard16.Stubs/Implementation/StandardPerformanceCollector/StandardPerformanceCollector.cs deleted file mode 100644 index a6fd30f5a..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard16.Stubs/Implementation/StandardPerformanceCollector/StandardPerformanceCollector.cs +++ /dev/null @@ -1,64 +0,0 @@ -namespace Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.Implementation.StandardPerfCollector -{ - using System; - using System.Collections.Generic; - - internal class StandardPerformanceCollectorStub : IPerformanceCollector - { - private static readonly Tuple[] emptyCollectResult = Array.Empty>(); - - /// - /// Gets a collection of registered performance counters. - /// - public IEnumerable PerformanceCounters { get; } = Array.Empty(); - - /// - /// Initializes a new instance of the class. - /// - public StandardPerformanceCollectorStub() - { - PerformanceCollectorEventSource.Log.PerfCounterNetCoreOnlyOnAzureWebApp(); - } - - /// - /// Performs collection for all registered counters. - /// - /// Invoked when an individual counter fails to be read. - public IEnumerable> Collect(Action onReadingFailure = null) - { - return StandardPerformanceCollectorStub.emptyCollectResult; - } - - /// - /// Refreshes counters. - /// - public void RefreshCounters() - { - } - - /// - /// Registers a counter using the counter name and reportAs value to the total list of counters. - /// - /// Name of the performance counter. - /// Report as name for the performance counter. - /// Captures the error logged. - /// Boolean that controls the registry of the counter based on the availability of instance place holder. - public void RegisterCounter( - string perfCounterName, - string reportAs, - out string error, - bool blockCounterWithInstancePlaceHolder = false) - { - error = string.Empty; - } - - /// - /// Removes a counter. - /// - /// Name of the performance counter to remove. - /// ReportAs value of the performance counter to remove. - public void RemoveCounter(string perfCounter, string reportAs) - { - } - } -} diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard16.Stubs/Perf.Shared.NetStandard16.Stubs.projitems b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard16.Stubs/Perf.Shared.NetStandard16.Stubs.projitems deleted file mode 100644 index 6fd20d364..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard16.Stubs/Perf.Shared.NetStandard16.Stubs.projitems +++ /dev/null @@ -1,15 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - 76b21faa-270d-47de-b14b-bec87edc34f1 - - - Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector - - - - - - \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard16.Stubs/Perf.Shared.NetStandard16.Stubs.shproj b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard16.Stubs/Perf.Shared.NetStandard16.Stubs.shproj deleted file mode 100644 index 01d799571..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard16.Stubs/Perf.Shared.NetStandard16.Stubs.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - 76b21faa-270d-47de-b14b-bec87edc34f1 - 15.0 - - - - - - - - diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20/Perf.Shared.NetStandard20.projitems b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20/Perf.Shared.NetStandard20.projitems deleted file mode 100644 index 5ee4b0520..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20/Perf.Shared.NetStandard20.projitems +++ /dev/null @@ -1,18 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - a8ba3bd0-19ce-488d-b2bd-0b9b677f4e03 - - - Perf.Shared.NetStandard20 - - - - - - - - - \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20/Perf.Shared.NetStandard20.shproj b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20/Perf.Shared.NetStandard20.shproj deleted file mode 100644 index 506a57598..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20/Perf.Shared.NetStandard20.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - a8ba3bd0-19ce-488d-b2bd-0b9b677f4e03 - 14.0 - - - - - - - - diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20Net45/Perf.Shared.NetStandard20Net45.projitems b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20Net45/Perf.Shared.NetStandard20Net45.projitems deleted file mode 100644 index 6b25d5485..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20Net45/Perf.Shared.NetStandard20Net45.projitems +++ /dev/null @@ -1,17 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - 054c25dc-e545-4712-95c4-81f30cf65ce8 - - - Perf.Shared.NetStandard20Net45 - - - - - - - - \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20Net45/Perf.Shared.NetStandard20Net45.shproj b/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20Net45/Perf.Shared.NetStandard20Net45.shproj deleted file mode 100644 index 6f5cfb9d0..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20Net45/Perf.Shared.NetStandard20Net45.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - 054c25dc-e545-4712-95c4-81f30cf65ce8 - 14.0 - - - - - - - - diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/Perf.Shared.Tests.projitems b/WEB/Src/PerformanceCollector/Perf.Shared.Tests/Perf.Shared.Tests.projitems deleted file mode 100644 index 8d2fab065..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/Perf.Shared.Tests.projitems +++ /dev/null @@ -1,67 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - 9b524bd3-682d-4b6f-9251-d4b2911df0fd - - - Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.Tests - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/Perf.Shared.Tests.shproj b/WEB/Src/PerformanceCollector/Perf.Shared.Tests/Perf.Shared.Tests.shproj deleted file mode 100644 index 7293324a4..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/Perf.Shared.Tests.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - 9b524bd3-682d-4b6f-9251-d4b2911df0fd - 15.0 - - - - - - - - diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/PerformanceCollectorModuleTests.cs b/WEB/Src/PerformanceCollector/Perf.Shared.Tests/PerformanceCollectorModuleTests.cs deleted file mode 100644 index 9c0bd0225..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/PerformanceCollectorModuleTests.cs +++ /dev/null @@ -1,140 +0,0 @@ -namespace Microsoft.ApplicationInsights.Tests -{ - using System; - using System.Collections.Generic; - using System.Threading.Tasks; - using Microsoft.ApplicationInsights.Extensibility; - using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector; - using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.Implementation; - using Microsoft.VisualStudio.TestTools.UnitTesting; - - /// - /// PerformanceCollectorModuleTests tests. - /// The goal is to test that the default list contains only those counters which are supported. - /// Adding any unsupported counter by default will add noisy traces to user ikey. - /// - [TestClass] - public class PerformanceCollectorModuleTests - { - [TestMethod] - public void PerformanceCollectorModuleDefaultContainsExpectedCountersNonWindows() - { -#if NETCOREAPP2_0 - PerformanceCounterUtility.isAzureWebApp = null; - var original = PerformanceCounterUtility.IsWindows; - PerformanceCounterUtility.IsWindows = false; - var module = new PerformanceCollectorModule(); - - try - { - module.Initialize(new TelemetryConfiguration()); - - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\% Processor Time")); - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\% Processor Time Normalized")); - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\Private Bytes")); - Assert.AreEqual(3, module.DefaultCounters.Count); - } - finally - { - PerformanceCounterUtility.IsWindows = original; - module.Dispose(); - } -#endif - } - - [TestMethod] - public void PerformanceCollectorModuleDefaultContainsExpectedCountersWebApps() - { - PerformanceCounterUtility.isAzureWebApp = null; - Environment.SetEnvironmentVariable("WEBSITE_SITE_NAME", "something"); - var module = new PerformanceCollectorModule(); - try - { - module.Initialize(new TelemetryConfiguration()); - - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\% Processor Time")); - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\% Processor Time Normalized")); - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\Private Bytes")); - - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Memory\Available Bytes")); - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\IO Data Bytes/sec")); - -#if NET45 - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\ASP.NET Applications(??APP_W3SVC_PROC??)\Requests/Sec")); - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\.NET CLR Exceptions(??APP_CLR_PROC??)\# of Exceps Thrown / sec")); - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\ASP.NET Applications(??APP_W3SVC_PROC??)\Request Execution Time")); - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\ASP.NET Applications(??APP_W3SVC_PROC??)\Requests In Application Queue")); - Assert.AreEqual(9, module.DefaultCounters.Count); -#else - Assert.AreEqual(5, module.DefaultCounters.Count); -#endif - } - finally - { - PerformanceCounterUtility.isAzureWebApp = null; - module.Dispose(); - Environment.SetEnvironmentVariable("WEBSITE_SITE_NAME", string.Empty); - Task.Delay(1000).Wait(); - } - } - - [TestMethod] - public void PerformanceCollectorModuleDefaultContainsExpectedCountersWindows() - { - PerformanceCounterUtility.isAzureWebApp = null; - var module = new PerformanceCollectorModule(); -#if NETCOREAPP2_0 - var original = PerformanceCounterUtility.IsWindows; - PerformanceCounterUtility.IsWindows = true; -#endif - try - { - module.Initialize(new TelemetryConfiguration()); -#if !NETCOREAPP1_0 - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\% Processor Time")); - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\% Processor Time Normalized")); - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\Private Bytes")); - - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Memory\Available Bytes")); - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\IO Data Bytes/sec")); - -#if NET45 - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\ASP.NET Applications(??APP_W3SVC_PROC??)\Requests/Sec")); - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\.NET CLR Exceptions(??APP_CLR_PROC??)\# of Exceps Thrown / sec")); - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\ASP.NET Applications(??APP_W3SVC_PROC??)\Request Execution Time")); - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\ASP.NET Applications(??APP_W3SVC_PROC??)\Requests In Application Queue")); -#endif - - Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Processor(_Total)\% Processor Time")); -#if NET45 - Assert.AreEqual(10, module.DefaultCounters.Count); -#else - Assert.AreEqual(6, module.DefaultCounters.Count); -#endif - -#endif - - } - finally - { - module.Dispose(); -#if NETCOREAPP2_0 - PerformanceCounterUtility.IsWindows = original; -#endif - } - } - - private bool ContainsPerfCounter(IList counters, string name) - { - foreach (var counter in counters) - { - if (counter.PerformanceCounter.Equals(name)) - { - return true; - } - } - - return false; - } - } -} \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Perf.Shared.projitems b/WEB/Src/PerformanceCollector/Perf.Shared/Perf.Shared.projitems deleted file mode 100644 index c9c30f9cc..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Shared/Perf.Shared.projitems +++ /dev/null @@ -1,82 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - a78f50d4-f518-4dcb-878b-526fd54cca35 - - - Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - - - True - - - \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Perf.Shared.shproj b/WEB/Src/PerformanceCollector/Perf.Shared/Perf.Shared.shproj deleted file mode 100644 index 5a5c52c3c..000000000 --- a/WEB/Src/PerformanceCollector/Perf.Shared/Perf.Shared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - a78f50d4-f518-4dcb-878b-526fd54cca35 - 15.0 - - - - - - - - diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/ArrayHelpers.cs b/WEB/Src/PerformanceCollector/Perf.Tests/ArrayHelpers.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/ArrayHelpers.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/ArrayHelpers.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/Filtering/AccumulatedValuesTest.cs b/WEB/Src/PerformanceCollector/Perf.Tests/Filtering/AccumulatedValuesTest.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/Filtering/AccumulatedValuesTest.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/Filtering/AccumulatedValuesTest.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/Filtering/CalculatedMetricTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/Filtering/CalculatedMetricTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/Filtering/CalculatedMetricTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/Filtering/CalculatedMetricTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/Filtering/CollectionConfigurationAccumulatorTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/Filtering/CollectionConfigurationAccumulatorTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/Filtering/CollectionConfigurationAccumulatorTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/Filtering/CollectionConfigurationAccumulatorTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/Filtering/CollectionConfigurationTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/Filtering/CollectionConfigurationTests.cs similarity index 99% rename from WEB/Src/PerformanceCollector/Perf.Net45.Tests/Filtering/CollectionConfigurationTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/Filtering/CollectionConfigurationTests.cs index 041aaf48e..b42469bb5 100644 --- a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/Filtering/CollectionConfigurationTests.cs +++ b/WEB/Src/PerformanceCollector/Perf.Tests/Filtering/CollectionConfigurationTests.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NET45 +namespace Microsoft.ApplicationInsights.Tests { using System; using System.Linq; @@ -892,4 +893,5 @@ Assert.AreEqual(null, errors[2].Data["FilterComparand"]); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/Filtering/DocumentStreamTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/Filtering/DocumentStreamTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/Filtering/DocumentStreamTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/Filtering/DocumentStreamTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/Filtering/FilterConjunctionGroupTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/Filtering/FilterConjunctionGroupTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/Filtering/FilterConjunctionGroupTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/Filtering/FilterConjunctionGroupTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/Filtering/FilterTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/Filtering/FilterTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/Filtering/FilterTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/Filtering/FilterTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/Filtering/Mocks/TelemetryMock.cs b/WEB/Src/PerformanceCollector/Perf.Tests/Filtering/Mocks/TelemetryMock.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/Filtering/Mocks/TelemetryMock.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/Filtering/Mocks/TelemetryMock.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/GlobalSuppressions.cs b/WEB/Src/PerformanceCollector/Perf.Tests/GlobalSuppressions.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/GlobalSuppressions.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/GlobalSuppressions.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/Helpers/HttpContextHelper.cs b/WEB/Src/PerformanceCollector/Perf.Tests/Helpers/HttpContextHelper.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/Helpers/HttpContextHelper.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/Helpers/HttpContextHelper.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/Helpers/SimpleTelemetryProcessorSpy.cs b/WEB/Src/PerformanceCollector/Perf.Tests/Helpers/SimpleTelemetryProcessorSpy.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/Helpers/SimpleTelemetryProcessorSpy.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/Helpers/SimpleTelemetryProcessorSpy.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/Mocks/PerformanceCollectorMock.cs b/WEB/Src/PerformanceCollector/Perf.Tests/Mocks/PerformanceCollectorMock.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/Mocks/PerformanceCollectorMock.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/Mocks/PerformanceCollectorMock.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Tests/Perf.Tests.csproj b/WEB/Src/PerformanceCollector/Perf.Tests/Perf.Tests.csproj new file mode 100644 index 000000000..f666f553a --- /dev/null +++ b/WEB/Src/PerformanceCollector/Perf.Tests/Perf.Tests.csproj @@ -0,0 +1,64 @@ + + + + + + + + net45;netcoreapp2.1;netcoreapp3.1 + Microsoft.AI.PerformanceCollector.Tests + Microsoft.AI.DependencyCollector.Tests + true + Microsoft.ApplicationInsights.Tests + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + + + + + + \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/PerformanceCollectorEventSourceTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorEventSourceTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/PerformanceCollectorEventSourceTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorEventSourceTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/PerformanceCollectorModuleTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorModuleTests.cs similarity index 75% rename from WEB/Src/PerformanceCollector/Perf.Net45.Tests/PerformanceCollectorModuleTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorModuleTests.cs index 619f97c33..c1bd15831 100644 --- a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/PerformanceCollectorModuleTests.cs +++ b/WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorModuleTests.cs @@ -5,6 +5,7 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Threading; + using System.Threading.Tasks; using Microsoft.ApplicationInsights.DataContracts; using Microsoft.ApplicationInsights.Extensibility; using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector; @@ -19,6 +20,7 @@ [TestClass] public class PerformanceCollectorModulesTests { +#if NET45 [TestMethod] [SuppressMessage(category: "Microsoft.Globalization", checkId: "CA1305:SpecifyIFormatProvider", Justification = "Don't care about invariant in unit tests.")] public void TimerTest() @@ -40,7 +42,7 @@ Assert.IsInstanceOfType(telemetry, typeof(MetricTelemetry)); var perfTelemetry = telemetry as MetricTelemetry; - + Assert.AreEqual((double)perfTelemetry.Name.GetHashCode(), perfTelemetry.Sum); } catch (AssertFailedException e) @@ -104,7 +106,7 @@ var collector = CreatePerformanceCollector(); var configuration = CreateTelemetryConfiguration(); - + using (var module = CreatePerformanceCollectionModule(collector)) { // start the module @@ -326,7 +328,7 @@ // make the module think that initial binding has already happened and it's not time to rebind yet var privateObject = new PrivateObject(module); privateObject.SetField("lastRefreshTimestamp", DateTime.Now + TimeSpan.FromMinutes(1)); - + // wait 1s to let the module finish initializing Thread.Sleep(TimeSpan.FromSeconds(1)); @@ -387,5 +389,125 @@ return module; } +#endif + + [TestMethod] + public void PerformanceCollectorModuleDefaultContainsExpectedCountersNonWindows() + { +#if NETCOREAPP2_1 || NETCOREAPP3_1 + PerformanceCounterUtility.isAzureWebApp = null; + var original = PerformanceCounterUtility.IsWindows; + PerformanceCounterUtility.IsWindows = false; + var module = new PerformanceCollectorModule(); + + try + { + module.Initialize(new TelemetryConfiguration()); + + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\% Processor Time")); + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\% Processor Time Normalized")); + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\Private Bytes")); + Assert.AreEqual(3, module.DefaultCounters.Count); + } + finally + { + PerformanceCounterUtility.IsWindows = original; + module.Dispose(); + } +#endif + } + + [TestMethod] + public void PerformanceCollectorModuleDefaultContainsExpectedCountersWebApps() + { + PerformanceCounterUtility.isAzureWebApp = null; + Environment.SetEnvironmentVariable("WEBSITE_SITE_NAME", "something"); + var module = new PerformanceCollectorModule(); + try + { + module.Initialize(new TelemetryConfiguration()); + + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\% Processor Time")); + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\% Processor Time Normalized")); + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\Private Bytes")); + + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Memory\Available Bytes")); + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\IO Data Bytes/sec")); + +#if NET45 + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\ASP.NET Applications(??APP_W3SVC_PROC??)\Requests/Sec")); + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\.NET CLR Exceptions(??APP_CLR_PROC??)\# of Exceps Thrown / sec")); + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\ASP.NET Applications(??APP_W3SVC_PROC??)\Request Execution Time")); + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\ASP.NET Applications(??APP_W3SVC_PROC??)\Requests In Application Queue")); + Assert.AreEqual(9, module.DefaultCounters.Count); +#else + Assert.AreEqual(5, module.DefaultCounters.Count); +#endif + } + finally + { + PerformanceCounterUtility.isAzureWebApp = null; + module.Dispose(); + Environment.SetEnvironmentVariable("WEBSITE_SITE_NAME", string.Empty); + Task.Delay(1000).Wait(); + } + } + + [TestMethod] + public void PerformanceCollectorModuleDefaultContainsExpectedCountersWindows() + { + PerformanceCounterUtility.isAzureWebApp = null; + var module = new PerformanceCollectorModule(); +#if NETCOREAPP2_1 || NETCOREAPP3_1 + var original = PerformanceCounterUtility.IsWindows; + PerformanceCounterUtility.IsWindows = true; +#endif + try + { + module.Initialize(new TelemetryConfiguration()); + + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\% Processor Time")); + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\% Processor Time Normalized")); + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\Private Bytes")); + + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Memory\Available Bytes")); + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Process(??APP_WIN32_PROC??)\IO Data Bytes/sec")); + +#if NET45 + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\ASP.NET Applications(??APP_W3SVC_PROC??)\Requests/Sec")); + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\.NET CLR Exceptions(??APP_CLR_PROC??)\# of Exceps Thrown / sec")); + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\ASP.NET Applications(??APP_W3SVC_PROC??)\Request Execution Time")); + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\ASP.NET Applications(??APP_W3SVC_PROC??)\Requests In Application Queue")); +#endif + + Assert.IsTrue(ContainsPerfCounter(module.DefaultCounters, @"\Processor(_Total)\% Processor Time")); +#if NET45 + Assert.AreEqual(10, module.DefaultCounters.Count); +#else + Assert.AreEqual(6, module.DefaultCounters.Count); +#endif + } + finally + { + module.Dispose(); +#if NETCOREAPP2_1 || NETCOREAPP3_1 + PerformanceCounterUtility.IsWindows = original; +#endif + } + } + + private bool ContainsPerfCounter(IList counters, string name) + { + foreach (var counter in counters) + { + if (counter.PerformanceCounter.Equals(name)) + { + return true; + } + } + + return false; + } + } -} +} \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/PerformanceCollectorTestBase.cs b/WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorTestBase.cs similarity index 99% rename from WEB/Src/PerformanceCollector/Perf.Net45.Tests/PerformanceCollectorTestBase.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorTestBase.cs index 7249ef16e..df5d2209c 100644 --- a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/PerformanceCollectorTestBase.cs +++ b/WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorTestBase.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NET45 +namespace Microsoft.ApplicationInsights.Tests { using System; using System.Diagnostics; @@ -201,4 +202,5 @@ Assert.IsTrue(results[0].Item2 >= 0 && results[0].Item2 <= 100); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/PerformanceCollectorWebAppTestBase.cs b/WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorWebAppTestBase.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/PerformanceCollectorWebAppTestBase.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorWebAppTestBase.cs diff --git a/WEB/Src/PerformanceCollector/NetCore20.Tests/Perf-NetCore20.Tests/PerformanceCollectorXPlatformTestBase.cs b/WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorXPlatformTestBase.cs similarity index 97% rename from WEB/Src/PerformanceCollector/NetCore20.Tests/Perf-NetCore20.Tests/PerformanceCollectorXPlatformTestBase.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorXPlatformTestBase.cs index ef6703e0e..ed2c24de8 100644 --- a/WEB/Src/PerformanceCollector/NetCore20.Tests/Perf-NetCore20.Tests/PerformanceCollectorXPlatformTestBase.cs +++ b/WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorXPlatformTestBase.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NETCOREAPP2_1 || NETCOREAPP3_1 +namespace Microsoft.ApplicationInsights.Tests { using System; using System.Diagnostics; @@ -81,4 +82,5 @@ Assert.AreEqual(@"\Process(??APP_WIN32_PROC??)\% Processor Time", oneCounter.Single().OriginalString); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/NetCore20.Tests/Perf-NetCore20.Tests/PerformanceCollectorXPlatformTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorXPlatformTests.cs similarity index 91% rename from WEB/Src/PerformanceCollector/NetCore20.Tests/Perf-NetCore20.Tests/PerformanceCollectorXPlatformTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorXPlatformTests.cs index 8579e4259..0058cee93 100644 --- a/WEB/Src/PerformanceCollector/NetCore20.Tests/Perf-NetCore20.Tests/PerformanceCollectorXPlatformTests.cs +++ b/WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorXPlatformTests.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NETCOREAPP2_1 || NETCOREAPP3_1 +namespace Microsoft.ApplicationInsights.Tests { using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.Implementation; using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.Implementation.XPlatform; @@ -22,4 +23,5 @@ this.PerformanceCollectorAddRemoveCountersForXPlatformTest(new PerformanceCollectorXPlatform()); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/PerformanceCounterUtilityTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCounterUtilityTests.cs similarity index 98% rename from WEB/Src/PerformanceCollector/Perf.Net45.Tests/PerformanceCounterUtilityTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCounterUtilityTests.cs index 2447eebba..f03bac6da 100644 --- a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/PerformanceCounterUtilityTests.cs +++ b/WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCounterUtilityTests.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NET45 +namespace Microsoft.ApplicationInsights.Tests { using System.Collections.Concurrent; using System.Linq; @@ -99,4 +100,5 @@ Assert.AreEqual(string.Empty, pc.InstanceName); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/PerformanceCounterUtilityTestsCommon.cs b/WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCounterUtilityTestsCommon.cs similarity index 97% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/PerformanceCounterUtilityTestsCommon.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCounterUtilityTestsCommon.cs index 2afce1595..5dd5cb036 100644 --- a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/PerformanceCounterUtilityTestsCommon.cs +++ b/WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCounterUtilityTestsCommon.cs @@ -18,9 +18,7 @@ try { var actual = PerformanceCounterUtility.GetPerformanceCollector(); -#if NETCOREAPP1_0 - Assert.AreEqual("StandardPerformanceCollectorStub", actual.GetType().Name); -#elif NETCOREAPP2_0 +#if NETCOREAPP2_0 Assert.AreEqual("StandardPerformanceCollector", actual.GetType().Name); #else // NET45 Assert.AreEqual("StandardPerformanceCollector", actual.GetType().Name); @@ -53,7 +51,7 @@ [TestMethod] public void GetCollectorReturnsXPlatformCollectorForWebAppForLinux() { -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 || NETCOREAPP3_1 var original = PerformanceCounterUtility.IsWindows; try { @@ -75,7 +73,7 @@ [TestMethod] public void GetCollectorReturnsXPlatformCollectorForNonWindows() { -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 || NETCOREAPP3_1 var original = PerformanceCounterUtility.IsWindows; try { diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/Mocks/CategorySampleMock.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/Mocks/CategorySampleMock.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/Mocks/CategorySampleMock.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/Mocks/CategorySampleMock.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/Mocks/ClockMock.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/Mocks/ClockMock.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/Mocks/ClockMock.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/Mocks/ClockMock.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/Mocks/QuickPulseCollectionTimeSlotManagerMock.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/Mocks/QuickPulseCollectionTimeSlotManagerMock.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/Mocks/QuickPulseCollectionTimeSlotManagerMock.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/Mocks/QuickPulseCollectionTimeSlotManagerMock.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/Mocks/QuickPulsePerfLibMock.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/Mocks/QuickPulsePerfLibMock.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/Mocks/QuickPulsePerfLibMock.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/Mocks/QuickPulsePerfLibMock.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/Mocks/QuickPulseProcessProviderMock.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/Mocks/QuickPulseProcessProviderMock.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/Mocks/QuickPulseProcessProviderMock.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/Mocks/QuickPulseProcessProviderMock.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/Mocks/QuickPulseServiceClientMock.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/Mocks/QuickPulseServiceClientMock.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/Mocks/QuickPulseServiceClientMock.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/Mocks/QuickPulseServiceClientMock.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/Mocks/QuickPulseTopCpuCollectorMock.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/Mocks/QuickPulseTopCpuCollectorMock.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/Mocks/QuickPulseTopCpuCollectorMock.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/Mocks/QuickPulseTopCpuCollectorMock.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/QuickPulse/PerfLib/CategorySampleTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/PerfLib/CategorySampleTests.cs similarity index 96% rename from WEB/Src/PerformanceCollector/Perf.Net45.Tests/QuickPulse/PerfLib/CategorySampleTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/PerfLib/CategorySampleTests.cs index 730d40520..610769892 100644 --- a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/QuickPulse/PerfLib/CategorySampleTests.cs +++ b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/PerfLib/CategorySampleTests.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NET45 +namespace Microsoft.ApplicationInsights.Tests { using System.Collections.Generic; using System.IO; @@ -50,4 +51,5 @@ Assert.AreEqual("Idle", categorySample.InstanceNameTable.First().Key); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/QuickPulse/PerfLib/CounterDefinitionSampleTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/PerfLib/CounterDefinitionSampleTests.cs similarity index 97% rename from WEB/Src/PerformanceCollector/Perf.Net45.Tests/QuickPulse/PerfLib/CounterDefinitionSampleTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/PerfLib/CounterDefinitionSampleTests.cs index 94f8802ec..31f4fe83e 100644 --- a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/QuickPulse/PerfLib/CounterDefinitionSampleTests.cs +++ b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/PerfLib/CounterDefinitionSampleTests.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NET45 +namespace Microsoft.ApplicationInsights.Tests { using System; using System.Runtime.InteropServices; @@ -77,4 +78,5 @@ handle.Free(); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/QuickPulse/PerfLib/PerfData.data b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/PerfLib/PerfData.data similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Net45.Tests/QuickPulse/PerfLib/PerfData.data rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/PerfLib/PerfData.data diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/QuickPulse/PerfLib/PerformanceMonitorTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/PerfLib/PerformanceMonitorTests.cs similarity index 89% rename from WEB/Src/PerformanceCollector/Perf.Net45.Tests/QuickPulse/PerfLib/PerformanceMonitorTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/PerfLib/PerformanceMonitorTests.cs index 5182a3378..401768541 100644 --- a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/QuickPulse/PerfLib/PerformanceMonitorTests.cs +++ b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/PerfLib/PerformanceMonitorTests.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NET45 +namespace Microsoft.ApplicationInsights.Tests { using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.Implementation.QuickPulse.PerfLib; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -20,4 +21,5 @@ Assert.IsTrue(data.Length > 0); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseCollectionStateManagerTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseCollectionStateManagerTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseCollectionStateManagerTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseCollectionStateManagerTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseCollectionTimeSlotManagerTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseCollectionTimeSlotManagerTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseCollectionTimeSlotManagerTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseCollectionTimeSlotManagerTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseDataAccumulatorManagerTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseDataAccumulatorManagerTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseDataAccumulatorManagerTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseDataAccumulatorManagerTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseDataAccumulatorTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseDataAccumulatorTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseDataAccumulatorTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseDataAccumulatorTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseDataSampleTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseDataSampleTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseDataSampleTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseDataSampleTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseEventSourceTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseEventSourceTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseEventSourceTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseEventSourceTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseProcessProviderTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseProcessProviderTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseProcessProviderTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseProcessProviderTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseQuotaTrackerTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseQuotaTrackerTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseQuotaTrackerTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseQuotaTrackerTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseServiceClientHelpersTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseServiceClientHelpersTests.cs similarity index 96% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseServiceClientHelpersTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseServiceClientHelpersTests.cs index d42b874f2..0c6d16fba 100644 --- a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseServiceClientHelpersTests.cs +++ b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseServiceClientHelpersTests.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.Tests.QuickPulse +#if NETCOREAPP +namespace Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.Tests.QuickPulse { using System.Net.Http.Headers; using Microsoft.ApplicationInsights.Common.Internal; @@ -80,3 +81,4 @@ } } } +#endif \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseServiceClientTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseServiceClientTests.cs similarity index 96% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseServiceClientTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseServiceClientTests.cs index f87cf301d..510d6c975 100644 --- a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseServiceClientTests.cs +++ b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseServiceClientTests.cs @@ -127,16 +127,10 @@ Uri serviceEndpoint = new Uri(string.Format(CultureInfo.InvariantCulture, "http://localhost:{0}", port)); this.TestContext.Properties[ServiceEndpointPropertyName] = serviceEndpoint; -#if NETCOREAPP1_0 - this.Listener = new HttpListener(IPAddress.Loopback, port); -#else this.Listener = new HttpListener(); string uriPrefix = string.Format(CultureInfo.InvariantCulture, "http://localhost:{0}/", port); this.Listener.Prefixes.Add(uriPrefix); -#endif - this.Listener.Start(); - this.AssertionSync = new SemaphoreSlim(0); var eventListenerReady = new AutoResetEvent(false); @@ -163,13 +157,13 @@ } } - [TestMethod] + [TestMethod] public void QuickPulseServiceClientPingsTheService() { // ARRANGE string instance = Guid.NewGuid().ToString(); var timestamp = DateTimeOffset.UtcNow; - + var serviceClient = new QuickPulseServiceClient(this.TestContext.Properties[ServiceEndpointPropertyName] as Uri, instance, instance, instance, string.Empty, new Clock(), false, 0); // ACT @@ -1775,7 +1769,7 @@ new Exception("Exception2"), Tuple.Create("Prop2", "Val2")), }; - + // ACT CollectionConfigurationInfo configurationInfo; serviceClient.SubmitSamples( @@ -2010,11 +2004,8 @@ try { ev.Set(); -#if NETCOREAPP1_0 - HttpListenerContext context = listener.GetContextAsync().GetAwaiter().GetResult(); -#else + HttpListenerContext context = listener.GetContext(); -#endif var request = context.Request; @@ -2027,64 +2018,64 @@ switch (request.Url.LocalPath) { case "/ping": - { - this.pingCount++; + { + this.pingCount++; - this.pingResponse(context.Response); + this.pingResponse(context.Response); - var dataPoint = - (MonitoringDataPoint) serializerDataPoint.ReadObject(context.Request.InputStream); - var transmissionTime = long.Parse( - context.Request.Headers[QuickPulseConstants.XMsQpsTransmissionTimeHeaderName], - CultureInfo.InvariantCulture); - var instanceName = - context.Request.Headers[QuickPulseConstants.XMsQpsInstanceNameHeaderName]; - var machineName = context.Request.Headers[QuickPulseConstants.XMsQpsMachineNameHeaderName]; - var invariantVersion = - context.Request.Headers[QuickPulseConstants.XMsQpsInvariantVersionHeaderName]; - var streamId = context.Request.Headers[QuickPulseConstants.XMsQpsStreamIdHeaderName]; - var collectionConfigurationETag = - context.Request.Headers[QuickPulseConstants.XMsQpsConfigurationETagHeaderName]; + var dataPoint = + (MonitoringDataPoint)serializerDataPoint.ReadObject(context.Request.InputStream); + var transmissionTime = long.Parse( + context.Request.Headers[QuickPulseConstants.XMsQpsTransmissionTimeHeaderName], + CultureInfo.InvariantCulture); + var instanceName = + context.Request.Headers[QuickPulseConstants.XMsQpsInstanceNameHeaderName]; + var machineName = context.Request.Headers[QuickPulseConstants.XMsQpsMachineNameHeaderName]; + var invariantVersion = + context.Request.Headers[QuickPulseConstants.XMsQpsInvariantVersionHeaderName]; + var streamId = context.Request.Headers[QuickPulseConstants.XMsQpsStreamIdHeaderName]; + var collectionConfigurationETag = + context.Request.Headers[QuickPulseConstants.XMsQpsConfigurationETagHeaderName]; - this.pings.Add( - Tuple.Create( - new PingHeaders() - { - TransmissionTime = new DateTimeOffset(transmissionTime, TimeSpan.Zero), - InstanceName = instanceName, - MachineName = machineName, - InvariantVersion = int.Parse(invariantVersion, CultureInfo.InvariantCulture), - StreamId = streamId - }, - collectionConfigurationETag, - dataPoint)); + this.pings.Add( + Tuple.Create( + new PingHeaders() + { + TransmissionTime = new DateTimeOffset(transmissionTime, TimeSpan.Zero), + InstanceName = instanceName, + MachineName = machineName, + InvariantVersion = int.Parse(invariantVersion, CultureInfo.InvariantCulture), + StreamId = streamId + }, + collectionConfigurationETag, + dataPoint)); - this.lastPingTimestamp = dataPoint.Timestamp; - this.lastPingInstance = dataPoint.Instance; - this.lastVersion = dataPoint.Version; - } + this.lastPingTimestamp = dataPoint.Timestamp; + this.lastPingInstance = dataPoint.Instance; + this.lastVersion = dataPoint.Version; + } break; case "/post": - { - this.submitCount++; + { + this.submitCount++; - this.submitResponse(context.Response); + this.submitResponse(context.Response); - var dataPoints = - serializerDataPointArray.ReadObject(context.Request.InputStream) as MonitoringDataPoint - []; - var transmissionTime = long.Parse( - context.Request.Headers[QuickPulseConstants.XMsQpsTransmissionTimeHeaderName], - CultureInfo.InvariantCulture); - var collectionConfigurationETag = - context.Request.Headers[QuickPulseConstants.XMsQpsConfigurationETagHeaderName]; + var dataPoints = + serializerDataPointArray.ReadObject(context.Request.InputStream) as MonitoringDataPoint + []; + var transmissionTime = long.Parse( + context.Request.Headers[QuickPulseConstants.XMsQpsTransmissionTimeHeaderName], + CultureInfo.InvariantCulture); + var collectionConfigurationETag = + context.Request.Headers[QuickPulseConstants.XMsQpsConfigurationETagHeaderName]; - this.samples.AddRange( - dataPoints.Select( - dp => Tuple.Create(new DateTimeOffset(transmissionTime, TimeSpan.Zero), - collectionConfigurationETag, dp))); - } + this.samples.AddRange( + dataPoints.Select( + dp => Tuple.Create(new DateTimeOffset(transmissionTime, TimeSpan.Zero), + collectionConfigurationETag, dp))); + } break; default: @@ -2118,7 +2109,7 @@ message: string.Format(CultureInfo.InvariantCulture, "Not all requests finished processing: expected {0}, actual: {1}", requestCount, waitTasks.Count(task => task.Result))); } -#endregion + #endregion private class PingHeaders { diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/QuickPulse/QuickPulseTelemetryModuleNetFullTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseTelemetryModuleNetFullTests.cs similarity index 98% rename from WEB/Src/PerformanceCollector/Perf.Net45.Tests/QuickPulse/QuickPulseTelemetryModuleNetFullTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseTelemetryModuleNetFullTests.cs index 465952ce9..5aa9ad5d3 100644 --- a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/QuickPulse/QuickPulseTelemetryModuleNetFullTests.cs +++ b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseTelemetryModuleNetFullTests.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.Tests.QuickPulse +#if NET45 +namespace Microsoft.ApplicationInsights.Tests.QuickPulse { using System; using System.Collections.Generic; @@ -115,3 +116,4 @@ } } } +#endif \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseTelemetryModuleTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseTelemetryModuleTests.cs similarity index 99% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseTelemetryModuleTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseTelemetryModuleTests.cs index 5f60ba4ff..9127f5fea 100644 --- a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseTelemetryModuleTests.cs +++ b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseTelemetryModuleTests.cs @@ -23,7 +23,7 @@ { #pragma warning disable 0162 // TODO: Stabilize sleep-based tests -#if NETCORE +#if NETCOREAPP private const bool Ignored = true; #else private const bool Ignored = false; diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseTelemetryProcessorTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseTelemetryProcessorTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseTelemetryProcessorTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseTelemetryProcessorTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseTestHelper.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseTestHelper.cs similarity index 95% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseTestHelper.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseTestHelper.cs index 9ecbeb88a..8d322ed13 100644 --- a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseTestHelper.cs +++ b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseTestHelper.cs @@ -1,12 +1,12 @@ namespace Microsoft.ApplicationInsights.Tests { using System; -#if NETCORE +#if NETCOREAPP using System.Reflection; #endif using Microsoft.ApplicationInsights.Extensibility; using Microsoft.ApplicationInsights.Extensibility.Implementation; -#if !NETCORE +#if !NETCOREAPP using Microsoft.VisualStudio.TestTools.UnitTesting; #endif @@ -23,7 +23,7 @@ private static void SetPrivateStaticField(Type type, string fieldName, object value) { -#if NETCORE +#if NETCOREAPP TypeInfo typeInfo = type.GetTypeInfo(); FieldInfo field = typeInfo.GetField(fieldName, BindingFlags.NonPublic | BindingFlags.Static); field.SetValue(null, value); diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/QuickPulse/QuickPulseTopCpuCollectorTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseTopCpuCollectorTests.cs similarity index 99% rename from WEB/Src/PerformanceCollector/Perf.Net45.Tests/QuickPulse/QuickPulseTopCpuCollectorTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseTopCpuCollectorTests.cs index a7c7078ab..4cbd24d3e 100644 --- a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/QuickPulse/QuickPulseTopCpuCollectorTests.cs +++ b/WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseTopCpuCollectorTests.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NET45 +namespace Microsoft.ApplicationInsights.Tests { using System; using System.Collections; @@ -313,4 +314,5 @@ Assert.IsFalse(flagWhenEverythingIsBackToNormalForGood); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/StandardPerformanceCollectorTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/StandardPerformanceCollectorTests.cs similarity index 96% rename from WEB/Src/PerformanceCollector/Perf.Net45.Tests/StandardPerformanceCollectorTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/StandardPerformanceCollectorTests.cs index 4f732ff84..3106ce7ad 100644 --- a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/StandardPerformanceCollectorTests.cs +++ b/WEB/Src/PerformanceCollector/Perf.Tests/StandardPerformanceCollectorTests.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.Tests +#if NET45 +namespace Microsoft.ApplicationInsights.Tests { using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.Implementation.StandardPerfCollector; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -51,4 +52,5 @@ this.PerformanceCollectorNormalizedCpuTest(new StandardPerformanceCollector()); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/TelemetryAction.cs b/WEB/Src/PerformanceCollector/Perf.Tests/TelemetryAction.cs similarity index 76% rename from WEB/Src/PerformanceCollector/Perf.Net45.Tests/TelemetryAction.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/TelemetryAction.cs index 034a706fa..98d84be2d 100644 --- a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/TelemetryAction.cs +++ b/WEB/Src/PerformanceCollector/Perf.Tests/TelemetryAction.cs @@ -1,4 +1,5 @@ -namespace Microsoft.ApplicationInsights.TestFramework +#if NET45 +namespace Microsoft.ApplicationInsights.TestFramework { using Microsoft.ApplicationInsights.Channel; @@ -7,3 +8,4 @@ /// public delegate void TelemetryAction(ITelemetry telemetry); } +#endif \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollector/AzureWebAppTest.cs b/WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollector/AzureWebAppTest.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollector/AzureWebAppTest.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollector/AzureWebAppTest.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollector/CPUPercenageGaugeTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollector/CPUPercenageGaugeTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollector/CPUPercenageGaugeTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollector/CPUPercenageGaugeTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollector/CacheHelperTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollector/CacheHelperTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollector/CacheHelperTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollector/CacheHelperTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollector/NormalizedCPUPercenageGaugeTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollector/NormalizedCPUPercenageGaugeTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollector/NormalizedCPUPercenageGaugeTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollector/NormalizedCPUPercenageGaugeTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollector/RateCounterTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollector/RateCounterTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollector/RateCounterTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollector/RateCounterTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollector/RatioCounterTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollector/RatioCounterTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollector/RatioCounterTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollector/RatioCounterTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollector/SampleFiles/RemoteEnvironmentVariablesAllSampleOne.json b/WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollector/SampleFiles/RemoteEnvironmentVariablesAllSampleOne.json similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollector/SampleFiles/RemoteEnvironmentVariablesAllSampleOne.json rename to WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollector/SampleFiles/RemoteEnvironmentVariablesAllSampleOne.json diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollector/SampleFiles/RemoteEnvironmentVariablesAllSampleTwo.json b/WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollector/SampleFiles/RemoteEnvironmentVariablesAllSampleTwo.json similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollector/SampleFiles/RemoteEnvironmentVariablesAllSampleTwo.json rename to WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollector/SampleFiles/RemoteEnvironmentVariablesAllSampleTwo.json diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollector/SumUpCountersGaugeTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollector/SumUpCountersGaugeTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollector/SumUpCountersGaugeTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollector/SumUpCountersGaugeTests.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollectorTests.cs b/WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollectorTests.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.Tests/WebAppPerformanceCollectorTests.cs rename to WEB/Src/PerformanceCollector/Perf.Tests/WebAppPerformanceCollectorTests.cs diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/AccumulatedValues.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/AccumulatedValues.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Filtering.Shared/AccumulatedValues.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/AccumulatedValues.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/AssemblyInfo.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/AssemblyInfo.cs similarity index 81% rename from WEB/Src/PerformanceCollector/Perf.Shared/AssemblyInfo.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/AssemblyInfo.cs index b68173ac3..e60a624bb 100644 --- a/WEB/Src/PerformanceCollector/Perf.Shared/AssemblyInfo.cs +++ b/WEB/Src/PerformanceCollector/PerformanceCollector/AssemblyInfo.cs @@ -5,11 +5,8 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -[assembly: InternalsVisibleTo("TestApp40, PublicKey=" + AssemblyInfo.PublicKey)] [assembly: InternalsVisibleTo("TestApp45, PublicKey=" + AssemblyInfo.PublicKey)] -[assembly: InternalsVisibleTo("Microsoft.AI.PerformanceCollector.Net45.Tests, PublicKey=" + AssemblyInfo.PublicKey)] -[assembly: InternalsVisibleTo("Microsoft.AI.PerformanceCollector.NetCore.Tests, PublicKey=" + AssemblyInfo.PublicKey)] -[assembly: InternalsVisibleTo("Microsoft.AI.PerformanceCollector.NetCore20.Tests, PublicKey=" + AssemblyInfo.PublicKey)] +[assembly: InternalsVisibleTo("Microsoft.AI.PerformanceCollector.Tests, PublicKey=" + AssemblyInfo.PublicKey)] internal static class AssemblyInfo { diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/CalculatedMetric.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/CalculatedMetric.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Filtering.Shared/CalculatedMetric.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/CalculatedMetric.cs diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/CollectionConfiguration.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/CollectionConfiguration.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Filtering.Shared/CollectionConfiguration.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/CollectionConfiguration.cs diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/CollectionConfigurationAccumulator.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/CollectionConfigurationAccumulator.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Filtering.Shared/CollectionConfigurationAccumulator.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/CollectionConfigurationAccumulator.cs diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/DocumentStream.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/DocumentStream.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Filtering.Shared/DocumentStream.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/DocumentStream.cs diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/Filter.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Filter.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Filtering.Shared/Filter.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Filter.cs diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/FilterConjunctionGroup.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/FilterConjunctionGroup.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Filtering.Shared/FilterConjunctionGroup.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/FilterConjunctionGroup.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/GlobalSuppressions.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/GlobalSuppressions.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/GlobalSuppressions.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/GlobalSuppressions.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/IQuickPulseTelemetryProcessor.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/IQuickPulseTelemetryProcessor.cs similarity index 99% rename from WEB/Src/PerformanceCollector/Perf.Shared/IQuickPulseTelemetryProcessor.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/IQuickPulseTelemetryProcessor.cs index ccb45f163..2f9024a90 100644 --- a/WEB/Src/PerformanceCollector/Perf.Shared/IQuickPulseTelemetryProcessor.cs +++ b/WEB/Src/PerformanceCollector/PerformanceCollector/IQuickPulseTelemetryProcessor.cs @@ -6,10 +6,10 @@ internal interface IQuickPulseTelemetryProcessor { + Uri ServiceEndpoint { get; set; } + void StartCollection(IQuickPulseDataAccumulatorManager accumulatorManager, Uri serviceEndpoint, TelemetryConfiguration configuration, bool disableFullTelemetryItems = false); void StopCollection(); - - Uri ServiceEndpoint { get; set; } } } \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/ICounterValue.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/ICounterValue.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/ICounterValue.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/ICounterValue.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/IPerformanceCollector.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/IPerformanceCollector.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/IPerformanceCollector.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/IPerformanceCollector.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/PerformanceCollectorEventSource.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/PerformanceCollectorEventSource.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/PerformanceCollectorEventSource.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/PerformanceCollectorEventSource.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/PerformanceCounterData.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/PerformanceCounterData.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/PerformanceCounterData.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/PerformanceCounterData.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/PerformanceCounterStructure.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/PerformanceCounterStructure.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/PerformanceCounterStructure.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/PerformanceCounterStructure.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/PerformanceCounterUtility.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/PerformanceCounterUtility.cs similarity index 93% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/PerformanceCounterUtility.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/PerformanceCounterUtility.cs index accee92ca..49f8a7f47 100644 --- a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/PerformanceCounterUtility.cs +++ b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/PerformanceCounterUtility.cs @@ -10,7 +10,7 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Text.RegularExpressions; - using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.Implementation.StandardPerfCollector; + using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.Implementation.StandardPerfCollector; using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.Implementation.WebAppPerfCollector; #if NETSTANDARD2_0 using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.Implementation.XPlatform; @@ -49,10 +49,7 @@ private const string WebSiteIsolationEnvironmentVariable = "WEBSITE_ISOLATION"; private const string WebSiteIsolationHyperV = "hyperv"; -#if !NETSTANDARD1_6 private static readonly ConcurrentDictionary> cache = new ConcurrentDictionary>(); -#endif - private static readonly ConcurrentDictionary PlaceholderCache = new ConcurrentDictionary(); @@ -65,7 +62,6 @@ @"^\\(?[^(]+)(\((?[^)]+)\)){0,1}\\(?[\s\S]+)$", RegexOptions.Compiled); -#if !NETSTANDARD1_6 /// /// Formats a counter into a readable string. /// @@ -73,40 +69,13 @@ { return FormatPerformanceCounter(pc.CategoryName, pc.CounterName, pc.InstanceName); } -#endif public static bool IsPerfCounterSupported() { -#if NETSTANDARD1_6 - // PerfCounter is limited to only when running in WebApp - return IsWebAppRunningInAzure(); -#else return true; -#endif } -#if NETSTANDARD1_6 - public static IPerformanceCollector GetPerformanceCollector() - { - IPerformanceCollector collector; - - // NetStandard1.6 has perf counter only on web apps. - - if (PerformanceCounterUtility.IsWebAppRunningInAzure()) - { - collector = (IPerformanceCollector)new WebAppPerformanceCollector(); - PerformanceCollectorEventSource.Log.InitializedWithCollector(collector.GetType().Name); - } - else - { - // This will be the Stub collector which won't do anything. - collector = (IPerformanceCollector)new StandardPerformanceCollectorStub(); - PerformanceCollectorEventSource.Log.InitializedWithCollector(collector.GetType().Name); - } - - return collector; - } -#elif NET45 +#if NET45 public static IPerformanceCollector GetPerformanceCollector() { IPerformanceCollector collector; @@ -230,7 +199,7 @@ { if (IsWebAppRunningInAzure()) { -#if NETSTANDARD1_6 || NETSTANDARD2_0 +#if NETSTANDARD2_0 return AzureWebAppCoreSdkVersionPrefix; #else return AzureWebAppSdkVersionPrefix; @@ -363,7 +332,7 @@ internal static string GetInstanceForCurrentW3SvcWorker() { -#if NETSTANDARD1_6 || NETSTANDARD2_0 +#if NETSTANDARD2_0 string name = new AssemblyName(Assembly.GetEntryAssembly().FullName).Name; #else string name = AppDomain.CurrentDomain.FriendlyName; @@ -388,32 +357,23 @@ [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Justification = "This method has different code for Net45/NetCore")] internal static string GetInstanceForWin32Process(IEnumerable win32Instances) { -#if NETSTANDARD1_6 - return string.Empty; -#else return FindProcessInstance( Process.GetCurrentProcess().Id, win32Instances, Win32ProcessCategoryName, Win32ProcessCounterName); -#endif } [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Justification = "This method has different code for Net45/NetCore")] internal static string GetInstanceForClrProcess(IEnumerable clrInstances) { -#if NETSTANDARD1_6 - return string.Empty; -#else return FindProcessInstance( Process.GetCurrentProcess().Id, clrInstances, ClrProcessCategoryName, ClrProcessCounterName); -#endif } -#if !NETSTANDARD1_6 internal static IList GetWin32ProcessInstances() { return GetInstances(Win32ProcessCategoryName); @@ -424,8 +384,6 @@ return GetInstances(ClrProcessCategoryName); } -#endif - private static string ExpandInstanceName( string instanceName, IEnumerable win32Instances, @@ -483,7 +441,6 @@ return cachedResult; } -#if !NETSTANDARD1_6 private static string FindProcessInstance(int pid, IEnumerable instances, string categoryName, string counterName) { Tuple cached; @@ -553,6 +510,5 @@ #endif } } -#endif - } + } } \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/Clock.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/Clock.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/Clock.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/Clock.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/IQuickPulseModuleScheduler.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/IQuickPulseModuleScheduler.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/IQuickPulseModuleScheduler.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/IQuickPulseModuleScheduler.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/IQuickPulseModuleSchedulerHandle.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/IQuickPulseModuleSchedulerHandle.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/IQuickPulseModuleSchedulerHandle.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/IQuickPulseModuleSchedulerHandle.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/QuickPulseCollectionTimeSlotManager.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/QuickPulseCollectionTimeSlotManager.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/QuickPulseCollectionTimeSlotManager.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/QuickPulseCollectionTimeSlotManager.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/QuickPulseCounter.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/QuickPulseCounter.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/QuickPulseCounter.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/QuickPulseCounter.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/QuickPulseDefaults.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/QuickPulseDefaults.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/QuickPulseDefaults.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/QuickPulseDefaults.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/QuickPulseQuotaTracker.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/QuickPulseQuotaTracker.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/QuickPulseQuotaTracker.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/QuickPulseQuotaTracker.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/QuickPulseTaskModuleScheduler.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/QuickPulseTaskModuleScheduler.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/QuickPulseTaskModuleScheduler.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/QuickPulseTaskModuleScheduler.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/QuickPulseThreadState.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/QuickPulseThreadState.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/QuickPulseThreadState.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/QuickPulseThreadState.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/QuickPulseTimings.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/QuickPulseTimings.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Helpers/QuickPulseTimings.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Helpers/QuickPulseTimings.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/IQuickPulseDataAccumulatorManager.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/IQuickPulseDataAccumulatorManager.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/IQuickPulseDataAccumulatorManager.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/IQuickPulseDataAccumulatorManager.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/IQuickPulseServiceClient.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/IQuickPulseServiceClient.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/IQuickPulseServiceClient.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/IQuickPulseServiceClient.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Process/IQuickPulsePerfLib.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Process/IQuickPulsePerfLib.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Process/IQuickPulsePerfLib.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Process/IQuickPulsePerfLib.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Process/IQuickPulseProcessProvider.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Process/IQuickPulseProcessProvider.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Process/IQuickPulseProcessProvider.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Process/IQuickPulseProcessProvider.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Process/IQuickPulseTopCpuCollector.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Process/IQuickPulseTopCpuCollector.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Process/IQuickPulseTopCpuCollector.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Process/IQuickPulseTopCpuCollector.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Process/PerfLib/CategorySample.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Process/PerfLib/CategorySample.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Process/PerfLib/CategorySample.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Process/PerfLib/CategorySample.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Process/PerfLib/CounterDefinitionSample.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Process/PerfLib/CounterDefinitionSample.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Process/PerfLib/CounterDefinitionSample.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Process/PerfLib/CounterDefinitionSample.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Process/PerfLib/PerfLib.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Process/PerfLib/PerfLib.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Process/PerfLib/PerfLib.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Process/PerfLib/PerfLib.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Process/QuickPulseProcess.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Process/QuickPulseProcess.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Process/QuickPulseProcess.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Process/QuickPulseProcess.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Process/QuickPulseProcessProvider.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Process/QuickPulseProcessProvider.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Process/QuickPulseProcessProvider.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Process/QuickPulseProcessProvider.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/QuickPulseCollectionStateManager.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseCollectionStateManager.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/QuickPulseCollectionStateManager.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseCollectionStateManager.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/QuickPulseConstants.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseConstants.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/QuickPulseConstants.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseConstants.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/QuickPulseDataAccumulator.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseDataAccumulator.cs similarity index 97% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/QuickPulseDataAccumulator.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseDataAccumulator.cs index 55330321a..a59a19622 100644 --- a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/QuickPulseDataAccumulator.cs +++ b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseDataAccumulator.cs @@ -11,7 +11,7 @@ /// /// This is performance-critical DTO that needs to be quickly accessed in a thread-safe manner. internal class QuickPulseDataAccumulator - { + { public DateTimeOffset? StartTimestamp = null; public DateTimeOffset? EndTimestamp = null; @@ -35,12 +35,12 @@ public bool GlobalDocumentQuotaReached; /// - /// 2^19 - 1. + /// MaxCount = 2^19 - 1. /// private const long MaxCount = 524287; /// - /// 2^44 - 1. + /// MaxDuration = 2^44 - 1. /// private const long MaxDuration = 17592186044415; @@ -48,7 +48,19 @@ { this.CollectionConfigurationAccumulator = new CollectionConfigurationAccumulator(collectionConfiguration); } - + + public long AIRequestCount => QuickPulseDataAccumulator.DecodeCountAndDuration(this.AIRequestCountAndDurationInTicks).Item1; + + public long AIRequestDurationInTicks => QuickPulseDataAccumulator.DecodeCountAndDuration(this.AIRequestCountAndDurationInTicks).Item2; + + public long AIDependencyCallCount => QuickPulseDataAccumulator.DecodeCountAndDuration(this.AIDependencyCallCountAndDurationInTicks).Item1; + + public long AIDependencyCallDurationInTicks => QuickPulseDataAccumulator.DecodeCountAndDuration(this.AIDependencyCallCountAndDurationInTicks).Item2; + + public ConcurrentStack TelemetryDocuments { get; set; } = new ConcurrentStack(); + + public CollectionConfigurationAccumulator CollectionConfigurationAccumulator { get; private set; } + public static long EncodeCountAndDuration(long count, long duration) { if (count > MaxCount || duration > MaxDuration) @@ -64,17 +76,5 @@ { return Tuple.Create(countAndDuration >> 44, countAndDuration & MaxDuration); } - - public long AIRequestCount => QuickPulseDataAccumulator.DecodeCountAndDuration(this.AIRequestCountAndDurationInTicks).Item1; - - public long AIRequestDurationInTicks => QuickPulseDataAccumulator.DecodeCountAndDuration(this.AIRequestCountAndDurationInTicks).Item2; - - public long AIDependencyCallCount => QuickPulseDataAccumulator.DecodeCountAndDuration(this.AIDependencyCallCountAndDurationInTicks).Item1; - - public long AIDependencyCallDurationInTicks => QuickPulseDataAccumulator.DecodeCountAndDuration(this.AIDependencyCallCountAndDurationInTicks).Item2; - - public ConcurrentStack TelemetryDocuments { get; set; } = new ConcurrentStack(); - - public CollectionConfigurationAccumulator CollectionConfigurationAccumulator { get; private set; } } } diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/QuickPulseDataAccumulatorManager.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseDataAccumulatorManager.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/QuickPulseDataAccumulatorManager.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseDataAccumulatorManager.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/QuickPulseDataSample.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseDataSample.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/QuickPulseDataSample.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseDataSample.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/QuickPulseEventSource.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseEventSource.cs similarity index 99% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/QuickPulseEventSource.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseEventSource.cs index 1e58f8b1f..418773e55 100644 --- a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/QuickPulseEventSource.cs +++ b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseEventSource.cs @@ -169,7 +169,7 @@ string name; try { -#if NETSTANDARD1_6 || NETSTANDARD2_0 +#if NETSTANDARD2_0 name = new AssemblyName(Assembly.GetEntryAssembly().FullName).Name; #else name = AppDomain.CurrentDomain.FriendlyName; diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/MetricPoint.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/MetricPoint.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/MetricPoint.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/MetricPoint.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/MonitoringDataPoint.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/MonitoringDataPoint.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/MonitoringDataPoint.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/MonitoringDataPoint.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/ProcessCpuData.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/ProcessCpuData.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/ProcessCpuData.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/ProcessCpuData.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/TelemetryDocument/DependencyTelemetryDocument.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/TelemetryDocument/DependencyTelemetryDocument.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/TelemetryDocument/DependencyTelemetryDocument.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/TelemetryDocument/DependencyTelemetryDocument.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/TelemetryDocument/EventTelemetryDocument.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/TelemetryDocument/EventTelemetryDocument.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/TelemetryDocument/EventTelemetryDocument.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/TelemetryDocument/EventTelemetryDocument.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/TelemetryDocument/ExceptionTelemetryDocument.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/TelemetryDocument/ExceptionTelemetryDocument.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/TelemetryDocument/ExceptionTelemetryDocument.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/TelemetryDocument/ExceptionTelemetryDocument.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/TelemetryDocument/ITelemetryDocument.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/TelemetryDocument/ITelemetryDocument.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/TelemetryDocument/ITelemetryDocument.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/TelemetryDocument/ITelemetryDocument.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/TelemetryDocument/RequestTelemetryDocument.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/TelemetryDocument/RequestTelemetryDocument.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/TelemetryDocument/RequestTelemetryDocument.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/TelemetryDocument/RequestTelemetryDocument.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/TelemetryDocument/TelemetryDocumentType.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/TelemetryDocument/TelemetryDocumentType.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/TelemetryDocument/TelemetryDocumentType.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/TelemetryDocument/TelemetryDocumentType.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/TelemetryDocument/TraceTelemetryDocument.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/TelemetryDocument/TraceTelemetryDocument.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/QuickPulse/Service contract/TelemetryDocument/TraceTelemetryDocument.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/Service contract/TelemetryDocument/TraceTelemetryDocument.cs diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/AggregationType.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/AggregationType.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/AggregationType.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/AggregationType.cs diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/CalculatedMetricInfo.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/CalculatedMetricInfo.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/CalculatedMetricInfo.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/CalculatedMetricInfo.cs diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/CollectionConfigurationInfo.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/CollectionConfigurationInfo.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/CollectionConfigurationInfo.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/CollectionConfigurationInfo.cs diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/DocumentFilterConjunctionGroupInfo.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/DocumentFilterConjunctionGroupInfo.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/DocumentFilterConjunctionGroupInfo.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/DocumentFilterConjunctionGroupInfo.cs diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/DocumentStreamInfo.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/DocumentStreamInfo.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/DocumentStreamInfo.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/DocumentStreamInfo.cs diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/Errors/CollectionConfigurationError.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/Errors/CollectionConfigurationError.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/Errors/CollectionConfigurationError.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/Errors/CollectionConfigurationError.cs diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/Errors/CollectionConfigurationErrorType.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/Errors/CollectionConfigurationErrorType.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/Errors/CollectionConfigurationErrorType.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/Errors/CollectionConfigurationErrorType.cs diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/FilterConjunctionGroupInfo.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/FilterConjunctionGroupInfo.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/FilterConjunctionGroupInfo.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/FilterConjunctionGroupInfo.cs diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/FilterInfo.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/FilterInfo.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/FilterInfo.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/FilterInfo.cs diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/Predicate.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/Predicate.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/Predicate.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/Predicate.cs diff --git a/WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/TelemetryType.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/TelemetryType.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Filtering.Shared/Implementation/Service contract/TelemetryType.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Service contract/TelemetryType.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20Net45/StandardPerformanceCollector/CounterFactory.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/StandardPerformanceCollector/CounterFactory.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20Net45/StandardPerformanceCollector/CounterFactory.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/StandardPerformanceCollector/CounterFactory.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20Net45/StandardPerformanceCollector/NormalizedProcessCPUPerformanceCounter.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/StandardPerformanceCollector/NormalizedProcessCPUPerformanceCounter.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20Net45/StandardPerformanceCollector/NormalizedProcessCPUPerformanceCounter.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/StandardPerformanceCollector/NormalizedProcessCPUPerformanceCounter.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20Net45/StandardPerformanceCollector/StandardPerformanceCollector.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/StandardPerformanceCollector/StandardPerformanceCollector.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20Net45/StandardPerformanceCollector/StandardPerformanceCollector.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/StandardPerformanceCollector/StandardPerformanceCollector.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20Net45/StandardPerformanceCollector/StandardPerformanceCounter.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/StandardPerformanceCollector/StandardPerformanceCounter.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared.NetStandard20Net45/StandardPerformanceCollector/StandardPerformanceCounter.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/StandardPerformanceCollector/StandardPerformanceCounter.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/Timer/Timer.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Timer/Timer.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/Timer/Timer.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Timer/Timer.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/Timer/TimerInterface.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Timer/TimerInterface.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/Timer/TimerInterface.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/Timer/TimerInterface.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/AzureWebEnvironmentVariables.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/AzureWebEnvironmentVariables.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/AzureWebEnvironmentVariables.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/AzureWebEnvironmentVariables.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/CPUPercenageGauge.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/CPUPercenageGauge.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/CPUPercenageGauge.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/CPUPercenageGauge.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/CacheHelper.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/CacheHelper.cs similarity index 96% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/CacheHelper.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/CacheHelper.cs index c2b87c6ff..b5d5f4ff8 100644 --- a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/CacheHelper.cs +++ b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/CacheHelper.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -#if NETSTANDARD1_6 || NETSTANDARD2_0 +#if NETSTANDARD2_0 using Microsoft.Extensions.Caching.Memory; #else using System.Runtime.Caching; @@ -21,7 +21,7 @@ /// private static readonly CacheHelper CacheHelperInstance = new CacheHelper(); -#if NETSTANDARD1_6 || NETSTANDARD2_0 +#if NETSTANDARD2_0 IMemoryCache cache = new MemoryCache(new MemoryCacheOptions()); #endif @@ -114,7 +114,7 @@ /// DateTimeOffset until item expires from cache. public void SaveToCache(string cacheKey, object toCache, DateTimeOffset absoluteExpiration) { -#if NETSTANDARD1_6 || NETSTANDARD2_0 +#if NETSTANDARD2_0 cache.Set(cacheKey, toCache, absoluteExpiration); #else MemoryCache.Default.Add(cacheKey, toCache, absoluteExpiration); @@ -128,7 +128,7 @@ /// The requested item, as object type T. public object GetFromCache(string cacheKey) { -#if NETSTANDARD1_6 || NETSTANDARD2_0 +#if NETSTANDARD2_0 return cache.Get(cacheKey); #else return MemoryCache.Default[cacheKey]; @@ -142,7 +142,7 @@ /// Boolean value for whether or not a key is in the cache. public bool IsInCache(string cacheKey) { -#if NETSTANDARD1_6 || NETSTANDARD2_0 +#if NETSTANDARD2_0 object output; return cache.TryGetValue(cacheKey, out output); #else @@ -160,7 +160,7 @@ { if (disposing) { -#if NETSTANDARD1_6 || NETSTANDARD2_0 +#if NETSTANDARD2_0 cache.Dispose(); #endif } diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/CounterFactory.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/CounterFactory.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/CounterFactory.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/CounterFactory.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/ICachedEnvironmentVariableAccess.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/ICachedEnvironmentVariableAccess.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/ICachedEnvironmentVariableAccess.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/ICachedEnvironmentVariableAccess.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/NormalizedCPUPercentageGauge.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/NormalizedCPUPercentageGauge.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/NormalizedCPUPercentageGauge.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/NormalizedCPUPercentageGauge.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/PerformanceCounterImplementation.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/PerformanceCounterImplementation.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/PerformanceCounterImplementation.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/PerformanceCounterImplementation.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/RateCounterGauge.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/RateCounterGauge.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/RateCounterGauge.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/RateCounterGauge.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/RatioCounterGauge.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/RatioCounterGauge.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/RatioCounterGauge.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/RatioCounterGauge.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/RawCounterGauge.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/RawCounterGauge.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/RawCounterGauge.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/RawCounterGauge.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/SumUpCountersGauge.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/SumUpCountersGauge.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/SumUpCountersGauge.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/SumUpCountersGauge.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/WebAppPerformanceCollector.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/WebAppPerformanceCollector.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/Implementation/WebAppPerformanceCollector/WebAppPerformanceCollector.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/WebAppPerformanceCollector.cs diff --git a/WEB/Src/PerformanceCollector/PerformanceCollector/Perf.csproj b/WEB/Src/PerformanceCollector/PerformanceCollector/Perf.csproj index 09a038402..91f2c8e17 100644 --- a/WEB/Src/PerformanceCollector/PerformanceCollector/Perf.csproj +++ b/WEB/Src/PerformanceCollector/PerformanceCollector/Perf.csproj @@ -6,8 +6,8 @@ Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector Microsoft.AI.PerfCounterCollector - net45;netstandard1.6;netstandard2.0 - netstandard1.6;netstandard2.0 + net45;netstandard2.0 + netstandard2.0 @@ -18,29 +18,6 @@ Azure Monitoring Analytics ApplicationInsights Telemetry ASP.NET ASMX Web Azure Server Services ASPX Websites Performance Counters Performance Collection - - - - All - - - All - - - All - - - All - - - - - - - All - - - @@ -56,7 +33,7 @@ - + @@ -80,15 +57,8 @@ - - - - - - - - + \ No newline at end of file diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/PerformanceCollectorModule.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/PerformanceCollectorModule.cs similarity index 99% rename from WEB/Src/PerformanceCollector/Perf.Shared/PerformanceCollectorModule.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/PerformanceCollectorModule.cs index 313a421b0..cc959fb0f 100644 --- a/WEB/Src/PerformanceCollector/Perf.Shared/PerformanceCollectorModule.cs +++ b/WEB/Src/PerformanceCollector/PerformanceCollector/PerformanceCollectorModule.cs @@ -213,10 +213,6 @@ private static bool IsRunningUnderIisExpress() { -#if NETSTANDARD1_6 - // For netstandard1.6 target, only time perfcounter is active is if running as Azure WebApp - return false; -#else var iisExpressProcessName = "iisexpress"; try @@ -231,7 +227,6 @@ return false; } -#endif } /// diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/PerformanceCounterCollectionRequest.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/PerformanceCounterCollectionRequest.cs similarity index 100% rename from WEB/Src/PerformanceCollector/Perf.Shared/PerformanceCounterCollectionRequest.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/PerformanceCounterCollectionRequest.cs diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/QuickPulseTelemetryModule.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/QuickPulseTelemetryModule.cs similarity index 98% rename from WEB/Src/PerformanceCollector/Perf.Shared/QuickPulseTelemetryModule.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/QuickPulseTelemetryModule.cs index 15bb2d081..0f72ff182 100644 --- a/WEB/Src/PerformanceCollector/Perf.Shared/QuickPulseTelemetryModule.cs +++ b/WEB/Src/PerformanceCollector/PerformanceCollector/QuickPulseTelemetryModule.cs @@ -26,10 +26,10 @@ /// public sealed class QuickPulseTelemetryModule : ITelemetryModule, IDisposable { -#if NETSTANDARD1_6 || NETSTANDARD2_0 - internal static IQuickPulseModuleScheduler moduleScheduler = QuickPulseTaskModuleScheduler.Instance; +#if NETSTANDARD2_0 + internal static IQuickPulseModuleScheduler ModuleScheduler = QuickPulseTaskModuleScheduler.Instance; #else - internal static IQuickPulseModuleScheduler moduleScheduler = QuickPulseThreadModuleScheduler.Instance; + internal static IQuickPulseModuleScheduler ModuleScheduler = QuickPulseThreadModuleScheduler.Instance; #endif internal readonly LinkedList TelemetryProcessors = new LinkedList(); @@ -181,7 +181,7 @@ this.timeProvider = this.timeProvider ?? new Clock(); this.topCpuCollector = this.topCpuCollector ?? new QuickPulseTopCpuCollector(this.timeProvider, new QuickPulseProcessProvider(PerfLib.GetPerfLib())); - this.timings = timings ?? QuickPulseTimings.Default; + this.timings = this.timings ?? QuickPulseTimings.Default; CollectionConfigurationError[] errors; this.collectionConfiguration = new CollectionConfiguration( @@ -259,6 +259,41 @@ } } + private static string GetInstanceName(TelemetryConfiguration configuration) + { + // we need to initialize an item to get instance information + var fakeItem = new EventTelemetry(); + + try + { + new TelemetryClient(configuration).Initialize(fakeItem); + } + catch (Exception) + { + // we don't care what happened there + } + + return string.IsNullOrWhiteSpace(fakeItem.Context?.Cloud?.RoleInstance) ? Environment.MachineName : fakeItem.Context.Cloud.RoleInstance; + } + + private static string GetStreamId() + { + return Guid.NewGuid().ToStringInvariant("N"); + } + + private static QuickPulseDataSample CreateDataSample( + QuickPulseDataAccumulator accumulator, + IEnumerable> perfData, + IEnumerable> topCpuData, + bool topCpuDataAccessDenied) + { + return new QuickPulseDataSample( + accumulator, + perfData.ToDictionary(tuple => tuple.Item1.ReportAs, tuple => tuple), + topCpuData, + topCpuDataAccessDenied); + } + private void UpdatePerformanceCollector(IEnumerable> performanceCountersToCollect, out CollectionConfigurationError[] errors) { // all counters that need to be collected according to the new configuration - remove duplicates @@ -321,7 +356,7 @@ string.Format(CultureInfo.InvariantCulture, "Unexpected error processing counter '{0}': {1}", counter, e.Message), e, Tuple.Create("MetricId", counter.Item1))); - QuickPulseEventSource.Log.CounterRegistrationFailedEvent(e.Message, counter.Item2); + QuickPulseEventSource.Log.CounterRegistrationFailedEvent(e.Message, counter.Item2); } } @@ -331,9 +366,9 @@ private void CreateStateThread() { - this.stateThread = QuickPulseTelemetryModule.moduleScheduler.Execute(this.StateThreadWorker); + this.stateThread = QuickPulseTelemetryModule.ModuleScheduler.Execute(this.StateThreadWorker); } - + private void InitializeServiceClient(TelemetryConfiguration configuration) { if (this.ServiceClient != null) @@ -376,7 +411,7 @@ serviceEndpointUri, instanceName, streamId, - ServerId, + this.ServerId, assemblyVersion, this.timeProvider, isWebApp, @@ -397,41 +432,6 @@ assemblyVersion)); } - private static string GetInstanceName(TelemetryConfiguration configuration) - { - // we need to initialize an item to get instance information - var fakeItem = new EventTelemetry(); - - try - { - new TelemetryClient(configuration).Initialize(fakeItem); - } - catch (Exception) - { - // we don't care what happened there - } - - return string.IsNullOrWhiteSpace(fakeItem.Context?.Cloud?.RoleInstance) ? Environment.MachineName : fakeItem.Context.Cloud.RoleInstance; - } - - private static string GetStreamId() - { - return Guid.NewGuid().ToStringInvariant("N"); - } - - private static QuickPulseDataSample CreateDataSample( - QuickPulseDataAccumulator accumulator, - IEnumerable> perfData, - IEnumerable> topCpuData, - bool topCpuDataAccessDenied) - { - return new QuickPulseDataSample( - accumulator, - perfData.ToDictionary(tuple => tuple.Item1.ReportAs, tuple => tuple), - topCpuData, - topCpuDataAccessDenied); - } - private void StateThreadWorker(CancellationToken cancellationToken) { SdkInternalOperationsMonitor.Enter(); @@ -628,7 +628,7 @@ private void CreateCollectionThread() { - this.collectionThread = QuickPulseTelemetryModule.moduleScheduler.Execute(this.CollectionThreadWorker); + this.collectionThread = QuickPulseTelemetryModule.ModuleScheduler.Execute(this.CollectionThreadWorker); } private void EndCollectionThread() diff --git a/WEB/Src/PerformanceCollector/Perf.Shared/QuickPulseTelemetryProcessor.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/QuickPulseTelemetryProcessor.cs similarity index 99% rename from WEB/Src/PerformanceCollector/Perf.Shared/QuickPulseTelemetryProcessor.cs rename to WEB/Src/PerformanceCollector/PerformanceCollector/QuickPulseTelemetryProcessor.cs index be1e1cd09..2f713414e 100644 --- a/WEB/Src/PerformanceCollector/Perf.Shared/QuickPulseTelemetryProcessor.cs +++ b/WEB/Src/PerformanceCollector/PerformanceCollector/QuickPulseTelemetryProcessor.cs @@ -22,11 +22,6 @@ /// public class QuickPulseTelemetryProcessor : ITelemetryProcessor, ITelemetryModule, IQuickPulseTelemetryProcessor { - /// - /// An overall, cross-stream quota tracker. - /// - private readonly QuickPulseQuotaTracker globalQuotaTracker; - /// /// 1.0 - initial release. /// 1.1 - added DocumentStreamId, EventTelemetryDocument, TraceTelemetryDocument. @@ -45,19 +40,12 @@ private const string ExceptionMessageSeparator = " <--- "; - private IQuickPulseDataAccumulatorManager dataAccumulatorManager = null; - /// - /// Gets or sets an endpoint that is compared against telemetry to remove our requests from customer telemetry. + /// An overall, cross-stream quota tracker. /// - /// - /// This is set from the QuickPulseTelemetryModule. - /// - Uri IQuickPulseTelemetryProcessor.ServiceEndpoint - { - get { return this.serviceEndpoint; } - set { this.serviceEndpoint = value; } - } + private readonly QuickPulseQuotaTracker globalQuotaTracker; + + private IQuickPulseDataAccumulatorManager dataAccumulatorManager = null; private Uri serviceEndpoint = QuickPulseDefaults.QuickPulseServiceEndpoint; @@ -101,6 +89,18 @@ initialGlobalTelemetryQuota ?? InitialGlobalTelemetryQuota); } + /// + /// Gets or sets an endpoint that is compared against telemetry to remove our requests from customer telemetry. + /// + /// + /// This is set from the QuickPulseTelemetryModule. + /// + Uri IQuickPulseTelemetryProcessor.ServiceEndpoint + { + get { return this.serviceEndpoint; } + set { this.serviceEndpoint = value; } + } + /// /// Gets or sets a value indicating whether request properties /// which were disabled via "RequestTrackingTelemetryModule.DisableTrackingProperties" should be evaluated. @@ -195,46 +195,6 @@ } } - private ITelemetryDocument ConvertRequestToTelemetryDocument(RequestTelemetry requestTelemetry) - { - var url = requestTelemetry.Url; -#if NET45 - if (this.EvaluateDisabledTrackingProperties && url == null) - { - try - { - // some of the requestTelemetry properties might be deferred by using RequestTrackingTelemetryModule.DisableTrackingProperties. - // evaluate them now - // note: RequestTrackingUtilities.UpdateRequestTelemetryFromRequest is not used here, since not all fields need to be populated - var request = System.Web.HttpContext.Current?.Request; - url = request?.Unvalidated.Url; - } - catch (Exception e) - { - QuickPulseEventSource.Log.UnknownErrorEvent(e.ToInvariantString()); - } - } -#endif - - ITelemetryDocument telemetryDocument = new RequestTelemetryDocument() - { - Id = Guid.NewGuid(), - Version = TelemetryDocumentContractVersion, - Timestamp = requestTelemetry.Timestamp, - OperationId = TruncateValue(requestTelemetry.Context?.Operation?.Id), - Name = TruncateValue(requestTelemetry.Name), - Success = requestTelemetry.Success, - Duration = requestTelemetry.Duration, - ResponseCode = requestTelemetry.ResponseCode, - Url = url, - Properties = GetProperties(requestTelemetry), - }; - - SetCommonTelemetryDocumentData(telemetryDocument, requestTelemetry); - - return telemetryDocument; - } - private static ITelemetryDocument ConvertDependencyToTelemetryDocument(DependencyTelemetry dependencyTelemetry) { ITelemetryDocument telemetryDocument = new DependencyTelemetryDocument() @@ -372,38 +332,6 @@ } } - private static KeyValuePair[] GetProperties(ISupportProperties telemetry, string specialPropertyName = null) - { - Dictionary properties = null; - - if (telemetry.Properties != null && telemetry.Properties.Count > 0) - { - properties = new Dictionary(MaxPropertyCount + 1); - - foreach (var prop in - telemetry.Properties.Where(p => !string.Equals(p.Key, specialPropertyName, StringComparison.Ordinal)).Take(MaxPropertyCount)) - { - string truncatedKey = TruncateValue(prop.Key); - - if (!properties.ContainsKey(truncatedKey)) - { - properties.Add(truncatedKey, TruncateValue(prop.Value)); - } - } - - if (specialPropertyName != null) - { - string specialPropertyValue; - if (telemetry.Properties.TryGetValue(specialPropertyName, out specialPropertyValue)) - { - properties.Add(TruncateValue(specialPropertyName), TruncateValue(specialPropertyValue)); - } - } - } - - return properties != null ? properties.ToArray() : null; - } - private static bool IsRequestSuccessful(RequestTelemetry request) { string responseCode = request.ResponseCode; @@ -438,6 +366,67 @@ return value; } + private static KeyValuePair[] GetProperties(ISupportProperties telemetry, string specialPropertyName = null) + { + Dictionary properties = null; + + if (telemetry.Properties != null && telemetry.Properties.Count > 0) + { + properties = new Dictionary(MaxPropertyCount + 1); + + foreach (var prop in + telemetry.Properties.Where(p => !string.Equals(p.Key, specialPropertyName, StringComparison.Ordinal)).Take(MaxPropertyCount)) + { + string truncatedKey = TruncateValue(prop.Key); + + if (!properties.ContainsKey(truncatedKey)) + { + properties.Add(truncatedKey, TruncateValue(prop.Value)); + } + } + + if (specialPropertyName != null) + { + string specialPropertyValue; + if (telemetry.Properties.TryGetValue(specialPropertyName, out specialPropertyValue)) + { + properties.Add(TruncateValue(specialPropertyName), TruncateValue(specialPropertyValue)); + } + } + } + + return properties != null ? properties.ToArray() : null; + } + + private static void ProcessMetrics( + CollectionConfigurationAccumulator configurationAccumulatorLocal, + IEnumerable> metrics, + TTelemetry telemetry, + out CollectionConfigurationError[] filteringErrors, + ref string projectionError) + { + filteringErrors = ArrayExtensions.Empty(); + + foreach (CalculatedMetric metric in metrics) + { + if (metric.CheckFilters(telemetry, out filteringErrors)) + { + // the telemetry document has passed the filters, count it in and project + try + { + double projection = metric.Project(telemetry); + + configurationAccumulatorLocal.MetricAccumulators[metric.Id].AddValue(projection); + } + catch (Exception e) + { + // most likely the projection did not result in a value parsable by double.Parse() + projectionError = e.ToString(); + } + } + } + } + private void ProcessTelemetry(ITelemetry telemetry) { // only process items that are going to the instrumentation key that our module is initialized with @@ -610,6 +599,46 @@ } } + private ITelemetryDocument ConvertRequestToTelemetryDocument(RequestTelemetry requestTelemetry) + { + var url = requestTelemetry.Url; +#if NET45 + if (this.EvaluateDisabledTrackingProperties && url == null) + { + try + { + // some of the requestTelemetry properties might be deferred by using RequestTrackingTelemetryModule.DisableTrackingProperties. + // evaluate them now + // note: RequestTrackingUtilities.UpdateRequestTelemetryFromRequest is not used here, since not all fields need to be populated + var request = System.Web.HttpContext.Current?.Request; + url = request?.Unvalidated.Url; + } + catch (Exception e) + { + QuickPulseEventSource.Log.UnknownErrorEvent(e.ToInvariantString()); + } + } +#endif + + ITelemetryDocument telemetryDocument = new RequestTelemetryDocument() + { + Id = Guid.NewGuid(), + Version = TelemetryDocumentContractVersion, + Timestamp = requestTelemetry.Timestamp, + OperationId = TruncateValue(requestTelemetry.Context?.Operation?.Id), + Name = TruncateValue(requestTelemetry.Name), + Success = requestTelemetry.Success, + Duration = requestTelemetry.Duration, + ResponseCode = requestTelemetry.ResponseCode, + Url = url, + Properties = GetProperties(requestTelemetry), + }; + + SetCommonTelemetryDocumentData(telemetryDocument, requestTelemetry); + + return telemetryDocument; + } + private ITelemetryDocument CreateTelemetryDocument( TTelemetry telemetry, IEnumerable documentStreams, @@ -644,35 +673,6 @@ return telemetryDocument; } - private static void ProcessMetrics( - CollectionConfigurationAccumulator configurationAccumulatorLocal, - IEnumerable> metrics, - TTelemetry telemetry, - out CollectionConfigurationError[] filteringErrors, - ref string projectionError) - { - filteringErrors = ArrayExtensions.Empty(); - - foreach (CalculatedMetric metric in metrics) - { - if (metric.CheckFilters(telemetry, out filteringErrors)) - { - // the telemetry document has passed the filters, count it in and project - try - { - double projection = metric.Project(telemetry); - - configurationAccumulatorLocal.MetricAccumulators[metric.Id].AddValue(projection); - } - catch (Exception e) - { - // most likely the projection did not result in a value parsable by double.Parse() - projectionError = e.ToString(); - } - } - } - } - private void UpdateExceptionAggregates() { Interlocked.Increment(ref this.dataAccumulatorManager.CurrentDataAccumulator.AIExceptionCount); diff --git a/WEB/Src/TestFramework/Shared/SdkVersionHelper.cs b/WEB/Src/TestFramework/Shared/SdkVersionHelper.cs index 39da2086c..e6af0bef4 100644 --- a/WEB/Src/TestFramework/Shared/SdkVersionHelper.cs +++ b/WEB/Src/TestFramework/Shared/SdkVersionHelper.cs @@ -2,7 +2,7 @@ { #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member using System; -#if NETCORE +#if NETCOREAPP using System.Collections.Generic; #endif using System.Linq; @@ -12,7 +12,7 @@ { public static string GetExpectedSdkVersion(Type assemblyType, string prefix) { -#if NETCORE +#if NETCOREAPP IEnumerable assemblyCustomAttributes = assemblyType.GetTypeInfo().Assembly.GetCustomAttributes(); #else object[] assemblyCustomAttributes = assemblyType.Assembly.GetCustomAttributes(false); diff --git a/WEB/Src/TestFramework/Shared/TestFramework.Shared.projitems b/WEB/Src/TestFramework/Shared/TestFramework.Shared.projitems index df4456096..8ebafdcab 100644 --- a/WEB/Src/TestFramework/Shared/TestFramework.Shared.projitems +++ b/WEB/Src/TestFramework/Shared/TestFramework.Shared.projitems @@ -21,8 +21,6 @@ - - diff --git a/WEB/Src/Web/Web/Implementation/AppMapCorrelationEventSource.cs b/WEB/Src/Web/Web/Implementation/AppMapCorrelationEventSource.cs index da601e73d..07f8ee4ac 100644 --- a/WEB/Src/Web/Web/Implementation/AppMapCorrelationEventSource.cs +++ b/WEB/Src/Web/Web/Implementation/AppMapCorrelationEventSource.cs @@ -2,9 +2,6 @@ { using System; using System.Diagnostics.Tracing; -#if NETSTANDARD1_6 - using System.Reflection; -#endif using Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing; /// diff --git a/WEB/Src/Web/Web/Web.csproj b/WEB/Src/Web/Web/Web.csproj index f304f2dc6..53c6e09c5 100644 --- a/WEB/Src/Web/Web/Web.csproj +++ b/WEB/Src/Web/Web/Web.csproj @@ -19,29 +19,6 @@ Azure Monitoring Analytics ApplicationInsights Telemetry AppInsights - - - - All - - - All - - - All - - - All - - - - - - - All - - - diff --git a/WEB/Src/WindowsServer/WindowsServer/AppServicesHeartbeatTelemetryModule.cs b/WEB/Src/WindowsServer/WindowsServer/AppServicesHeartbeatTelemetryModule.cs index a337dc3c2..8fa1bc42d 100644 --- a/WEB/Src/WindowsServer/WindowsServer/AppServicesHeartbeatTelemetryModule.cs +++ b/WEB/Src/WindowsServer/WindowsServer/AppServicesHeartbeatTelemetryModule.cs @@ -26,12 +26,8 @@ new KeyValuePair("appSrv_ResourceGroup", "WEBSITE_RESOURCE_GROUP"), }; - // Cache the heartbeat property manager across updates. Note that tests can also override the heartbeat manager. - internal IHeartbeatPropertyManager HeartbeatManager; + private IHeartbeatPropertyManager heartbeatManager; - // Used to determine if we call Add or Set heartbeat properties in the case of updates. - private bool isInitialized = false; - /// /// Initializes a new instance of the class. /// @@ -46,7 +42,33 @@ /// The heartbeat property manager to use when setting/updating env var values. internal AppServicesHeartbeatTelemetryModule(IHeartbeatPropertyManager hbeatPropManager) { - this.HeartbeatManager = hbeatPropManager; + this.HeartbeatPropertyManager = hbeatPropManager; + } + + /// Gets a value indicating whether this module has been initialized. + /// Used to determine if we call Add or Set heartbeat properties in the case of updates. + internal bool IsInitialized { get; private set; } = false; + + /// + /// Gets or sets an instance of IHeartbeatPropertyManager. + /// + /// + /// This is expected to be an instance of . + /// Note that tests can also override the heartbeat manager. + /// + internal IHeartbeatPropertyManager HeartbeatPropertyManager + { + get + { + if (this.heartbeatManager == null) + { + this.heartbeatManager = HeartbeatPropertyManagerProvider.GetHeartbeatPropertyManager(); + } + + return this.heartbeatManager; + } + + set => this.heartbeatManager = value; } /// @@ -69,10 +91,10 @@ { try { - var hbeatManager = this.GetHeartbeatPropertyManager(); + var hbeatManager = this.HeartbeatPropertyManager; if (hbeatManager != null) { - this.isInitialized = this.AddAppServiceEnvironmentVariablesToHeartbeat(hbeatManager, isUpdateOperation: this.isInitialized); + this.IsInitialized = this.AddAppServiceEnvironmentVariablesToHeartbeat(hbeatManager, isUpdateOperation: this.IsInitialized); } } catch (Exception appSrvEnvVarHbeatFailure) @@ -126,35 +148,5 @@ return hasBeenUpdated; } - - private IHeartbeatPropertyManager GetHeartbeatPropertyManager() - { - if (this.HeartbeatManager == null) - { - var telemetryModules = TelemetryModules.Instance; - - try - { - foreach (var module in telemetryModules.Modules) - { - if (module is IHeartbeatPropertyManager hman) - { - this.HeartbeatManager = hman; - } - } - } - catch (Exception hearbeatManagerAccessException) - { - WindowsServerEventSource.Log.AppServiceHeartbeatManagerAccessFailure(hearbeatManagerAccessException.ToInvariantString()); - } - - if (this.HeartbeatManager == null) - { - WindowsServerEventSource.Log.AppServiceHeartbeatManagerNotAvailable(); - } - } - - return this.HeartbeatManager; - } } } \ No newline at end of file diff --git a/WEB/Src/WindowsServer/WindowsServer/AssemblyInfo.cs b/WEB/Src/WindowsServer/WindowsServer/AssemblyInfo.cs index 8af7f281e..aa110c0d8 100644 --- a/WEB/Src/WindowsServer/WindowsServer/AssemblyInfo.cs +++ b/WEB/Src/WindowsServer/WindowsServer/AssemblyInfo.cs @@ -2,6 +2,8 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.AI.WindowsServer.Tests, PublicKey=" + AssemblyInfo.PublicKey)] +[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.AspNetCore.Tests, PublicKey=" + AssemblyInfo.PublicKey)] +[assembly: InternalsVisibleTo("Microsoft.ApplicationInsights.WorkerService.Tests, PublicKey=" + AssemblyInfo.PublicKey)] internal static class AssemblyInfo { diff --git a/WEB/Src/WindowsServer/WindowsServer/AzureInstanceMetadataTelemetryModule.cs b/WEB/Src/WindowsServer/WindowsServer/AzureInstanceMetadataTelemetryModule.cs index de658b695..bed6594f4 100644 --- a/WEB/Src/WindowsServer/WindowsServer/AzureInstanceMetadataTelemetryModule.cs +++ b/WEB/Src/WindowsServer/WindowsServer/AzureInstanceMetadataTelemetryModule.cs @@ -12,8 +12,33 @@ /// public sealed class AzureInstanceMetadataTelemetryModule : ITelemetryModule { - private bool isInitialized = false; private object lockObject = new object(); + private IHeartbeatPropertyManager heartbeatManager; + + /// Gets a value indicating whether this module has been initialized. + internal bool IsInitialized { get; private set; } = false; + + /// + /// Gets or sets an instance of IHeartbeatPropertyManager. + /// + /// + /// This is expected to be an instance of . + /// Note that tests can also override the heartbeat manager. + /// + internal IHeartbeatPropertyManager HeartbeatPropertyManager + { + get + { + if (this.heartbeatManager == null) + { + this.heartbeatManager = HeartbeatPropertyManagerProvider.GetHeartbeatPropertyManager(); + } + + return this.heartbeatManager; + } + + set => this.heartbeatManager = value; + } /// /// Initializes a new instance of the class. @@ -25,36 +50,32 @@ public void Initialize(TelemetryConfiguration unused) { // Core SDK creates 1 instance of a module but calls Initialize multiple times - if (!this.isInitialized) + if (!this.IsInitialized) { lock (this.lockObject) { - if (!this.isInitialized) + if (!this.IsInitialized) { - var telemetryModules = TelemetryModules.Instance; - - foreach (var module in telemetryModules.Modules) + var hbeatManager = this.HeartbeatPropertyManager; + if (hbeatManager != null) { - if (module is IHeartbeatPropertyManager hbeatManager) + // start off the heartbeat property collection process, but don't wait for it nor report + // any status from here, fire and forget. The thread running the collection will report + // to the core event log. + try { - // start off the heartbeat property collection process, but don't wait for it nor report - // any status from here, fire and forget. The thread running the collection will report - // to the core event log. - try - { - var heartbeatProperties = new AzureComputeMetadataHeartbeatPropertyProvider(); - Task.Factory.StartNew( - async () => await heartbeatProperties.SetDefaultPayloadAsync(hbeatManager) - .ConfigureAwait(false)); - } - catch (Exception heartbeatAquisitionException) - { - WindowsServerEventSource.Log.AzureInstanceMetadataFailureWithException(heartbeatAquisitionException.Message, heartbeatAquisitionException.InnerException?.Message); - } + var heartbeatProperties = new AzureComputeMetadataHeartbeatPropertyProvider(); + Task.Factory.StartNew( + async () => await heartbeatProperties.SetDefaultPayloadAsync(hbeatManager) + .ConfigureAwait(false)); + } + catch (Exception heartbeatAquisitionException) + { + WindowsServerEventSource.Log.AzureInstanceMetadataFailureWithException(heartbeatAquisitionException.Message, heartbeatAquisitionException.InnerException?.Message); } } - this.isInitialized = true; + this.IsInitialized = true; } } } diff --git a/WEB/Src/WindowsServer/WindowsServer/BuildInfoConfigComponentVersionTelemetryInitializer.cs b/WEB/Src/WindowsServer/WindowsServer/BuildInfoConfigComponentVersionTelemetryInitializer.cs index c815e8097..9b9e438b3 100644 --- a/WEB/Src/WindowsServer/WindowsServer/BuildInfoConfigComponentVersionTelemetryInitializer.cs +++ b/WEB/Src/WindowsServer/WindowsServer/BuildInfoConfigComponentVersionTelemetryInitializer.cs @@ -53,11 +53,7 @@ { string path = string.Empty; -#if !NETSTANDARD1_6 path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, BuildInfoConfigComponentVersionTelemetryInitializer.BuildInfoConfigFilename); -#else - path = Path.Combine(AppContext.BaseDirectory, BuildInfoConfigComponentVersionTelemetryInitializer.BuildInfoConfigFilename); -#endif if (File.Exists(path)) { diff --git a/WEB/Src/WindowsServer/WindowsServer/Implementation/HeartbeatPropertyManagerProvider.cs b/WEB/Src/WindowsServer/WindowsServer/Implementation/HeartbeatPropertyManagerProvider.cs new file mode 100644 index 000000000..c04bb8ea5 --- /dev/null +++ b/WEB/Src/WindowsServer/WindowsServer/Implementation/HeartbeatPropertyManagerProvider.cs @@ -0,0 +1,36 @@ +namespace Microsoft.ApplicationInsights.WindowsServer.Implementation +{ + using System; + + using Microsoft.ApplicationInsights.Extensibility.Implementation; + using Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing; + + internal static class HeartbeatPropertyManagerProvider + { + public static IHeartbeatPropertyManager GetHeartbeatPropertyManager() + { + var telemetryModules = TelemetryModules.Instance; + if (telemetryModules != null) + { + try + { + foreach (var module in telemetryModules.Modules) + { + if (module is IHeartbeatPropertyManager hman) + { + return hman; + } + } + } + catch (Exception hearbeatManagerAccessException) + { + WindowsServerEventSource.Log.AppServiceHeartbeatManagerAccessFailure(hearbeatManagerAccessException.ToInvariantString()); + } + } + + // Module was not found. Log and return null. + WindowsServerEventSource.Log.AppServiceHeartbeatManagerNotAvailable(); + return null; + } + } +} diff --git a/WEB/Src/WindowsServer/WindowsServer/Implementation/MetricManager.cs b/WEB/Src/WindowsServer/WindowsServer/Implementation/MetricManager.cs index 751019186..4eec79724 100644 --- a/WEB/Src/WindowsServer/WindowsServer/Implementation/MetricManager.cs +++ b/WEB/Src/WindowsServer/WindowsServer/Implementation/MetricManager.cs @@ -302,7 +302,6 @@ namespace Microsoft.ApplicationInsights.WindowsServer { foreach (KeyValuePair property in metric.Dimensions) { -#if !NETSTANDARD1_6 if (string.Compare(property.Key, FirstChanceExceptionStatisticsTelemetryModule.OperationNameTag, StringComparison.Ordinal) == 0) { if (string.IsNullOrEmpty(property.Value) == false) @@ -311,7 +310,6 @@ namespace Microsoft.ApplicationInsights.WindowsServer } } else -#endif { telemetry.Properties.Add(property); } diff --git a/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj b/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj index 8e4173dbd..93d680da9 100644 --- a/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj +++ b/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj @@ -6,8 +6,8 @@ Microsoft.ApplicationInsights.WindowsServer Microsoft.AI.WindowsServer - net45;netstandard1.6;netstandard2.0 - netstandard1.6;netstandard2.0 + net45;netstandard2.0 + netstandard2.0 @@ -18,33 +18,10 @@ Azure Monitoring Analytics ApplicationInsights Telemetry AppInsights - + $(DefineConstants);NETSTANDARD; - - - - All - - - All - - - All - - - All - - - - - - - All - - - @@ -53,7 +30,7 @@ - + diff --git a/WEB/Test/E2ETests/DependencyCollectionTests.sln b/WEB/Test/E2ETests/DependencyCollectionTests.sln index 51a54518f..aca585aa8 100644 --- a/WEB/Test/E2ETests/DependencyCollectionTests.sln +++ b/WEB/Test/E2ETests/DependencyCollectionTests.sln @@ -43,17 +43,11 @@ Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\BASE\src\Common\Common\Common.projitems*{37030556-260d-49b9-b546-72a44d0b2cb6}*SharedItemsImports = 5 ..\..\Src\Common\Common.projitems*{3d729610-dbc2-4cde-9969-cbdb93db6102}*SharedItemsImports = 5 - ..\..\Src\WindowsServer\WindowsServer.Shared\WindowsServer.Shared.projitems*{3d729610-dbc2-4cde-9969-cbdb93db6102}*SharedItemsImports = 5 ..\..\Src\Common\Common.projitems*{4605eefe-6a7f-4568-a55c-5541d390b013}*SharedItemsImports = 5 - ..\..\Src\Web\Web.Shared.Net\Web.Shared.Net.projitems*{4605eefe-6a7f-4568-a55c-5541d390b013}*SharedItemsImports = 5 ..\..\Src\Common\Common.projitems*{69638973-00ed-4468-85ce-548fe6bd859b}*SharedItemsImports = 5 - ..\..\Src\PerformanceCollector\Filtering.Shared\Filtering.Shared.projitems*{69638973-00ed-4468-85ce-548fe6bd859b}*SharedItemsImports = 5 ..\..\Src\PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.projitems*{69638973-00ed-4468-85ce-548fe6bd859b}*SharedItemsImports = 5 - ..\..\Src\PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.projitems*{69638973-00ed-4468-85ce-548fe6bd859b}*SharedItemsImports = 5 - ..\..\Src\PerformanceCollector\Perf.Shared\Perf.Shared.projitems*{69638973-00ed-4468-85ce-548fe6bd859b}*SharedItemsImports = 5 ..\..\..\BASE\src\Common\Common\Common.projitems*{b03d7034-2a49-4fe1-b9b1-4df16b136b2c}*SharedItemsImports = 5 ..\..\Src\Common\Common.projitems*{f68e18ca-00b6-4129-85a6-afc4ffe1ca9b}*SharedItemsImports = 5 - ..\..\Src\DependencyCollector\Shared\DependencyCollector.Shared.projitems*{f68e18ca-00b6-4129-85a6-afc4ffe1ca9b}*SharedItemsImports = 5 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/WEB/Test/E2ETests/TestApps/NetCore30/E2ETestAppCore30/SqlCommandHelper.cs b/WEB/Test/E2ETests/TestApps/NetCore30/E2ETestAppCore30/SqlCommandHelper.cs index 778c95c4f..868b8c617 100644 --- a/WEB/Test/E2ETests/TestApps/NetCore30/E2ETestAppCore30/SqlCommandHelper.cs +++ b/WEB/Test/E2ETests/TestApps/NetCore30/E2ETestAppCore30/SqlCommandHelper.cs @@ -42,7 +42,7 @@ await ExecuteReaderAsyncInternal(connectionString, commandText, commandType); } -#if !NETCOREAPP3_0 && !NETCOREAPP2_0 && !NETCOREAPP1_0 +#if !NETCOREAPP3_0 && !NETCOREAPP2_0 public static void BeginExecuteReader(string connectionString, string commandText, int numberOfAsyncArgs) { ManualResetEvent mre = new ManualResetEvent(false); @@ -130,7 +130,7 @@ await ExecuteNonQueryAsyncInternal(connectionString, commandText); } -#if !NETCOREAPP3_0 && !NETCOREAPP2_0 && !NETCOREAPP1_0 +#if !NETCOREAPP3_0 && !NETCOREAPP2_0 public static void BeginExecuteNonQuery(string connectionString, string commandText, int numberOfArgs) { ManualResetEvent mre = new ManualResetEvent(false); @@ -190,7 +190,7 @@ await ExecuteXmlReaderAsyncInternal(connectionString, commandText); } -#if !NETCOREAPP3_0 && !NETCOREAPP2_0 && !NETCOREAPP1_0 +#if !NETCOREAPP3_0 && !NETCOREAPP2_0 public static void BeginExecuteXmlReader(string connectionString, string commandText) { ManualResetEvent mre = new ManualResetEvent(false); @@ -306,7 +306,7 @@ } } -#if !NETCOREAPP3_0 && !NETCOREAPP2_0 && !NETCOREAPP1_0 +#if !NETCOREAPP3_0 && !NETCOREAPP2_0 private sealed class AsyncExecuteReaderWrapper : IDisposable { private readonly SqlCommand command; diff --git a/WEB/Test/E2ETests/TestApps/helpersfortestapp/FW40Shared/SqlCommandHelper.cs b/WEB/Test/E2ETests/TestApps/helpersfortestapp/FW40Shared/SqlCommandHelper.cs index 778c95c4f..868b8c617 100644 --- a/WEB/Test/E2ETests/TestApps/helpersfortestapp/FW40Shared/SqlCommandHelper.cs +++ b/WEB/Test/E2ETests/TestApps/helpersfortestapp/FW40Shared/SqlCommandHelper.cs @@ -42,7 +42,7 @@ await ExecuteReaderAsyncInternal(connectionString, commandText, commandType); } -#if !NETCOREAPP3_0 && !NETCOREAPP2_0 && !NETCOREAPP1_0 +#if !NETCOREAPP3_0 && !NETCOREAPP2_0 public static void BeginExecuteReader(string connectionString, string commandText, int numberOfAsyncArgs) { ManualResetEvent mre = new ManualResetEvent(false); @@ -130,7 +130,7 @@ await ExecuteNonQueryAsyncInternal(connectionString, commandText); } -#if !NETCOREAPP3_0 && !NETCOREAPP2_0 && !NETCOREAPP1_0 +#if !NETCOREAPP3_0 && !NETCOREAPP2_0 public static void BeginExecuteNonQuery(string connectionString, string commandText, int numberOfArgs) { ManualResetEvent mre = new ManualResetEvent(false); @@ -190,7 +190,7 @@ await ExecuteXmlReaderAsyncInternal(connectionString, commandText); } -#if !NETCOREAPP3_0 && !NETCOREAPP2_0 && !NETCOREAPP1_0 +#if !NETCOREAPP3_0 && !NETCOREAPP2_0 public static void BeginExecuteXmlReader(string connectionString, string commandText) { ManualResetEvent mre = new ManualResetEvent(false); @@ -306,7 +306,7 @@ } } -#if !NETCOREAPP3_0 && !NETCOREAPP2_0 && !NETCOREAPP1_0 +#if !NETCOREAPP3_0 && !NETCOREAPP2_0 private sealed class AsyncExecuteReaderWrapper : IDisposable { private readonly SqlCommand command; diff --git a/WEB/Test/PerformanceCollector/FunctionalTests.sln b/WEB/Test/PerformanceCollector/FunctionalTests.sln index 2cf687ee6..ca80ccf04 100644 --- a/WEB/Test/PerformanceCollector/FunctionalTests.sln +++ b/WEB/Test/PerformanceCollector/FunctionalTests.sln @@ -28,18 +28,12 @@ EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\Src\Common\Common.projitems*{455a52da-0242-48ca-afb1-9566f1e0513a}*SharedItemsImports = 5 - ..\..\Src\WindowsServer\WindowsServer.Shared\WindowsServer.Shared.projitems*{455a52da-0242-48ca-afb1-9566f1e0513a}*SharedItemsImports = 5 ..\..\Src\Common\Common.projitems*{685e146a-1541-4cfe-9fab-4f627979965e}*SharedItemsImports = 5 - ..\..\Src\PerformanceCollector\Filtering.Shared\Filtering.Shared.projitems*{685e146a-1541-4cfe-9fab-4f627979965e}*SharedItemsImports = 5 ..\..\Src\PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.projitems*{685e146a-1541-4cfe-9fab-4f627979965e}*SharedItemsImports = 5 - ..\..\Src\PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.projitems*{685e146a-1541-4cfe-9fab-4f627979965e}*SharedItemsImports = 5 - ..\..\Src\PerformanceCollector\Perf.Shared\Perf.Shared.projitems*{685e146a-1541-4cfe-9fab-4f627979965e}*SharedItemsImports = 5 ..\..\..\BASE\src\Common\Common\Common.projitems*{6d3a5a2f-e594-488b-bb4e-93fa0efba1e6}*SharedItemsImports = 5 ..\..\..\BASE\src\Common\Common\Common.projitems*{bcbb6bd4-90cd-452e-81aa-c54b7f941053}*SharedItemsImports = 5 ..\..\Src\Common\Common.projitems*{e6045048-621c-476f-ac23-9a82afd56fe3}*SharedItemsImports = 5 - ..\..\Src\Web\Web.Shared.Net\Web.Shared.Net.projitems*{e6045048-621c-476f-ac23-9a82afd56fe3}*SharedItemsImports = 5 ..\..\Src\Common\Common.projitems*{e9f6bf3e-3bd3-43f6-b4f1-4c84a0ceb340}*SharedItemsImports = 5 - ..\..\Src\DependencyCollector\Shared\DependencyCollector.Shared.projitems*{e9f6bf3e-3bd3-43f6-b4f1-4c84a0ceb340}*SharedItemsImports = 5 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/WEB/Test/Web/FunctionalTests.sln b/WEB/Test/Web/FunctionalTests.sln index aa8f41bef..1dff45706 100644 --- a/WEB/Test/Web/FunctionalTests.sln +++ b/WEB/Test/Web/FunctionalTests.sln @@ -45,18 +45,12 @@ EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\Src\Common\Common.projitems*{00e2f973-3be4-4ae5-b3e9-21f97c45e5e7}*SharedItemsImports = 5 - ..\..\Src\Web\Web.Shared.Net\Web.Shared.Net.projitems*{00e2f973-3be4-4ae5-b3e9-21f97c45e5e7}*SharedItemsImports = 5 ..\..\..\BASE\src\Common\Common\Common.projitems*{3a5be8ff-4571-48c0-bf28-5dbcb509900e}*SharedItemsImports = 5 ..\..\..\BASE\src\Common\Common\Common.projitems*{4d3aed61-d670-4817-affd-91ecbe03fff2}*SharedItemsImports = 5 ..\..\Src\Common\Common.projitems*{5171849e-f678-4bb1-b3ca-9754e9d94821}*SharedItemsImports = 5 - ..\..\Src\DependencyCollector\Shared\DependencyCollector.Shared.projitems*{5171849e-f678-4bb1-b3ca-9754e9d94821}*SharedItemsImports = 5 ..\..\Src\Common\Common.projitems*{634a3177-56b4-44b1-9c81-32ba3959eaa5}*SharedItemsImports = 5 - ..\..\Src\WindowsServer\WindowsServer.Shared\WindowsServer.Shared.projitems*{634a3177-56b4-44b1-9c81-32ba3959eaa5}*SharedItemsImports = 5 ..\..\Src\Common\Common.projitems*{a73a7554-a7af-451d-b611-2f98a6259d79}*SharedItemsImports = 5 - ..\..\Src\PerformanceCollector\Filtering.Shared\Filtering.Shared.projitems*{a73a7554-a7af-451d-b611-2f98a6259d79}*SharedItemsImports = 5 ..\..\Src\PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.projitems*{a73a7554-a7af-451d-b611-2f98a6259d79}*SharedItemsImports = 5 - ..\..\Src\PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.projitems*{a73a7554-a7af-451d-b611-2f98a6259d79}*SharedItemsImports = 5 - ..\..\Src\PerformanceCollector\Perf.Shared\Perf.Shared.projitems*{a73a7554-a7af-451d-b611-2f98a6259d79}*SharedItemsImports = 5 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU