From ed24de5b8f450901ff70d49ff5df6e748e82cfa9 Mon Sep 17 00:00:00 2001 From: Jacob Affinito Date: Thu, 13 Jun 2024 14:58:23 -0700 Subject: [PATCH] Move JsonConverters and Fix Extensions to add support for ILRepack. --- FullAgent.sln | 8 -- build/ArtifactBuilder/CoreAgentComponents.cs | 6 +- .../FrameworkAgentComponents.cs | 6 +- build/build_functions.ps1 | 14 +--- src/Agent/MsiInstaller/Installer/Product.wxs | 15 ---- src/Agent/NewRelic/Agent/Core/Agent.cs | 1 - .../Attributes/AttributeDefinitionService.cs | 1 - .../BrowserMonitoringStreamInjector.cs | 1 - src/Agent/NewRelic/Agent/Core/Core.csproj | 2 +- .../DataTransport/DataStreamingService.cs | 1 - .../DataTransport/DataTransportService.cs | 1 - .../ServerlessModeDataTransportService.cs | 1 - .../Core/DependencyInjection/AgentServices.cs | 1 - .../NewRelic/Agent/Core/Segments/Segment.cs | 1 - .../Agent/Core/Transactions/Transaction.cs | 1 - .../Core/Utilities/DictionaryExtensions.cs | 1 - .../Agent/Core/Utilities/HeaderEncoder.cs | 1 - .../Core/Utilities/TrimmedEncodedBuffer.cs | 1 - .../BedrockPayloads/ClaudePayloads.cs | 2 +- .../BedrockPayloads/CohereCommandPayloads.cs | 2 +- .../BedrockPayloads/JurassicPayloads.cs | 2 +- .../BedrockPayloads/Llama2Payloads.cs | 2 +- .../BedrockPayloads/PayloadInterfaces.cs | 2 +- .../JsonConverters/BedrockPayloads/README.md | 4 +- .../BedrockPayloads/TitanPayloads.cs | 2 +- .../LambdaPayloads/SnsMessage.cs | 2 +- .../JsonConverters/WrapperHelpers.cs | 2 +- .../Lambda/LambdaEventHelpers.cs | 4 +- .../NewRelic.Agent.Extensions.csproj | 51 ++++++++++++- .../Providers/Wrapper/AspNet/AspNet.csproj | 1 - .../Wrapper/AspNetCore/AspNetCore.csproj | 1 - .../AspNetCore6Plus/AspNetCore6Plus.csproj | 1 - .../Wrapper/AwsLambda/AwsLambda.csproj | 1 - .../Providers/Wrapper/Bedrock/Bedrock.csproj | 1 - .../Bedrock/InvokeModelAsyncWrapper.cs | 4 +- .../Wrapper/Couchbase/Couchbase.csproj | 1 - .../Elasticsearch/Elasticsearch.csproj | 1 - .../Wrapper/HttpClient/HttpClient.csproj | 1 - .../HttpWebRequest/HttpWebRequest.csproj | 1 - .../Providers/Wrapper/Kafka/Kafka.csproj | 1 - .../Log4NetLogging/Log4NetLogging.csproj | 1 - .../Wrapper/MassTransit/MassTransit.csproj | 1 - .../MassTransitLegacy.csproj | 1 - .../MicrosoftExtensionsLogging.csproj | 1 - .../Providers/Wrapper/MongoDb/MongoDb.csproj | 1 - .../Wrapper/MongoDb26/MongoDb26.csproj | 1 - .../Providers/Wrapper/Mvc3/Mvc3.csproj | 1 - .../Wrapper/NLogLogging/NLogLogging.csproj | 1 - .../Wrapper/NServiceBus/NServiceBus.csproj | 1 - .../Wrapper/OpenRasta/OpenRasta.csproj | 1 - .../Providers/Wrapper/Owin/Owin.csproj | 1 - .../Wrapper/RabbitMq/RabbitMq.csproj | 1 - .../Wrapper/RestSharp/RestSharp.csproj | 1 - .../ScriptHandlerFactory.csproj | 1 - .../SerilogLogging/SerilogLogging.csproj | 1 - .../ServiceStackRedis.csproj | 1 - .../Providers/Wrapper/Sql/Sql.csproj | 1 - .../StackExchangeRedis.csproj | 1 - .../StackExchangeRedis2Plus.csproj | 1 - .../Providers/Wrapper/Wcf3/Wcf3.csproj | 1 - .../Providers/Wrapper/WebApi1/WebApi1.csproj | 1 - .../Providers/Wrapper/WebApi2/WebApi2.csproj | 1 - .../WebOptimization/WebOptimization.csproj | 1 - .../Wrapper/WebServices/WebServices.csproj | 1 - src/NewRelic.Core/Directory.Build.props | 4 - src/NewRelic.Core/NewRelic.Core.csproj | 76 ------------------- .../BenchmarkingTests.csproj | 1 - .../BenchmarkingTests/Tests/ExampleTests.cs | 1 - .../UnitTests/CompositeTests/AgentApiTests.cs | 1 - .../CATSupportabilityMetricTests.cs | 1 - .../CompositeTests/CompositeTests.csproj | 1 - .../Aggregators/CustomEventAggregatorTests.cs | 1 - .../Aggregators/ErrorEventAggregatorTests.cs | 1 - .../Aggregators/LogEventAggregatorTests.cs | 1 - .../TransactionEventAggregatorTests.cs | 1 - .../BrowserMonitoringScriptMakerTests.cs | 1 - .../Core.UnitTest/Core.UnitTest.csproj | 1 - .../RumTests/RumClientConfigTests.cs | 1 - .../CustomEvents/CustomEventWireModelTests.cs | 1 - .../ValidationConstraintTests.cs | 1 - .../Spans/SpanEventAggregatorTests.cs | 1 - .../Spans/SpanEventMakerTests.cs | 1 - .../ImmutableTransactionBuilder.cs | 1 - .../Utilities/DateTimeExtensionsTests.cs | 1 - .../WireModels/ErrorEventWireModelTests.cs | 1 - .../WireModels/ErrorTraceWireModelTests.cs | 1 - .../WireModels/MetricWireModelTests.cs | 1 - .../DistributedTracePayloadHandlerTests.cs | 1 - .../NewRelic.Agent.TestUtilities.csproj | 1 - 89 files changed, 67 insertions(+), 212 deletions(-) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions}/JsonConverters/BedrockPayloads/ClaudePayloads.cs (94%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions}/JsonConverters/BedrockPayloads/CohereCommandPayloads.cs (95%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions}/JsonConverters/BedrockPayloads/JurassicPayloads.cs (96%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions}/JsonConverters/BedrockPayloads/Llama2Payloads.cs (94%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions}/JsonConverters/BedrockPayloads/PayloadInterfaces.cs (89%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions}/JsonConverters/BedrockPayloads/README.md (56%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions}/JsonConverters/BedrockPayloads/TitanPayloads.cs (97%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions}/JsonConverters/LambdaPayloads/SnsMessage.cs (85%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions}/JsonConverters/WrapperHelpers.cs (90%) delete mode 100644 src/NewRelic.Core/Directory.Build.props delete mode 100644 src/NewRelic.Core/NewRelic.Core.csproj diff --git a/FullAgent.sln b/FullAgent.sln index 765a790a86..64b59d0b77 100644 --- a/FullAgent.sln +++ b/FullAgent.sln @@ -88,8 +88,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConcurrentBenchmarking", "t EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewRelic.Agent.Extensions", "src\Agent\NewRelic\Agent\Extensions\NewRelic.Agent.Extensions\NewRelic.Agent.Extensions.csproj", "{686AE051-BC8C-4AEC-803D-237AEB807CA9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewRelic.Core", "src\NewRelic.Core\NewRelic.Core.csproj", "{9784EAEA-C32F-4DC4-BD84-4075BBA541AB}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{C0BB7A5D-6820-4058-AC47-0111ECC34015}" ProjectSection(SolutionItems) = preProject build\Common.src.props = build\Common.src.props @@ -163,7 +161,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Home", "src\Agent\NewRelic\ {710C7C7A-CD27-4F94-B2D3-9804BD848D57} = {710C7C7A-CD27-4F94-B2D3-9804BD848D57} {87EF7419-8390-49F2-8C51-4DF9B886E834} = {87EF7419-8390-49F2-8C51-4DF9B886E834} {8D2B52DD-D45C-481D-92F0-28990F168820} = {8D2B52DD-D45C-481D-92F0-28990F168820} - {9784EAEA-C32F-4DC4-BD84-4075BBA541AB} = {9784EAEA-C32F-4DC4-BD84-4075BBA541AB} {9C20BC4E-7A9F-4518-B3E7-C1FFD6C0EC8A} = {9C20BC4E-7A9F-4518-B3E7-C1FFD6C0EC8A} {9E9E1367-E09E-45F9-9A01-7D4489FBCB23} = {9E9E1367-E09E-45F9-9A01-7D4489FBCB23} {A4B357E3-9CEF-492C-A0E2-2397D15F1CD6} = {A4B357E3-9CEF-492C-A0E2-2397D15F1CD6} @@ -320,10 +317,6 @@ Global {686AE051-BC8C-4AEC-803D-237AEB807CA9}.Debug|Any CPU.Build.0 = Debug|Any CPU {686AE051-BC8C-4AEC-803D-237AEB807CA9}.Release|Any CPU.ActiveCfg = Release|Any CPU {686AE051-BC8C-4AEC-803D-237AEB807CA9}.Release|Any CPU.Build.0 = Release|Any CPU - {9784EAEA-C32F-4DC4-BD84-4075BBA541AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9784EAEA-C32F-4DC4-BD84-4075BBA541AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9784EAEA-C32F-4DC4-BD84-4075BBA541AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9784EAEA-C32F-4DC4-BD84-4075BBA541AB}.Release|Any CPU.Build.0 = Release|Any CPU {33F999A9-88AE-44DE-9BAA-267CF55FACA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {33F999A9-88AE-44DE-9BAA-267CF55FACA2}.Debug|Any CPU.Build.0 = Debug|Any CPU {33F999A9-88AE-44DE-9BAA-267CF55FACA2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -482,7 +475,6 @@ Global {FBD561F5-BA22-46D5-85D4-3BB24B82A85F} = {E5B988C0-5D19-407E-8210-71FFB90C579A} {4E32935B-8C6E-4885-9B15-19D632040ABA} = {E5B988C0-5D19-407E-8210-71FFB90C579A} {686AE051-BC8C-4AEC-803D-237AEB807CA9} = {1800B0F7-BA26-47E5-A7D4-63BC85880C99} - {9784EAEA-C32F-4DC4-BD84-4075BBA541AB} = {E3DAC9C6-AE41-4B37-A253-C621E568590E} {33F999A9-88AE-44DE-9BAA-267CF55FACA2} = {E5B988C0-5D19-407E-8210-71FFB90C579A} {6D177CB0-32F2-46F5-9C6A-9A6EB9F68892} = {E5B988C0-5D19-407E-8210-71FFB90C579A} {B30142E5-36A2-4D91-A20C-4B8C9632EC41} = {E5B988C0-5D19-407E-8210-71FFB90C579A} diff --git a/build/ArtifactBuilder/CoreAgentComponents.cs b/build/ArtifactBuilder/CoreAgentComponents.cs index b82258bfbd..86dbbfa7c1 100644 --- a/build/ArtifactBuilder/CoreAgentComponents.cs +++ b/build/ArtifactBuilder/CoreAgentComponents.cs @@ -28,11 +28,7 @@ protected override string SourceHomeBuilderPath protected override void CreateAgentComponents() { - var agentDllsForExtensionDirectory = new List() - { - $@"{SourceHomeBuilderPath}\extensions\NewRelic.Core.dll", - $@"{SourceHomeBuilderPath}\extensions\NewRelic.Parsing.dll" - }; + var agentDllsForExtensionDirectory = new List(); var storageProviders = new List() { diff --git a/build/ArtifactBuilder/FrameworkAgentComponents.cs b/build/ArtifactBuilder/FrameworkAgentComponents.cs index 69a298bcc9..56336c9014 100644 --- a/build/ArtifactBuilder/FrameworkAgentComponents.cs +++ b/build/ArtifactBuilder/FrameworkAgentComponents.cs @@ -18,11 +18,7 @@ public FrameworkAgentComponents(string configuration, string platform, string re protected override void CreateAgentComponents() { - var agentDllsForExtensionDirectory = new List() - { - $@"{SourceHomeBuilderPath}\extensions\NewRelic.Core.dll", - $@"{SourceHomeBuilderPath}\extensions\NewRelic.Parsing.dll" - }; + var agentDllsForExtensionDirectory = new List(); var storageProviders = new List() { diff --git a/build/build_functions.ps1 b/build/build_functions.ps1 index cb33867a4f..5bae93f8b2 100644 --- a/build/build_functions.ps1 +++ b/build/build_functions.ps1 @@ -114,16 +114,6 @@ function Copy-ExtensionsOther { Copy-Item -Path "$RootDirectory\src\Agent\Miscellaneous\NewRelic.Providers.Wrapper.Misc.Instrumentation.xml" -Destination "$Destination\extensions" -Force Copy-Item -Path "$RootDirectory\src\Agent\NewRelic\Agent\Core\Extension\extension.xsd" -Destination "$Destination\extensions" -Force - - if ($Type -like "Framework"){ - Copy-Item -Path "$RootDirectory\src\_build\AnyCPU-$Configuration\NewRelic.Core\net462-ILRepacked\NewRelic.Core.dll" -Destination "$Destination\extensions" -Force - Copy-Item -Path "$RootDirectory\src\Agent\NewRelic\Agent\Parsing\bin\$Configuration\net462\NewRelic.Parsing.dll" -Destination "$Destination\extensions" -Force - } - - if ($Type -like "Core"){ - Copy-Item -Path "$RootDirectory\src\_build\AnyCPU-$Configuration\NewRelic.Core\netstandard2.0-ILRepacked\NewRelic.Core.dll" -Destination "$Destination\extensions" -Force - Copy-Item -Path "$RootDirectory\src\Agent\NewRelic\Agent\Parsing\bin\$Configuration\netstandard2.0\NewRelic.Parsing.dll" -Destination "$Destination\extensions" -Force - } } function Copy-AgentRoot { @@ -143,12 +133,12 @@ function Copy-AgentRoot { Copy-Item -Path "$RootDirectory\src\Agent\NewRelic\Agent\Core\Config\Configuration.xsd" -Destination "$Destination\newrelic.xsd" -Force if ($Type -like "Framework") { - Copy-Item -Path "$RootDirectory\src\Agent\NewRelic\Agent\Extensions\NewRelic.Agent.Extensions\bin\$Configuration\net462\NewRelic.Agent.Extensions.dll" -Destination "$Destination" -Force + Copy-Item -Path "$RootDirectory\src\_build\AnyCPU-$Configuration\NewRelic.Agent.Extensions\net462-ILRepacked\NewRelic.Agent.Extensions.dll" -Destination "$Destination" -Force Copy-Item -Path "$RootDirectory\src\_build\AnyCPU-$Configuration\NewRelic.Agent.Core\net462-ILRepacked\NewRelic.Agent.Core.dll" -Destination "$Destination" -Force } if ($Type -like "Core") { - Copy-Item -Path "$RootDirectory\src\Agent\NewRelic\Agent\Extensions\NewRelic.Agent.Extensions\bin\$Configuration\netstandard2.0\NewRelic.Agent.Extensions.dll" -Destination "$Destination" -Force + Copy-Item -Path "$RootDirectory\src\_build\AnyCPU-$Configuration\NewRelic.Agent.Extensions\netstandard2.0-ILRepacked\NewRelic.Agent.Extensions.dll" -Destination "$Destination" -Force Copy-Item -Path "$RootDirectory\src\_build\AnyCPU-$Configuration\NewRelic.Agent.Core\netstandard2.0-ILRepacked\NewRelic.Agent.Core.dll" -Destination "$Destination" -Force Copy-Item -Path "$RootDirectory\src\Agent\Miscellaneous\core-agent-readme.md" -Destination "$Destination\README.md" -Force } diff --git a/src/Agent/MsiInstaller/Installer/Product.wxs b/src/Agent/MsiInstaller/Installer/Product.wxs index 3a85254ec7..bc2d2f83cc 100644 --- a/src/Agent/MsiInstaller/Installer/Product.wxs +++ b/src/Agent/MsiInstaller/Installer/Product.wxs @@ -394,14 +394,6 @@ SPDX-License-Identifier: Apache-2.0 - - - - - - - - @@ -471,13 +463,6 @@ SPDX-License-Identifier: Apache-2.0 - - - - - - - diff --git a/src/Agent/NewRelic/Agent/Core/Agent.cs b/src/Agent/NewRelic/Agent/Core/Agent.cs index 4f9dbd4f88..81ab98fb51 100644 --- a/src/Agent/NewRelic/Agent/Core/Agent.cs +++ b/src/Agent/NewRelic/Agent/Core/Agent.cs @@ -22,7 +22,6 @@ using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Synthetics; using NewRelic.Agent.Extensions.Helpers; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core; using NewRelic.Agent.Extensions.Logging; using NewRelic.Agent.Core.SharedInterfaces; using System; diff --git a/src/Agent/NewRelic/Agent/Core/Attributes/AttributeDefinitionService.cs b/src/Agent/NewRelic/Agent/Core/Attributes/AttributeDefinitionService.cs index 0c20cfa209..a4cec76a34 100644 --- a/src/Agent/NewRelic/Agent/Core/Attributes/AttributeDefinitionService.cs +++ b/src/Agent/NewRelic/Agent/Core/Attributes/AttributeDefinitionService.cs @@ -4,7 +4,6 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Globalization; -using NewRelic.Core; using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Core.Spans; using NewRelic.Agent.Extensions.Providers.Wrapper; diff --git a/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringStreamInjector.cs b/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringStreamInjector.cs index 38aa91777f..ee0f256843 100644 --- a/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringStreamInjector.cs +++ b/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringStreamInjector.cs @@ -2,7 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Core.Utilities; -using NewRelic.Core; using NewRelic.Agent.Extensions.Logging; using System; using System.IO; diff --git a/src/Agent/NewRelic/Agent/Core/Core.csproj b/src/Agent/NewRelic/Agent/Core/Core.csproj index 93525eca58..2aa8c126c4 100644 --- a/src/Agent/NewRelic/Agent/Core/Core.csproj +++ b/src/Agent/NewRelic/Agent/Core/Core.csproj @@ -79,8 +79,8 @@ + - diff --git a/src/Agent/NewRelic/Agent/Core/DataTransport/DataStreamingService.cs b/src/Agent/NewRelic/Agent/Core/DataTransport/DataStreamingService.cs index 23082472bb..975fb4fb9d 100644 --- a/src/Agent/NewRelic/Agent/Core/DataTransport/DataStreamingService.cs +++ b/src/Agent/NewRelic/Agent/Core/DataTransport/DataStreamingService.cs @@ -14,7 +14,6 @@ using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.Extensions.Collections; -using NewRelic.Core; using NewRelic.Agent.Extensions.Logging; using NewRelic.Agent.Core.SharedInterfaces; diff --git a/src/Agent/NewRelic/Agent/Core/DataTransport/DataTransportService.cs b/src/Agent/NewRelic/Agent/Core/DataTransport/DataTransportService.cs index dece0230c5..62da5474d7 100644 --- a/src/Agent/NewRelic/Agent/Core/DataTransport/DataTransportService.cs +++ b/src/Agent/NewRelic/Agent/Core/DataTransport/DataTransportService.cs @@ -10,7 +10,6 @@ using NewRelic.Agent.Core.ThreadProfiling; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.Core; using NewRelic.Agent.Extensions.Logging; using NewRelic.Agent.Core.SharedInterfaces; using System; diff --git a/src/Agent/NewRelic/Agent/Core/DataTransport/ServerlessModeDataTransportService.cs b/src/Agent/NewRelic/Agent/Core/DataTransport/ServerlessModeDataTransportService.cs index 726dad189b..e151dda9ca 100644 --- a/src/Agent/NewRelic/Agent/Core/DataTransport/ServerlessModeDataTransportService.cs +++ b/src/Agent/NewRelic/Agent/Core/DataTransport/ServerlessModeDataTransportService.cs @@ -13,7 +13,6 @@ using NewRelic.Agent.Core.ThreadProfiling; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.Core; using NewRelic.Agent.Extensions.Logging; using NewRelic.Agent.Core.SharedInterfaces; diff --git a/src/Agent/NewRelic/Agent/Core/DependencyInjection/AgentServices.cs b/src/Agent/NewRelic/Agent/Core/DependencyInjection/AgentServices.cs index 30f8f001a3..a5a6bc9f69 100644 --- a/src/Agent/NewRelic/Agent/Core/DependencyInjection/AgentServices.cs +++ b/src/Agent/NewRelic/Agent/Core/DependencyInjection/AgentServices.cs @@ -42,7 +42,6 @@ using NewRelic.Agent.Extensions.Providers; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.Core.SharedInterfaces.Web; -using NewRelicCore = NewRelic.Core; using NewRelic.Agent.Core.Labels; namespace NewRelic.Agent.Core.DependencyInjection diff --git a/src/Agent/NewRelic/Agent/Core/Segments/Segment.cs b/src/Agent/NewRelic/Agent/Core/Segments/Segment.cs index 1c75d82df8..7323b80277 100644 --- a/src/Agent/NewRelic/Agent/Core/Segments/Segment.cs +++ b/src/Agent/NewRelic/Agent/Core/Segments/Segment.cs @@ -7,7 +7,6 @@ using NewRelic.Agent.Core.Aggregators; using NewRelic.Agent.Configuration; using System.Threading; -using NewRelic.Core; using NewRelic.Agent.Api; using NewRelic.Agent.Api.Experimental; using NewRelic.Agent.Core.Spans; diff --git a/src/Agent/NewRelic/Agent/Core/Transactions/Transaction.cs b/src/Agent/NewRelic/Agent/Core/Transactions/Transaction.cs index 6cef3a6e64..cec596a876 100644 --- a/src/Agent/NewRelic/Agent/Core/Transactions/Transaction.cs +++ b/src/Agent/NewRelic/Agent/Core/Transactions/Transaction.cs @@ -22,7 +22,6 @@ using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.Extensions.Collections; -using NewRelic.Core; using NewRelic.Agent.Extensions.Logging; using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using System; diff --git a/src/Agent/NewRelic/Agent/Core/Utilities/DictionaryExtensions.cs b/src/Agent/NewRelic/Agent/Core/Utilities/DictionaryExtensions.cs index 368ad1555d..f8ac15210b 100644 --- a/src/Agent/NewRelic/Agent/Core/Utilities/DictionaryExtensions.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilities/DictionaryExtensions.cs @@ -1,7 +1,6 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core; using System; using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/src/Agent/NewRelic/Agent/Core/Utilities/HeaderEncoder.cs b/src/Agent/NewRelic/Agent/Core/Utilities/HeaderEncoder.cs index a9d00b383f..c41a029bac 100644 --- a/src/Agent/NewRelic/Agent/Core/Utilities/HeaderEncoder.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilities/HeaderEncoder.cs @@ -1,7 +1,6 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core; using NewRelic.Agent.Extensions.Logging; using Newtonsoft.Json; using System; diff --git a/src/Agent/NewRelic/Agent/Core/Utilities/TrimmedEncodedBuffer.cs b/src/Agent/NewRelic/Agent/Core/Utilities/TrimmedEncodedBuffer.cs index 79070db937..f4183edd90 100644 --- a/src/Agent/NewRelic/Agent/Core/Utilities/TrimmedEncodedBuffer.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilities/TrimmedEncodedBuffer.cs @@ -1,7 +1,6 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core; using System.Text; namespace NewRelic.Agent.Core.Utilities diff --git a/src/NewRelic.Core/JsonConverters/BedrockPayloads/ClaudePayloads.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/ClaudePayloads.cs similarity index 94% rename from src/NewRelic.Core/JsonConverters/BedrockPayloads/ClaudePayloads.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/ClaudePayloads.cs index be3b0cdf90..94322cc295 100644 --- a/src/NewRelic.Core/JsonConverters/BedrockPayloads/ClaudePayloads.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/ClaudePayloads.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json; -namespace NewRelic.Core.JsonConverters.BedrockPayloads +namespace NewRelic.Agent.Extensions.JsonConverters.BedrockPayloads { public class ClaudeRequestPayload : IRequestPayload { diff --git a/src/NewRelic.Core/JsonConverters/BedrockPayloads/CohereCommandPayloads.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/CohereCommandPayloads.cs similarity index 95% rename from src/NewRelic.Core/JsonConverters/BedrockPayloads/CohereCommandPayloads.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/CohereCommandPayloads.cs index ebae1c39ee..f54a5161eb 100644 --- a/src/NewRelic.Core/JsonConverters/BedrockPayloads/CohereCommandPayloads.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/CohereCommandPayloads.cs @@ -5,7 +5,7 @@ using System.Linq; using Newtonsoft.Json; -namespace NewRelic.Core.JsonConverters.BedrockPayloads +namespace NewRelic.Agent.Extensions.JsonConverters.BedrockPayloads { public class CohereCommandRequestPayload : IRequestPayload { diff --git a/src/NewRelic.Core/JsonConverters/BedrockPayloads/JurassicPayloads.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/JurassicPayloads.cs similarity index 96% rename from src/NewRelic.Core/JsonConverters/BedrockPayloads/JurassicPayloads.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/JurassicPayloads.cs index beaf1efaa7..9a58bf80dc 100644 --- a/src/NewRelic.Core/JsonConverters/BedrockPayloads/JurassicPayloads.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/JurassicPayloads.cs @@ -5,7 +5,7 @@ using System.Linq; using Newtonsoft.Json; -namespace NewRelic.Core.JsonConverters.BedrockPayloads +namespace NewRelic.Agent.Extensions.JsonConverters.BedrockPayloads { public class JurassicRequestPayload : IRequestPayload { diff --git a/src/NewRelic.Core/JsonConverters/BedrockPayloads/Llama2Payloads.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/Llama2Payloads.cs similarity index 94% rename from src/NewRelic.Core/JsonConverters/BedrockPayloads/Llama2Payloads.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/Llama2Payloads.cs index 3aade07015..9f9fbbc8b5 100644 --- a/src/NewRelic.Core/JsonConverters/BedrockPayloads/Llama2Payloads.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/Llama2Payloads.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json; -namespace NewRelic.Core.JsonConverters.BedrockPayloads +namespace NewRelic.Agent.Extensions.JsonConverters.BedrockPayloads { public class Llama2RequestPayload : IRequestPayload { diff --git a/src/NewRelic.Core/JsonConverters/BedrockPayloads/PayloadInterfaces.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/PayloadInterfaces.cs similarity index 89% rename from src/NewRelic.Core/JsonConverters/BedrockPayloads/PayloadInterfaces.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/PayloadInterfaces.cs index 3bdb0faaa3..ec98e2d6f6 100644 --- a/src/NewRelic.Core/JsonConverters/BedrockPayloads/PayloadInterfaces.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/PayloadInterfaces.cs @@ -1,7 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -namespace NewRelic.Core.JsonConverters.BedrockPayloads +namespace NewRelic.Agent.Extensions.JsonConverters.BedrockPayloads { public interface IRequestPayload { diff --git a/src/NewRelic.Core/JsonConverters/BedrockPayloads/README.md b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/README.md similarity index 56% rename from src/NewRelic.Core/JsonConverters/BedrockPayloads/README.md rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/README.md index ae90576b66..f0fc9734bf 100644 --- a/src/NewRelic.Core/JsonConverters/BedrockPayloads/README.md +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/README.md @@ -1,6 +1,6 @@ ## AWS Bedrock (LLM) payloads in NewRelic.Core -These classes are used in the Bedrock instrumentation wrapper. They are placed here in NewRelic.Core.JsonConverters, +These classes are used in the Bedrock instrumentation wrapper. They are placed here in NewRelic.Agent.Extensions.JsonConverters, rather than in the wrapper project, to avoid the wrapper having a dependency on Newtonsoft.Json. -NewRelic.Core already ILRepacks Newtonsoft.Json so it is available here for sure. +NewRelic.Agent.Extensions already ILRepacks Newtonsoft.Json so it is available here for sure. diff --git a/src/NewRelic.Core/JsonConverters/BedrockPayloads/TitanPayloads.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/TitanPayloads.cs similarity index 97% rename from src/NewRelic.Core/JsonConverters/BedrockPayloads/TitanPayloads.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/TitanPayloads.cs index afb16759e1..ea3c3266df 100644 --- a/src/NewRelic.Core/JsonConverters/BedrockPayloads/TitanPayloads.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/BedrockPayloads/TitanPayloads.cs @@ -5,7 +5,7 @@ using System.Linq; using Newtonsoft.Json; -namespace NewRelic.Core.JsonConverters.BedrockPayloads +namespace NewRelic.Agent.Extensions.JsonConverters.BedrockPayloads { public class TitanRequestPayload : IRequestPayload { diff --git a/src/NewRelic.Core/JsonConverters/LambdaPayloads/SnsMessage.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/LambdaPayloads/SnsMessage.cs similarity index 85% rename from src/NewRelic.Core/JsonConverters/LambdaPayloads/SnsMessage.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/LambdaPayloads/SnsMessage.cs index 89e204eae6..d5fb3f1bb3 100644 --- a/src/NewRelic.Core/JsonConverters/LambdaPayloads/SnsMessage.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/LambdaPayloads/SnsMessage.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace NewRelic.Core.JsonConverters.LambdaPayloads +namespace NewRelic.Agent.Extensions.JsonConverters.LambdaPayloads { public class SnsMessage diff --git a/src/NewRelic.Core/JsonConverters/WrapperHelpers.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/WrapperHelpers.cs similarity index 90% rename from src/NewRelic.Core/JsonConverters/WrapperHelpers.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/WrapperHelpers.cs index 4ebe54fa58..117f0bb745 100644 --- a/src/NewRelic.Core/JsonConverters/WrapperHelpers.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/JsonConverters/WrapperHelpers.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json; -namespace NewRelic.Core.JsonConverters +namespace NewRelic.Agent.Extensions.JsonConverters { public static class WrapperHelpers { diff --git a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Lambda/LambdaEventHelpers.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Lambda/LambdaEventHelpers.cs index 193e13df78..751a610a2c 100644 --- a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Lambda/LambdaEventHelpers.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Lambda/LambdaEventHelpers.cs @@ -6,8 +6,8 @@ using System.Linq; using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core.JsonConverters; -using NewRelic.Core.JsonConverters.LambdaPayloads; +using NewRelic.Agent.Extensions.JsonConverters; +using NewRelic.Agent.Extensions.JsonConverters.LambdaPayloads; namespace NewRelic.Agent.Extensions.Lambda; diff --git a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/NewRelic.Agent.Extensions.csproj b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/NewRelic.Agent.Extensions.csproj index 4a33b8d775..cfba4812a2 100644 --- a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/NewRelic.Agent.Extensions.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/NewRelic.Agent.Extensions.csproj @@ -5,6 +5,9 @@ NewRelic.Agent.Extensions Extensions for the New Relic .NET Agent true + $(MSBuildThisFileDirectory)..\..\..\..\..\_build\$(Platform)-$(Configuration)\$(AssemblyName)\obj + $(MSBuildThisFileDirectory)..\..\..\..\..\_build\$(Platform)-$(Configuration)\$(AssemblyName)\ + true @@ -14,11 +17,14 @@ + - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + @@ -32,4 +38,43 @@ + + + + + + + + + + + + + + + + 1 + 1 + + + + + + + + + + + + + $([System.String]::new("$(OutputPath)").Trim('\')) + + + + "$(ILRepack)" /parallel /internalize /norepackres /keepotherversionreferences /keyfile:"$(AssemblyOriginatorKeyFile)" /lib:"$(ILRepackSearchDirOutputPath)" /out:"$(OutputPath)..\$(TargetFramework)-ILRepacked\$(AssemblyName).dll" "$(TargetPath)" "@(ILRepackInclude, '" "')" + + + + + diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/AspNet.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/AspNet.csproj index 1da431be5c..30213a35f2 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/AspNet.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/AspNet.csproj @@ -21,7 +21,6 @@ - \ No newline at end of file diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/AspNetCore.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/AspNetCore.csproj index f86a0e51b5..6ffe3dd19e 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/AspNetCore.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore/AspNetCore.csproj @@ -17,7 +17,6 @@ - \ No newline at end of file diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/AspNetCore6Plus.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/AspNetCore6Plus.csproj index 443a129f23..f0d28a71be 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/AspNetCore6Plus.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNetCore6Plus/AspNetCore6Plus.csproj @@ -14,7 +14,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AwsLambda/AwsLambda.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AwsLambda/AwsLambda.csproj index d53885c367..45ba25e8c7 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AwsLambda/AwsLambda.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AwsLambda/AwsLambda.csproj @@ -14,7 +14,6 @@ - \ No newline at end of file diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Bedrock/Bedrock.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Bedrock/Bedrock.csproj index 41c0cd9fdd..3e6924f5fe 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Bedrock/Bedrock.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Bedrock/Bedrock.csproj @@ -18,7 +18,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Bedrock/InvokeModelAsyncWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Bedrock/InvokeModelAsyncWrapper.cs index 11e0fc1618..83373045c8 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Bedrock/InvokeModelAsyncWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Bedrock/InvokeModelAsyncWrapper.cs @@ -11,8 +11,8 @@ using NewRelic.Reflection; using System.Net; using System.IO; -using NewRelic.Core.JsonConverters; -using NewRelic.Core.JsonConverters.BedrockPayloads; +using NewRelic.Agent.Extensions.JsonConverters; +using NewRelic.Agent.Extensions.JsonConverters.BedrockPayloads; namespace NewRelic.Providers.Wrapper.Bedrock { diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Couchbase/Couchbase.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Couchbase/Couchbase.csproj index c85e421462..9af2cb0923 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Couchbase/Couchbase.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Couchbase/Couchbase.csproj @@ -21,7 +21,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Elasticsearch/Elasticsearch.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Elasticsearch/Elasticsearch.csproj index 7daa85dfa6..5bf6aefefe 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Elasticsearch/Elasticsearch.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Elasticsearch/Elasticsearch.csproj @@ -13,7 +13,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/HttpClient/HttpClient.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/HttpClient/HttpClient.csproj index 308da9634c..0b76e6f611 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/HttpClient/HttpClient.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/HttpClient/HttpClient.csproj @@ -21,7 +21,6 @@ - \ No newline at end of file diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/HttpWebRequest/HttpWebRequest.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/HttpWebRequest/HttpWebRequest.csproj index b2363a3a25..724525332e 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/HttpWebRequest/HttpWebRequest.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/HttpWebRequest/HttpWebRequest.csproj @@ -19,7 +19,6 @@ - \ No newline at end of file diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/Kafka.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/Kafka.csproj index 89537e6b61..425a2670b9 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/Kafka.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/Kafka.csproj @@ -16,7 +16,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Log4NetLogging/Log4NetLogging.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Log4NetLogging/Log4NetLogging.csproj index 4fe344f233..9e1f376f71 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Log4NetLogging/Log4NetLogging.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Log4NetLogging/Log4NetLogging.csproj @@ -17,7 +17,6 @@ - \ No newline at end of file diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/MassTransit.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/MassTransit.csproj index 927a8a0adc..3f04999bd6 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/MassTransit.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/MassTransit.csproj @@ -18,7 +18,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/MassTransitLegacy.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/MassTransitLegacy.csproj index 58a82a8775..9a7092e029 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/MassTransitLegacy.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/MassTransitLegacy.csproj @@ -18,7 +18,6 @@ - \ No newline at end of file diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MicrosoftExtensionsLogging/MicrosoftExtensionsLogging.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MicrosoftExtensionsLogging/MicrosoftExtensionsLogging.csproj index d2068ec578..33a8ef915d 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MicrosoftExtensionsLogging/MicrosoftExtensionsLogging.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MicrosoftExtensionsLogging/MicrosoftExtensionsLogging.csproj @@ -19,7 +19,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb/MongoDb.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb/MongoDb.csproj index 6a7b3eca03..535acc0436 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb/MongoDb.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb/MongoDb.csproj @@ -23,7 +23,6 @@ - \ No newline at end of file diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb26/MongoDb26.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb26/MongoDb26.csproj index 44d4f390d0..d2b78e844d 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb26/MongoDb26.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb26/MongoDb26.csproj @@ -11,7 +11,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/Mvc3.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/Mvc3.csproj index 9231166da6..51e93afdc5 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/Mvc3.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/Mvc3.csproj @@ -21,7 +21,6 @@ - \ No newline at end of file diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/NLogLogging/NLogLogging.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/NLogLogging/NLogLogging.csproj index 09b8d6bf2e..d575345c03 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/NLogLogging/NLogLogging.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/NLogLogging/NLogLogging.csproj @@ -19,7 +19,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/NServiceBus/NServiceBus.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/NServiceBus/NServiceBus.csproj index ec10998c26..316a6633af 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/NServiceBus/NServiceBus.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/NServiceBus/NServiceBus.csproj @@ -19,7 +19,6 @@ - \ No newline at end of file diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/OpenRasta/OpenRasta.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/OpenRasta/OpenRasta.csproj index 61d78f0ae4..b01917dd61 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/OpenRasta/OpenRasta.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/OpenRasta/OpenRasta.csproj @@ -14,7 +14,6 @@ - \ No newline at end of file diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Owin/Owin.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Owin/Owin.csproj index 071bac15e0..04876b1ffe 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Owin/Owin.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Owin/Owin.csproj @@ -20,7 +20,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/RabbitMq.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/RabbitMq.csproj index 1c94211c8d..b357c7a675 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/RabbitMq.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/RabbitMq.csproj @@ -14,7 +14,6 @@ - \ No newline at end of file diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RestSharp/RestSharp.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RestSharp/RestSharp.csproj index 4a072e7f3c..059fd06575 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RestSharp/RestSharp.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RestSharp/RestSharp.csproj @@ -15,7 +15,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/ScriptHandlerFactory/ScriptHandlerFactory.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/ScriptHandlerFactory/ScriptHandlerFactory.csproj index dc5105cf74..fb34f162ae 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/ScriptHandlerFactory/ScriptHandlerFactory.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/ScriptHandlerFactory/ScriptHandlerFactory.csproj @@ -22,7 +22,6 @@ - \ No newline at end of file diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/SerilogLogging/SerilogLogging.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/SerilogLogging/SerilogLogging.csproj index b3d0b0e987..d608b0bb12 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/SerilogLogging/SerilogLogging.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/SerilogLogging/SerilogLogging.csproj @@ -23,7 +23,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/ServiceStackRedis/ServiceStackRedis.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/ServiceStackRedis/ServiceStackRedis.csproj index d5e58ffc2c..0ec543c7bf 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/ServiceStackRedis/ServiceStackRedis.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/ServiceStackRedis/ServiceStackRedis.csproj @@ -15,7 +15,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/Sql.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/Sql.csproj index b89469455d..c2306d69e0 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/Sql.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/Sql.csproj @@ -14,7 +14,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis/StackExchangeRedis.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis/StackExchangeRedis.csproj index 15452ed98e..a63f3251ab 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis/StackExchangeRedis.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis/StackExchangeRedis.csproj @@ -16,7 +16,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis2Plus/StackExchangeRedis2Plus.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis2Plus/StackExchangeRedis2Plus.csproj index 8cda6af997..80b649440f 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis2Plus/StackExchangeRedis2Plus.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis2Plus/StackExchangeRedis2Plus.csproj @@ -16,7 +16,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Wcf3/Wcf3.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Wcf3/Wcf3.csproj index c1a58d778a..a413ffbfa2 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Wcf3/Wcf3.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Wcf3/Wcf3.csproj @@ -13,7 +13,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi1/WebApi1.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi1/WebApi1.csproj index 5f12008b12..e60033dad1 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi1/WebApi1.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi1/WebApi1.csproj @@ -24,7 +24,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi2/WebApi2.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi2/WebApi2.csproj index 367ba4b41f..73280dc819 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi2/WebApi2.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi2/WebApi2.csproj @@ -20,7 +20,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebOptimization/WebOptimization.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebOptimization/WebOptimization.csproj index 8c2e6560e1..38948bd618 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebOptimization/WebOptimization.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebOptimization/WebOptimization.csproj @@ -16,7 +16,6 @@ - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebServices/WebServices.csproj b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebServices/WebServices.csproj index 4a580dd931..3f2352c899 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebServices/WebServices.csproj +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebServices/WebServices.csproj @@ -12,7 +12,6 @@ - diff --git a/src/NewRelic.Core/Directory.Build.props b/src/NewRelic.Core/Directory.Build.props deleted file mode 100644 index e0ada8e881..0000000000 --- a/src/NewRelic.Core/Directory.Build.props +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/NewRelic.Core/NewRelic.Core.csproj b/src/NewRelic.Core/NewRelic.Core.csproj deleted file mode 100644 index 63ef485aa4..0000000000 --- a/src/NewRelic.Core/NewRelic.Core.csproj +++ /dev/null @@ -1,76 +0,0 @@ - - - net462;netstandard2.0 - NewRelic.Core - NewRelic.Core - New Relic Common Library - v - true - $(MSBuildThisFileDirectory)\..\_build\$(Platform)-$(Configuration)\$(AssemblyName)\ - $(MSBuildThisFileDirectory)\..\_build\$(Platform)-$(Configuration)\$(AssemblyName)\ - - - - embedded - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - $([System.String]::new("$(OutputPath)").Trim('\')) - - - - "$(ILRepack)" /parallel /internalize /norepackres /keepotherversionreferences /keyfile:"$(AssemblyOriginatorKeyFile)" /lib:"$(ILRepackSearchDirOutputPath)" /out:"$(OutputPath)..\$(TargetFramework)-ILRepacked\$(AssemblyName).dll" "$(TargetPath)" "@(ILRepackInclude, '" "')" - - - - - - - diff --git a/tests/Agent/Benchmarking/BenchmarkingTests/BenchmarkingTests.csproj b/tests/Agent/Benchmarking/BenchmarkingTests/BenchmarkingTests.csproj index 2d49d8efed..316c89d98d 100644 --- a/tests/Agent/Benchmarking/BenchmarkingTests/BenchmarkingTests.csproj +++ b/tests/Agent/Benchmarking/BenchmarkingTests/BenchmarkingTests.csproj @@ -37,7 +37,6 @@ - diff --git a/tests/Agent/Benchmarking/BenchmarkingTests/Tests/ExampleTests.cs b/tests/Agent/Benchmarking/BenchmarkingTests/Tests/ExampleTests.cs index 7c4d418725..839885e6e6 100644 --- a/tests/Agent/Benchmarking/BenchmarkingTests/Tests/ExampleTests.cs +++ b/tests/Agent/Benchmarking/BenchmarkingTests/Tests/ExampleTests.cs @@ -9,7 +9,6 @@ using NewRelic.Agent.Extensions.Providers.Wrapper; using System.Collections.Generic; using System.Data; -using NewRelic.Core; using NewRelic.Agent.Extensions.Parsing; using System.Threading; using NewRelic.Agent.Core.Utilities; diff --git a/tests/Agent/UnitTests/CompositeTests/AgentApiTests.cs b/tests/Agent/UnitTests/CompositeTests/AgentApiTests.cs index 06035e89f7..c0da43590b 100644 --- a/tests/Agent/UnitTests/CompositeTests/AgentApiTests.cs +++ b/tests/Agent/UnitTests/CompositeTests/AgentApiTests.cs @@ -10,7 +10,6 @@ using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.CrossApplicationTracing; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.TestUtilities; -using NewRelic.Core; using NewRelic.Agent.Core.DistributedTracing; using NewRelic.Testing.Assertions; using NUnit.Framework; diff --git a/tests/Agent/UnitTests/CompositeTests/CATSupportabilityMetricTests.cs b/tests/Agent/UnitTests/CompositeTests/CATSupportabilityMetricTests.cs index 55aa357bfb..f22374daae 100644 --- a/tests/Agent/UnitTests/CompositeTests/CATSupportabilityMetricTests.cs +++ b/tests/Agent/UnitTests/CompositeTests/CATSupportabilityMetricTests.cs @@ -7,7 +7,6 @@ using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.CrossApplicationTracing; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.TestUtilities; -using NewRelic.Core; using NewRelic.Testing.Assertions; using NUnit.Framework; using System; diff --git a/tests/Agent/UnitTests/CompositeTests/CompositeTests.csproj b/tests/Agent/UnitTests/CompositeTests/CompositeTests.csproj index 21be6ea12f..9812a1a99c 100644 --- a/tests/Agent/UnitTests/CompositeTests/CompositeTests.csproj +++ b/tests/Agent/UnitTests/CompositeTests/CompositeTests.csproj @@ -40,7 +40,6 @@ - diff --git a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/CustomEventAggregatorTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/CustomEventAggregatorTests.cs index 0fcdf34529..2faabb4fa7 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/CustomEventAggregatorTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/CustomEventAggregatorTests.cs @@ -14,7 +14,6 @@ using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.Core; using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/ErrorEventAggregatorTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/ErrorEventAggregatorTests.cs index 3b1c494721..31fb840618 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/ErrorEventAggregatorTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/ErrorEventAggregatorTests.cs @@ -12,7 +12,6 @@ using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; using NewRelic.Agent.Extensions.Collections; -using NewRelic.Core; using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using System; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/LogEventAggregatorTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/LogEventAggregatorTests.cs index c3876e19db..dfd430f9ff 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/LogEventAggregatorTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/LogEventAggregatorTests.cs @@ -12,7 +12,6 @@ using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; using NewRelic.Agent.Extensions.Collections; -using NewRelic.Core; using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using System; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/TransactionEventAggregatorTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/TransactionEventAggregatorTests.cs index d0c4e06c05..0423b4e430 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/TransactionEventAggregatorTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/TransactionEventAggregatorTests.cs @@ -11,7 +11,6 @@ using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.Core; using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using System; diff --git a/tests/Agent/UnitTests/Core.UnitTest/BrowserMonitoring/BrowserMonitoringScriptMakerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/BrowserMonitoring/BrowserMonitoringScriptMakerTests.cs index 7ccdd5432b..7f76c391e4 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/BrowserMonitoring/BrowserMonitoringScriptMakerTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/BrowserMonitoring/BrowserMonitoringScriptMakerTests.cs @@ -14,7 +14,6 @@ using NewRelic.Agent.Core.Transformers.TransactionTransformer; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Builders; -using NewRelic.Core; using NUnit.Framework; using System; using System.Text.RegularExpressions; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Core.UnitTest.csproj b/tests/Agent/UnitTests/Core.UnitTest/Core.UnitTest.csproj index f81d8b18f5..e15e5eb923 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Core.UnitTest.csproj +++ b/tests/Agent/UnitTests/Core.UnitTest/Core.UnitTest.csproj @@ -43,7 +43,6 @@ - diff --git a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/RumTests/RumClientConfigTests.cs b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/RumTests/RumClientConfigTests.cs index d9beef14dd..039a9de4c0 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/RumTests/RumClientConfigTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/RumTests/RumClientConfigTests.cs @@ -29,7 +29,6 @@ using NewRelic.Agent.Core.AgentHealth; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.Events; -using NewRelic.Core; namespace NewRelic.Agent.Core.CrossAgentTests.RumTests { diff --git a/tests/Agent/UnitTests/Core.UnitTest/CustomEvents/CustomEventWireModelTests.cs b/tests/Agent/UnitTests/Core.UnitTest/CustomEvents/CustomEventWireModelTests.cs index bad586e935..68416ee456 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/CustomEvents/CustomEventWireModelTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/CustomEvents/CustomEventWireModelTests.cs @@ -10,7 +10,6 @@ using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.TestUtilities; using System; -using NewRelic.Core; namespace NewRelic.Agent.Core.CustomEvents.Tests { diff --git a/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/ValidationConstraintTests.cs b/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/ValidationConstraintTests.cs index 5882f31727..083e78734f 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/ValidationConstraintTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/ValidationConstraintTests.cs @@ -2,7 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Core.DistributedTracing; -using NewRelic.Core.JsonConverters; using Newtonsoft.Json.Linq; using NUnit.Framework; using System; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventAggregatorTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventAggregatorTests.cs index 2875d12fb4..d4bf60b953 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventAggregatorTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventAggregatorTests.cs @@ -11,7 +11,6 @@ using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.Segments; -using NewRelic.Core; using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using System; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventMakerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventMakerTests.cs index 37a95c4882..916e6b0d54 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventMakerTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventMakerTests.cs @@ -24,7 +24,6 @@ using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.TestUtilities; -using NewRelic.Core; using NewRelic.Agent.Core.SharedInterfaces; using NewRelic.Agent.Core.SharedInterfaces.Web; using NewRelic.Testing.Assertions; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Transactions/ImmutableTransactionBuilder.cs b/tests/Agent/UnitTests/Core.UnitTest/Transactions/ImmutableTransactionBuilder.cs index bded55bb39..07531232db 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Transactions/ImmutableTransactionBuilder.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Transactions/ImmutableTransactionBuilder.cs @@ -6,7 +6,6 @@ using NewRelic.Agent.Core.Segments.Tests; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Data; -using NewRelic.Core; using System; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Utilities/DateTimeExtensionsTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Utilities/DateTimeExtensionsTests.cs index 5e68dda40b..50c5a88286 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Utilities/DateTimeExtensionsTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Utilities/DateTimeExtensionsTests.cs @@ -1,7 +1,6 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core; using NUnit.Framework; using System; diff --git a/tests/Agent/UnitTests/Core.UnitTest/WireModels/ErrorEventWireModelTests.cs b/tests/Agent/UnitTests/Core.UnitTest/WireModels/ErrorEventWireModelTests.cs index 3f382153ca..a2717411bc 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/WireModels/ErrorEventWireModelTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/WireModels/ErrorEventWireModelTests.cs @@ -1,7 +1,6 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core; using Newtonsoft.Json; using NUnit.Framework; using System; diff --git a/tests/Agent/UnitTests/Core.UnitTest/WireModels/ErrorTraceWireModelTests.cs b/tests/Agent/UnitTests/Core.UnitTest/WireModels/ErrorTraceWireModelTests.cs index 3c6200a21f..df9725ae9f 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/WireModels/ErrorTraceWireModelTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/WireModels/ErrorTraceWireModelTests.cs @@ -7,7 +7,6 @@ using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.Core; using Newtonsoft.Json; using NUnit.Framework; using System; diff --git a/tests/Agent/UnitTests/Core.UnitTest/WireModels/MetricWireModelTests.cs b/tests/Agent/UnitTests/Core.UnitTest/WireModels/MetricWireModelTests.cs index a1de3d6084..fe8b5279b9 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/WireModels/MetricWireModelTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/WireModels/MetricWireModelTests.cs @@ -5,7 +5,6 @@ using NewRelic.Agent.Core.Metrics; using NewRelic.Agent.Core.Transformers.TransactionTransformer; using NewRelic.Agent.Core.Utilities; -using NewRelic.Core; using NewRelic.Testing.Assertions; using Newtonsoft.Json; using NUnit.Framework; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/DistributedTracing/DistributedTracePayloadHandlerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/DistributedTracing/DistributedTracePayloadHandlerTests.cs index b4c288e075..6dd22ff559 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/DistributedTracing/DistributedTracePayloadHandlerTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/DistributedTracing/DistributedTracePayloadHandlerTests.cs @@ -17,7 +17,6 @@ using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Builders; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.TestUtilities; -using NewRelic.Core; using NewRelic.Testing.Assertions; using NUnit.Framework; using System; diff --git a/tests/Agent/UnitTests/NewRelic.Agent.TestUtilities/NewRelic.Agent.TestUtilities.csproj b/tests/Agent/UnitTests/NewRelic.Agent.TestUtilities/NewRelic.Agent.TestUtilities.csproj index b4d81ce082..1c1393c4f3 100644 --- a/tests/Agent/UnitTests/NewRelic.Agent.TestUtilities/NewRelic.Agent.TestUtilities.csproj +++ b/tests/Agent/UnitTests/NewRelic.Agent.TestUtilities/NewRelic.Agent.TestUtilities.csproj @@ -20,7 +20,6 @@ -