From 0dcdcfdeb91f89ebace9ea26b10654072be0db58 Mon Sep 17 00:00:00 2001 From: Jacob Affinito Date: Mon, 17 Jun 2024 10:08:48 -0700 Subject: [PATCH] chore: Move Parsing and NewRelic.Core types into other agent projects. (#2554) --- .github/workflows/all_solutions.yml | 13 --- .github/workflows/workflows.sln | 30 +++++++ FullAgent.sln | 30 ------- .../Artifacts/NugetAgentExtensions.cs | 37 -------- build/ArtifactBuilder/CoreAgentComponents.cs | 6 +- .../FrameworkAgentComponents.cs | 6 +- build/ArtifactBuilder/Program.cs | 9 -- build/build_functions.ps1 | 14 +--- build/package.ps1 | 1 - src/Agent/MsiInstaller/Installer/Product.wxs | 15 ---- src/Agent/NewRelic/Agent/Core/Agent.cs | 5 +- .../Core/AgentHealth/AgentHealthReporter.cs | 4 +- .../Agent/Core/AgentInstallConfiguration.cs | 6 +- src/Agent/NewRelic/Agent/Core/AgentManager.cs | 6 +- .../Core/Aggregators/AbstractAggregator.cs | 2 +- .../Core/Aggregators/CustomEventAggregator.cs | 6 +- .../Core/Aggregators/ErrorEventAggregator.cs | 6 +- .../Core/Aggregators/ErrorTraceAggregator.cs | 6 +- .../Core/Aggregators/LogEventAggregator.cs | 6 +- .../Core/Aggregators/MetricAggregator.cs | 3 +- .../Aggregators/MetricStatsCollectionQueue.cs | 4 +- .../Core/Aggregators/SpanEventAggregator.cs | 6 +- .../SpanEventAggregatorInfiniteTracing.cs | 4 +- .../Core/Aggregators/SqlTraceAggregator.cs | 4 +- .../Aggregators/SqlTraceStatsCollection.cs | 2 +- .../Aggregators/TransactionEventAggregator.cs | 6 +- .../Aggregators/TransactionTraceAggregator.cs | 4 +- src/Agent/NewRelic/Agent/Core/Api/AgentApi.cs | 3 +- .../Agent/Core/Api/AgentApiImplementation.cs | 5 +- .../NewRelic/Agent/Core/Api/AgentBridgeApi.cs | 2 +- .../Core/Api/DistributedTraceApiModel.cs | 4 +- .../NewRelic/Agent/Core/Api/SpanBridgeApi.cs | 2 +- .../Agent/Core/Api/TransactionBridgeApi.cs | 2 +- .../Core/Attributes/AttributeDefinition.cs | 4 +- .../Attributes/AttributeDefinitionService.cs | 6 +- .../Agent/Core/Attributes/AttributeFilter.cs | 2 +- .../Attributes/AttributeValueCollection.cs | 2 +- .../Core/Attributes/LogContextDataFilter.cs | 2 +- .../BrowserMonitoringPrereqChecker.cs | 2 +- .../BrowserMonitoringScriptMaker.cs | 4 +- .../BrowserMonitoringStreamInjector.cs | 3 +- .../BrowserMonitoringWriter.cs | 2 +- .../BrowserScriptInjectionIndexHelper.cs | 2 +- .../Agent/Core/CallStack/CallStackManager.cs | 2 +- .../Agent/Core/Commands/CommandService.cs | 5 +- .../Commands/InstrumentationUpdateCommand.cs | 2 +- .../Commands/StartThreadProfilerCommand.cs | 2 +- .../Commands/StopThreadProfilerCommand.cs | 2 +- .../Commands/ThreadProfilerCommandArgs.cs | 4 +- .../Core/Config/BootstrapConfiguration.cs | 6 +- .../Agent/Core/Config/ConfigurationLoader.cs | 6 +- .../Agent/Core/Config/ConfigurationTracker.cs | 2 +- .../AppSettingsConfigResolveWhenUsed.cs | 6 +- .../Configuration/ConfigurationService.cs | 6 +- .../Configuration/DefaultConfiguration.cs | 13 ++- .../IConfigurationManagerStatic.cs | 2 +- .../Configuration/InternalConfiguration.cs | 4 +- .../Core/Configuration/ServerConfiguration.cs | 2 +- src/Agent/NewRelic/Agent/Core/Core.csproj | 13 ++- .../Client/DataTransportAuditLogger.cs | 4 +- .../DataTransport/Client/HttpClientBase.cs | 2 +- .../Core/DataTransport/Client/HttpResponse.cs | 2 +- .../Core/DataTransport/Client/NRHttpClient.cs | 2 +- .../Client/WebRequestClientResponse.cs | 2 +- .../Core/DataTransport/ConnectionHandler.cs | 6 +- .../Core/DataTransport/ConnectionManager.cs | 2 +- .../DataTransport/DataStreamingService.cs | 7 +- .../DataTransport/DataTransportService.cs | 5 +- .../Agent/Core/DataTransport/GrpcWrapper.cs | 2 +- .../Core/DataTransport/HttpCollectorWire.cs | 2 +- .../ServerlessModeDataTransportService.cs | 5 +- .../ServerlessModePayloadManager.cs | 4 +- .../DataTransport/SpanStreamingService.cs | 4 +- .../Core/Database/CacheByDatastoreVendor.cs | 4 +- .../DependencyInjection/AgentContainer.cs | 2 +- .../Core/DependencyInjection/AgentServices.cs | 8 +- .../DistributedTracing/AdaptiveSampler.cs | 3 +- .../DistributedTraceException.cs | 2 +- .../DistributedTracePayload.cs | 7 +- .../DistributedTracePayloadHandler.cs | 5 +- .../DistributedTracingParentType.cs | 2 +- .../Core/DistributedTracing/ITracingState.cs | 1 - .../TracePriorityManager.cs | 2 +- .../DistributedTracing/TracestateUtils.cs | 2 +- .../Core/DistributedTracing/TracingState.cs | 3 +- .../DistributedTracing/W3CTraceContext.cs | 1 - .../DistributedTracing/W3CTraceparent.cs | 2 +- .../Core}/DistributedTracing/W3CTracestate.cs | 2 +- src/Agent/NewRelic/Agent/Core/Environment.cs | 7 +- .../Instrumentation/InstrumentationService.cs | 2 +- .../Instrumentation/InstrumentationStore.cs | 2 +- .../Instrumentation/InstrumentationWatcher.cs | 2 +- ...trumentationServerConfigurationListener.cs | 3 +- .../DistributedTracePayloadJsonConverter.cs | 5 +- .../Core/JsonConverters/JsonArrayConverter.cs | 4 +- .../JsonConverters/JsonSerializerHelpers.cs | 4 +- .../JsonConverters/ValidationConstraint.cs | 4 +- .../Agent/Core/Labels/LabelsService.cs | 2 +- .../NewRelic/Agent/Core/Logging/Logger.cs | 2 +- .../Agent/Core/Logging/LoggerBootstrapper.cs | 5 +- .../Agent/Core/Logging/NrLogLevelEnricher.cs | 2 +- .../Agent/Core/Logging/ProcessIdEnricher.cs | 4 +- .../Agent/Core/Logging/ThreadIdEnricher.cs | 2 +- .../Core/Logging/UTCTimestampEnricher.cs | 2 +- .../NewRelic/Agent/Core/Metrics/ApdexStats.cs | 2 +- .../ApiSupportabilityMetricCounters.cs | 2 +- .../CATSupportabilityMetricCounters.cs | 2 +- .../Agent/Core/Metrics/MetricNameService.cs | 4 +- .../Agent/Core/Metrics/MetricNames.cs | 4 +- .../NewRelic/Agent/Core/NativeMethods.cs | 2 +- .../Agent/Core/RuntimeEnvironmentInfo.cs | 3 +- .../Agent/Core/Samplers/AbstractSampler.cs | 2 +- .../Agent/Core/Samplers/CpuSampler.cs | 4 +- .../Agent/Core/Samplers/GCSamplerNetCore.cs | 2 +- .../NewRelic/Agent/Core/Samplers/GcSampler.cs | 4 +- .../Agent/Core/Samplers/MemorySampler.cs | 4 +- .../Agent/Core/Samplers/ThreadStatsSampler.cs | 4 +- .../Core/Segments/DatastoreSegmentData.cs | 2 +- .../Core/Segments/ExternalSegmentData.cs | 3 +- .../NewRelic/Agent/Core/Segments/Segment.cs | 1 - .../Agent/Core/Segments/SpanEventWireModel.cs | 2 +- .../Core/SharedInterfaces}/Environment.cs | 2 +- .../Core/SharedInterfaces}/EnvironmentMock.cs | 2 +- .../Core/SharedInterfaces}/IDateTimeStatic.cs | 2 +- .../Core/SharedInterfaces}/IDnsStatic.cs | 2 +- .../Core/SharedInterfaces}/IEnvironment.cs | 2 +- .../Core/SharedInterfaces}/INetworkData.cs | 4 +- .../INetworkInterfaceData.cs | 2 +- .../Agent/Core/SharedInterfaces}/IProcess.cs | 4 +- .../SharedInterfaces}/IThreadPoolStatic.cs | 2 +- .../PerformanceCounterProxy.cs | 4 +- .../Web/Core/HttpRuntimeStatic.cs | 2 +- .../Web/Framework/HttpRuntimeStatic.cs | 2 +- .../Web/IHttpRuntimeStatic.cs | 2 +- .../Agent/Core/Spans/SpanEventMaker.cs | 2 +- .../ThreadProfiling/ThreadProfilingBucket.cs | 4 +- .../ThreadProfiling/ThreadProfilingSampler.cs | 2 +- .../ThreadProfiling/ThreadProfilingService.cs | 4 +- .../NewRelic/Agent/Core/Time/Scheduler.cs | 6 +- .../SyntheticsTransactionCollector.cs | 2 +- .../Core/Transactions/NoOpTransaction.cs | 4 +- .../Core/Transactions/SyntheticsModel.cs | 4 +- .../Agent/Core/Transactions/Transaction.cs | 8 +- .../Core/Transactions/TransactionMetadata.cs | 4 +- .../Core/Transactions/TransactionService.cs | 3 +- .../Core/Transformers/CpuSampleTransformer.cs | 3 +- .../Transformers/CustomEventTransformer.cs | 4 +- .../Core/Transformers/GcSampleTransformer.cs | 2 +- .../SegmentTreeMaker.cs | 4 +- .../TransactionTraceMaker.cs | 5 +- .../TransactionTransformer.cs | 4 +- .../Agent/Core/Utilities/ActionExtensions.cs | 2 +- .../Utilities}/BuildTimestampAttribute.cs | 6 +- .../Core/Utilities}/DateTimeExtensions.cs | 2 +- .../Core/Utilities/DictionaryExtensions.cs | 1 - .../Agent/Core/Utilities}/DotnetVersion.cs | 2 +- .../Agent/Core/Utilities/ExtensionsLoader.cs | 4 +- .../Agent/Core/Utilities}/GuidGenerator.cs | 4 +- .../Agent/Core/Utilities/HeaderEncoder.cs | 3 +- .../Core/Utilities/IEnumerableExtensions.cs | 84 ------------------- .../Agent/Core/Utilities}/Memoizer.cs | 2 +- .../NrCoveredByIntegrationTestsAttribute.cs | 4 +- .../NrExcludeFromCodeCoverageAttribute.cs | 2 +- .../NewRelic/Agent/Core/Utilities}/Strings.cs | 2 +- .../Agent/Core/Utilities/SystemInfo.cs | 4 +- .../ToBeRemovedInFutureReleaseAttribute.cs | 2 +- .../Core/Utilities/TrimmedEncodedBuffer.cs | 1 - .../Agent/Core/Utilities}/TypeInstantiator.cs | 2 +- .../Core/Utilities}/TypeInstantiatorResult.cs | 2 +- .../Core/Utilization/UtilizationStore.cs | 6 +- .../Utilization/VendorHttpApiRequestor.cs | 2 +- .../Agent/Core/Utilization/VendorInfo.cs | 5 +- .../Core/WireModels/CustomEventWireModel.cs | 2 +- .../Core/WireModels/ErrorEventWireModel.cs | 2 +- .../Agent/Core/WireModels/IMetricBuilder.cs | 2 +- .../Core/WireModels/LogEventWireModel.cs | 4 +- .../Core/WireModels/MetricDataWireModel.cs | 2 +- .../Agent/Core/WireModels/MetricWireModel.cs | 2 +- .../Builders/CandidateTransactionName.cs | 2 +- .../Builders/DatabaseStatementParser.cs | 1 - .../CatHeaderHandler.cs | 5 +- .../Synthetics/SyntheticsHeaderHandler.cs | 2 +- .../NewRelic/Agent/Core/Wrapper/WrapperMap.cs | 2 +- .../Agent/Core/Wrapper/WrapperService.cs | 2 +- .../Caching/ICacheStats.cs | 2 +- .../Caching/SimpleCache.cs | 2 +- .../Collections}/ConcurrentHashSet.cs | 4 +- .../Collections}/ConcurrentList.cs | 4 +- .../Collections}/ConcurrentPriorityQueue.cs | 2 +- .../Collections}/ConcurrentQueue.cs | 4 +- .../Collections}/DisposableCollection.cs | 2 +- .../Collections}/IHasPriority.cs | 2 +- .../IResizableCappedCollection.cs | 2 +- .../PartitionedBlockingCollection.cs | 4 +- .../Collections}/PrioritizedNode.cs | 2 +- .../Collections}/StaticCounter.cs | 2 +- .../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 +- .../Logging/ILogger.cs | 17 ++++ .../NewRelic.Agent.Extensions}/Logging/Log.cs | 2 +- .../Logging/NoOpLogger.cs | 12 ++- .../NewRelic.Agent.Extensions.csproj | 52 +++++++++++- .../ConnectionStringParserHelper.cs | 2 +- .../IConnectionStringParser.cs | 5 +- .../IbmDb2ConnectionStringParser.cs | 3 +- .../MsSqlConnectionStringParser.cs | 3 +- .../MySqlConnectionStringParser.cs | 3 +- .../OracleConnectionStringParser.cs | 3 +- .../PostgresConnectionStringParser.cs | 3 +- ...tackExchangeRedisConnectionStringParser.cs | 3 +- .../Parsing/MySqlExplainPlanActions.cs | 3 +- .../Parsing/SqlParser.cs | 5 +- .../Parsing/SqlServerExplainPlanActions.cs | 2 +- .../Parsing/SqlWrapperHelper.cs | 2 +- .../Parsing/StringsHelper.cs | 2 +- .../Generic/DictionaryExtensions.cs | 2 +- .../Collections/Generic/ForEachEnumerable.cs | 2 +- .../Generic/IEnumerableExtensions.cs | 73 +++++++++++++++- .../NameValueCollectionExtensions.cs | 2 +- .../ObjectArrayExtensions.cs | 2 +- .../SystemExtensions}/StringExtensions.cs | 2 +- .../ReaderWriterLockSlimExtensions.cs | 2 +- .../SystemExtensions}/TimeSpanExtensions.cs | 2 +- .../Providers/Wrapper/AspNet/AspNet.csproj | 1 - .../CreateEventExecutionStepsWrapper.cs | 2 +- .../FinishPipelineRequestWrapper.cs | 2 +- .../Wrapper/AspNet/Shared/OnErrorWrapper.cs | 2 +- .../AspNet/Shared/QueryStringRetriever.cs | 2 +- .../Wrapper/AspNetCore/AspNetCore.csproj | 1 - .../AspNetCore6Plus/AspNetCore6Plus.csproj | 1 - .../Wrapper/AwsLambda/AwsLambda.csproj | 1 - .../Wrapper/AwsLambda/HandlerMethodWrapper.cs | 2 +- .../Providers/Wrapper/Bedrock/Bedrock.csproj | 1 - .../Bedrock/InvokeModelAsyncWrapper.cs | 4 +- .../Wrapper/Couchbase/Couchbase.csproj | 1 - .../Elasticsearch/Elasticsearch.csproj | 1 - .../Wrapper/Elasticsearch/RequestWrapper.cs | 2 +- .../Wrapper/HttpClient/HttpClient.csproj | 1 - .../Providers/Wrapper/HttpClient/SendAsync.cs | 2 +- .../HttpWebRequest/GetResponseWrapper.cs | 2 +- .../HttpWebRequest/HttpWebRequest.csproj | 1 - .../Providers/Wrapper/Kafka/Kafka.csproj | 1 - .../Wrapper/Kafka/KafkaProducerWrapper.cs | 2 +- .../Log4NetLogging/Log4NetLogging.csproj | 1 - .../Wrapper/MassTransit/MassTransit.csproj | 1 - .../MassTransit/TransportConfigWrapper.cs | 2 +- .../MassTransitLegacy.csproj | 1 - .../TransportConfigLegacyWrapper.cs | 2 +- .../MicrosoftExtensionsLogging.csproj | 1 - .../MongoDb/MongoDatabaseDefaultWrapper.cs | 2 +- .../Providers/Wrapper/MongoDb/MongoDb.csproj | 1 - .../Wrapper/MongoDb26/MongoDatabaseWrapper.cs | 2 +- .../Wrapper/MongoDb26/MongoDb26.csproj | 2 - .../Wrapper/MongoDb26/MongoDbHelper.cs | 2 +- .../Mvc3/AsyncBeginInvokeActionWrapper.cs | 2 +- .../Mvc3/InvokeExceptionFiltersWrapper.cs | 2 +- .../Providers/Wrapper/Mvc3/Mvc3.csproj | 1 - .../Wrapper/Mvc3/MvcRouteNamingHelper.cs | 2 +- .../Wrapper/Mvc3/SyncInvokeActionWrapper.cs | 2 +- .../Wrapper/NLogLogging/NLogLogging.csproj | 1 - .../Wrapper/NServiceBus/NServiceBus.csproj | 1 - .../NServiceBus/ReceiveMessageWrapper.cs | 2 +- .../Wrapper/NServiceBus/SendMessageWrapper.cs | 2 +- .../Wrapper/OpenRasta/GetHandlerWrapper.cs | 4 +- .../Wrapper/OpenRasta/OpenRasta.csproj | 2 - .../Providers/Wrapper/Owin/Owin.csproj | 1 - .../Wrapper/RabbitMq/BasicGetWrapper.cs | 2 +- .../RabbitMq/HandleBasicDeliverWrapper.cs | 2 +- .../Wrapper/RabbitMq/QueuePurgeWrapper.cs | 2 +- .../Wrapper/RabbitMq/RabbitMq.csproj | 1 - .../Wrapper/RabbitMq/RabbitMqHelper.cs | 2 +- .../Wrapper/RestSharp/RestSharp.csproj | 1 - .../ScriptHandlerFactory.csproj | 1 - .../SerilogLogging/SerilogLogging.csproj | 1 - .../ServiceStackRedis/SendCommandWrapper.cs | 4 +- .../ServiceStackRedis.csproj | 2 - .../Wrapper/Sql/OdbcCommandWrapper.cs | 2 +- .../Wrapper/Sql/OleDbCommandWrapper.cs | 2 +- .../Providers/Wrapper/Sql/Sql.csproj | 2 - .../Wrapper/Sql/SqlCommandWrapper.cs | 3 +- .../Wrapper/StackExchangeRedis/Common.cs | 2 +- .../StackExchangeRedis.csproj | 2 - .../StackExchangeRedis2Plus/SessionCache.cs | 4 +- .../StackExchangeRedis2Plus.csproj | 2 - .../Wrapper/Wcf3/MethodInvokerWrapper.cs | 2 +- .../Wcf3/ServiceChannelProxyWrapper.cs | 4 +- .../Providers/Wrapper/Wcf3/Wcf3.csproj | 1 - .../WebApi1/InvokeActionAsyncWrapper.cs | 2 +- .../Providers/Wrapper/WebApi1/WebApi1.csproj | 1 - .../Wrapper/WebApi2/ExceptionLoggerWrapper.cs | 2 +- .../WebApi2/InvokeActionAsyncWrapper.cs | 2 +- .../Providers/Wrapper/WebApi2/WebApi2.csproj | 1 - .../StaticResourceNamingWrapper.cs | 2 +- .../WebOptimization/WebOptimization.csproj | 1 - .../Wrapper/WebServices/WebServices.csproj | 1 - src/NewRelic.Core/Directory.Build.props | 4 - src/NewRelic.Core/Logging/ILogger.cs | 27 ------ src/NewRelic.Core/NewRelic.Core.csproj | 76 ----------------- .../BenchmarkingTests.csproj | 1 - .../BenchmarkingTests/Tests/ExampleTests.cs | 4 +- .../UnitTests/CompositeTests/AgentApiTests.cs | 3 +- .../UnitTests/CompositeTests/ApdexTests.cs | 2 +- .../UnitTests/CompositeTests/Assertions.cs | 2 +- .../CATSupportabilityMetricTests.cs | 1 - .../CompositeTests/CompositeTestAgent.cs | 4 +- .../CompositeTests/CompositeTests.csproj | 1 - .../TraceContextCrossAgentTests.cs | 3 +- .../SecurityPoliciesCrossAgentTests.cs | 2 +- .../Utilization/UtilizationCrossAgentTests.cs | 2 +- .../CrossApplicationTracingTests.cs | 3 +- .../CompositeTests/DistributedTracingTests.cs | 2 +- ...HarvestConfigSupportabilityMetricsTests.cs | 2 +- .../CompositeTests/Samplers/GcSamplerTests.cs | 2 +- .../Samplers/ThreadStatsSamplerTests.cs | 2 +- .../CompositeTests/SyntheticsTests.cs | 4 +- .../CompositeTests/TestTransactionContext.cs | 2 +- .../AgentHealth/AgentHealthReporterTests.cs | 4 +- .../Aggregators/CustomEventAggregatorTests.cs | 3 +- .../Aggregators/ErrorEventAggregatorTests.cs | 5 +- .../Aggregators/ErrorTraceAggregatorTests.cs | 2 +- .../Aggregators/LogEventAggregatorTests.cs | 5 +- .../Aggregators/MetricAggregatorTests.cs | 1 - .../Aggregators/SqlTraceAggregatorTests.cs | 2 +- .../TransactionEventAggregatorTests.cs | 3 +- .../TransactionTraceAggregatorTests.cs | 2 +- .../AttributeDefinitionServiceTests.cs | 4 +- .../Attributes/LogContextDataFilterTests.cs | 4 +- .../BrowserMonitoringScriptMakerTests.cs | 1 - .../Config/BootstrapConfigurationTests.cs | 2 +- .../Config/BootstrapLogConfigurationTests.cs | 2 +- .../ServerlessModeConfigurationTests.cs | 2 +- .../Configuration/ConfigurationService.cs | 4 +- .../DefaultConfigurationTests.cs | 4 +- .../Core.UnitTest/Core.UnitTest.csproj | 2 - .../CrossAgentTests/CatMapTests.cs | 2 +- .../DataTransport/CollectorHostNameTests.cs | 4 +- .../RumTests/RumClientConfigTests.cs | 5 +- .../ServerSentEvent/ServerSentEventTests.cs | 4 +- .../CustomEvents/CustomEventWireModelTests.cs | 2 +- .../DataTransportServiceTests.cs | 2 +- .../ServerlessModePayloadManagerTests.cs | 2 +- .../Database/SqlParsingCrossAgentTest.cs | 3 +- .../DistributedTracePayloadTests.cs | 3 +- .../DistributedTracing/TracingStateTests.cs | 4 +- .../DistributedTracing/W3CTraceparentTests.cs | 2 +- .../DistributedTracing/W3CTracestateTests.cs | 2 +- .../Core.UnitTest/Errors/ErrorServiceTests.cs | 4 +- .../ConvertMetricDataToJsonTests.cs | 2 +- ...stributedTracePayloadJsonConverterTests.cs | 2 +- .../JsonConverters/JsonArrayConverterTests.cs | 2 +- .../ValidationConstraintTests.cs | 3 +- .../Core.UnitTest/Logging/LoggerTests.cs | 4 +- .../EnvironmentTest.cs | 2 +- .../LoggerBootstrapperTest.cs | 2 +- .../Core.UnitTest/Samplers/CpuSamplerTests.cs | 2 +- .../Samplers/MemorySamplerTests.cs | 2 +- .../Segments/ExternalSegmentDataTests.cs | 2 +- .../Segments/ExternalSegmentTests.cs | 2 +- .../Segments/MessageBrokerSegmentDataTests.cs | 2 +- .../Segments/MethodSegmentDataTests.cs | 2 +- .../Segments/SimpleSegmentDataTests.cs | 2 +- .../SharedInterfaces}/DnsStaticTests.cs | 4 +- .../SharedInterfaces}/NetworkDataTests.cs | 4 +- .../PerformanceCounterProxyFactoryTests.cs | 4 +- ...SpanEventAggregatorInfiniteTracingTests.cs | 2 +- .../Spans/SpanEventAggregatorTests.cs | 3 +- .../Spans/SpanEventMakerTests.cs | 6 +- .../Spans/SpanStreamingServiceTests.cs | 4 +- .../ImmutableTransactionBuilder.cs | 2 +- .../Transactions/SyntheticsModelTests.cs | 2 +- .../TransactionBuilderServiceTests.cs | 1 - .../SegmentTreeMakerTests.cs | 2 +- .../TransactionAttributeMakerTests.cs | 6 +- .../TransactionEventMakerTests.cs | 1 - .../TransactionTransformerSqlTraceTests.cs | 2 +- .../TransactionTransformerTests.cs | 4 +- .../Utilities}/AppDomainExtensions.cs | 2 +- .../Utilities/DateTimeExtensionsTests.cs | 1 - .../Utilities}/DotnetVersionTests.cs | 2 +- .../Core.UnitTest/Utilities}/MemozierTests.cs | 3 +- .../Core.UnitTest/Utilities/StringsTest.cs | 2 +- .../Utilities}/TypeInstantiator.cs | 2 +- .../Utilization/UtilizationStoreTest.cs | 2 +- .../Utilization/VendorInfoTests.cs | 2 +- .../ConcurrentPriorityQueueTests.cs | 1 + .../WireModels/ErrorEventWireModelTests.cs | 1 - .../WireModels/ErrorTraceWireModelTests.cs | 1 - .../WireModels/LogEventWireModelTests.cs | 2 +- .../WireModels/MetricWireModelTests.cs | 2 +- .../AgentWrapperApi/AgentWrapperApiTests.cs | 8 +- .../Builders/DatabaseStatementParserTest.cs | 4 +- .../CatHeaderHandlerTests.cs | 4 +- .../DistributedTracePayloadHandlerTests.cs | 3 +- .../TracePriorityManagerTests.cs | 8 +- .../Cache}/SimpleCacheTests.cs | 4 +- .../Collections}/ConcurrentHashSet.cs | 6 +- .../Collections}/ConcurrentList.cs | 6 +- .../Collections}/ConcurrentQueueTests.cs | 6 +- .../Collections}/DisposableCollection.cs | 4 +- .../Collections}/IEnumerableExtensions.cs | 3 +- .../Collections}/PrioritizedNodeTests.cs | 4 +- .../Collections}/StaticCounterTests.cs | 4 +- .../NewRelic.Agent.Extensions.Tests.csproj | 8 +- .../Parsing}/ConnectionStringParserTests.cs | 2 +- .../Parsing}/MockDbCommand.cs | 0 .../Parsing}/MockDbConnection.cs | 0 .../Parsing}/MySqlExplainPlanActionTests.cs | 1 - .../Parsing}/SqlParserTests.cs | 1 - .../SqlServerExplainPlanActionTests.cs | 2 +- .../Parsing}/SqlWrapperHelperTests.cs | 4 +- .../Parsing}/StringsHelperTest.cs | 3 +- .../Generic/DictionaryExtensions.cs | 4 +- .../Generic/IEnumerableExtensionsTests.cs | 4 +- .../NameValueCollectionExtensions.cs | 4 +- .../ObjectArrayExtensionsTests.cs | 4 +- .../StringExtensionsTests.cs | 6 +- .../ReaderWriterLockSlimExtensions.cs | 4 +- .../TimeSpanExtensionsTests.cs | 4 +- .../NewRelic.Agent.TestUtilities/Logging.cs | 2 +- .../NewRelic.Agent.TestUtilities.csproj | 1 - .../ParsingTests/ParsingTests.csproj | 1 - 429 files changed, 705 insertions(+), 973 deletions(-) create mode 100644 .github/workflows/workflows.sln delete mode 100644 build/ArtifactBuilder/Artifacts/NugetAgentExtensions.cs rename src/{NewRelic.Core => Agent/NewRelic/Agent/Core}/DistributedTracing/DistributedTraceException.cs (97%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Core}/DistributedTracing/DistributedTracePayload.cs (98%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Core}/DistributedTracing/DistributedTracingParentType.cs (82%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Core}/DistributedTracing/TracePriorityManager.cs (98%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Core}/DistributedTracing/TracestateUtils.cs (98%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Core}/DistributedTracing/W3CTraceparent.cs (99%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Core}/DistributedTracing/W3CTracestate.cs (99%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Core}/JsonConverters/DistributedTracePayloadJsonConverter.cs (98%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Core}/JsonConverters/ValidationConstraint.cs (97%) rename src/{NewRelic.Core/NewRelic.SystemInterfaces => Agent/NewRelic/Agent/Core/SharedInterfaces}/Environment.cs (96%) rename src/{NewRelic.Core/NewRelic.SystemInterfaces => Agent/NewRelic/Agent/Core/SharedInterfaces}/EnvironmentMock.cs (95%) rename src/{NewRelic.Core/NewRelic.SystemInterfaces => Agent/NewRelic/Agent/Core/SharedInterfaces}/IDateTimeStatic.cs (89%) rename src/{NewRelic.Core/NewRelic.SystemInterfaces => Agent/NewRelic/Agent/Core/SharedInterfaces}/IDnsStatic.cs (98%) rename src/{NewRelic.Core/NewRelic.SystemInterfaces => Agent/NewRelic/Agent/Core/SharedInterfaces}/IEnvironment.cs (98%) rename src/{NewRelic.Core/NewRelic.SystemInterfaces => Agent/NewRelic/Agent/Core/SharedInterfaces}/INetworkData.cs (98%) rename src/{NewRelic.Core/NewRelic.SystemInterfaces => Agent/NewRelic/Agent/Core/SharedInterfaces}/INetworkInterfaceData.cs (94%) rename src/{NewRelic.Core/NewRelic.SystemInterfaces => Agent/NewRelic/Agent/Core/SharedInterfaces}/IProcess.cs (96%) rename src/{NewRelic.Core/NewRelic.SystemInterfaces => Agent/NewRelic/Agent/Core/SharedInterfaces}/IThreadPoolStatic.cs (97%) rename src/{NewRelic.Core/NewRelic.SystemInterfaces => Agent/NewRelic/Agent/Core/SharedInterfaces}/PerformanceCounterProxy.cs (98%) rename src/{NewRelic.Core/NewRelic.SystemInterfaces => Agent/NewRelic/Agent/Core/SharedInterfaces}/Web/Core/HttpRuntimeStatic.cs (85%) rename src/{NewRelic.Core/NewRelic.SystemInterfaces => Agent/NewRelic/Agent/Core/SharedInterfaces}/Web/Framework/HttpRuntimeStatic.cs (85%) rename src/{NewRelic.Core/NewRelic.SystemInterfaces => Agent/NewRelic/Agent/Core/SharedInterfaces}/Web/IHttpRuntimeStatic.cs (79%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Core/Utilities}/BuildTimestampAttribute.cs (86%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Core/Utilities}/DateTimeExtensions.cs (98%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Core/Utilities}/DotnetVersion.cs (99%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Core/Utilities}/GuidGenerator.cs (97%) delete mode 100644 src/Agent/NewRelic/Agent/Core/Utilities/IEnumerableExtensions.cs rename src/{NewRelic.Core/NewRelic.Memoization => Agent/NewRelic/Agent/Core/Utilities}/Memoizer.cs (97%) rename src/{NewRelic.Core/CodeAttributes => Agent/NewRelic/Agent/Core/Utilities}/NrCoveredByIntegrationTestsAttribute.cs (78%) rename src/{NewRelic.Core/CodeAttributes => Agent/NewRelic/Agent/Core/Utilities}/NrExcludeFromCodeCoverageAttribute.cs (90%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Core/Utilities}/Strings.cs (99%) rename src/{NewRelic.Core/CodeAttributes => Agent/NewRelic/Agent/Core/Utilities}/ToBeRemovedInFutureReleaseAttribute.cs (94%) rename src/{NewRelic.Core/NewRelic.TypeInstantiation => Agent/NewRelic/Agent/Core/Utilities}/TypeInstantiator.cs (99%) rename src/{NewRelic.Core/NewRelic.TypeInstantiation => Agent/NewRelic/Agent/Core/Utilities}/TypeInstantiatorResult.cs (93%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions}/Caching/ICacheStats.cs (88%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions}/Caching/SimpleCache.cs (99%) rename src/{NewRelic.Core/NewRelic.Collections => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections}/ConcurrentHashSet.cs (95%) rename src/{NewRelic.Core/NewRelic.Collections => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections}/ConcurrentList.cs (97%) rename src/{NewRelic.Core/NewRelic.Collections => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections}/ConcurrentPriorityQueue.cs (99%) rename src/{NewRelic.Core/NewRelic.Collections => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections}/ConcurrentQueue.cs (96%) rename src/{NewRelic.Core/NewRelic.Collections => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections}/DisposableCollection.cs (95%) rename src/{NewRelic.Core/NewRelic.Collections => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections}/IHasPriority.cs (78%) rename src/{NewRelic.Core/NewRelic.Collections => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections}/IResizableCappedCollection.cs (94%) rename src/{NewRelic.Core/NewRelic.Collections => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections}/PartitionedBlockingCollection.cs (96%) rename src/{NewRelic.Core/NewRelic.Collections => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections}/PrioritizedNode.cs (98%) rename src/{NewRelic.Core/NewRelic.Collections => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections}/StaticCounter.cs (91%) 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%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions}/Logging/Log.cs (99%) rename src/{NewRelic.Core => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions}/Logging/NoOpLogger.cs (81%) rename src/Agent/NewRelic/Agent/{ => Extensions/NewRelic.Agent.Extensions}/Parsing/ConnectionString/ConnectionStringParserHelper.cs (95%) rename src/Agent/NewRelic/Agent/{ => Extensions/NewRelic.Agent.Extensions}/Parsing/ConnectionString/IConnectionStringParser.cs (94%) rename src/Agent/NewRelic/Agent/{ => Extensions/NewRelic.Agent.Extensions}/Parsing/ConnectionString/IbmDb2ConnectionStringParser.cs (96%) rename src/Agent/NewRelic/Agent/{ => Extensions/NewRelic.Agent.Extensions}/Parsing/ConnectionString/MsSqlConnectionStringParser.cs (97%) rename src/Agent/NewRelic/Agent/{ => Extensions/NewRelic.Agent.Extensions}/Parsing/ConnectionString/MySqlConnectionStringParser.cs (96%) rename src/Agent/NewRelic/Agent/{ => Extensions/NewRelic.Agent.Extensions}/Parsing/ConnectionString/OracleConnectionStringParser.cs (98%) rename src/Agent/NewRelic/Agent/{ => Extensions/NewRelic.Agent.Extensions}/Parsing/ConnectionString/PostgresConnectionStringParser.cs (95%) rename src/Agent/NewRelic/Agent/{ => Extensions/NewRelic.Agent.Extensions}/Parsing/ConnectionString/StackExchangeRedisConnectionStringParser.cs (96%) rename src/Agent/NewRelic/Agent/{ => Extensions/NewRelic.Agent.Extensions}/Parsing/MySqlExplainPlanActions.cs (98%) rename src/Agent/NewRelic/Agent/{ => Extensions/NewRelic.Agent.Extensions}/Parsing/SqlParser.cs (99%) rename src/Agent/NewRelic/Agent/{ => Extensions/NewRelic.Agent.Extensions}/Parsing/SqlServerExplainPlanActions.cs (98%) rename src/Agent/NewRelic/Agent/{ => Extensions/NewRelic.Agent.Extensions}/Parsing/SqlWrapperHelper.cs (99%) rename src/Agent/NewRelic/Agent/{ => Extensions/NewRelic.Agent.Extensions}/Parsing/StringsHelper.cs (98%) rename src/{NewRelic.Core/NewRelic.SystemExtensions => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions}/Collections/Generic/DictionaryExtensions.cs (98%) rename src/{NewRelic.Core/NewRelic.SystemExtensions => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions}/Collections/Generic/ForEachEnumerable.cs (96%) rename src/{NewRelic.Core/NewRelic.SystemExtensions => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions}/Collections/Generic/IEnumerableExtensions.cs (71%) rename src/{NewRelic.Core/NewRelic.SystemExtensions => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions}/Collections/NameValueCollectionExtensions.cs (94%) rename src/{NewRelic.Core/NewRelic.SystemExtensions => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions}/ObjectArrayExtensions.cs (97%) rename src/{NewRelic.Core/NewRelic.SystemExtensions => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions}/StringExtensions.cs (99%) rename src/{NewRelic.Core/NewRelic.SystemExtensions => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions}/Threading/ReaderWriterLockSlimExtensions.cs (97%) rename src/{NewRelic.Core/NewRelic.SystemExtensions => Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions}/TimeSpanExtensions.cs (97%) delete mode 100644 src/NewRelic.Core/Directory.Build.props delete mode 100644 src/NewRelic.Core/Logging/ILogger.cs delete mode 100644 src/NewRelic.Core/NewRelic.Core.csproj rename tests/{NewRelic.Core.Tests/NewRelic.SystemInterfaces => Agent/UnitTests/Core.UnitTest/SharedInterfaces}/DnsStaticTests.cs (98%) rename tests/{NewRelic.Core.Tests/NewRelic.SystemInterfaces => Agent/UnitTests/Core.UnitTest/SharedInterfaces}/NetworkDataTests.cs (98%) rename tests/{NewRelic.Core.Tests/NewRelic.SystemInterfaces => Agent/UnitTests/Core.UnitTest/SharedInterfaces}/PerformanceCounterProxyFactoryTests.cs (99%) rename tests/{NewRelic.Core.Tests/NewRelic.TypeInstantiation => Agent/UnitTests/Core.UnitTest/Utilities}/AppDomainExtensions.cs (98%) rename tests/{NewRelic.Core.Tests => Agent/UnitTests/Core.UnitTest/Utilities}/DotnetVersionTests.cs (98%) rename tests/{NewRelic.Core.Tests/NewRelic.Memoization => Agent/UnitTests/Core.UnitTest/Utilities}/MemozierTests.cs (98%) rename tests/{NewRelic.Core.Tests/NewRelic.TypeInstantiation => Agent/UnitTests/Core.UnitTest/Utilities}/TypeInstantiator.cs (99%) rename tests/{NewRelic.Core.Tests/NewRelic.Cache => Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Cache}/SimpleCacheTests.cs (99%) rename tests/{NewRelic.Core.Tests/NewRelic.Collections => Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections}/ConcurrentHashSet.cs (98%) rename tests/{NewRelic.Core.Tests/NewRelic.Collections => Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections}/ConcurrentList.cs (98%) rename tests/{NewRelic.Core.Tests/NewRelic.Collections => Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections}/ConcurrentQueueTests.cs (98%) rename tests/{NewRelic.Core.Tests/NewRelic.Collections => Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections}/DisposableCollection.cs (97%) rename tests/Agent/UnitTests/{Core.UnitTest/Utilities => NewRelic.Agent.Extensions.Tests/Collections}/IEnumerableExtensions.cs (93%) rename tests/{NewRelic.Core.Tests/NewRelic.Collections => Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections}/PrioritizedNodeTests.cs (99%) rename tests/{NewRelic.Core.Tests/NewRelic.Collections => Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections}/StaticCounterTests.cs (93%) rename tests/Agent/UnitTests/{ParsingTests => NewRelic.Agent.Extensions.Tests/Parsing}/ConnectionStringParserTests.cs (99%) rename tests/Agent/UnitTests/{ParsingTests => NewRelic.Agent.Extensions.Tests/Parsing}/MockDbCommand.cs (100%) rename tests/Agent/UnitTests/{ParsingTests => NewRelic.Agent.Extensions.Tests/Parsing}/MockDbConnection.cs (100%) rename tests/Agent/UnitTests/{ParsingTests => NewRelic.Agent.Extensions.Tests/Parsing}/MySqlExplainPlanActionTests.cs (99%) rename tests/Agent/UnitTests/{ParsingTests => NewRelic.Agent.Extensions.Tests/Parsing}/SqlParserTests.cs (99%) rename tests/Agent/UnitTests/{ParsingTests => NewRelic.Agent.Extensions.Tests/Parsing}/SqlServerExplainPlanActionTests.cs (99%) rename tests/Agent/UnitTests/{ParsingTests => NewRelic.Agent.Extensions.Tests/Parsing}/SqlWrapperHelperTests.cs (98%) rename tests/Agent/UnitTests/{ParsingTests => NewRelic.Agent.Extensions.Tests/Parsing}/StringsHelperTest.cs (98%) rename tests/{NewRelic.Core.Tests/NewRelic.SystemExtensions => Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions}/Collections/Generic/DictionaryExtensions.cs (97%) rename tests/{NewRelic.Core.Tests/NewRelic.SystemExtensions => Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions}/Collections/Generic/IEnumerableExtensionsTests.cs (98%) rename tests/{NewRelic.Core.Tests/NewRelic.SystemExtensions => Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions}/Collections/NameValueCollectionExtensions.cs (96%) rename tests/{NewRelic.Core.Tests/NewRelic.SystemExtensions => Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions}/ObjectArrayExtensionsTests.cs (97%) rename tests/{NewRelic.Core.Tests/NewRelic.SystemExtensions => Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions}/StringExtensionsTests.cs (98%) rename tests/{NewRelic.Core.Tests/NewRelic.SystemExtensions => Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions}/Threading/ReaderWriterLockSlimExtensions.cs (96%) rename tests/{NewRelic.Core.Tests/NewRelic.SystemExtensions => Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions}/TimeSpanExtensionsTests.cs (92%) diff --git a/.github/workflows/all_solutions.yml b/.github/workflows/all_solutions.yml index 5dee5a54f4..0217b18fe9 100644 --- a/.github/workflows/all_solutions.yml +++ b/.github/workflows/all_solutions.yml @@ -70,13 +70,6 @@ jobs: echo "version=$agentVersion" >> $env:GITHUB_OUTPUT shell: powershell - - name: Archive NewRelic.Agent.Extensions - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 - with: - name: NewRelic.Agent.Extensions - path: ${{ github.workspace }}\src\Agent\NewRelic\Agent\Extensions\NewRelic.Agent.Extensions\bin\Release - if-no-files-found: error - - name: Archive FullAgent Home folders uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: @@ -665,12 +658,6 @@ jobs: name: rpm-build-artifacts path: src/_build/CoreArtifacts - - name: Download NewRelic.Agent.Extensions - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 - with: - name: NewRelic.Agent.Extensions - path: src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/bin/Release - - name: Add msbuild to PATH uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0 diff --git a/.github/workflows/workflows.sln b/.github/workflows/workflows.sln new file mode 100644 index 0000000000..0c926605d1 --- /dev/null +++ b/.github/workflows/workflows.sln @@ -0,0 +1,30 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.002.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{AAC9CA3C-605D-40C5-8A35-E606A75FE972}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nugetSlackNotifications", "scripts\nugetSlackNotifications\nugetSlackNotifications.csproj", "{0A39161F-8458-404C-B2CB-72DF6A02B77A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0A39161F-8458-404C-B2CB-72DF6A02B77A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A39161F-8458-404C-B2CB-72DF6A02B77A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0A39161F-8458-404C-B2CB-72DF6A02B77A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0A39161F-8458-404C-B2CB-72DF6A02B77A}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {0A39161F-8458-404C-B2CB-72DF6A02B77A} = {AAC9CA3C-605D-40C5-8A35-E606A75FE972} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {00939DF1-4B23-430C-9972-9961583ACDC9} + EndGlobalSection +EndGlobal diff --git a/FullAgent.sln b/FullAgent.sln index 404120280d..64b59d0b77 100644 --- a/FullAgent.sln +++ b/FullAgent.sln @@ -67,8 +67,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpWebRequest", "src\Agent EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sql", "src\Agent\NewRelic\Agent\Extensions\Providers\Wrapper\Sql\Sql.csproj", "{22274460-3222-4474-B679-19E1F27A2CC3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Parsing", "src\Agent\NewRelic\Agent\Parsing\Parsing.csproj", "{7C0C1700-6001-48F5-A214-6D392F225A07}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Msmq", "src\Agent\NewRelic\Agent\Extensions\Providers\Wrapper\Msmq\Msmq.csproj", "{570429FD-C785-4673-82DF-643D06B6DC53}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScriptHandlerFactory", "src\Agent\NewRelic\Agent\Extensions\Providers\Wrapper\ScriptHandlerFactory\ScriptHandlerFactory.csproj", "{AA683341-1FF5-4D45-A831-1BAF3C100A5C}" @@ -90,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 @@ -109,14 +105,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AsyncLocalTests", "tests\Ag EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewRelic.Agent.TestUtilities", "tests\Agent\UnitTests\NewRelic.Agent.TestUtilities\NewRelic.Agent.TestUtilities.csproj", "{37FFBAD3-4263-4CDD-9072-CADEE1CD5B37}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ParsingTests", "tests\Agent\UnitTests\ParsingTests\ParsingTests.csproj", "{3E734568-9142-4163-B651-F5BDC3D04F4A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCore", "src\Agent\NewRelic\Agent\Extensions\Providers\Wrapper\AspNetCore\AspNetCore.csproj", "{2FB30555-65A4-43D7-82AA-56BF203D3A96}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RestSharp", "src\Agent\NewRelic\Agent\Extensions\Providers\Wrapper\RestSharp\RestSharp.csproj", "{B65A0C00-100D-4F27-BAC7-6B8A9FC7619D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NewRelic.Core.Tests", "tests\NewRelic.Core.Tests\NewRelic.Core.Tests.csproj", "{6DC9A481-9A72-4D35-B312-43E02E36C241}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Storage", "Storage", "{2D194040-0192-4A87-A076-2B640C7FA82F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CallContext", "src\Agent\NewRelic\Agent\Extensions\Providers\Storage\CallContext\CallContext.csproj", "{8D2B52DD-D45C-481D-92F0-28990F168820}" @@ -167,10 +159,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Home", "src\Agent\NewRelic\ {686AE051-BC8C-4AEC-803D-237AEB807CA9} = {686AE051-BC8C-4AEC-803D-237AEB807CA9} {6FA157C2-C50C-49E4-8CD7-50F2AD77A33D} = {6FA157C2-C50C-49E4-8CD7-50F2AD77A33D} {710C7C7A-CD27-4F94-B2D3-9804BD848D57} = {710C7C7A-CD27-4F94-B2D3-9804BD848D57} - {7C0C1700-6001-48F5-A214-6D392F225A07} = {7C0C1700-6001-48F5-A214-6D392F225A07} {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} @@ -295,10 +285,6 @@ Global {22274460-3222-4474-B679-19E1F27A2CC3}.Debug|Any CPU.Build.0 = Debug|Any CPU {22274460-3222-4474-B679-19E1F27A2CC3}.Release|Any CPU.ActiveCfg = Release|Any CPU {22274460-3222-4474-B679-19E1F27A2CC3}.Release|Any CPU.Build.0 = Release|Any CPU - {7C0C1700-6001-48F5-A214-6D392F225A07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C0C1700-6001-48F5-A214-6D392F225A07}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C0C1700-6001-48F5-A214-6D392F225A07}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C0C1700-6001-48F5-A214-6D392F225A07}.Release|Any CPU.Build.0 = Release|Any CPU {570429FD-C785-4673-82DF-643D06B6DC53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {570429FD-C785-4673-82DF-643D06B6DC53}.Debug|Any CPU.Build.0 = Debug|Any CPU {570429FD-C785-4673-82DF-643D06B6DC53}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -331,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 @@ -355,10 +337,6 @@ Global {37FFBAD3-4263-4CDD-9072-CADEE1CD5B37}.Debug|Any CPU.Build.0 = Debug|Any CPU {37FFBAD3-4263-4CDD-9072-CADEE1CD5B37}.Release|Any CPU.ActiveCfg = Release|Any CPU {37FFBAD3-4263-4CDD-9072-CADEE1CD5B37}.Release|Any CPU.Build.0 = Release|Any CPU - {3E734568-9142-4163-B651-F5BDC3D04F4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E734568-9142-4163-B651-F5BDC3D04F4A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E734568-9142-4163-B651-F5BDC3D04F4A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E734568-9142-4163-B651-F5BDC3D04F4A}.Release|Any CPU.Build.0 = Release|Any CPU {2FB30555-65A4-43D7-82AA-56BF203D3A96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2FB30555-65A4-43D7-82AA-56BF203D3A96}.Debug|Any CPU.Build.0 = Debug|Any CPU {2FB30555-65A4-43D7-82AA-56BF203D3A96}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -367,10 +345,6 @@ Global {B65A0C00-100D-4F27-BAC7-6B8A9FC7619D}.Debug|Any CPU.Build.0 = Debug|Any CPU {B65A0C00-100D-4F27-BAC7-6B8A9FC7619D}.Release|Any CPU.ActiveCfg = Release|Any CPU {B65A0C00-100D-4F27-BAC7-6B8A9FC7619D}.Release|Any CPU.Build.0 = Release|Any CPU - {6DC9A481-9A72-4D35-B312-43E02E36C241}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6DC9A481-9A72-4D35-B312-43E02E36C241}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6DC9A481-9A72-4D35-B312-43E02E36C241}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6DC9A481-9A72-4D35-B312-43E02E36C241}.Release|Any CPU.Build.0 = Release|Any CPU {8D2B52DD-D45C-481D-92F0-28990F168820}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8D2B52DD-D45C-481D-92F0-28990F168820}.Debug|Any CPU.Build.0 = Debug|Any CPU {8D2B52DD-D45C-481D-92F0-28990F168820}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -493,7 +467,6 @@ Global {F889CE37-934F-48F2-A105-6C19CE292D37} = {5E86E10A-C38F-48CB-ADE9-67B22BB2F50A} {C51E44B7-ADC9-4EDA-AAAE-F6307180A3EB} = {5E86E10A-C38F-48CB-ADE9-67B22BB2F50A} {22274460-3222-4474-B679-19E1F27A2CC3} = {5E86E10A-C38F-48CB-ADE9-67B22BB2F50A} - {7C0C1700-6001-48F5-A214-6D392F225A07} = {592C9958-32E6-4834-ACEB-D32CBDB57310} {570429FD-C785-4673-82DF-643D06B6DC53} = {5E86E10A-C38F-48CB-ADE9-67B22BB2F50A} {AA683341-1FF5-4D45-A831-1BAF3C100A5C} = {5E86E10A-C38F-48CB-ADE9-67B22BB2F50A} {203A8EA4-A0F2-4139-B02E-9B0F2B39C107} = {5E86E10A-C38F-48CB-ADE9-67B22BB2F50A} @@ -502,16 +475,13 @@ 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} {D5509D1E-4FF5-425E-894F-9E5226E87864} = {E5B988C0-5D19-407E-8210-71FFB90C579A} {37FFBAD3-4263-4CDD-9072-CADEE1CD5B37} = {E5B988C0-5D19-407E-8210-71FFB90C579A} - {3E734568-9142-4163-B651-F5BDC3D04F4A} = {E5B988C0-5D19-407E-8210-71FFB90C579A} {2FB30555-65A4-43D7-82AA-56BF203D3A96} = {5E86E10A-C38F-48CB-ADE9-67B22BB2F50A} {B65A0C00-100D-4F27-BAC7-6B8A9FC7619D} = {5E86E10A-C38F-48CB-ADE9-67B22BB2F50A} - {6DC9A481-9A72-4D35-B312-43E02E36C241} = {BADDAE10-27A9-4452-9432-BFDBC3C62E87} {2D194040-0192-4A87-A076-2B640C7FA82F} = {8DE69D20-1763-42A1-B3FB-A11E2311BB9C} {8D2B52DD-D45C-481D-92F0-28990F168820} = {2D194040-0192-4A87-A076-2B640C7FA82F} {EFFD9051-E3AC-4266-9AF6-7ECC74C032BD} = {2D194040-0192-4A87-A076-2B640C7FA82F} diff --git a/build/ArtifactBuilder/Artifacts/NugetAgentExtensions.cs b/build/ArtifactBuilder/Artifacts/NugetAgentExtensions.cs deleted file mode 100644 index bd78fe9fc7..0000000000 --- a/build/ArtifactBuilder/Artifacts/NugetAgentExtensions.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.IO; -using System.Linq; - -namespace ArtifactBuilder.Artifacts -{ - public class NugetAgentExtensions : Artifact - { - public NugetAgentExtensions(string configuration) - : base(nameof(NugetAgentExtensions)) - { - Configuration = configuration; - NugetPackagePath = $@"{RepoRootDirectory}\src\Agent\NewRelic\Agent\Extensions\NewRelic.Agent.Extensions\bin\{configuration}"; - } - - public string Configuration { get; } - private string NugetPackagePath { get; } - - protected override void InternalBuild() - { - var fileNameSearchPattern = $"NewRelic.Agent.Extensions*.nupkg"; - var packagePath = Directory.GetFiles(NugetPackagePath, fileNameSearchPattern).FirstOrDefault(); - - if (string.IsNullOrEmpty(packagePath)) - { - Console.WriteLine("Warning: The {0} package could not be found.", fileNameSearchPattern); - return; - } - - Directory.CreateDirectory(OutputDirectory); - - var fileInfo = new FileInfo(packagePath); - File.Copy(fileInfo.FullName, $@"{OutputDirectory}\{fileInfo.Name}", true); - Console.WriteLine($"Successfully created package {nameof(NugetAgentExtensions)}"); - } - } -} 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/ArtifactBuilder/Program.cs b/build/ArtifactBuilder/Program.cs index db68020266..8d4af5d21b 100644 --- a/build/ArtifactBuilder/Program.cs +++ b/build/ArtifactBuilder/Program.cs @@ -28,9 +28,6 @@ static int Main(string[] args) case "nugetagentapi": BuildNugetAgentApi(args); break; - case "nugetagentextensions": - BuildNugetAgentExtensions(args); - break; case "nugetazurecloudservices": BuildNugetAzureCloudServices(args); break; @@ -105,12 +102,6 @@ private static void BuildNugetAgentApi(string[] args) c.Build(); } - private static void BuildNugetAgentExtensions(string[] args) - { - var configuration = args[1]; - var c = new NugetAgentExtensions(configuration); - c.Build(); - } private static void BuildNugetAzureCloudServices(string[] args) { var configuration = args[1]; 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/build/package.ps1 b/build/package.ps1 index 56f4eb75b4..4c797d848a 100644 --- a/build/package.ps1 +++ b/build/package.ps1 @@ -18,7 +18,6 @@ $packagesToBuild = @( "dotnet run --project '$artifactBuilderCsproj' NugetAzureWebSites $configuration x64", "dotnet run --project '$artifactBuilderCsproj' NugetAzureWebSites $configuration x86", "dotnet run --project '$artifactBuilderCsproj' NugetAgentApi $configuration", - "dotnet run --project '$artifactBuilderCsproj' NugetAgentExtensions $configuration", "dotnet run --project '$artifactBuilderCsproj' NugetAzureCloudServices $configuration", "dotnet run --project '$artifactBuilderCsproj' NugetAgent $configuration", "dotnet run --project '$artifactBuilderCsproj' ZipArchives $configuration", 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 2d367fad06..81ab98fb51 100644 --- a/src/Agent/NewRelic/Agent/Core/Agent.cs +++ b/src/Agent/NewRelic/Agent/Core/Agent.cs @@ -22,9 +22,8 @@ using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Synthetics; using NewRelic.Agent.Extensions.Helpers; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; using System; using System.Collections.Generic; using System.IO; diff --git a/src/Agent/NewRelic/Agent/Core/AgentHealth/AgentHealthReporter.cs b/src/Agent/NewRelic/Agent/Core/AgentHealth/AgentHealthReporter.cs index a0a08a01a7..d007282a0d 100644 --- a/src/Agent/NewRelic/Agent/Core/AgentHealth/AgentHealthReporter.cs +++ b/src/Agent/NewRelic/Agent/Core/AgentHealth/AgentHealthReporter.cs @@ -9,8 +9,8 @@ using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Collections; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Collections; +using NewRelic.Agent.Extensions.Logging; using System; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/src/Agent/NewRelic/Agent/Core/AgentInstallConfiguration.cs b/src/Agent/NewRelic/Agent/Core/AgentInstallConfiguration.cs index ccf6b597af..e5c9983ddf 100644 --- a/src/Agent/NewRelic/Agent/Core/AgentInstallConfiguration.cs +++ b/src/Agent/NewRelic/Agent/Core/AgentInstallConfiguration.cs @@ -5,12 +5,12 @@ using System.IO; using System.Linq; using NewRelic.Agent.Core.AgentHealth; -using NewRelic.Core; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using Newtonsoft.Json; using System.Reflection; using System.Diagnostics; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.Utilities; #if NETFRAMEWORK using System.Web; using Microsoft.Win32; diff --git a/src/Agent/NewRelic/Agent/Core/AgentManager.cs b/src/Agent/NewRelic/Agent/Core/AgentManager.cs index c2cf441da1..71ecfb7a3b 100644 --- a/src/Agent/NewRelic/Agent/Core/AgentManager.cs +++ b/src/Agent/NewRelic/Agent/Core/AgentManager.cs @@ -15,7 +15,7 @@ using NewRelic.Agent.Core.Tracer; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.Wrapper; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; using System.Collections.Generic; using System.Diagnostics; @@ -317,12 +317,12 @@ private void LogInitialized() } #if NETFRAMEWORK - if (NewRelic.Core.DotnetVersion.IsUnsupportedDotnetFrameworkVersion(AgentInstallConfiguration.DotnetFrameworkVersion)) + if (DotnetVersion.IsUnsupportedDotnetFrameworkVersion(AgentInstallConfiguration.DotnetFrameworkVersion)) { Log.Warn("Unsupported installed .NET Framework version {0} detected. Please use a version of .NET Framework >= 4.6.2.", AgentInstallConfiguration.DotnetFrameworkVersion); } #else - if (NewRelic.Core.DotnetVersion.IsUnsupportedDotnetCoreVersion(AgentInstallConfiguration.DotnetCoreVersion)) + if (DotnetVersion.IsUnsupportedDotnetCoreVersion(AgentInstallConfiguration.DotnetCoreVersion)) { Log.Warn("Unsupported .NET version {0} detected. Please use net6 or net8 or newer.", AgentInstallConfiguration.DotnetCoreVersion); } diff --git a/src/Agent/NewRelic/Agent/Core/Aggregators/AbstractAggregator.cs b/src/Agent/NewRelic/Agent/Core/Aggregators/AbstractAggregator.cs index 6f76b2fdf5..e3fdb71ff0 100644 --- a/src/Agent/NewRelic/Agent/Core/Aggregators/AbstractAggregator.cs +++ b/src/Agent/NewRelic/Agent/Core/Aggregators/AbstractAggregator.cs @@ -6,7 +6,7 @@ using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Utilities; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; namespace NewRelic.Agent.Core.Aggregators { diff --git a/src/Agent/NewRelic/Agent/Core/Aggregators/CustomEventAggregator.cs b/src/Agent/NewRelic/Agent/Core/Aggregators/CustomEventAggregator.cs index d740d39f3c..3a11e9051c 100644 --- a/src/Agent/NewRelic/Agent/Core/Aggregators/CustomEventAggregator.cs +++ b/src/Agent/NewRelic/Agent/Core/Aggregators/CustomEventAggregator.cs @@ -6,9 +6,9 @@ using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.WireModels; -using NewRelic.Collections; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Collections; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/Agent/NewRelic/Agent/Core/Aggregators/ErrorEventAggregator.cs b/src/Agent/NewRelic/Agent/Core/Aggregators/ErrorEventAggregator.cs index 46fd0b5481..a3e82f8099 100644 --- a/src/Agent/NewRelic/Agent/Core/Aggregators/ErrorEventAggregator.cs +++ b/src/Agent/NewRelic/Agent/Core/Aggregators/ErrorEventAggregator.cs @@ -7,9 +7,9 @@ using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Transactions; using NewRelic.Agent.Core.WireModels; -using NewRelic.Collections; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Collections; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/src/Agent/NewRelic/Agent/Core/Aggregators/ErrorTraceAggregator.cs b/src/Agent/NewRelic/Agent/Core/Aggregators/ErrorTraceAggregator.cs index d623e14f87..612a984bca 100644 --- a/src/Agent/NewRelic/Agent/Core/Aggregators/ErrorTraceAggregator.cs +++ b/src/Agent/NewRelic/Agent/Core/Aggregators/ErrorTraceAggregator.cs @@ -6,9 +6,9 @@ using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.WireModels; -using NewRelic.Collections; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Collections; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/Agent/NewRelic/Agent/Core/Aggregators/LogEventAggregator.cs b/src/Agent/NewRelic/Agent/Core/Aggregators/LogEventAggregator.cs index a16b4f0701..825e8fc4c2 100644 --- a/src/Agent/NewRelic/Agent/Core/Aggregators/LogEventAggregator.cs +++ b/src/Agent/NewRelic/Agent/Core/Aggregators/LogEventAggregator.cs @@ -10,9 +10,9 @@ using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.WireModels; -using NewRelic.Collections; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Collections; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; namespace NewRelic.Agent.Core.Aggregators { diff --git a/src/Agent/NewRelic/Agent/Core/Aggregators/MetricAggregator.cs b/src/Agent/NewRelic/Agent/Core/Aggregators/MetricAggregator.cs index 8ebf9c1507..fd4c7d9581 100644 --- a/src/Agent/NewRelic/Agent/Core/Aggregators/MetricAggregator.cs +++ b/src/Agent/NewRelic/Agent/Core/Aggregators/MetricAggregator.cs @@ -9,8 +9,7 @@ using NewRelic.Agent.Core.SharedInterfaces; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.WireModels; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.Aggregators { diff --git a/src/Agent/NewRelic/Agent/Core/Aggregators/MetricStatsCollectionQueue.cs b/src/Agent/NewRelic/Agent/Core/Aggregators/MetricStatsCollectionQueue.cs index bde01bba02..bfb77e2d3b 100644 --- a/src/Agent/NewRelic/Agent/Core/Aggregators/MetricStatsCollectionQueue.cs +++ b/src/Agent/NewRelic/Agent/Core/Aggregators/MetricStatsCollectionQueue.cs @@ -1,9 +1,9 @@ -// Copyright 2020 New Relic, Inc. All rights reserved. +// Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 using System; using System.Collections.Concurrent; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.Aggregators { diff --git a/src/Agent/NewRelic/Agent/Core/Aggregators/SpanEventAggregator.cs b/src/Agent/NewRelic/Agent/Core/Aggregators/SpanEventAggregator.cs index 28e7a5c48d..1001b4053b 100644 --- a/src/Agent/NewRelic/Agent/Core/Aggregators/SpanEventAggregator.cs +++ b/src/Agent/NewRelic/Agent/Core/Aggregators/SpanEventAggregator.cs @@ -6,13 +6,13 @@ using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Segments; -using NewRelic.Collections; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Collections; +using NewRelic.Agent.Core.SharedInterfaces; using System; using System.Collections.Generic; using System.Linq; using System.Threading; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.Aggregators { diff --git a/src/Agent/NewRelic/Agent/Core/Aggregators/SpanEventAggregatorInfiniteTracing.cs b/src/Agent/NewRelic/Agent/Core/Aggregators/SpanEventAggregatorInfiniteTracing.cs index 0bb84f3cca..a6fdf90f26 100644 --- a/src/Agent/NewRelic/Agent/Core/Aggregators/SpanEventAggregatorInfiniteTracing.cs +++ b/src/Agent/NewRelic/Agent/Core/Aggregators/SpanEventAggregatorInfiniteTracing.cs @@ -8,8 +8,8 @@ using NewRelic.Agent.Core.Segments; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Utilities; -using NewRelic.Collections; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Collections; +using NewRelic.Agent.Extensions.Logging; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/Agent/NewRelic/Agent/Core/Aggregators/SqlTraceAggregator.cs b/src/Agent/NewRelic/Agent/Core/Aggregators/SqlTraceAggregator.cs index 90cfd7ae84..f090294a65 100644 --- a/src/Agent/NewRelic/Agent/Core/Aggregators/SqlTraceAggregator.cs +++ b/src/Agent/NewRelic/Agent/Core/Aggregators/SqlTraceAggregator.cs @@ -6,8 +6,8 @@ using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.WireModels; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/Agent/NewRelic/Agent/Core/Aggregators/SqlTraceStatsCollection.cs b/src/Agent/NewRelic/Agent/Core/Aggregators/SqlTraceStatsCollection.cs index c47ec095ca..4e8d39d81c 100644 --- a/src/Agent/NewRelic/Agent/Core/Aggregators/SqlTraceStatsCollection.cs +++ b/src/Agent/NewRelic/Agent/Core/Aggregators/SqlTraceStatsCollection.cs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Core.WireModels; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using System.Collections.Generic; namespace NewRelic.Agent.Core.Aggregators diff --git a/src/Agent/NewRelic/Agent/Core/Aggregators/TransactionEventAggregator.cs b/src/Agent/NewRelic/Agent/Core/Aggregators/TransactionEventAggregator.cs index f8a8a7c473..2f8aa1c8fd 100644 --- a/src/Agent/NewRelic/Agent/Core/Aggregators/TransactionEventAggregator.cs +++ b/src/Agent/NewRelic/Agent/Core/Aggregators/TransactionEventAggregator.cs @@ -7,9 +7,9 @@ using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Transactions; using NewRelic.Agent.Core.WireModels; -using NewRelic.Collections; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Collections; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/Agent/NewRelic/Agent/Core/Aggregators/TransactionTraceAggregator.cs b/src/Agent/NewRelic/Agent/Core/Aggregators/TransactionTraceAggregator.cs index 0a5c6dfa5e..7846c017c2 100644 --- a/src/Agent/NewRelic/Agent/Core/Aggregators/TransactionTraceAggregator.cs +++ b/src/Agent/NewRelic/Agent/Core/Aggregators/TransactionTraceAggregator.cs @@ -10,9 +10,9 @@ using NewRelic.Agent.Core.TransactionTraces; using NewRelic.Agent.Core.Transformers.TransactionTransformer; using NewRelic.Agent.Core.WireModels; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using Newtonsoft.Json; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.Aggregators { diff --git a/src/Agent/NewRelic/Agent/Core/Api/AgentApi.cs b/src/Agent/NewRelic/Agent/Core/Api/AgentApi.cs index 8f1e356fdc..abaa293a3a 100644 --- a/src/Agent/NewRelic/Agent/Core/Api/AgentApi.cs +++ b/src/Agent/NewRelic/Agent/Core/Api/AgentApi.cs @@ -5,8 +5,7 @@ using NewRelic.Agent.Api; using NewRelic.Agent.Core.Metrics; -using NewRelic.Core.CodeAttributes; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; using System.Collections.Generic; diff --git a/src/Agent/NewRelic/Agent/Core/Api/AgentApiImplementation.cs b/src/Agent/NewRelic/Agent/Core/Api/AgentApiImplementation.cs index 1a64f6cfa6..8955222306 100644 --- a/src/Agent/NewRelic/Agent/Core/Api/AgentApiImplementation.cs +++ b/src/Agent/NewRelic/Agent/Core/Api/AgentApiImplementation.cs @@ -6,8 +6,7 @@ using NewRelic.Agent.Configuration; using NewRelic.Agent.Core.Aggregators; using NewRelic.Agent.Core.BrowserMonitoring; -using NewRelic.Core.CodeAttributes; -using NewRelic.Core.DistributedTracing; +using NewRelic.Agent.Core.DistributedTracing; using NewRelic.Agent.Core.Errors; using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Metrics; @@ -21,7 +20,7 @@ using System.Globalization; using System.Reflection; using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Builders; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using NewRelic.Agent.Api; using System.Linq; diff --git a/src/Agent/NewRelic/Agent/Core/Api/AgentBridgeApi.cs b/src/Agent/NewRelic/Agent/Core/Api/AgentBridgeApi.cs index 7f7b9cfbe7..1f0ab9cf2e 100644 --- a/src/Agent/NewRelic/Agent/Core/Api/AgentBridgeApi.cs +++ b/src/Agent/NewRelic/Agent/Core/Api/AgentBridgeApi.cs @@ -5,7 +5,7 @@ using NewRelic.Agent.Api; using NewRelic.Agent.Core.Metrics; using NewRelic.Agent.Configuration; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System.Collections.Generic; namespace NewRelic.Agent.Core.Api diff --git a/src/Agent/NewRelic/Agent/Core/Api/DistributedTraceApiModel.cs b/src/Agent/NewRelic/Agent/Core/Api/DistributedTraceApiModel.cs index 961f2b48a9..cb7f4011b8 100644 --- a/src/Agent/NewRelic/Agent/Core/Api/DistributedTraceApiModel.cs +++ b/src/Agent/NewRelic/Agent/Core/Api/DistributedTraceApiModel.cs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Api; -using NewRelic.Core; -using NewRelic.Core.Logging; +using NewRelic.Agent.Core.Utilities; +using NewRelic.Agent.Extensions.Logging; using System; namespace NewRelic.Agent.Core.Api diff --git a/src/Agent/NewRelic/Agent/Core/Api/SpanBridgeApi.cs b/src/Agent/NewRelic/Agent/Core/Api/SpanBridgeApi.cs index 631c28fc8a..2c71c9ce4c 100644 --- a/src/Agent/NewRelic/Agent/Core/Api/SpanBridgeApi.cs +++ b/src/Agent/NewRelic/Agent/Core/Api/SpanBridgeApi.cs @@ -5,7 +5,7 @@ using NewRelic.Agent.Api; using NewRelic.Agent.Core.Metrics; using NewRelic.Agent.Configuration; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.Api { diff --git a/src/Agent/NewRelic/Agent/Core/Api/TransactionBridgeApi.cs b/src/Agent/NewRelic/Agent/Core/Api/TransactionBridgeApi.cs index e6e12287a0..78d8e8cb4b 100644 --- a/src/Agent/NewRelic/Agent/Core/Api/TransactionBridgeApi.cs +++ b/src/Agent/NewRelic/Agent/Core/Api/TransactionBridgeApi.cs @@ -8,7 +8,7 @@ using NewRelic.Agent.Core.Metrics; using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.Api { diff --git a/src/Agent/NewRelic/Agent/Core/Attributes/AttributeDefinition.cs b/src/Agent/NewRelic/Agent/Core/Attributes/AttributeDefinition.cs index 91a34f0058..22cbca5ce1 100644 --- a/src/Agent/NewRelic/Agent/Core/Attributes/AttributeDefinition.cs +++ b/src/Agent/NewRelic/Agent/Core/Attributes/AttributeDefinition.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using NewRelic.SystemExtensions; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.SystemExtensions; +using NewRelic.Agent.Extensions.Logging; using System.Diagnostics; namespace NewRelic.Agent.Core.Attributes diff --git a/src/Agent/NewRelic/Agent/Core/Attributes/AttributeDefinitionService.cs b/src/Agent/NewRelic/Agent/Core/Attributes/AttributeDefinitionService.cs index 8ce7e64593..a4cec76a34 100644 --- a/src/Agent/NewRelic/Agent/Core/Attributes/AttributeDefinitionService.cs +++ b/src/Agent/NewRelic/Agent/Core/Attributes/AttributeDefinitionService.cs @@ -4,16 +4,14 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Globalization; -using NewRelic.Core; -using NewRelic.Parsing; -using NewRelic.Core.CodeAttributes; +using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Core.Spans; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.Events; using System.Linq; using System; -using NewRelic.Core.DistributedTracing; +using NewRelic.Agent.Core.DistributedTracing; namespace NewRelic.Agent.Core.Attributes { diff --git a/src/Agent/NewRelic/Agent/Core/Attributes/AttributeFilter.cs b/src/Agent/NewRelic/Agent/Core/Attributes/AttributeFilter.cs index 4c93c343ed..a4628d89c0 100644 --- a/src/Agent/NewRelic/Agent/Core/Attributes/AttributeFilter.cs +++ b/src/Agent/NewRelic/Agent/Core/Attributes/AttributeFilter.cs @@ -5,7 +5,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using NewRelic.Core.Logging; +using NewRelic.Agent.Core.Logging; using NewRelic.Agent.Configuration; namespace NewRelic.Agent.Core.Attributes diff --git a/src/Agent/NewRelic/Agent/Core/Attributes/AttributeValueCollection.cs b/src/Agent/NewRelic/Agent/Core/Attributes/AttributeValueCollection.cs index 6ddf958c89..368664b26c 100644 --- a/src/Agent/NewRelic/Agent/Core/Attributes/AttributeValueCollection.cs +++ b/src/Agent/NewRelic/Agent/Core/Attributes/AttributeValueCollection.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System; using System.Collections.ObjectModel; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System.Linq; using System.Threading; diff --git a/src/Agent/NewRelic/Agent/Core/Attributes/LogContextDataFilter.cs b/src/Agent/NewRelic/Agent/Core/Attributes/LogContextDataFilter.cs index 4e516fa323..3e723d8a00 100644 --- a/src/Agent/NewRelic/Agent/Core/Attributes/LogContextDataFilter.cs +++ b/src/Agent/NewRelic/Agent/Core/Attributes/LogContextDataFilter.cs @@ -8,7 +8,7 @@ using NewRelic.Agent.Configuration; using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Utilities; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.Attributes { diff --git a/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringPrereqChecker.cs b/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringPrereqChecker.cs index 191595f41c..8e343e2674 100644 --- a/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringPrereqChecker.cs +++ b/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringPrereqChecker.cs @@ -8,7 +8,7 @@ using System.Text.RegularExpressions; using NewRelic.Agent.Configuration; using NewRelic.Agent.Core.Transactions; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.BrowserMonitoring { diff --git a/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringScriptMaker.cs b/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringScriptMaker.cs index 78436ed553..7bc6070801 100644 --- a/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringScriptMaker.cs +++ b/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringScriptMaker.cs @@ -6,8 +6,8 @@ using NewRelic.Agent.Core.JsonConverters; using NewRelic.Agent.Core.Transactions; using NewRelic.Agent.Core.Transformers.TransactionTransformer; -using NewRelic.Core; -using NewRelic.Core.Logging; +using NewRelic.Agent.Core.Utilities; +using NewRelic.Agent.Extensions.Logging; using Newtonsoft.Json; using System; using System.Web; diff --git a/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringStreamInjector.cs b/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringStreamInjector.cs index a0ad8e164c..ee0f256843 100644 --- a/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringStreamInjector.cs +++ b/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringStreamInjector.cs @@ -2,8 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Core.Utilities; -using NewRelic.Core; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; using System.IO; using System.Text; diff --git a/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringWriter.cs b/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringWriter.cs index 70af589304..c179000680 100644 --- a/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringWriter.cs +++ b/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserMonitoringWriter.cs @@ -1,7 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core; +using NewRelic.Agent.Core.Utilities; using System; using System.Text.RegularExpressions; diff --git a/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserScriptInjectionIndexHelper.cs b/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserScriptInjectionIndexHelper.cs index 6f2482f133..ac27db5208 100644 --- a/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserScriptInjectionIndexHelper.cs +++ b/src/Agent/NewRelic/Agent/Core/BrowserMonitoring/BrowserScriptInjectionIndexHelper.cs @@ -4,7 +4,7 @@ using System; using System.Text; using System.Text.RegularExpressions; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.BrowserMonitoring { diff --git a/src/Agent/NewRelic/Agent/Core/CallStack/CallStackManager.cs b/src/Agent/NewRelic/Agent/Core/CallStack/CallStackManager.cs index 84e46c5b60..3147fbe689 100644 --- a/src/Agent/NewRelic/Agent/Core/CallStack/CallStackManager.cs +++ b/src/Agent/NewRelic/Agent/Core/CallStack/CallStackManager.cs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Extensions.Providers; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System.Collections.Generic; using System.Linq; diff --git a/src/Agent/NewRelic/Agent/Core/Commands/CommandService.cs b/src/Agent/NewRelic/Agent/Core/Commands/CommandService.cs index 1dde133621..77511dad9c 100644 --- a/src/Agent/NewRelic/Agent/Core/Commands/CommandService.cs +++ b/src/Agent/NewRelic/Agent/Core/Commands/CommandService.cs @@ -5,9 +5,8 @@ using NewRelic.Agent.Core.DataTransport; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Utilities; -using NewRelic.Core.Logging; -using NewRelic.SystemExtensions.Collections.Generic; -using System; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using System.Collections.Generic; using System.Globalization; diff --git a/src/Agent/NewRelic/Agent/Core/Commands/InstrumentationUpdateCommand.cs b/src/Agent/NewRelic/Agent/Core/Commands/InstrumentationUpdateCommand.cs index 31a2131d3f..d506aed5fe 100644 --- a/src/Agent/NewRelic/Agent/Core/Commands/InstrumentationUpdateCommand.cs +++ b/src/Agent/NewRelic/Agent/Core/Commands/InstrumentationUpdateCommand.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using NewRelic.Agent.Core.Configuration; using NewRelic.Agent.Core.Instrumentation; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using Newtonsoft.Json.Linq; namespace NewRelic.Agent.Core.Commands diff --git a/src/Agent/NewRelic/Agent/Core/Commands/StartThreadProfilerCommand.cs b/src/Agent/NewRelic/Agent/Core/Commands/StartThreadProfilerCommand.cs index 5148abf2bc..13fe5e258f 100644 --- a/src/Agent/NewRelic/Agent/Core/Commands/StartThreadProfilerCommand.cs +++ b/src/Agent/NewRelic/Agent/Core/Commands/StartThreadProfilerCommand.cs @@ -3,7 +3,7 @@ using NewRelic.Agent.Configuration; using NewRelic.Agent.Core.ThreadProfiling; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System.Collections.Generic; namespace NewRelic.Agent.Core.Commands diff --git a/src/Agent/NewRelic/Agent/Core/Commands/StopThreadProfilerCommand.cs b/src/Agent/NewRelic/Agent/Core/Commands/StopThreadProfilerCommand.cs index 159083ad83..dab4a80488 100644 --- a/src/Agent/NewRelic/Agent/Core/Commands/StopThreadProfilerCommand.cs +++ b/src/Agent/NewRelic/Agent/Core/Commands/StopThreadProfilerCommand.cs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Core.ThreadProfiling; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System.Collections.Generic; namespace NewRelic.Agent.Core.Commands diff --git a/src/Agent/NewRelic/Agent/Core/Commands/ThreadProfilerCommandArgs.cs b/src/Agent/NewRelic/Agent/Core/Commands/ThreadProfilerCommandArgs.cs index 6d4e7514f1..d0f487b2fe 100644 --- a/src/Agent/NewRelic/Agent/Core/Commands/ThreadProfilerCommandArgs.cs +++ b/src/Agent/NewRelic/Agent/Core/Commands/ThreadProfilerCommandArgs.cs @@ -3,8 +3,8 @@ using System; using System.Collections.Generic; -using NewRelic.Core.Logging; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; namespace NewRelic.Agent.Core.Commands { diff --git a/src/Agent/NewRelic/Agent/Core/Config/BootstrapConfiguration.cs b/src/Agent/NewRelic/Agent/Core/Config/BootstrapConfiguration.cs index 418d04501e..207333ba78 100644 --- a/src/Agent/NewRelic/Agent/Core/Config/BootstrapConfiguration.cs +++ b/src/Agent/NewRelic/Agent/Core/Config/BootstrapConfiguration.cs @@ -4,9 +4,9 @@ using System; using System.IO; using NewRelic.Agent.Core.Configuration; -using NewRelic.Core; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.Utilities; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; namespace NewRelic.Agent.Core.Config { diff --git a/src/Agent/NewRelic/Agent/Core/Config/ConfigurationLoader.cs b/src/Agent/NewRelic/Agent/Core/Config/ConfigurationLoader.cs index 82ab4225f1..624b832042 100644 --- a/src/Agent/NewRelic/Agent/Core/Config/ConfigurationLoader.cs +++ b/src/Agent/NewRelic/Agent/Core/Config/ConfigurationLoader.cs @@ -4,8 +4,8 @@ using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.Configuration; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; using System; using System.IO; using System.Xml; @@ -567,7 +567,7 @@ public static class ConfigLoaderHelpers { // This field exists only for testing purposes. It allows bootstrap logic and regular // configuration logic to use the same environment variable logic. - public static IEnvironment EnvironmentVariableProxy = new SystemInterfaces.Environment(); + public static IEnvironment EnvironmentVariableProxy = new SharedInterfaces.Environment(); public static string GetEnvironmentVar(string name) { diff --git a/src/Agent/NewRelic/Agent/Core/Config/ConfigurationTracker.cs b/src/Agent/NewRelic/Agent/Core/Config/ConfigurationTracker.cs index 4094e680fc..4a30824256 100644 --- a/src/Agent/NewRelic/Agent/Core/Config/ConfigurationTracker.cs +++ b/src/Agent/NewRelic/Agent/Core/Config/ConfigurationTracker.cs @@ -3,7 +3,7 @@ using NewRelic.Agent.Configuration; using NewRelic.Agent.Core.Time; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; using System.IO; using System.Threading; diff --git a/src/Agent/NewRelic/Agent/Core/Configuration/AppSettingsConfigResolveWhenUsed.cs b/src/Agent/NewRelic/Agent/Core/Configuration/AppSettingsConfigResolveWhenUsed.cs index ffa78cb7e3..9755dc7973 100644 --- a/src/Agent/NewRelic/Agent/Core/Configuration/AppSettingsConfigResolveWhenUsed.cs +++ b/src/Agent/NewRelic/Agent/Core/Configuration/AppSettingsConfigResolveWhenUsed.cs @@ -6,8 +6,8 @@ using System.Collections.Generic; using System.IO; using Microsoft.Extensions.Configuration; -using NewRelic.Core; -using NewRelic.Core.Logging; +using NewRelic.Agent.Core.Utilities; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.Configuration { @@ -58,7 +58,7 @@ private static IConfigurationRoot InitializeConfiguration() private static string GetDotnetEnvironment() { - var env = new SystemInterfaces.Environment(); + var env = new SharedInterfaces.Environment(); // Determine the environment (e.g. Production, Development, Staging, etc.) by considering the following env vars in order // "DOTNET_ENVIRONMENT" takes precedence over "ASPNETCORE_ENVIRONMENT", even for ASP.NET Core applications // EnvironmentName is proprietary to our agent and the behavior as of version 10.20 is to not take precedence over the .NET builtins diff --git a/src/Agent/NewRelic/Agent/Core/Configuration/ConfigurationService.cs b/src/Agent/NewRelic/Agent/Core/Configuration/ConfigurationService.cs index 5614ce21fd..9bf25bfd2d 100644 --- a/src/Agent/NewRelic/Agent/Core/Configuration/ConfigurationService.cs +++ b/src/Agent/NewRelic/Agent/Core/Configuration/ConfigurationService.cs @@ -6,9 +6,9 @@ using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Requests; using NewRelic.Agent.Core.Utilities; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; -using NewRelic.SystemInterfaces.Web; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; +using NewRelic.Agent.Core.SharedInterfaces.Web; using System; using System.Linq; diff --git a/src/Agent/NewRelic/Agent/Core/Configuration/DefaultConfiguration.cs b/src/Agent/NewRelic/Agent/Core/Configuration/DefaultConfiguration.cs index 3d8577c8d1..870c4979c8 100644 --- a/src/Agent/NewRelic/Agent/Core/Configuration/DefaultConfiguration.cs +++ b/src/Agent/NewRelic/Agent/Core/Configuration/DefaultConfiguration.cs @@ -5,13 +5,12 @@ using NewRelic.Agent.Core.Config; using NewRelic.Agent.Core.Metrics; using NewRelic.Agent.Helpers; -using NewRelic.Core; -using NewRelic.Core.Logging; -using NewRelic.Memoization; -using NewRelic.SystemExtensions; -using NewRelic.SystemExtensions.Collections.Generic; -using NewRelic.SystemInterfaces; -using NewRelic.SystemInterfaces.Web; +using NewRelic.Agent.Core.Utilities; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Extensions.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Core.SharedInterfaces; +using NewRelic.Agent.Core.SharedInterfaces.Web; using System; using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/src/Agent/NewRelic/Agent/Core/Configuration/IConfigurationManagerStatic.cs b/src/Agent/NewRelic/Agent/Core/Configuration/IConfigurationManagerStatic.cs index 6bfc27ffcb..7c43796856 100644 --- a/src/Agent/NewRelic/Agent/Core/Configuration/IConfigurationManagerStatic.cs +++ b/src/Agent/NewRelic/Agent/Core/Configuration/IConfigurationManagerStatic.cs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 using System; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; #if NETSTANDARD2_0 using Microsoft.Extensions.Configuration; diff --git a/src/Agent/NewRelic/Agent/Core/Configuration/InternalConfiguration.cs b/src/Agent/NewRelic/Agent/Core/Configuration/InternalConfiguration.cs index c707209cb4..cbe0332ac6 100644 --- a/src/Agent/NewRelic/Agent/Core/Configuration/InternalConfiguration.cs +++ b/src/Agent/NewRelic/Agent/Core/Configuration/InternalConfiguration.cs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Core.Config; -using NewRelic.SystemInterfaces; -using NewRelic.SystemInterfaces.Web; +using NewRelic.Agent.Core.SharedInterfaces; +using NewRelic.Agent.Core.SharedInterfaces.Web; namespace NewRelic.Agent.Core.Configuration { diff --git a/src/Agent/NewRelic/Agent/Core/Configuration/ServerConfiguration.cs b/src/Agent/NewRelic/Agent/Core/Configuration/ServerConfiguration.cs index aba34c60c6..12adb21167 100644 --- a/src/Agent/NewRelic/Agent/Core/Configuration/ServerConfiguration.cs +++ b/src/Agent/NewRelic/Agent/Core/Configuration/ServerConfiguration.cs @@ -6,7 +6,7 @@ using System.Diagnostics; using System.Runtime.Serialization; using NewRelic.Agent.Core.JsonConverters; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; diff --git a/src/Agent/NewRelic/Agent/Core/Core.csproj b/src/Agent/NewRelic/Agent/Core/Core.csproj index 455564ad86..038904cda0 100644 --- a/src/Agent/NewRelic/Agent/Core/Core.csproj +++ b/src/Agent/NewRelic/Agent/Core/Core.csproj @@ -26,9 +26,9 @@ - + @@ -79,9 +79,8 @@ + - - @@ -104,8 +103,6 @@ - - @@ -135,8 +132,8 @@ - 20 - 17 + 18 + 15 diff --git a/src/Agent/NewRelic/Agent/Core/DataTransport/Client/DataTransportAuditLogger.cs b/src/Agent/NewRelic/Agent/Core/DataTransport/Client/DataTransportAuditLogger.cs index 909347e51b..c5f13c7a08 100644 --- a/src/Agent/NewRelic/Agent/Core/DataTransport/Client/DataTransportAuditLogger.cs +++ b/src/Agent/NewRelic/Agent/Core/DataTransport/Client/DataTransportAuditLogger.cs @@ -1,8 +1,8 @@ -// Copyright 2020 New Relic, Inc. All rights reserved. +// Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Core.Logging; -using NewRelic.Core; +using NewRelic.Agent.Core.Utilities; namespace NewRelic.Agent.Core.DataTransport.Client { diff --git a/src/Agent/NewRelic/Agent/Core/DataTransport/Client/HttpClientBase.cs b/src/Agent/NewRelic/Agent/Core/DataTransport/Client/HttpClientBase.cs index 99048d3d83..edcd759f0d 100644 --- a/src/Agent/NewRelic/Agent/Core/DataTransport/Client/HttpClientBase.cs +++ b/src/Agent/NewRelic/Agent/Core/DataTransport/Client/HttpClientBase.cs @@ -6,7 +6,7 @@ using System.Net.Http; using System.Threading.Tasks; using NewRelic.Agent.Core.DataTransport.Client.Interfaces; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.DataTransport.Client { diff --git a/src/Agent/NewRelic/Agent/Core/DataTransport/Client/HttpResponse.cs b/src/Agent/NewRelic/Agent/Core/DataTransport/Client/HttpResponse.cs index d657cdd6b1..d4632f0c0e 100644 --- a/src/Agent/NewRelic/Agent/Core/DataTransport/Client/HttpResponse.cs +++ b/src/Agent/NewRelic/Agent/Core/DataTransport/Client/HttpResponse.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; using NewRelic.Agent.Core.DataTransport.Client.Interfaces; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.DataTransport.Client { diff --git a/src/Agent/NewRelic/Agent/Core/DataTransport/Client/NRHttpClient.cs b/src/Agent/NewRelic/Agent/Core/DataTransport/Client/NRHttpClient.cs index 5c88c5be36..ad0b445ae3 100644 --- a/src/Agent/NewRelic/Agent/Core/DataTransport/Client/NRHttpClient.cs +++ b/src/Agent/NewRelic/Agent/Core/DataTransport/Client/NRHttpClient.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using NewRelic.Agent.Configuration; using NewRelic.Agent.Core.DataTransport.Client.Interfaces; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.DataTransport.Client { diff --git a/src/Agent/NewRelic/Agent/Core/DataTransport/Client/WebRequestClientResponse.cs b/src/Agent/NewRelic/Agent/Core/DataTransport/Client/WebRequestClientResponse.cs index b03fc38b48..d49383363e 100644 --- a/src/Agent/NewRelic/Agent/Core/DataTransport/Client/WebRequestClientResponse.cs +++ b/src/Agent/NewRelic/Agent/Core/DataTransport/Client/WebRequestClientResponse.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using NewRelic.Agent.Core.DataTransport.Client.Interfaces; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.DataTransport.Client { diff --git a/src/Agent/NewRelic/Agent/Core/DataTransport/ConnectionHandler.cs b/src/Agent/NewRelic/Agent/Core/DataTransport/ConnectionHandler.cs index 4ab56c29f3..eb67f8c641 100644 --- a/src/Agent/NewRelic/Agent/Core/DataTransport/ConnectionHandler.cs +++ b/src/Agent/NewRelic/Agent/Core/DataTransport/ConnectionHandler.cs @@ -9,9 +9,9 @@ using NewRelic.Agent.Core.Metrics; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.Utilization; -using NewRelic.Core.Logging; -using NewRelic.SystemExtensions.Collections.Generic; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Core.SharedInterfaces; using System; using System.Collections.Generic; using System.IO; diff --git a/src/Agent/NewRelic/Agent/Core/DataTransport/ConnectionManager.cs b/src/Agent/NewRelic/Agent/Core/DataTransport/ConnectionManager.cs index 471794eed3..d1cffe1fa6 100644 --- a/src/Agent/NewRelic/Agent/Core/DataTransport/ConnectionManager.cs +++ b/src/Agent/NewRelic/Agent/Core/DataTransport/ConnectionManager.cs @@ -5,7 +5,7 @@ using NewRelic.Agent.Core.DataTransport; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Utilities; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; using System.IO; using System.Linq; diff --git a/src/Agent/NewRelic/Agent/Core/DataTransport/DataStreamingService.cs b/src/Agent/NewRelic/Agent/Core/DataTransport/DataStreamingService.cs index f01c1ab170..975fb4fb9d 100644 --- a/src/Agent/NewRelic/Agent/Core/DataTransport/DataStreamingService.cs +++ b/src/Agent/NewRelic/Agent/Core/DataTransport/DataStreamingService.cs @@ -13,10 +13,9 @@ using NewRelic.Agent.Core.AgentHealth; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Collections; -using NewRelic.Core; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Collections; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; namespace NewRelic.Agent.Core.DataTransport { diff --git a/src/Agent/NewRelic/Agent/Core/DataTransport/DataTransportService.cs b/src/Agent/NewRelic/Agent/Core/DataTransport/DataTransportService.cs index ce2878666e..62da5474d7 100644 --- a/src/Agent/NewRelic/Agent/Core/DataTransport/DataTransportService.cs +++ b/src/Agent/NewRelic/Agent/Core/DataTransport/DataTransportService.cs @@ -10,9 +10,8 @@ using NewRelic.Agent.Core.ThreadProfiling; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.Core; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/Agent/NewRelic/Agent/Core/DataTransport/GrpcWrapper.cs b/src/Agent/NewRelic/Agent/Core/DataTransport/GrpcWrapper.cs index 8d328c541c..1dc830e228 100644 --- a/src/Agent/NewRelic/Agent/Core/DataTransport/GrpcWrapper.cs +++ b/src/Agent/NewRelic/Agent/Core/DataTransport/GrpcWrapper.cs @@ -5,7 +5,7 @@ using Grpc.Core; using System.Threading; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System.Collections.Generic; #if LEGACY_GRPC diff --git a/src/Agent/NewRelic/Agent/Core/DataTransport/HttpCollectorWire.cs b/src/Agent/NewRelic/Agent/Core/DataTransport/HttpCollectorWire.cs index e93364954c..0c34f280f2 100644 --- a/src/Agent/NewRelic/Agent/Core/DataTransport/HttpCollectorWire.cs +++ b/src/Agent/NewRelic/Agent/Core/DataTransport/HttpCollectorWire.cs @@ -3,7 +3,7 @@ using NewRelic.Agent.Configuration; using NewRelic.Agent.Core.AgentHealth; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; using System.Collections.Generic; using System.Net; diff --git a/src/Agent/NewRelic/Agent/Core/DataTransport/ServerlessModeDataTransportService.cs b/src/Agent/NewRelic/Agent/Core/DataTransport/ServerlessModeDataTransportService.cs index 1a72518eca..e151dda9ca 100644 --- a/src/Agent/NewRelic/Agent/Core/DataTransport/ServerlessModeDataTransportService.cs +++ b/src/Agent/NewRelic/Agent/Core/DataTransport/ServerlessModeDataTransportService.cs @@ -13,9 +13,8 @@ using NewRelic.Agent.Core.ThreadProfiling; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.Core; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; namespace NewRelic.Agent.Core.DataTransport { diff --git a/src/Agent/NewRelic/Agent/Core/DataTransport/ServerlessModePayloadManager.cs b/src/Agent/NewRelic/Agent/Core/DataTransport/ServerlessModePayloadManager.cs index 3da766872f..a6b6448bde 100644 --- a/src/Agent/NewRelic/Agent/Core/DataTransport/ServerlessModePayloadManager.cs +++ b/src/Agent/NewRelic/Agent/Core/DataTransport/ServerlessModePayloadManager.cs @@ -8,8 +8,8 @@ using System.Linq; using System.Text; using NewRelic.Agent.Core.Utilities; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; using Newtonsoft.Json; namespace NewRelic.Agent.Core.DataTransport diff --git a/src/Agent/NewRelic/Agent/Core/DataTransport/SpanStreamingService.cs b/src/Agent/NewRelic/Agent/Core/DataTransport/SpanStreamingService.cs index f1f0c14e65..45f5ebcc25 100644 --- a/src/Agent/NewRelic/Agent/Core/DataTransport/SpanStreamingService.cs +++ b/src/Agent/NewRelic/Agent/Core/DataTransport/SpanStreamingService.cs @@ -6,8 +6,8 @@ using NewRelic.Agent.Core.AgentHealth; using NewRelic.Agent.Core.Segments; using NewRelic.Agent.Core.Utilities; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; namespace NewRelic.Agent.Core.DataTransport { diff --git a/src/Agent/NewRelic/Agent/Core/Database/CacheByDatastoreVendor.cs b/src/Agent/NewRelic/Agent/Core/Database/CacheByDatastoreVendor.cs index 5f9329e810..570b082465 100644 --- a/src/Agent/NewRelic/Agent/Core/Database/CacheByDatastoreVendor.cs +++ b/src/Agent/NewRelic/Agent/Core/Database/CacheByDatastoreVendor.cs @@ -3,8 +3,8 @@ using System; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core.Caching; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Caching; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.Database { diff --git a/src/Agent/NewRelic/Agent/Core/DependencyInjection/AgentContainer.cs b/src/Agent/NewRelic/Agent/Core/DependencyInjection/AgentContainer.cs index f640b7ef67..0923797b62 100644 --- a/src/Agent/NewRelic/Agent/Core/DependencyInjection/AgentContainer.cs +++ b/src/Agent/NewRelic/Agent/Core/DependencyInjection/AgentContainer.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using Autofac; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.DependencyInjection { diff --git a/src/Agent/NewRelic/Agent/Core/DependencyInjection/AgentServices.cs b/src/Agent/NewRelic/Agent/Core/DependencyInjection/AgentServices.cs index a537879a72..a5a6bc9f69 100644 --- a/src/Agent/NewRelic/Agent/Core/DependencyInjection/AgentServices.cs +++ b/src/Agent/NewRelic/Agent/Core/DependencyInjection/AgentServices.cs @@ -41,9 +41,7 @@ using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Synthetics; using NewRelic.Agent.Extensions.Providers; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemInterfaces; -using NewRelic.SystemInterfaces.Web; -using NewRelicCore = NewRelic.Core; +using NewRelic.Agent.Core.SharedInterfaces.Web; using NewRelic.Agent.Core.Labels; namespace NewRelic.Agent.Core.DependencyInjection @@ -80,7 +78,7 @@ public static void RegisterServices(IContainer container, bool serverlessModeEna container.RegisterInstance(AgentInstallConfiguration.GetIsWindows); container.Register(); container.Register(); - container.Register(); + container.Register(); container.Register(); container.Register(); container.Register(); @@ -216,7 +214,7 @@ public static void RegisterServices(IContainer container, bool serverlessModeEna { container.Register(); } - container.Register(); + container.Register(); container.Register(); container.Register(); diff --git a/src/Agent/NewRelic/Agent/Core/DistributedTracing/AdaptiveSampler.cs b/src/Agent/NewRelic/Agent/Core/DistributedTracing/AdaptiveSampler.cs index 5f6b28d9ef..7976d653ca 100644 --- a/src/Agent/NewRelic/Agent/Core/DistributedTracing/AdaptiveSampler.cs +++ b/src/Agent/NewRelic/Agent/Core/DistributedTracing/AdaptiveSampler.cs @@ -3,8 +3,7 @@ using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Utilities; -using NewRelic.Core.DistributedTracing; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; using System.Collections.Generic; using System.Threading; diff --git a/src/NewRelic.Core/DistributedTracing/DistributedTraceException.cs b/src/Agent/NewRelic/Agent/Core/DistributedTracing/DistributedTraceException.cs similarity index 97% rename from src/NewRelic.Core/DistributedTracing/DistributedTraceException.cs rename to src/Agent/NewRelic/Agent/Core/DistributedTracing/DistributedTraceException.cs index 9b604b2cfa..fb49a08f81 100644 --- a/src/NewRelic.Core/DistributedTracing/DistributedTraceException.cs +++ b/src/Agent/NewRelic/Agent/Core/DistributedTracing/DistributedTraceException.cs @@ -3,7 +3,7 @@ using System; -namespace NewRelic.Core.DistributedTracing +namespace NewRelic.Agent.Core.DistributedTracing { public class DistributedTraceException : Exception { diff --git a/src/NewRelic.Core/DistributedTracing/DistributedTracePayload.cs b/src/Agent/NewRelic/Agent/Core/DistributedTracing/DistributedTracePayload.cs similarity index 98% rename from src/NewRelic.Core/DistributedTracing/DistributedTracePayload.cs rename to src/Agent/NewRelic/Agent/Core/DistributedTracing/DistributedTracePayload.cs index b98ab92501..3de509b8ed 100644 --- a/src/NewRelic.Core/DistributedTracing/DistributedTracePayload.cs +++ b/src/Agent/NewRelic/Agent/Core/DistributedTracing/DistributedTracePayload.cs @@ -1,13 +1,14 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core.JsonConverters; -using NewRelic.Core.Logging; +using NewRelic.Agent.Core.JsonConverters; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.Utilities; using Newtonsoft.Json; using System; using System.Collections.Generic; -namespace NewRelic.Core.DistributedTracing +namespace NewRelic.Agent.Core.DistributedTracing { public enum IngestErrorType { diff --git a/src/Agent/NewRelic/Agent/Core/DistributedTracing/DistributedTracePayloadHandler.cs b/src/Agent/NewRelic/Agent/Core/DistributedTracing/DistributedTracePayloadHandler.cs index ca3490b1c7..a1ee72fd25 100644 --- a/src/Agent/NewRelic/Agent/Core/DistributedTracing/DistributedTracePayloadHandler.cs +++ b/src/Agent/NewRelic/Agent/Core/DistributedTracing/DistributedTracePayloadHandler.cs @@ -7,9 +7,8 @@ using NewRelic.Agent.Core.Api; using NewRelic.Agent.Core.Transactions; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core; -using NewRelic.Core.DistributedTracing; -using NewRelic.Core.Logging; +using NewRelic.Agent.Core.Utilities; +using NewRelic.Agent.Extensions.Logging; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/NewRelic.Core/DistributedTracing/DistributedTracingParentType.cs b/src/Agent/NewRelic/Agent/Core/DistributedTracing/DistributedTracingParentType.cs similarity index 82% rename from src/NewRelic.Core/DistributedTracing/DistributedTracingParentType.cs rename to src/Agent/NewRelic/Agent/Core/DistributedTracing/DistributedTracingParentType.cs index ead0d1ed22..f29a4e9bea 100644 --- a/src/NewRelic.Core/DistributedTracing/DistributedTracingParentType.cs +++ b/src/Agent/NewRelic/Agent/Core/DistributedTracing/DistributedTracingParentType.cs @@ -1,7 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -namespace NewRelic.Core.DistributedTracing +namespace NewRelic.Agent.Core.DistributedTracing { public enum DistributedTracingParentType { diff --git a/src/Agent/NewRelic/Agent/Core/DistributedTracing/ITracingState.cs b/src/Agent/NewRelic/Agent/Core/DistributedTracing/ITracingState.cs index e99a5f2701..63c40accc9 100644 --- a/src/Agent/NewRelic/Agent/Core/DistributedTracing/ITracingState.cs +++ b/src/Agent/NewRelic/Agent/Core/DistributedTracing/ITracingState.cs @@ -2,7 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core.DistributedTracing; using System; using System.Collections.Generic; diff --git a/src/NewRelic.Core/DistributedTracing/TracePriorityManager.cs b/src/Agent/NewRelic/Agent/Core/DistributedTracing/TracePriorityManager.cs similarity index 98% rename from src/NewRelic.Core/DistributedTracing/TracePriorityManager.cs rename to src/Agent/NewRelic/Agent/Core/DistributedTracing/TracePriorityManager.cs index 9b98acbe92..1db89827d3 100644 --- a/src/NewRelic.Core/DistributedTracing/TracePriorityManager.cs +++ b/src/Agent/NewRelic/Agent/Core/DistributedTracing/TracePriorityManager.cs @@ -4,7 +4,7 @@ using System; using System.Threading; -namespace NewRelic.Core.DistributedTracing +namespace NewRelic.Agent.Core.DistributedTracing { public interface ITracePriorityManager { diff --git a/src/NewRelic.Core/DistributedTracing/TracestateUtils.cs b/src/Agent/NewRelic/Agent/Core/DistributedTracing/TracestateUtils.cs similarity index 98% rename from src/NewRelic.Core/DistributedTracing/TracestateUtils.cs rename to src/Agent/NewRelic/Agent/Core/DistributedTracing/TracestateUtils.cs index 5ce8224572..8601e6944a 100644 --- a/src/NewRelic.Core/DistributedTracing/TracestateUtils.cs +++ b/src/Agent/NewRelic/Agent/Core/DistributedTracing/TracestateUtils.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace NewRelic.Core.DistributedTracing +namespace NewRelic.Agent.Core.DistributedTracing { internal static class TracestateUtils { diff --git a/src/Agent/NewRelic/Agent/Core/DistributedTracing/TracingState.cs b/src/Agent/NewRelic/Agent/Core/DistributedTracing/TracingState.cs index f952794e95..a851a55bc7 100644 --- a/src/Agent/NewRelic/Agent/Core/DistributedTracing/TracingState.cs +++ b/src/Agent/NewRelic/Agent/Core/DistributedTracing/TracingState.cs @@ -2,8 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core; -using NewRelic.Core.DistributedTracing; +using NewRelic.Agent.Core.Utilities; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/Agent/NewRelic/Agent/Core/DistributedTracing/W3CTraceContext.cs b/src/Agent/NewRelic/Agent/Core/DistributedTracing/W3CTraceContext.cs index 2f78f96477..d855db8453 100644 --- a/src/Agent/NewRelic/Agent/Core/DistributedTracing/W3CTraceContext.cs +++ b/src/Agent/NewRelic/Agent/Core/DistributedTracing/W3CTraceContext.cs @@ -1,7 +1,6 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core.DistributedTracing; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/NewRelic.Core/DistributedTracing/W3CTraceparent.cs b/src/Agent/NewRelic/Agent/Core/DistributedTracing/W3CTraceparent.cs similarity index 99% rename from src/NewRelic.Core/DistributedTracing/W3CTraceparent.cs rename to src/Agent/NewRelic/Agent/Core/DistributedTracing/W3CTraceparent.cs index 9c18e15030..c9349e4076 100644 --- a/src/NewRelic.Core/DistributedTracing/W3CTraceparent.cs +++ b/src/Agent/NewRelic/Agent/Core/DistributedTracing/W3CTraceparent.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Text.RegularExpressions; -namespace NewRelic.Core.DistributedTracing +namespace NewRelic.Agent.Core.DistributedTracing { public class W3CTraceparent { diff --git a/src/NewRelic.Core/DistributedTracing/W3CTracestate.cs b/src/Agent/NewRelic/Agent/Core/DistributedTracing/W3CTracestate.cs similarity index 99% rename from src/NewRelic.Core/DistributedTracing/W3CTracestate.cs rename to src/Agent/NewRelic/Agent/Core/DistributedTracing/W3CTracestate.cs index e9b6e7d694..890232bc95 100644 --- a/src/NewRelic.Core/DistributedTracing/W3CTracestate.cs +++ b/src/Agent/NewRelic/Agent/Core/DistributedTracing/W3CTracestate.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; -namespace NewRelic.Core.DistributedTracing +namespace NewRelic.Agent.Core.DistributedTracing { public class W3CTracestate { diff --git a/src/Agent/NewRelic/Agent/Core/Environment.cs b/src/Agent/NewRelic/Agent/Core/Environment.cs index 19165eecc6..45a19d3805 100644 --- a/src/Agent/NewRelic/Agent/Core/Environment.cs +++ b/src/Agent/NewRelic/Agent/Core/Environment.cs @@ -13,11 +13,10 @@ using Microsoft.Win32; #endif using NewRelic.Agent.Core.Utilities; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; using Newtonsoft.Json; using NewRelic.Agent.Configuration; -using NewRelic.Core.CodeAttributes; namespace NewRelic.Agent.Core { @@ -62,7 +61,7 @@ public Environment(ISystemInfo systemInfo, IProcessStatic processStatic, IConfig AddVariable(".NET Version", () => System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription.ToString()); AddVariable("Processor Architecture", () => System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture.ToString()); #else - AddVariable(".NET Version", () => NewRelic.Core.DotnetVersion.GetDotnetFrameworkVersion().ToString()); + AddVariable(".NET Version", () => DotnetVersion.GetDotnetFrameworkVersion().ToString()); AddVariable("Processor Architecture", () => (IntPtr.Size == 8) ? "X64" : "X86"); #endif diff --git a/src/Agent/NewRelic/Agent/Core/Instrumentation/InstrumentationService.cs b/src/Agent/NewRelic/Agent/Core/Instrumentation/InstrumentationService.cs index 86382cbbec..c77f9fc685 100644 --- a/src/Agent/NewRelic/Agent/Core/Instrumentation/InstrumentationService.cs +++ b/src/Agent/NewRelic/Agent/Core/Instrumentation/InstrumentationService.cs @@ -1,7 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.Instrumentation { diff --git a/src/Agent/NewRelic/Agent/Core/Instrumentation/InstrumentationStore.cs b/src/Agent/NewRelic/Agent/Core/Instrumentation/InstrumentationStore.cs index 7a552711d1..21ab0ea430 100644 --- a/src/Agent/NewRelic/Agent/Core/Instrumentation/InstrumentationStore.cs +++ b/src/Agent/NewRelic/Agent/Core/Instrumentation/InstrumentationStore.cs @@ -1,7 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/src/Agent/NewRelic/Agent/Core/Instrumentation/InstrumentationWatcher.cs b/src/Agent/NewRelic/Agent/Core/Instrumentation/InstrumentationWatcher.cs index cf17659c5f..656946af55 100644 --- a/src/Agent/NewRelic/Agent/Core/Instrumentation/InstrumentationWatcher.cs +++ b/src/Agent/NewRelic/Agent/Core/Instrumentation/InstrumentationWatcher.cs @@ -4,7 +4,7 @@ using NewRelic.Agent.Configuration; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.Wrapper; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; using System.Collections.Generic; using System.IO; diff --git a/src/Agent/NewRelic/Agent/Core/Instrumentation/LiveInstrumentationServerConfigurationListener.cs b/src/Agent/NewRelic/Agent/Core/Instrumentation/LiveInstrumentationServerConfigurationListener.cs index 20ad46cfee..39e130d36c 100644 --- a/src/Agent/NewRelic/Agent/Core/Instrumentation/LiveInstrumentationServerConfigurationListener.cs +++ b/src/Agent/NewRelic/Agent/Core/Instrumentation/LiveInstrumentationServerConfigurationListener.cs @@ -3,7 +3,8 @@ using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Utilities; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.Logging; using System; namespace NewRelic.Agent.Core.Instrumentation diff --git a/src/NewRelic.Core/JsonConverters/DistributedTracePayloadJsonConverter.cs b/src/Agent/NewRelic/Agent/Core/JsonConverters/DistributedTracePayloadJsonConverter.cs similarity index 98% rename from src/NewRelic.Core/JsonConverters/DistributedTracePayloadJsonConverter.cs rename to src/Agent/NewRelic/Agent/Core/JsonConverters/DistributedTracePayloadJsonConverter.cs index 50013cf2e5..fd2f3cac6d 100644 --- a/src/NewRelic.Core/JsonConverters/DistributedTracePayloadJsonConverter.cs +++ b/src/Agent/NewRelic/Agent/Core/JsonConverters/DistributedTracePayloadJsonConverter.cs @@ -1,12 +1,13 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core.DistributedTracing; +using NewRelic.Agent.Core.DistributedTracing; +using NewRelic.Agent.Core.Utilities; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; -namespace NewRelic.Core.JsonConverters +namespace NewRelic.Agent.Core.JsonConverters { public class DistributedTracePayloadJsonConverter : JsonConverter { diff --git a/src/Agent/NewRelic/Agent/Core/JsonConverters/JsonArrayConverter.cs b/src/Agent/NewRelic/Agent/Core/JsonConverters/JsonArrayConverter.cs index cd2bffc442..bc9b2ad099 100644 --- a/src/Agent/NewRelic/Agent/Core/JsonConverters/JsonArrayConverter.cs +++ b/src/Agent/NewRelic/Agent/Core/JsonConverters/JsonArrayConverter.cs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Core.Utilities; -using NewRelic.Core; -using NewRelic.Core.Caching; +using NewRelic.Agent.Extensions.Caching; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; diff --git a/src/Agent/NewRelic/Agent/Core/JsonConverters/JsonSerializerHelpers.cs b/src/Agent/NewRelic/Agent/Core/JsonConverters/JsonSerializerHelpers.cs index 5ead67a9b4..d06986055c 100644 --- a/src/Agent/NewRelic/Agent/Core/JsonConverters/JsonSerializerHelpers.cs +++ b/src/Agent/NewRelic/Agent/Core/JsonConverters/JsonSerializerHelpers.cs @@ -1,11 +1,11 @@ -// Copyright 2020 New Relic, Inc. All rights reserved. +// Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 using Newtonsoft.Json; using NewRelic.Agent.Core.Attributes; using System.Collections.Generic; using System.Linq; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.JsonConverters { diff --git a/src/NewRelic.Core/JsonConverters/ValidationConstraint.cs b/src/Agent/NewRelic/Agent/Core/JsonConverters/ValidationConstraint.cs similarity index 97% rename from src/NewRelic.Core/JsonConverters/ValidationConstraint.cs rename to src/Agent/NewRelic/Agent/Core/JsonConverters/ValidationConstraint.cs index 8e768de8e7..b9c73d83bf 100644 --- a/src/NewRelic.Core/JsonConverters/ValidationConstraint.cs +++ b/src/Agent/NewRelic/Agent/Core/JsonConverters/ValidationConstraint.cs @@ -1,12 +1,12 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core.DistributedTracing; +using NewRelic.Agent.Core.DistributedTracing; using Newtonsoft.Json.Linq; using System; using System.Linq; -namespace NewRelic.Core.JsonConverters +namespace NewRelic.Agent.Core.JsonConverters { /// /// Represents a constraint that is applied during de-serialization of an arbitrary type into JSON. diff --git a/src/Agent/NewRelic/Agent/Core/Labels/LabelsService.cs b/src/Agent/NewRelic/Agent/Core/Labels/LabelsService.cs index c90cb8cb63..147aa19060 100644 --- a/src/Agent/NewRelic/Agent/Core/Labels/LabelsService.cs +++ b/src/Agent/NewRelic/Agent/Core/Labels/LabelsService.cs @@ -6,7 +6,7 @@ using System.Linq; using NewRelic.Agent.Configuration; using NewRelic.Agent.Helpers; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Agent.Core.Labels { diff --git a/src/Agent/NewRelic/Agent/Core/Logging/Logger.cs b/src/Agent/NewRelic/Agent/Core/Logging/Logger.cs index 3c646ff91e..514ec1b321 100644 --- a/src/Agent/NewRelic/Agent/Core/Logging/Logger.cs +++ b/src/Agent/NewRelic/Agent/Core/Logging/Logger.cs @@ -8,7 +8,7 @@ namespace NewRelic.Agent.Core.Logging { - public class Logger : ILogger, global::NewRelic.Core.Logging.ILogger + public class Logger : ILogger { private readonly Serilog.ILogger _logger = Serilog.Log.Logger; diff --git a/src/Agent/NewRelic/Agent/Core/Logging/LoggerBootstrapper.cs b/src/Agent/NewRelic/Agent/Core/Logging/LoggerBootstrapper.cs index b22c679541..72eb290eb2 100644 --- a/src/Agent/NewRelic/Agent/Core/Logging/LoggerBootstrapper.cs +++ b/src/Agent/NewRelic/Agent/Core/Logging/LoggerBootstrapper.cs @@ -9,6 +9,7 @@ using Serilog.Core; using Logger = NewRelic.Agent.Core.Logging.Logger; using NewRelic.Agent.Core.Logging; + using Serilog.Events; #if NETSTANDARD2_0 using System.Runtime.InteropServices; @@ -74,7 +75,7 @@ public static void ConfigureLogger(ILogConfig config) Log.Logger = configuredLogger; - NewRelic.Core.Logging.Log.Initialize(new Logger()); + Extensions.Logging.Log.Initialize(new Logger()); Log.Logger.Information("Log level set to {0}", config.LogLevel); } @@ -212,7 +213,7 @@ private static LoggerConfiguration ConfigureFileSink(this LoggerConfiguration lo Log.Logger.Warning(ex, "Unexpected exception when configuring file sink."); // Fallback to the event log sink if we cannot setup a file logger. - NewRelic.Core.Logging.Log.FileLoggingHasFailed = true; + Extensions.Logging.Log.FileLoggingHasFailed = true; Log.Logger.Warning("Falling back to EventLog sink."); loggerConfiguration.ConfigureEventLogSink(); } diff --git a/src/Agent/NewRelic/Agent/Core/Logging/NrLogLevelEnricher.cs b/src/Agent/NewRelic/Agent/Core/Logging/NrLogLevelEnricher.cs index 361e7d74b9..375d56be17 100644 --- a/src/Agent/NewRelic/Agent/Core/Logging/NrLogLevelEnricher.cs +++ b/src/Agent/NewRelic/Agent/Core/Logging/NrLogLevelEnricher.cs @@ -1,7 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core.CodeAttributes; +using NewRelic.Agent.Core.Utilities; using Serilog.Core; using Serilog.Events; diff --git a/src/Agent/NewRelic/Agent/Core/Logging/ProcessIdEnricher.cs b/src/Agent/NewRelic/Agent/Core/Logging/ProcessIdEnricher.cs index bc2cffc980..87ebc0fd8f 100644 --- a/src/Agent/NewRelic/Agent/Core/Logging/ProcessIdEnricher.cs +++ b/src/Agent/NewRelic/Agent/Core/Logging/ProcessIdEnricher.cs @@ -1,8 +1,8 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core.CodeAttributes; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.Utilities; +using NewRelic.Agent.Core.SharedInterfaces; using Serilog.Core; using Serilog.Events; diff --git a/src/Agent/NewRelic/Agent/Core/Logging/ThreadIdEnricher.cs b/src/Agent/NewRelic/Agent/Core/Logging/ThreadIdEnricher.cs index 197e4878db..967f7013c5 100644 --- a/src/Agent/NewRelic/Agent/Core/Logging/ThreadIdEnricher.cs +++ b/src/Agent/NewRelic/Agent/Core/Logging/ThreadIdEnricher.cs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 using System.Threading; -using NewRelic.Core.CodeAttributes; +using NewRelic.Agent.Core.Utilities; using Serilog.Core; using Serilog.Events; diff --git a/src/Agent/NewRelic/Agent/Core/Logging/UTCTimestampEnricher.cs b/src/Agent/NewRelic/Agent/Core/Logging/UTCTimestampEnricher.cs index 91eef8bfb4..dedc162afb 100644 --- a/src/Agent/NewRelic/Agent/Core/Logging/UTCTimestampEnricher.cs +++ b/src/Agent/NewRelic/Agent/Core/Logging/UTCTimestampEnricher.cs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 using System; -using NewRelic.Core.CodeAttributes; +using NewRelic.Agent.Core.Utilities; using Serilog.Core; using Serilog.Events; diff --git a/src/Agent/NewRelic/Agent/Core/Metrics/ApdexStats.cs b/src/Agent/NewRelic/Agent/Core/Metrics/ApdexStats.cs index 32d396309a..81863a4c16 100644 --- a/src/Agent/NewRelic/Agent/Core/Metrics/ApdexStats.cs +++ b/src/Agent/NewRelic/Agent/Core/Metrics/ApdexStats.cs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 using System; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Agent.Core.Metrics { diff --git a/src/Agent/NewRelic/Agent/Core/Metrics/ApiSupportabilityMetricCounters.cs b/src/Agent/NewRelic/Agent/Core/Metrics/ApiSupportabilityMetricCounters.cs index c2d2b62859..4d209fa2ca 100644 --- a/src/Agent/NewRelic/Agent/Core/Metrics/ApiSupportabilityMetricCounters.cs +++ b/src/Agent/NewRelic/Agent/Core/Metrics/ApiSupportabilityMetricCounters.cs @@ -4,7 +4,7 @@ using NewRelic.Agent.Core.SharedInterfaces; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; namespace NewRelic.Agent.Core.Metrics diff --git a/src/Agent/NewRelic/Agent/Core/Metrics/CATSupportabilityMetricCounters.cs b/src/Agent/NewRelic/Agent/Core/Metrics/CATSupportabilityMetricCounters.cs index 3153a63a3d..51087429b0 100644 --- a/src/Agent/NewRelic/Agent/Core/Metrics/CATSupportabilityMetricCounters.cs +++ b/src/Agent/NewRelic/Agent/Core/Metrics/CATSupportabilityMetricCounters.cs @@ -4,7 +4,7 @@ using NewRelic.Agent.Core.SharedInterfaces; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/Agent/NewRelic/Agent/Core/Metrics/MetricNameService.cs b/src/Agent/NewRelic/Agent/Core/Metrics/MetricNameService.cs index f9b679d60d..ef3365e7cc 100644 --- a/src/Agent/NewRelic/Agent/Core/Metrics/MetricNameService.cs +++ b/src/Agent/NewRelic/Agent/Core/Metrics/MetricNameService.cs @@ -10,8 +10,8 @@ using NewRelic.Agent.Core.Transactions; using NewRelic.Agent.Core.Transformers.TransactionTransformer; using NewRelic.Agent.Core.Utilities; -using NewRelic.Core.Logging; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; namespace NewRelic.Agent.Core.Metrics { diff --git a/src/Agent/NewRelic/Agent/Core/Metrics/MetricNames.cs b/src/Agent/NewRelic/Agent/Core/Metrics/MetricNames.cs index 5c86c8046f..43851cf6f8 100644 --- a/src/Agent/NewRelic/Agent/Core/Metrics/MetricNames.cs +++ b/src/Agent/NewRelic/Agent/Core/Metrics/MetricNames.cs @@ -5,13 +5,13 @@ using NewRelic.Agent.Core.Samplers; using NewRelic.Agent.Core.Transformers.TransactionTransformer; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core; -using NewRelic.Parsing; +using NewRelic.Agent.Extensions.Parsing; using System; using System.Collections.Generic; using System.Linq; using System.Net; using System.Text; +using NewRelic.Agent.Core.Utilities; namespace NewRelic.Agent.Core.Metrics { diff --git a/src/Agent/NewRelic/Agent/Core/NativeMethods.cs b/src/Agent/NewRelic/Agent/Core/NativeMethods.cs index c859e5aeba..79f701d368 100644 --- a/src/Agent/NewRelic/Agent/Core/NativeMethods.cs +++ b/src/Agent/NewRelic/Agent/Core/NativeMethods.cs @@ -3,7 +3,7 @@ using System; using System.Runtime.InteropServices; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core { diff --git a/src/Agent/NewRelic/Agent/Core/RuntimeEnvironmentInfo.cs b/src/Agent/NewRelic/Agent/Core/RuntimeEnvironmentInfo.cs index b3fa14f30f..60ef8aaa9f 100644 --- a/src/Agent/NewRelic/Agent/Core/RuntimeEnvironmentInfo.cs +++ b/src/Agent/NewRelic/Agent/Core/RuntimeEnvironmentInfo.cs @@ -3,8 +3,7 @@ using System; using System.IO; -using NewRelic.Core.CodeAttributes; -using NewRelic.Core.Logging; +using NewRelic.Agent.Core.Utilities; namespace NewRelic.Agent.Core { diff --git a/src/Agent/NewRelic/Agent/Core/Samplers/AbstractSampler.cs b/src/Agent/NewRelic/Agent/Core/Samplers/AbstractSampler.cs index 1d050f48ea..eb2edc305c 100644 --- a/src/Agent/NewRelic/Agent/Core/Samplers/AbstractSampler.cs +++ b/src/Agent/NewRelic/Agent/Core/Samplers/AbstractSampler.cs @@ -5,7 +5,7 @@ using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Utilities; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.Samplers { diff --git a/src/Agent/NewRelic/Agent/Core/Samplers/CpuSampler.cs b/src/Agent/NewRelic/Agent/Core/Samplers/CpuSampler.cs index 1722dea068..e4d3972831 100644 --- a/src/Agent/NewRelic/Agent/Core/Samplers/CpuSampler.cs +++ b/src/Agent/NewRelic/Agent/Core/Samplers/CpuSampler.cs @@ -4,8 +4,8 @@ using System; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Transformers; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; namespace NewRelic.Agent.Core.Samplers { diff --git a/src/Agent/NewRelic/Agent/Core/Samplers/GCSamplerNetCore.cs b/src/Agent/NewRelic/Agent/Core/Samplers/GCSamplerNetCore.cs index 303c0249a5..d473180c2d 100644 --- a/src/Agent/NewRelic/Agent/Core/Samplers/GCSamplerNetCore.cs +++ b/src/Agent/NewRelic/Agent/Core/Samplers/GCSamplerNetCore.cs @@ -8,7 +8,7 @@ using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Transformers; using NewRelic.Agent.Core.Utilities; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.Samplers { diff --git a/src/Agent/NewRelic/Agent/Core/Samplers/GcSampler.cs b/src/Agent/NewRelic/Agent/Core/Samplers/GcSampler.cs index c639de6b6a..5e6e5e8760 100644 --- a/src/Agent/NewRelic/Agent/Core/Samplers/GcSampler.cs +++ b/src/Agent/NewRelic/Agent/Core/Samplers/GcSampler.cs @@ -7,8 +7,8 @@ using System.Threading; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Transformers; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; namespace NewRelic.Agent.Core.Samplers { diff --git a/src/Agent/NewRelic/Agent/Core/Samplers/MemorySampler.cs b/src/Agent/NewRelic/Agent/Core/Samplers/MemorySampler.cs index 17ce93f725..92e1966277 100644 --- a/src/Agent/NewRelic/Agent/Core/Samplers/MemorySampler.cs +++ b/src/Agent/NewRelic/Agent/Core/Samplers/MemorySampler.cs @@ -4,8 +4,8 @@ using System; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Transformers; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; namespace NewRelic.Agent.Core.Samplers { diff --git a/src/Agent/NewRelic/Agent/Core/Samplers/ThreadStatsSampler.cs b/src/Agent/NewRelic/Agent/Core/Samplers/ThreadStatsSampler.cs index 195f0613ad..37e320646b 100644 --- a/src/Agent/NewRelic/Agent/Core/Samplers/ThreadStatsSampler.cs +++ b/src/Agent/NewRelic/Agent/Core/Samplers/ThreadStatsSampler.cs @@ -3,9 +3,9 @@ using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Transformers; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using System.Threading; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; using System.Diagnostics.Tracing; diff --git a/src/Agent/NewRelic/Agent/Core/Segments/DatastoreSegmentData.cs b/src/Agent/NewRelic/Agent/Core/Segments/DatastoreSegmentData.cs index 680a87baba..8a445aca87 100644 --- a/src/Agent/NewRelic/Agent/Core/Segments/DatastoreSegmentData.cs +++ b/src/Agent/NewRelic/Agent/Core/Segments/DatastoreSegmentData.cs @@ -13,7 +13,7 @@ using NewRelic.Agent.Core.WireModels; using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; using System.Collections.Generic; using System.Text; diff --git a/src/Agent/NewRelic/Agent/Core/Segments/ExternalSegmentData.cs b/src/Agent/NewRelic/Agent/Core/Segments/ExternalSegmentData.cs index 7c085c6b0f..33bb888605 100644 --- a/src/Agent/NewRelic/Agent/Core/Segments/ExternalSegmentData.cs +++ b/src/Agent/NewRelic/Agent/Core/Segments/ExternalSegmentData.cs @@ -10,8 +10,7 @@ using NewRelic.Agent.Core.Metrics; using static NewRelic.Agent.Core.WireModels.MetricWireModel; using NewRelic.Agent.Configuration; -using NewRelic.Parsing; -using NewRelic.Agent.Core.Attributes; +using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Core.Spans; namespace NewRelic.Agent.Core.Segments 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/Segments/SpanEventWireModel.cs b/src/Agent/NewRelic/Agent/Core/Segments/SpanEventWireModel.cs index 5da76cd6ad..b574a63d90 100644 --- a/src/Agent/NewRelic/Agent/Core/Segments/SpanEventWireModel.cs +++ b/src/Agent/NewRelic/Agent/Core/Segments/SpanEventWireModel.cs @@ -8,7 +8,7 @@ using Google.Protobuf.Collections; using Newtonsoft.Json; using NewRelic.Agent.Core.JsonConverters; -using NewRelic.Collections; +using NewRelic.Agent.Extensions.Collections; using NewRelic.Agent.Core.DataTransport; using NewRelic.Agent.Core.WireModels; diff --git a/src/NewRelic.Core/NewRelic.SystemInterfaces/Environment.cs b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/Environment.cs similarity index 96% rename from src/NewRelic.Core/NewRelic.SystemInterfaces/Environment.cs rename to src/Agent/NewRelic/Agent/Core/SharedInterfaces/Environment.cs index 663876025e..acd0d7f840 100644 --- a/src/NewRelic.Core/NewRelic.SystemInterfaces/Environment.cs +++ b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/Environment.cs @@ -5,7 +5,7 @@ using System.Collections; using System.Collections.Generic; -namespace NewRelic.SystemInterfaces +namespace NewRelic.Agent.Core.SharedInterfaces { public class Environment : IEnvironment { diff --git a/src/NewRelic.Core/NewRelic.SystemInterfaces/EnvironmentMock.cs b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/EnvironmentMock.cs similarity index 95% rename from src/NewRelic.Core/NewRelic.SystemInterfaces/EnvironmentMock.cs rename to src/Agent/NewRelic/Agent/Core/SharedInterfaces/EnvironmentMock.cs index 580a5b7ef1..e0dddf9bc6 100644 --- a/src/NewRelic.Core/NewRelic.SystemInterfaces/EnvironmentMock.cs +++ b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/EnvironmentMock.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace NewRelic.SystemInterfaces +namespace NewRelic.Agent.Core.SharedInterfaces { public class EnvironmentMock : IEnvironment { diff --git a/src/NewRelic.Core/NewRelic.SystemInterfaces/IDateTimeStatic.cs b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/IDateTimeStatic.cs similarity index 89% rename from src/NewRelic.Core/NewRelic.SystemInterfaces/IDateTimeStatic.cs rename to src/Agent/NewRelic/Agent/Core/SharedInterfaces/IDateTimeStatic.cs index 0c667de2de..7a0ef8246c 100644 --- a/src/NewRelic.Core/NewRelic.SystemInterfaces/IDateTimeStatic.cs +++ b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/IDateTimeStatic.cs @@ -3,7 +3,7 @@ using System; -namespace NewRelic.SystemInterfaces +namespace NewRelic.Agent.Core.SharedInterfaces { public interface IDateTimeStatic { diff --git a/src/NewRelic.Core/NewRelic.SystemInterfaces/IDnsStatic.cs b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/IDnsStatic.cs similarity index 98% rename from src/NewRelic.Core/NewRelic.SystemInterfaces/IDnsStatic.cs rename to src/Agent/NewRelic/Agent/Core/SharedInterfaces/IDnsStatic.cs index 21fee0944f..ad3395f38a 100644 --- a/src/NewRelic.Core/NewRelic.SystemInterfaces/IDnsStatic.cs +++ b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/IDnsStatic.cs @@ -5,7 +5,7 @@ using System.Net; using System.Text.RegularExpressions; -namespace NewRelic.SystemInterfaces +namespace NewRelic.Agent.Core.SharedInterfaces { public interface IDnsStatic { diff --git a/src/NewRelic.Core/NewRelic.SystemInterfaces/IEnvironment.cs b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/IEnvironment.cs similarity index 98% rename from src/NewRelic.Core/NewRelic.SystemInterfaces/IEnvironment.cs rename to src/Agent/NewRelic/Agent/Core/SharedInterfaces/IEnvironment.cs index 268d82195d..0caa4c64c1 100644 --- a/src/NewRelic.Core/NewRelic.SystemInterfaces/IEnvironment.cs +++ b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/IEnvironment.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Security; -namespace NewRelic.SystemInterfaces +namespace NewRelic.Agent.Core.SharedInterfaces { public interface IEnvironment { diff --git a/src/NewRelic.Core/NewRelic.SystemInterfaces/INetworkData.cs b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/INetworkData.cs similarity index 98% rename from src/NewRelic.Core/NewRelic.SystemInterfaces/INetworkData.cs rename to src/Agent/NewRelic/Agent/Core/SharedInterfaces/INetworkData.cs index 7dba40e651..9e4595d637 100644 --- a/src/NewRelic.Core/NewRelic.SystemInterfaces/INetworkData.cs +++ b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/INetworkData.cs @@ -1,14 +1,14 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; using System.Collections.Generic; using System.Net; using System.Net.NetworkInformation; using System.Net.Sockets; -namespace NewRelic.SystemInterfaces +namespace NewRelic.Agent.Core.SharedInterfaces { public interface INetworkData { diff --git a/src/NewRelic.Core/NewRelic.SystemInterfaces/INetworkInterfaceData.cs b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/INetworkInterfaceData.cs similarity index 94% rename from src/NewRelic.Core/NewRelic.SystemInterfaces/INetworkInterfaceData.cs rename to src/Agent/NewRelic/Agent/Core/SharedInterfaces/INetworkInterfaceData.cs index d2e4ccb3f4..5ddd7f84f1 100644 --- a/src/NewRelic.Core/NewRelic.SystemInterfaces/INetworkInterfaceData.cs +++ b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/INetworkInterfaceData.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Net.NetworkInformation; -namespace NewRelic.SystemInterfaces +namespace NewRelic.Agent.Core.SharedInterfaces { public interface INetworkInterfaceData { diff --git a/src/NewRelic.Core/NewRelic.SystemInterfaces/IProcess.cs b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/IProcess.cs similarity index 96% rename from src/NewRelic.Core/NewRelic.SystemInterfaces/IProcess.cs rename to src/Agent/NewRelic/Agent/Core/SharedInterfaces/IProcess.cs index 280bb0b49e..abc5b6f6a7 100644 --- a/src/NewRelic.Core/NewRelic.SystemInterfaces/IProcess.cs +++ b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/IProcess.cs @@ -1,10 +1,10 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Memoization; +using NewRelic.Agent.Core.Utilities; using System; -namespace NewRelic.SystemInterfaces +namespace NewRelic.Agent.Core.SharedInterfaces { public interface IProcessStatic { diff --git a/src/NewRelic.Core/NewRelic.SystemInterfaces/IThreadPoolStatic.cs b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/IThreadPoolStatic.cs similarity index 97% rename from src/NewRelic.Core/NewRelic.SystemInterfaces/IThreadPoolStatic.cs rename to src/Agent/NewRelic/Agent/Core/SharedInterfaces/IThreadPoolStatic.cs index cf97cceb6f..d94fb64efc 100644 --- a/src/NewRelic.Core/NewRelic.SystemInterfaces/IThreadPoolStatic.cs +++ b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/IThreadPoolStatic.cs @@ -3,7 +3,7 @@ using System.Threading; -namespace NewRelic.SystemInterfaces +namespace NewRelic.Agent.Core.SharedInterfaces { public interface IThreadPoolStatic { diff --git a/src/NewRelic.Core/NewRelic.SystemInterfaces/PerformanceCounterProxy.cs b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/PerformanceCounterProxy.cs similarity index 98% rename from src/NewRelic.Core/NewRelic.SystemInterfaces/PerformanceCounterProxy.cs rename to src/Agent/NewRelic/Agent/Core/SharedInterfaces/PerformanceCounterProxy.cs index dc02c93145..1772f933cd 100644 --- a/src/NewRelic.Core/NewRelic.SystemInterfaces/PerformanceCounterProxy.cs +++ b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/PerformanceCounterProxy.cs @@ -2,13 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 #if NETFRAMEWORK -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; using System.Collections.Concurrent; using System.Diagnostics; using System.Linq; -namespace NewRelic.SystemInterfaces +namespace NewRelic.Agent.Core.SharedInterfaces { public interface IPerformanceCounterProxy : IDisposable { diff --git a/src/NewRelic.Core/NewRelic.SystemInterfaces/Web/Core/HttpRuntimeStatic.cs b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/Web/Core/HttpRuntimeStatic.cs similarity index 85% rename from src/NewRelic.Core/NewRelic.SystemInterfaces/Web/Core/HttpRuntimeStatic.cs rename to src/Agent/NewRelic/Agent/Core/SharedInterfaces/Web/Core/HttpRuntimeStatic.cs index 9dfe19f26c..5791694353 100644 --- a/src/NewRelic.Core/NewRelic.SystemInterfaces/Web/Core/HttpRuntimeStatic.cs +++ b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/Web/Core/HttpRuntimeStatic.cs @@ -4,7 +4,7 @@ #if NETSTANDARD2_0 using System; -namespace NewRelic.SystemInterfaces.Web +namespace NewRelic.Agent.Core.SharedInterfaces.Web { public class HttpRuntimeStatic : IHttpRuntimeStatic diff --git a/src/NewRelic.Core/NewRelic.SystemInterfaces/Web/Framework/HttpRuntimeStatic.cs b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/Web/Framework/HttpRuntimeStatic.cs similarity index 85% rename from src/NewRelic.Core/NewRelic.SystemInterfaces/Web/Framework/HttpRuntimeStatic.cs rename to src/Agent/NewRelic/Agent/Core/SharedInterfaces/Web/Framework/HttpRuntimeStatic.cs index d004156968..9ab6644d3b 100644 --- a/src/NewRelic.Core/NewRelic.SystemInterfaces/Web/Framework/HttpRuntimeStatic.cs +++ b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/Web/Framework/HttpRuntimeStatic.cs @@ -4,7 +4,7 @@ #if NETFRAMEWORK using System; -namespace NewRelic.SystemInterfaces.Web +namespace NewRelic.Agent.Core.SharedInterfaces.Web { public class HttpRuntimeStatic : IHttpRuntimeStatic diff --git a/src/NewRelic.Core/NewRelic.SystemInterfaces/Web/IHttpRuntimeStatic.cs b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/Web/IHttpRuntimeStatic.cs similarity index 79% rename from src/NewRelic.Core/NewRelic.SystemInterfaces/Web/IHttpRuntimeStatic.cs rename to src/Agent/NewRelic/Agent/Core/SharedInterfaces/Web/IHttpRuntimeStatic.cs index 807012ea64..3f5e126455 100644 --- a/src/NewRelic.Core/NewRelic.SystemInterfaces/Web/IHttpRuntimeStatic.cs +++ b/src/Agent/NewRelic/Agent/Core/SharedInterfaces/Web/IHttpRuntimeStatic.cs @@ -1,7 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -namespace NewRelic.SystemInterfaces.Web +namespace NewRelic.Agent.Core.SharedInterfaces.Web { public interface IHttpRuntimeStatic { diff --git a/src/Agent/NewRelic/Agent/Core/Spans/SpanEventMaker.cs b/src/Agent/NewRelic/Agent/Core/Spans/SpanEventMaker.cs index d831c7784c..0103f14606 100644 --- a/src/Agent/NewRelic/Agent/Core/Spans/SpanEventMaker.cs +++ b/src/Agent/NewRelic/Agent/Core/Spans/SpanEventMaker.cs @@ -6,7 +6,7 @@ using NewRelic.Agent.Core.Attributes; using NewRelic.Agent.Core.Segments; using NewRelic.Agent.Core.Transactions; -using NewRelic.Core; +using NewRelic.Agent.Core.Utilities; namespace NewRelic.Agent.Core.Spans { diff --git a/src/Agent/NewRelic/Agent/Core/ThreadProfiling/ThreadProfilingBucket.cs b/src/Agent/NewRelic/Agent/Core/ThreadProfiling/ThreadProfilingBucket.cs index 64dc2bf85b..30ebf67196 100644 --- a/src/Agent/NewRelic/Agent/Core/ThreadProfiling/ThreadProfilingBucket.cs +++ b/src/Agent/NewRelic/Agent/Core/ThreadProfiling/ThreadProfilingBucket.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; using System.Linq; -using NewRelic.Core.Logging; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; namespace NewRelic.Agent.Core.ThreadProfiling { diff --git a/src/Agent/NewRelic/Agent/Core/ThreadProfiling/ThreadProfilingSampler.cs b/src/Agent/NewRelic/Agent/Core/ThreadProfiling/ThreadProfilingSampler.cs index d48029d775..a7c2acb68f 100644 --- a/src/Agent/NewRelic/Agent/Core/ThreadProfiling/ThreadProfilingSampler.cs +++ b/src/Agent/NewRelic/Agent/Core/ThreadProfiling/ThreadProfilingSampler.cs @@ -1,7 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; using System.Runtime.InteropServices; using System.Threading; diff --git a/src/Agent/NewRelic/Agent/Core/ThreadProfiling/ThreadProfilingService.cs b/src/Agent/NewRelic/Agent/Core/ThreadProfiling/ThreadProfilingService.cs index 9527285f64..33886ebbf7 100644 --- a/src/Agent/NewRelic/Agent/Core/ThreadProfiling/ThreadProfilingService.cs +++ b/src/Agent/NewRelic/Agent/Core/ThreadProfiling/ThreadProfilingService.cs @@ -4,8 +4,8 @@ using NewRelic.Agent.Core.DataTransport; using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Utilities; -using NewRelic.Core.Logging; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using System; using System.Collections; using System.Collections.Generic; diff --git a/src/Agent/NewRelic/Agent/Core/Time/Scheduler.cs b/src/Agent/NewRelic/Agent/Core/Time/Scheduler.cs index bf5e796aff..89230fc359 100644 --- a/src/Agent/NewRelic/Agent/Core/Time/Scheduler.cs +++ b/src/Agent/NewRelic/Agent/Core/Time/Scheduler.cs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Core.Utilities; -using NewRelic.Collections; -using NewRelic.Core.Logging; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.Collections; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using System; using System.Collections.Generic; using System.Threading; diff --git a/src/Agent/NewRelic/Agent/Core/TransactionTraces/SyntheticsTransactionCollector.cs b/src/Agent/NewRelic/Agent/Core/TransactionTraces/SyntheticsTransactionCollector.cs index 0ffda0e750..e60485f035 100644 --- a/src/Agent/NewRelic/Agent/Core/TransactionTraces/SyntheticsTransactionCollector.cs +++ b/src/Agent/NewRelic/Agent/Core/TransactionTraces/SyntheticsTransactionCollector.cs @@ -9,7 +9,7 @@ using NewRelic.Agent.Core.Configuration; using NewRelic.Agent.Core.Transactions; using NewRelic.Agent.Core.Transformers.TransactionTransformer; -using NewRelic.Collections; +using NewRelic.Agent.Extensions.Collections; namespace NewRelic.Agent.Core.TransactionTraces { diff --git a/src/Agent/NewRelic/Agent/Core/Transactions/NoOpTransaction.cs b/src/Agent/NewRelic/Agent/Core/Transactions/NoOpTransaction.cs index 02e9ad80d8..db300005f5 100644 --- a/src/Agent/NewRelic/Agent/Core/Transactions/NoOpTransaction.cs +++ b/src/Agent/NewRelic/Agent/Core/Transactions/NoOpTransaction.cs @@ -8,8 +8,8 @@ using NewRelic.Agent.Core.Segments; using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core.CodeAttributes; -using NewRelic.Core.Logging; +using NewRelic.Agent.Core.Utilities; +using NewRelic.Agent.Extensions.Logging; using System; using System.Collections.Generic; using System.Data; diff --git a/src/Agent/NewRelic/Agent/Core/Transactions/SyntheticsModel.cs b/src/Agent/NewRelic/Agent/Core/Transactions/SyntheticsModel.cs index 84be32fd4b..cf5ad81de6 100644 --- a/src/Agent/NewRelic/Agent/Core/Transactions/SyntheticsModel.cs +++ b/src/Agent/NewRelic/Agent/Core/Transactions/SyntheticsModel.cs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Core.JsonConverters; -using NewRelic.Core; -using NewRelic.Core.Logging; +using NewRelic.Agent.Core.Utilities; +using NewRelic.Agent.Extensions.Logging; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; diff --git a/src/Agent/NewRelic/Agent/Core/Transactions/Transaction.cs b/src/Agent/NewRelic/Agent/Core/Transactions/Transaction.cs index 05e385ff40..cec596a876 100644 --- a/src/Agent/NewRelic/Agent/Core/Transactions/Transaction.cs +++ b/src/Agent/NewRelic/Agent/Core/Transactions/Transaction.cs @@ -21,11 +21,9 @@ using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Data; using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Collections; -using NewRelic.Core; -using NewRelic.Core.Logging; -using NewRelic.Parsing; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.Collections; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using System; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/src/Agent/NewRelic/Agent/Core/Transactions/TransactionMetadata.cs b/src/Agent/NewRelic/Agent/Core/Transactions/TransactionMetadata.cs index aa891e35a5..72b7334c4e 100644 --- a/src/Agent/NewRelic/Agent/Core/Transactions/TransactionMetadata.cs +++ b/src/Agent/NewRelic/Agent/Core/Transactions/TransactionMetadata.cs @@ -4,8 +4,8 @@ using NewRelic.Agent.Core.Attributes; using NewRelic.Agent.Core.Errors; using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.CrossApplicationTracing; -using NewRelic.Collections; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Collections; +using NewRelic.Agent.Core.Logging; using System; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/src/Agent/NewRelic/Agent/Core/Transactions/TransactionService.cs b/src/Agent/NewRelic/Agent/Core/Transactions/TransactionService.cs index 1bb1a6ac07..5c72c5f545 100644 --- a/src/Agent/NewRelic/Agent/Core/Transactions/TransactionService.cs +++ b/src/Agent/NewRelic/Agent/Core/Transactions/TransactionService.cs @@ -11,8 +11,7 @@ using NewRelic.Agent.Core.Attributes; using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Builders; using NewRelic.Agent.Extensions.Providers; -using NewRelic.Core.DistributedTracing; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/Agent/NewRelic/Agent/Core/Transformers/CpuSampleTransformer.cs b/src/Agent/NewRelic/Agent/Core/Transformers/CpuSampleTransformer.cs index 5e96d595c6..9fe36c0c1b 100644 --- a/src/Agent/NewRelic/Agent/Core/Transformers/CpuSampleTransformer.cs +++ b/src/Agent/NewRelic/Agent/Core/Transformers/CpuSampleTransformer.cs @@ -5,8 +5,7 @@ using NewRelic.Agent.Core.Aggregators; using NewRelic.Agent.Core.Samplers; using NewRelic.Agent.Core.WireModels; -using NewRelic.Core.Logging; - +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.Transformers { diff --git a/src/Agent/NewRelic/Agent/Core/Transformers/CustomEventTransformer.cs b/src/Agent/NewRelic/Agent/Core/Transformers/CustomEventTransformer.cs index 19c67011b2..fb7ca8e517 100644 --- a/src/Agent/NewRelic/Agent/Core/Transformers/CustomEventTransformer.cs +++ b/src/Agent/NewRelic/Agent/Core/Transformers/CustomEventTransformer.cs @@ -7,8 +7,8 @@ using NewRelic.Agent.Core.Attributes; using NewRelic.Agent.Core.Aggregators; using NewRelic.Agent.Core.WireModels; -using NewRelic.Core.Logging; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Agent.Core.Transformers { diff --git a/src/Agent/NewRelic/Agent/Core/Transformers/GcSampleTransformer.cs b/src/Agent/NewRelic/Agent/Core/Transformers/GcSampleTransformer.cs index 8c6f19bf8a..3bf406ce41 100644 --- a/src/Agent/NewRelic/Agent/Core/Transformers/GcSampleTransformer.cs +++ b/src/Agent/NewRelic/Agent/Core/Transformers/GcSampleTransformer.cs @@ -4,7 +4,7 @@ using NewRelic.Agent.Core.Aggregators; using NewRelic.Agent.Core.Samplers; using NewRelic.Agent.Core.WireModels; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; using System.Collections.Generic; diff --git a/src/Agent/NewRelic/Agent/Core/Transformers/TransactionTransformer/SegmentTreeMaker.cs b/src/Agent/NewRelic/Agent/Core/Transformers/TransactionTransformer/SegmentTreeMaker.cs index 2a1db864fe..cef5a1866c 100644 --- a/src/Agent/NewRelic/Agent/Core/Transformers/TransactionTransformer/SegmentTreeMaker.cs +++ b/src/Agent/NewRelic/Agent/Core/Transformers/TransactionTransformer/SegmentTreeMaker.cs @@ -3,8 +3,8 @@ using NewRelic.Agent.Core.Segments; using NewRelic.Agent.Core.Utilities; -using NewRelic.Core.Logging; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/Agent/NewRelic/Agent/Core/Transformers/TransactionTransformer/TransactionTraceMaker.cs b/src/Agent/NewRelic/Agent/Core/Transformers/TransactionTransformer/TransactionTraceMaker.cs index 4bd48f1438..8545fa06d1 100644 --- a/src/Agent/NewRelic/Agent/Core/Transformers/TransactionTransformer/TransactionTraceMaker.cs +++ b/src/Agent/NewRelic/Agent/Core/Transformers/TransactionTransformer/TransactionTraceMaker.cs @@ -9,9 +9,8 @@ using NewRelic.Agent.Core.Transactions; using NewRelic.Agent.Core.WireModels; using NewRelic.Agent.Helpers; -using NewRelic.SystemExtensions; -using NewRelic.SystemExtensions.Collections.Generic; -using IEnumerableExtensions = NewRelic.SystemExtensions.Collections.Generic.IEnumerableExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; namespace NewRelic.Agent.Core.Transformers.TransactionTransformer { diff --git a/src/Agent/NewRelic/Agent/Core/Transformers/TransactionTransformer/TransactionTransformer.cs b/src/Agent/NewRelic/Agent/Core/Transformers/TransactionTransformer/TransactionTransformer.cs index ffa6e4d8b4..c6647ead35 100644 --- a/src/Agent/NewRelic/Agent/Core/Transformers/TransactionTransformer/TransactionTransformer.cs +++ b/src/Agent/NewRelic/Agent/Core/Transformers/TransactionTransformer/TransactionTransformer.cs @@ -14,12 +14,10 @@ using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core.DistributedTracing; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; using System.Collections.Generic; using System.Linq; -using System.Threading; using static NewRelic.Agent.Core.WireModels.MetricWireModel; namespace NewRelic.Agent.Core.Transformers.TransactionTransformer diff --git a/src/Agent/NewRelic/Agent/Core/Utilities/ActionExtensions.cs b/src/Agent/NewRelic/Agent/Core/Utilities/ActionExtensions.cs index b3d2d5ffbc..85dbe976c5 100644 --- a/src/Agent/NewRelic/Agent/Core/Utilities/ActionExtensions.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilities/ActionExtensions.cs @@ -1,7 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; namespace NewRelic.Agent.Core.Utilities diff --git a/src/NewRelic.Core/BuildTimestampAttribute.cs b/src/Agent/NewRelic/Agent/Core/Utilities/BuildTimestampAttribute.cs similarity index 86% rename from src/NewRelic.Core/BuildTimestampAttribute.cs rename to src/Agent/NewRelic/Agent/Core/Utilities/BuildTimestampAttribute.cs index 345e8a40c1..dc911184ca 100644 --- a/src/NewRelic.Core/BuildTimestampAttribute.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilities/BuildTimestampAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace NewRelic.Core +namespace NewRelic.Agent.Core.Utilities { /// /// This attribute can be generated using an MSBuild file. @@ -11,12 +11,12 @@ namespace NewRelic.Core /// Example: /// /// - /// + /// /// <_Parameter1>$([System.DateTime]::UtcNow.Ticks) /// /// /// - /// This AssemblyAttribute item generates an assembly attribute like so: [assembly: NewRelic.Core.BuildTimestamp("637213171838522390")] + /// This AssemblyAttribute item generates an assembly attribute like so: [assembly: NewRelic.Agent.Core.Utilities.BuildTimestamp("637213171838522390")] /// Parameters for the attribute are always strings. There is an open issue requesting support for non-string parameters. /// https://github.com/microsoft/msbuild/issues/2281 /// diff --git a/src/NewRelic.Core/DateTimeExtensions.cs b/src/Agent/NewRelic/Agent/Core/Utilities/DateTimeExtensions.cs similarity index 98% rename from src/NewRelic.Core/DateTimeExtensions.cs rename to src/Agent/NewRelic/Agent/Core/Utilities/DateTimeExtensions.cs index 1993c1a1eb..4fd6e560aa 100644 --- a/src/NewRelic.Core/DateTimeExtensions.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilities/DateTimeExtensions.cs @@ -3,7 +3,7 @@ using System; -namespace NewRelic.Core +namespace NewRelic.Agent.Core.Utilities { public enum TimeUnit { 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/NewRelic.Core/DotnetVersion.cs b/src/Agent/NewRelic/Agent/Core/Utilities/DotnetVersion.cs similarity index 99% rename from src/NewRelic.Core/DotnetVersion.cs rename to src/Agent/NewRelic/Agent/Core/Utilities/DotnetVersion.cs index bf57029ecd..eea8abc4b8 100644 --- a/src/NewRelic.Core/DotnetVersion.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilities/DotnetVersion.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; -namespace NewRelic.Core +namespace NewRelic.Agent.Core.Utilities { public enum DotnetFrameworkVersion { diff --git a/src/Agent/NewRelic/Agent/Core/Utilities/ExtensionsLoader.cs b/src/Agent/NewRelic/Agent/Core/Utilities/ExtensionsLoader.cs index d33f1e635c..64dab83bc1 100644 --- a/src/Agent/NewRelic/Agent/Core/Utilities/ExtensionsLoader.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilities/ExtensionsLoader.cs @@ -3,9 +3,7 @@ using NewRelic.Agent.Extensions.Providers; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core.CodeAttributes; -using NewRelic.Core.Logging; -using NewRelic.TypeInstantiation; +using NewRelic.Agent.Extensions.Logging; using System; using System.Collections.Generic; using System.IO; diff --git a/src/NewRelic.Core/GuidGenerator.cs b/src/Agent/NewRelic/Agent/Core/Utilities/GuidGenerator.cs similarity index 97% rename from src/NewRelic.Core/GuidGenerator.cs rename to src/Agent/NewRelic/Agent/Core/Utilities/GuidGenerator.cs index 548d3ad70e..a3c3f5c125 100644 --- a/src/NewRelic.Core/GuidGenerator.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilities/GuidGenerator.cs @@ -1,14 +1,14 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System; using System.Diagnostics; using System.IO; using System.Security.Cryptography; using System.Threading; -namespace NewRelic.Core +namespace NewRelic.Agent.Core.Utilities { public static class GuidGenerator { diff --git a/src/Agent/NewRelic/Agent/Core/Utilities/HeaderEncoder.cs b/src/Agent/NewRelic/Agent/Core/Utilities/HeaderEncoder.cs index c062499f28..c41a029bac 100644 --- a/src/Agent/NewRelic/Agent/Core/Utilities/HeaderEncoder.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilities/HeaderEncoder.cs @@ -1,8 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using Newtonsoft.Json; using System; diff --git a/src/Agent/NewRelic/Agent/Core/Utilities/IEnumerableExtensions.cs b/src/Agent/NewRelic/Agent/Core/Utilities/IEnumerableExtensions.cs deleted file mode 100644 index 03a82b2d3b..0000000000 --- a/src/Agent/NewRelic/Agent/Core/Utilities/IEnumerableExtensions.cs +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright 2020 New Relic, Inc. All rights reserved. -// SPDX-License-Identifier: Apache-2.0 - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Collections.ObjectModel; - -namespace NewRelic.Agent.Core.Utilities -{ - public static class IEnumerableExtensions - { - public static bool IsEmpty(this IEnumerable enumerable) - { - return !enumerable.Any(); - } - - public static IEnumerable NotNull(this IEnumerable @this) - { - return @this.Where(x => x != null); - } - - public static ReadOnlyDictionary ToReadOnlyDictionary(this IEnumerable> source) - { - return source.ToReadOnlyDictionary(item => item.Key, item => item.Value); - } - - public static ReadOnlyDictionary ToReadOnlyDictionary(this IEnumerable source, Func keySelector, Func valueSelector) - { - var dictionary = new Dictionary(); - foreach (var item in source) - { - if (item == null) - continue; - var key = keySelector(item); - if (key == null) - continue; - var value = valueSelector(item); - if (value == null) - continue; - - dictionary.Add(key, value); - } - - return new ReadOnlyDictionary(dictionary); - } - - public static bool IsSequential(this IEnumerable sequence) - { - // Null is inherently sequential... sort of. I mean, it's not NOT sequential, right? - if (sequence == null) - return true; - - var enumerator = sequence.GetEnumerator(); - - // An empty set is inherently sequential - if (!enumerator.MoveNext()) - return true; - - var previousValue = enumerator.Current; - while (enumerator.MoveNext()) - { - // If any value is not equal to (1 + previousValue) then the set is not sequential - if (enumerator.Current != ++previousValue) - return false; - } - - return true; - } - - public static TimeSpan Sum(this IEnumerable source, Func selector) - { - return source.Aggregate(TimeSpan.Zero, (runningTotal, nextItem) => runningTotal + selector(nextItem)); - } - - public static bool IsSequential(this IEnumerable enumerable, Func predicate) - { - if (enumerable == null) - return true; - - return enumerable.Select(predicate).IsSequential(); - } - } -} diff --git a/src/NewRelic.Core/NewRelic.Memoization/Memoizer.cs b/src/Agent/NewRelic/Agent/Core/Utilities/Memoizer.cs similarity index 97% rename from src/NewRelic.Core/NewRelic.Memoization/Memoizer.cs rename to src/Agent/NewRelic/Agent/Core/Utilities/Memoizer.cs index 445facdfae..3fc46c4675 100644 --- a/src/NewRelic.Core/NewRelic.Memoization/Memoizer.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilities/Memoizer.cs @@ -3,7 +3,7 @@ using System; -namespace NewRelic.Memoization +namespace NewRelic.Agent.Core.Utilities { public class Memoizer { diff --git a/src/NewRelic.Core/CodeAttributes/NrCoveredByIntegrationTestsAttribute.cs b/src/Agent/NewRelic/Agent/Core/Utilities/NrCoveredByIntegrationTestsAttribute.cs similarity index 78% rename from src/NewRelic.Core/CodeAttributes/NrCoveredByIntegrationTestsAttribute.cs rename to src/Agent/NewRelic/Agent/Core/Utilities/NrCoveredByIntegrationTestsAttribute.cs index 18a605d709..3cc2d5f41c 100644 --- a/src/NewRelic.Core/CodeAttributes/NrCoveredByIntegrationTestsAttribute.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilities/NrCoveredByIntegrationTestsAttribute.cs @@ -1,9 +1,9 @@ -// Copyright 2020 New Relic, Inc. All rights reserved. +// Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 using System; -namespace NewRelic.Core.CodeAttributes +namespace NewRelic.Agent.Core.Utilities { /// /// A custom attribute used to indicate that this method/class is covered by diff --git a/src/NewRelic.Core/CodeAttributes/NrExcludeFromCodeCoverageAttribute.cs b/src/Agent/NewRelic/Agent/Core/Utilities/NrExcludeFromCodeCoverageAttribute.cs similarity index 90% rename from src/NewRelic.Core/CodeAttributes/NrExcludeFromCodeCoverageAttribute.cs rename to src/Agent/NewRelic/Agent/Core/Utilities/NrExcludeFromCodeCoverageAttribute.cs index 334774b663..9eb26934a7 100644 --- a/src/NewRelic.Core/CodeAttributes/NrExcludeFromCodeCoverageAttribute.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilities/NrExcludeFromCodeCoverageAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace NewRelic.Core.CodeAttributes +namespace NewRelic.Agent.Core.Utilities { /// /// A custom attribute used to exclude methods and/or classes from code coverage. diff --git a/src/NewRelic.Core/Strings.cs b/src/Agent/NewRelic/Agent/Core/Utilities/Strings.cs similarity index 99% rename from src/NewRelic.Core/Strings.cs rename to src/Agent/NewRelic/Agent/Core/Utilities/Strings.cs index 2bc8cfbd75..27d8c1ba67 100644 --- a/src/NewRelic.Core/Strings.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilities/Strings.cs @@ -5,7 +5,7 @@ using System.IO; using System.Text; -namespace NewRelic.Core +namespace NewRelic.Agent.Core.Utilities { public static class Strings { diff --git a/src/Agent/NewRelic/Agent/Core/Utilities/SystemInfo.cs b/src/Agent/NewRelic/Agent/Core/Utilities/SystemInfo.cs index fe593f070f..1109fbfe3d 100644 --- a/src/Agent/NewRelic/Agent/Core/Utilities/SystemInfo.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilities/SystemInfo.cs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Core.Utilization; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; using System; using System.ComponentModel; using System.IO; diff --git a/src/NewRelic.Core/CodeAttributes/ToBeRemovedInFutureReleaseAttribute.cs b/src/Agent/NewRelic/Agent/Core/Utilities/ToBeRemovedInFutureReleaseAttribute.cs similarity index 94% rename from src/NewRelic.Core/CodeAttributes/ToBeRemovedInFutureReleaseAttribute.cs rename to src/Agent/NewRelic/Agent/Core/Utilities/ToBeRemovedInFutureReleaseAttribute.cs index 872182d93e..f081620372 100644 --- a/src/NewRelic.Core/CodeAttributes/ToBeRemovedInFutureReleaseAttribute.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilities/ToBeRemovedInFutureReleaseAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace NewRelic.Core.CodeAttributes +namespace NewRelic.Agent.Core.Utilities { /// /// Identifies a piece of code that is planned to be removed in a future release of the agent. 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/NewRelic.TypeInstantiation/TypeInstantiator.cs b/src/Agent/NewRelic/Agent/Core/Utilities/TypeInstantiator.cs similarity index 99% rename from src/NewRelic.Core/NewRelic.TypeInstantiation/TypeInstantiator.cs rename to src/Agent/NewRelic/Agent/Core/Utilities/TypeInstantiator.cs index e2edd5c1b4..9ef92cb6ff 100644 --- a/src/NewRelic.Core/NewRelic.TypeInstantiation/TypeInstantiator.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilities/TypeInstantiator.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Reflection; -namespace NewRelic.TypeInstantiation +namespace NewRelic.Agent.Core.Utilities { public class TypeInstantiator { diff --git a/src/NewRelic.Core/NewRelic.TypeInstantiation/TypeInstantiatorResult.cs b/src/Agent/NewRelic/Agent/Core/Utilities/TypeInstantiatorResult.cs similarity index 93% rename from src/NewRelic.Core/NewRelic.TypeInstantiation/TypeInstantiatorResult.cs rename to src/Agent/NewRelic/Agent/Core/Utilities/TypeInstantiatorResult.cs index 02998fba37..b9a93b761f 100644 --- a/src/NewRelic.Core/NewRelic.TypeInstantiation/TypeInstantiatorResult.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilities/TypeInstantiatorResult.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Linq; -namespace NewRelic.TypeInstantiation +namespace NewRelic.Agent.Core.Utilities { public class TypeInstantiatorResult { diff --git a/src/Agent/NewRelic/Agent/Core/Utilization/UtilizationStore.cs b/src/Agent/NewRelic/Agent/Core/Utilization/UtilizationStore.cs index 0cdecf27bd..d8fb53e2a2 100644 --- a/src/Agent/NewRelic/Agent/Core/Utilization/UtilizationStore.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilization/UtilizationStore.cs @@ -5,8 +5,8 @@ using NewRelic.Agent.Core.AgentHealth; using NewRelic.Agent.Configuration; using NewRelic.Agent.Core.Utilities; -using NewRelic.SystemInterfaces; -using NewRelic.Core.Logging; +using NewRelic.Agent.Core.SharedInterfaces; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.Utilization { @@ -58,7 +58,7 @@ private string Truncate(string bootId, int maxLength) public IDictionary GetVendorSettings() { - var vendorInfo = new VendorInfo(_configuration, _agentHealthReporter, new SystemInterfaces.Environment(), new VendorHttpApiRequestor()); + var vendorInfo = new VendorInfo(_configuration, _agentHealthReporter, new SharedInterfaces.Environment(), new VendorHttpApiRequestor()); return vendorInfo.GetVendors(); } diff --git a/src/Agent/NewRelic/Agent/Core/Utilization/VendorHttpApiRequestor.cs b/src/Agent/NewRelic/Agent/Core/Utilization/VendorHttpApiRequestor.cs index 72bcd28d59..3a67f59eeb 100644 --- a/src/Agent/NewRelic/Agent/Core/Utilization/VendorHttpApiRequestor.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilization/VendorHttpApiRequestor.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.IO; using System.Net; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; namespace NewRelic.Agent.Core.Utilization { diff --git a/src/Agent/NewRelic/Agent/Core/Utilization/VendorInfo.cs b/src/Agent/NewRelic/Agent/Core/Utilization/VendorInfo.cs index efeb9bb9f9..d1dc657bc6 100644 --- a/src/Agent/NewRelic/Agent/Core/Utilization/VendorInfo.cs +++ b/src/Agent/NewRelic/Agent/Core/Utilization/VendorInfo.cs @@ -5,14 +5,15 @@ using NewRelic.Agent.Core.AgentHealth; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Helpers; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; using System.IO; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; namespace NewRelic.Agent.Core.Utilization { diff --git a/src/Agent/NewRelic/Agent/Core/WireModels/CustomEventWireModel.cs b/src/Agent/NewRelic/Agent/Core/WireModels/CustomEventWireModel.cs index 303a17e90f..e97eadebd9 100644 --- a/src/Agent/NewRelic/Agent/Core/WireModels/CustomEventWireModel.cs +++ b/src/Agent/NewRelic/Agent/Core/WireModels/CustomEventWireModel.cs @@ -3,7 +3,7 @@ using NewRelic.Agent.Core.JsonConverters; using NewRelic.Agent.Core.Attributes; -using NewRelic.Collections; +using NewRelic.Agent.Extensions.Collections; using Newtonsoft.Json; using System; diff --git a/src/Agent/NewRelic/Agent/Core/WireModels/ErrorEventWireModel.cs b/src/Agent/NewRelic/Agent/Core/WireModels/ErrorEventWireModel.cs index 92dd7f4b9d..dcfd46a05f 100644 --- a/src/Agent/NewRelic/Agent/Core/WireModels/ErrorEventWireModel.cs +++ b/src/Agent/NewRelic/Agent/Core/WireModels/ErrorEventWireModel.cs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Core.Attributes; -using NewRelic.Collections; +using NewRelic.Agent.Extensions.Collections; using System; namespace NewRelic.Agent.Core.WireModels diff --git a/src/Agent/NewRelic/Agent/Core/WireModels/IMetricBuilder.cs b/src/Agent/NewRelic/Agent/Core/WireModels/IMetricBuilder.cs index 1cac52661d..8a5536592e 100644 --- a/src/Agent/NewRelic/Agent/Core/WireModels/IMetricBuilder.cs +++ b/src/Agent/NewRelic/Agent/Core/WireModels/IMetricBuilder.cs @@ -5,7 +5,7 @@ using NewRelic.Agent.Core.Metrics; using NewRelic.Agent.Core.Samplers; using NewRelic.Agent.Core.Transformers.TransactionTransformer; -using NewRelic.Core; +using NewRelic.Agent.Core.Utilities; using System; using System.Net; diff --git a/src/Agent/NewRelic/Agent/Core/WireModels/LogEventWireModel.cs b/src/Agent/NewRelic/Agent/Core/WireModels/LogEventWireModel.cs index 3a2e043917..d04a62dc06 100644 --- a/src/Agent/NewRelic/Agent/Core/WireModels/LogEventWireModel.cs +++ b/src/Agent/NewRelic/Agent/Core/WireModels/LogEventWireModel.cs @@ -3,8 +3,8 @@ using System; using System.Collections.Generic; -using NewRelic.Collections; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.Collections; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Agent.Core.WireModels { diff --git a/src/Agent/NewRelic/Agent/Core/WireModels/MetricDataWireModel.cs b/src/Agent/NewRelic/Agent/Core/WireModels/MetricDataWireModel.cs index ae98c1b770..1c4b194cdf 100644 --- a/src/Agent/NewRelic/Agent/Core/WireModels/MetricDataWireModel.cs +++ b/src/Agent/NewRelic/Agent/Core/WireModels/MetricDataWireModel.cs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Core.JsonConverters; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; using Newtonsoft.Json; using System; using System.Collections.Generic; diff --git a/src/Agent/NewRelic/Agent/Core/WireModels/MetricWireModel.cs b/src/Agent/NewRelic/Agent/Core/WireModels/MetricWireModel.cs index f5c2552882..3507527b8c 100644 --- a/src/Agent/NewRelic/Agent/Core/WireModels/MetricWireModel.cs +++ b/src/Agent/NewRelic/Agent/Core/WireModels/MetricWireModel.cs @@ -7,9 +7,9 @@ using NewRelic.Agent.Core.Metrics; using NewRelic.Agent.Core.Samplers; using NewRelic.Agent.Core.Transformers.TransactionTransformer; +using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core; using Newtonsoft.Json; using System; using System.Collections.Generic; diff --git a/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/Builders/CandidateTransactionName.cs b/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/Builders/CandidateTransactionName.cs index ed48a32cb6..9f4b3ad24a 100644 --- a/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/Builders/CandidateTransactionName.cs +++ b/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/Builders/CandidateTransactionName.cs @@ -4,7 +4,7 @@ using NewRelic.Agent.Api; using NewRelic.Agent.Core.Transactions; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using Newtonsoft.Json; namespace NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Builders diff --git a/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/Builders/DatabaseStatementParser.cs b/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/Builders/DatabaseStatementParser.cs index 5984cbf780..7481aac60f 100644 --- a/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/Builders/DatabaseStatementParser.cs +++ b/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/Builders/DatabaseStatementParser.cs @@ -6,7 +6,6 @@ using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Parsing; using System.Data; namespace NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Builders diff --git a/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/CrossApplicationTracing/CatHeaderHandler.cs b/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/CrossApplicationTracing/CatHeaderHandler.cs index eb6da1b115..c435760709 100644 --- a/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/CrossApplicationTracing/CatHeaderHandler.cs +++ b/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/CrossApplicationTracing/CatHeaderHandler.cs @@ -7,9 +7,8 @@ using NewRelic.Agent.Core.Transformers.TransactionTransformer; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Helpers; -using NewRelic.Core; -using NewRelic.Core.Logging; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using Newtonsoft.Json; using System; using System.Collections.Generic; diff --git a/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/Synthetics/SyntheticsHeaderHandler.cs b/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/Synthetics/SyntheticsHeaderHandler.cs index f59ec82271..7bd0d0316f 100644 --- a/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/Synthetics/SyntheticsHeaderHandler.cs +++ b/src/Agent/NewRelic/Agent/Core/Wrapper/AgentWrapperApi/Synthetics/SyntheticsHeaderHandler.cs @@ -5,7 +5,7 @@ using System.Linq; using NewRelic.Agent.Configuration; using NewRelic.Agent.Core.Transactions; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using NewRelic.Agent.Helpers; using System; diff --git a/src/Agent/NewRelic/Agent/Core/Wrapper/WrapperMap.cs b/src/Agent/NewRelic/Agent/Core/Wrapper/WrapperMap.cs index fd5619c33e..6e3a889d3a 100644 --- a/src/Agent/NewRelic/Agent/Core/Wrapper/WrapperMap.cs +++ b/src/Agent/NewRelic/Agent/Core/Wrapper/WrapperMap.cs @@ -3,7 +3,7 @@ using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using System.Collections.Generic; using System.Linq; diff --git a/src/Agent/NewRelic/Agent/Core/Wrapper/WrapperService.cs b/src/Agent/NewRelic/Agent/Core/Wrapper/WrapperService.cs index 5518538048..f263789c08 100644 --- a/src/Agent/NewRelic/Agent/Core/Wrapper/WrapperService.cs +++ b/src/Agent/NewRelic/Agent/Core/Wrapper/WrapperService.cs @@ -8,7 +8,7 @@ using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.Core.Tracer; using NewRelic.Agent.Core.Utilities; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using NewRelic.Agent.Api; namespace NewRelic.Agent.Core.Wrapper diff --git a/src/NewRelic.Core/Caching/ICacheStats.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Caching/ICacheStats.cs similarity index 88% rename from src/NewRelic.Core/Caching/ICacheStats.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Caching/ICacheStats.cs index 26286ccaf1..6ac8a5d0a9 100644 --- a/src/NewRelic.Core/Caching/ICacheStats.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Caching/ICacheStats.cs @@ -1,7 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -namespace NewRelic.Core.Caching +namespace NewRelic.Agent.Extensions.Caching { public interface ICacheStats { diff --git a/src/NewRelic.Core/Caching/SimpleCache.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Caching/SimpleCache.cs similarity index 99% rename from src/NewRelic.Core/Caching/SimpleCache.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Caching/SimpleCache.cs index 8ce4a2f550..f67cb33dc7 100644 --- a/src/NewRelic.Core/Caching/SimpleCache.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Caching/SimpleCache.cs @@ -6,7 +6,7 @@ using System.Runtime.CompilerServices; using System.Threading; -namespace NewRelic.Core.Caching +namespace NewRelic.Agent.Extensions.Caching { /// /// Simple cache maintains a collection. Periodically, the cache is maintained on a seperate thread. diff --git a/src/NewRelic.Core/NewRelic.Collections/ConcurrentHashSet.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/ConcurrentHashSet.cs similarity index 95% rename from src/NewRelic.Core/NewRelic.Collections/ConcurrentHashSet.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/ConcurrentHashSet.cs index 77b465936a..28e8133cf2 100644 --- a/src/NewRelic.Core/NewRelic.Collections/ConcurrentHashSet.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/ConcurrentHashSet.cs @@ -5,9 +5,9 @@ using System.Collections; using System.Collections.Generic; using System.Threading; -using NewRelic.SystemExtensions.Threading; +using NewRelic.Agent.Extensions.SystemExtensions.Threading; -namespace NewRelic.Collections +namespace NewRelic.Agent.Extensions.Collections { public class ConcurrentHashSet : ICollection { diff --git a/src/NewRelic.Core/NewRelic.Collections/ConcurrentList.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/ConcurrentList.cs similarity index 97% rename from src/NewRelic.Core/NewRelic.Collections/ConcurrentList.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/ConcurrentList.cs index 5d21ec152a..f0872d5a2b 100644 --- a/src/NewRelic.Core/NewRelic.Collections/ConcurrentList.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/ConcurrentList.cs @@ -5,9 +5,9 @@ using System.Collections; using System.Collections.Generic; using System.Threading; -using NewRelic.SystemExtensions.Threading; +using NewRelic.Agent.Extensions.SystemExtensions.Threading; -namespace NewRelic.Collections +namespace NewRelic.Agent.Extensions.Collections { public class ConcurrentList : IList { diff --git a/src/NewRelic.Core/NewRelic.Collections/ConcurrentPriorityQueue.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/ConcurrentPriorityQueue.cs similarity index 99% rename from src/NewRelic.Core/NewRelic.Collections/ConcurrentPriorityQueue.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/ConcurrentPriorityQueue.cs index f505b7d5db..34359a9098 100644 --- a/src/NewRelic.Core/NewRelic.Collections/ConcurrentPriorityQueue.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/ConcurrentPriorityQueue.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Threading; -namespace NewRelic.Collections +namespace NewRelic.Agent.Extensions.Collections { public class ConcurrentPriorityQueue : IResizableCappedCollection { diff --git a/src/NewRelic.Core/NewRelic.Collections/ConcurrentQueue.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/ConcurrentQueue.cs similarity index 96% rename from src/NewRelic.Core/NewRelic.Collections/ConcurrentQueue.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/ConcurrentQueue.cs index 2400e06c35..d689f85a9a 100644 --- a/src/NewRelic.Core/NewRelic.Collections/ConcurrentQueue.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/ConcurrentQueue.cs @@ -5,9 +5,9 @@ using System.Collections; using System.Collections.Generic; using System.Threading; -using NewRelic.SystemExtensions.Threading; +using NewRelic.Agent.Extensions.SystemExtensions.Threading; -namespace NewRelic.Collections +namespace NewRelic.Agent.Extensions.Collections { public class ConcurrentQueue : IEnumerable, ICollection { diff --git a/src/NewRelic.Core/NewRelic.Collections/DisposableCollection.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/DisposableCollection.cs similarity index 95% rename from src/NewRelic.Core/NewRelic.Collections/DisposableCollection.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/DisposableCollection.cs index c2cbbadc5e..554ddb2cda 100644 --- a/src/NewRelic.Core/NewRelic.Collections/DisposableCollection.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/DisposableCollection.cs @@ -4,7 +4,7 @@ using System; using System.Collections.ObjectModel; -namespace NewRelic.Collections +namespace NewRelic.Agent.Extensions.Collections { public class DisposableCollection : DisposableCollection { } diff --git a/src/NewRelic.Core/NewRelic.Collections/IHasPriority.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/IHasPriority.cs similarity index 78% rename from src/NewRelic.Core/NewRelic.Collections/IHasPriority.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/IHasPriority.cs index 181121a312..2d559d6ac9 100644 --- a/src/NewRelic.Core/NewRelic.Collections/IHasPriority.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/IHasPriority.cs @@ -1,7 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -namespace NewRelic.Collections +namespace NewRelic.Agent.Extensions.Collections { public interface IHasPriority diff --git a/src/NewRelic.Core/NewRelic.Collections/IResizableCappedCollection.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/IResizableCappedCollection.cs similarity index 94% rename from src/NewRelic.Core/NewRelic.Collections/IResizableCappedCollection.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/IResizableCappedCollection.cs index d195fd06ca..d705d37984 100644 --- a/src/NewRelic.Core/NewRelic.Collections/IResizableCappedCollection.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/IResizableCappedCollection.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace NewRelic.Collections +namespace NewRelic.Agent.Extensions.Collections { public interface IResizableCappedCollection : ICollection { diff --git a/src/NewRelic.Core/NewRelic.Collections/PartitionedBlockingCollection.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/PartitionedBlockingCollection.cs similarity index 96% rename from src/NewRelic.Core/NewRelic.Collections/PartitionedBlockingCollection.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/PartitionedBlockingCollection.cs index 3142c58011..1b6d166c03 100644 --- a/src/NewRelic.Core/NewRelic.Collections/PartitionedBlockingCollection.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/PartitionedBlockingCollection.cs @@ -1,4 +1,4 @@ -// Copyright 2020 New Relic, Inc. All rights reserved. +// Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 using System; @@ -7,7 +7,7 @@ using System.Linq; using System.Threading; -namespace NewRelic.Collections +namespace NewRelic.Agent.Extensions.Collections { public class PartitionedBlockingCollection { diff --git a/src/NewRelic.Core/NewRelic.Collections/PrioritizedNode.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/PrioritizedNode.cs similarity index 98% rename from src/NewRelic.Core/NewRelic.Collections/PrioritizedNode.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/PrioritizedNode.cs index dc454bfe0b..a78a3d0d4c 100644 --- a/src/NewRelic.Core/NewRelic.Collections/PrioritizedNode.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/PrioritizedNode.cs @@ -3,7 +3,7 @@ using System; -namespace NewRelic.Collections +namespace NewRelic.Agent.Extensions.Collections { public class PrioritizedNode : IComparable, IEquatable>, IComparable> where T : IHasPriority diff --git a/src/NewRelic.Core/NewRelic.Collections/StaticCounter.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/StaticCounter.cs similarity index 91% rename from src/NewRelic.Core/NewRelic.Collections/StaticCounter.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/StaticCounter.cs index 3511cd9bdc..43efec42a1 100644 --- a/src/NewRelic.Core/NewRelic.Collections/StaticCounter.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Collections/StaticCounter.cs @@ -3,7 +3,7 @@ using System.Threading; -namespace NewRelic.Collections +namespace NewRelic.Agent.Extensions.Collections { public struct StaticCounter 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/Logging/ILogger.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Logging/ILogger.cs index 9d0772dc3b..c4b78cc84b 100644 --- a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Logging/ILogger.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Logging/ILogger.cs @@ -16,6 +16,23 @@ public enum Level public interface ILogger { + bool IsDebugEnabled { get; } + bool IsErrorEnabled { get; } + bool IsFinestEnabled { get; } + bool IsInfoEnabled { get; } + bool IsWarnEnabled { get; } + + void Debug(Exception exception, string message, params object[] args); + void Debug(string message, params object[] args); + void Error(Exception exception, string message, params object[] args); + void Error(string message, params object[] args); + void Finest(Exception exception, string message, params object[] args); + void Finest(string message, params object[] args); + void Info(Exception exception, string message, params object[] args); + void Info(string message, params object[] args); + void Warn(Exception exception, string message, params object[] args); + void Warn(string message, params object[] args); + bool IsEnabledFor(Level level); void Log(Level level, string message); void Log(Level level, Exception ex, string message); diff --git a/src/NewRelic.Core/Logging/Log.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Logging/Log.cs similarity index 99% rename from src/NewRelic.Core/Logging/Log.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Logging/Log.cs index e044bfc873..e257e8f7d0 100644 --- a/src/NewRelic.Core/Logging/Log.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Logging/Log.cs @@ -3,7 +3,7 @@ using System; -namespace NewRelic.Core.Logging +namespace NewRelic.Agent.Extensions.Logging { public enum LogLevel { diff --git a/src/NewRelic.Core/Logging/NoOpLogger.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Logging/NoOpLogger.cs similarity index 81% rename from src/NewRelic.Core/Logging/NoOpLogger.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Logging/NoOpLogger.cs index 0d19e833c0..a7764f6a50 100644 --- a/src/NewRelic.Core/Logging/NoOpLogger.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Logging/NoOpLogger.cs @@ -3,7 +3,7 @@ using System; -namespace NewRelic.Core.Logging +namespace NewRelic.Agent.Extensions.Logging { public class NoOpLogger : ILogger { @@ -25,6 +25,16 @@ public void Finest(Exception exception, string message, params object[] args) { public void Finest(string message, params object[] args) { } public void Info(Exception exception, string message, params object[] args) { } public void Info(string message, params object[] args) { } + + public bool IsEnabledFor(Level level) + { + return false; + } + + public void Log(Level level, string message) { } + + public void Log(Level level, Exception ex, string message) { } + public void Warn(Exception exception, string message, params object[] args) { } public void Warn(string message, params object[] args) { } 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..84e5d9d075 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 @@ -4,7 +4,9 @@ NewRelic.Agent.Extensions 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 +16,14 @@ + - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + @@ -32,4 +37,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/Parsing/ConnectionString/ConnectionStringParserHelper.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/ConnectionStringParserHelper.cs similarity index 95% rename from src/Agent/NewRelic/Agent/Parsing/ConnectionString/ConnectionStringParserHelper.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/ConnectionStringParserHelper.cs index 6c8e0f8763..e4aa66d4db 100644 --- a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/ConnectionStringParserHelper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/ConnectionStringParserHelper.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Net; -namespace NewRelic.Parsing.ConnectionString +namespace NewRelic.Agent.Extensions.Parsing.ConnectionString { public static class ConnectionStringParserHelper { diff --git a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/IConnectionStringParser.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/IConnectionStringParser.cs similarity index 94% rename from src/Agent/NewRelic/Agent/Parsing/ConnectionString/IConnectionStringParser.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/IConnectionStringParser.cs index 781106a24a..aa3ec16a74 100644 --- a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/IConnectionStringParser.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/IConnectionStringParser.cs @@ -1,11 +1,10 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core.Caching; +using NewRelic.Agent.Extensions.Caching; -namespace NewRelic.Parsing.ConnectionString +namespace NewRelic.Agent.Extensions.Parsing.ConnectionString { public interface IConnectionStringParser { diff --git a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/IbmDb2ConnectionStringParser.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/IbmDb2ConnectionStringParser.cs similarity index 96% rename from src/Agent/NewRelic/Agent/Parsing/ConnectionString/IbmDb2ConnectionStringParser.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/IbmDb2ConnectionStringParser.cs index ec1f302d13..8cf3314aaf 100644 --- a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/IbmDb2ConnectionStringParser.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/IbmDb2ConnectionStringParser.cs @@ -1,13 +1,12 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; using System.Collections.Generic; using System.Data.Common; using System.Linq; -namespace NewRelic.Parsing.ConnectionString +namespace NewRelic.Agent.Extensions.Parsing.ConnectionString { public class IbmDb2ConnectionStringParser : IConnectionStringParser { diff --git a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/MsSqlConnectionStringParser.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/MsSqlConnectionStringParser.cs similarity index 97% rename from src/Agent/NewRelic/Agent/Parsing/ConnectionString/MsSqlConnectionStringParser.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/MsSqlConnectionStringParser.cs index 890f0dc417..953acdce3d 100644 --- a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/MsSqlConnectionStringParser.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/MsSqlConnectionStringParser.cs @@ -1,13 +1,12 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; using System.Collections.Generic; using System.Data.Common; using System.Linq; -namespace NewRelic.Parsing.ConnectionString +namespace NewRelic.Agent.Extensions.Parsing.ConnectionString { public class MsSqlConnectionStringParser : IConnectionStringParser { diff --git a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/MySqlConnectionStringParser.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/MySqlConnectionStringParser.cs similarity index 96% rename from src/Agent/NewRelic/Agent/Parsing/ConnectionString/MySqlConnectionStringParser.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/MySqlConnectionStringParser.cs index f9c3c15341..9eac69b940 100644 --- a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/MySqlConnectionStringParser.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/MySqlConnectionStringParser.cs @@ -1,12 +1,11 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; using System.Collections.Generic; using System.Data.Common; -namespace NewRelic.Parsing.ConnectionString +namespace NewRelic.Agent.Extensions.Parsing.ConnectionString { public class MySqlConnectionStringParser : IConnectionStringParser { diff --git a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/OracleConnectionStringParser.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/OracleConnectionStringParser.cs similarity index 98% rename from src/Agent/NewRelic/Agent/Parsing/ConnectionString/OracleConnectionStringParser.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/OracleConnectionStringParser.cs index 139120e385..7d85b66da7 100644 --- a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/OracleConnectionStringParser.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/OracleConnectionStringParser.cs @@ -1,14 +1,13 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Agent.Extensions.Parsing; using System.Collections.Generic; using System.Data.Common; using System.Linq; using NewRelic.Agent.Helpers; using NewRelic.Agent.Extensions.Providers.Wrapper; -namespace NewRelic.Parsing.ConnectionString +namespace NewRelic.Agent.Extensions.Parsing.ConnectionString { public class OracleConnectionStringParser : IConnectionStringParser { diff --git a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/PostgresConnectionStringParser.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/PostgresConnectionStringParser.cs similarity index 95% rename from src/Agent/NewRelic/Agent/Parsing/ConnectionString/PostgresConnectionStringParser.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/PostgresConnectionStringParser.cs index feae1654da..e50094fde5 100644 --- a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/PostgresConnectionStringParser.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/PostgresConnectionStringParser.cs @@ -1,12 +1,11 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; using System.Collections.Generic; using System.Data.Common; -namespace NewRelic.Parsing.ConnectionString +namespace NewRelic.Agent.Extensions.Parsing.ConnectionString { public class PostgresConnectionStringParser : IConnectionStringParser { diff --git a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/StackExchangeRedisConnectionStringParser.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/StackExchangeRedisConnectionStringParser.cs similarity index 96% rename from src/Agent/NewRelic/Agent/Parsing/ConnectionString/StackExchangeRedisConnectionStringParser.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/StackExchangeRedisConnectionStringParser.cs index dd29b5488d..bb79178666 100644 --- a/src/Agent/NewRelic/Agent/Parsing/ConnectionString/StackExchangeRedisConnectionStringParser.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/ConnectionString/StackExchangeRedisConnectionStringParser.cs @@ -1,12 +1,11 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Agent.Extensions.Parsing; using System.Linq; using NewRelic.Agent.Helpers; using NewRelic.Agent.Extensions.Providers.Wrapper; -namespace NewRelic.Parsing.ConnectionString +namespace NewRelic.Agent.Extensions.Parsing.ConnectionString { public class StackExchangeRedisConnectionStringParser : IConnectionStringParser { diff --git a/src/Agent/NewRelic/Agent/Parsing/MySqlExplainPlanActions.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/MySqlExplainPlanActions.cs similarity index 98% rename from src/Agent/NewRelic/Agent/Parsing/MySqlExplainPlanActions.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/MySqlExplainPlanActions.cs index 994a4f679e..391700dda8 100644 --- a/src/Agent/NewRelic/Agent/Parsing/MySqlExplainPlanActions.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/MySqlExplainPlanActions.cs @@ -5,10 +5,9 @@ using System.Collections.Generic; using System.Data; using System.Linq; -using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; -namespace NewRelic.Parsing +namespace NewRelic.Agent.Extensions.Parsing { public class MySqlExplainPlanActions { diff --git a/src/Agent/NewRelic/Agent/Parsing/SqlParser.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/SqlParser.cs similarity index 99% rename from src/Agent/NewRelic/Agent/Parsing/SqlParser.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/SqlParser.cs index 079fe1a9ab..4dd2c7eaa5 100644 --- a/src/Agent/NewRelic/Agent/Parsing/SqlParser.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/SqlParser.cs @@ -1,16 +1,15 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Agent.Extensions.Parsing; +using NewRelic.Agent.Extensions.Logging; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core.Logging; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Data; using System.Text.RegularExpressions; -namespace NewRelic.Parsing +namespace NewRelic.Agent.Extensions.Parsing { /// diff --git a/src/Agent/NewRelic/Agent/Parsing/SqlServerExplainPlanActions.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/SqlServerExplainPlanActions.cs similarity index 98% rename from src/Agent/NewRelic/Agent/Parsing/SqlServerExplainPlanActions.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/SqlServerExplainPlanActions.cs index 213564a141..58408a7df7 100644 --- a/src/Agent/NewRelic/Agent/Parsing/SqlServerExplainPlanActions.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/SqlServerExplainPlanActions.cs @@ -7,7 +7,7 @@ using System.Linq; using NewRelic.Agent.Extensions.Providers.Wrapper; -namespace NewRelic.Parsing +namespace NewRelic.Agent.Extensions.Parsing { public static class SqlServerExplainPlanActions { diff --git a/src/Agent/NewRelic/Agent/Parsing/SqlWrapperHelper.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/SqlWrapperHelper.cs similarity index 99% rename from src/Agent/NewRelic/Agent/Parsing/SqlWrapperHelper.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/SqlWrapperHelper.cs index bd8e03bca4..8344c4cd67 100644 --- a/src/Agent/NewRelic/Agent/Parsing/SqlWrapperHelper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/SqlWrapperHelper.cs @@ -13,7 +13,7 @@ using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; -namespace NewRelic.Parsing +namespace NewRelic.Agent.Extensions.Parsing { public static class SqlWrapperHelper { diff --git a/src/Agent/NewRelic/Agent/Parsing/StringsHelper.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/StringsHelper.cs similarity index 98% rename from src/Agent/NewRelic/Agent/Parsing/StringsHelper.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/StringsHelper.cs index 2e511caeca..30d632680e 100644 --- a/src/Agent/NewRelic/Agent/Parsing/StringsHelper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Parsing/StringsHelper.cs @@ -6,7 +6,7 @@ using System.Text; using NewRelic.Agent.Helpers; -namespace NewRelic.Parsing +namespace NewRelic.Agent.Extensions.Parsing { public static class StringsHelper { diff --git a/src/NewRelic.Core/NewRelic.SystemExtensions/Collections/Generic/DictionaryExtensions.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/Collections/Generic/DictionaryExtensions.cs similarity index 98% rename from src/NewRelic.Core/NewRelic.SystemExtensions/Collections/Generic/DictionaryExtensions.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/Collections/Generic/DictionaryExtensions.cs index c1d70807dc..9f27478c28 100644 --- a/src/NewRelic.Core/NewRelic.SystemExtensions/Collections/Generic/DictionaryExtensions.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/Collections/Generic/DictionaryExtensions.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace NewRelic.SystemExtensions.Collections.Generic +namespace NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic { public static class DictionaryExtensions { diff --git a/src/NewRelic.Core/NewRelic.SystemExtensions/Collections/Generic/ForEachEnumerable.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/Collections/Generic/ForEachEnumerable.cs similarity index 96% rename from src/NewRelic.Core/NewRelic.SystemExtensions/Collections/Generic/ForEachEnumerable.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/Collections/Generic/ForEachEnumerable.cs index bd6073af41..e336418d14 100644 --- a/src/NewRelic.Core/NewRelic.SystemExtensions/Collections/Generic/ForEachEnumerable.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/Collections/Generic/ForEachEnumerable.cs @@ -5,7 +5,7 @@ using System.Collections; using System.Collections.Generic; -namespace NewRelic.SystemExtensions.Collections.Generic +namespace NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic { public class ForEachEnumerable : IEnumerable { diff --git a/src/NewRelic.Core/NewRelic.SystemExtensions/Collections/Generic/IEnumerableExtensions.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/Collections/Generic/IEnumerableExtensions.cs similarity index 71% rename from src/NewRelic.Core/NewRelic.SystemExtensions/Collections/Generic/IEnumerableExtensions.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/Collections/Generic/IEnumerableExtensions.cs index 15c469694d..092e3ea139 100644 --- a/src/NewRelic.Core/NewRelic.SystemExtensions/Collections/Generic/IEnumerableExtensions.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/Collections/Generic/IEnumerableExtensions.cs @@ -3,9 +3,10 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; -namespace NewRelic.SystemExtensions.Collections.Generic +namespace NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic { public static class IEnumerableExtensions { @@ -101,9 +102,9 @@ public static Dictionary ToDictionary(this IEnumerab return dictionary; } - public static IEnumerable NotNull(this IEnumerable source) + public static IEnumerable NotNull(this IEnumerable @this) { - return source.Where(x => x != null); + return @this.Where(x => x != null); } public static IEnumerable Swallow(this IEnumerable source) where TException : Exception @@ -165,5 +166,71 @@ public static IEnumerable Flatten(this T root, Func> get stack.Push(child); } } + + public static bool IsEmpty(this IEnumerable enumerable) + { + return !enumerable.Any(); + } + + public static ReadOnlyDictionary ToReadOnlyDictionary(this IEnumerable> source) + { + return source.ToReadOnlyDictionary(item => item.Key, item => item.Value); + } + + public static ReadOnlyDictionary ToReadOnlyDictionary(this IEnumerable source, Func keySelector, Func valueSelector) + { + var dictionary = new Dictionary(); + foreach (var item in source) + { + if (item == null) + continue; + var key = keySelector(item); + if (key == null) + continue; + var value = valueSelector(item); + if (value == null) + continue; + + dictionary.Add(key, value); + } + + return new ReadOnlyDictionary(dictionary); + } + + public static bool IsSequential(this IEnumerable sequence) + { + // Null is inherently sequential... sort of. I mean, it's not NOT sequential, right? + if (sequence == null) + return true; + + var enumerator = sequence.GetEnumerator(); + + // An empty set is inherently sequential + if (!enumerator.MoveNext()) + return true; + + var previousValue = enumerator.Current; + while (enumerator.MoveNext()) + { + // If any value is not equal to (1 + previousValue) then the set is not sequential + if (enumerator.Current != ++previousValue) + return false; + } + + return true; + } + + public static TimeSpan Sum(this IEnumerable source, Func selector) + { + return source.Aggregate(TimeSpan.Zero, (runningTotal, nextItem) => runningTotal + selector(nextItem)); + } + + public static bool IsSequential(this IEnumerable enumerable, Func predicate) + { + if (enumerable == null) + return true; + + return enumerable.Select(predicate).IsSequential(); + } } } diff --git a/src/NewRelic.Core/NewRelic.SystemExtensions/Collections/NameValueCollectionExtensions.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/Collections/NameValueCollectionExtensions.cs similarity index 94% rename from src/NewRelic.Core/NewRelic.SystemExtensions/Collections/NameValueCollectionExtensions.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/Collections/NameValueCollectionExtensions.cs index cd7085ad30..bbb7f5bfb6 100644 --- a/src/NewRelic.Core/NewRelic.SystemExtensions/Collections/NameValueCollectionExtensions.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/Collections/NameValueCollectionExtensions.cs @@ -6,7 +6,7 @@ using System.Collections.Specialized; using System.Linq; -namespace NewRelic.SystemExtensions.Collections +namespace NewRelic.Agent.Extensions.SystemExtensions.Collections { public static class NameValueCollectionExtensions { diff --git a/src/NewRelic.Core/NewRelic.SystemExtensions/ObjectArrayExtensions.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/ObjectArrayExtensions.cs similarity index 97% rename from src/NewRelic.Core/NewRelic.SystemExtensions/ObjectArrayExtensions.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/ObjectArrayExtensions.cs index 89afd4caa2..8f09e73f46 100644 --- a/src/NewRelic.Core/NewRelic.SystemExtensions/ObjectArrayExtensions.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/ObjectArrayExtensions.cs @@ -3,7 +3,7 @@ using System; -namespace NewRelic.SystemExtensions +namespace NewRelic.Agent.Extensions.SystemExtensions { /// /// A set of helper methods for wrapper factories. diff --git a/src/NewRelic.Core/NewRelic.SystemExtensions/StringExtensions.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/StringExtensions.cs similarity index 99% rename from src/NewRelic.Core/NewRelic.SystemExtensions/StringExtensions.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/StringExtensions.cs index dc5bc150b7..809c969122 100644 --- a/src/NewRelic.Core/NewRelic.SystemExtensions/StringExtensions.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/StringExtensions.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; -namespace NewRelic.SystemExtensions +namespace NewRelic.Agent.Extensions.SystemExtensions { public static class StringExtensions { diff --git a/src/NewRelic.Core/NewRelic.SystemExtensions/Threading/ReaderWriterLockSlimExtensions.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/Threading/ReaderWriterLockSlimExtensions.cs similarity index 97% rename from src/NewRelic.Core/NewRelic.SystemExtensions/Threading/ReaderWriterLockSlimExtensions.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/Threading/ReaderWriterLockSlimExtensions.cs index 08d7eb2d01..287a47b69b 100644 --- a/src/NewRelic.Core/NewRelic.SystemExtensions/Threading/ReaderWriterLockSlimExtensions.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/Threading/ReaderWriterLockSlimExtensions.cs @@ -4,7 +4,7 @@ using System; using System.Threading; -namespace NewRelic.SystemExtensions.Threading +namespace NewRelic.Agent.Extensions.SystemExtensions.Threading { public static class ReaderWriterLockSlimExtensions { diff --git a/src/NewRelic.Core/NewRelic.SystemExtensions/TimeSpanExtensions.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/TimeSpanExtensions.cs similarity index 97% rename from src/NewRelic.Core/NewRelic.SystemExtensions/TimeSpanExtensions.cs rename to src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/TimeSpanExtensions.cs index d11d564fa3..badbc63d10 100644 --- a/src/NewRelic.Core/NewRelic.SystemExtensions/TimeSpanExtensions.cs +++ b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/SystemExtensions/TimeSpanExtensions.cs @@ -3,7 +3,7 @@ using System; -namespace NewRelic.SystemExtensions +namespace NewRelic.Agent.Extensions.SystemExtensions { public static class TimeSpanExtensions { 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/AspNet/ClassicPipeline/CreateEventExecutionStepsWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/ClassicPipeline/CreateEventExecutionStepsWrapper.cs index 1549a12001..b90e732458 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/ClassicPipeline/CreateEventExecutionStepsWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/ClassicPipeline/CreateEventExecutionStepsWrapper.cs @@ -9,7 +9,7 @@ using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Providers.Wrapper.AspNet.Shared; using NewRelic.Reflection; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.AspNet.ClassicPipeline { diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/IntegratedPipeline/FinishPipelineRequestWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/IntegratedPipeline/FinishPipelineRequestWrapper.cs index 5e4f652f30..c81947b3c3 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/IntegratedPipeline/FinishPipelineRequestWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/IntegratedPipeline/FinishPipelineRequestWrapper.cs @@ -6,7 +6,7 @@ using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Providers.Wrapper.AspNet.Shared; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.AspNet.IntegratedPipeline { diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/Shared/OnErrorWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/Shared/OnErrorWrapper.cs index dd2045f35d..08bcb9e2cd 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/Shared/OnErrorWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/Shared/OnErrorWrapper.cs @@ -5,7 +5,7 @@ using System; using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.AspNet.Shared { diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/Shared/QueryStringRetriever.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/Shared/QueryStringRetriever.cs index 48400a3ed2..e8e20f54eb 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/Shared/QueryStringRetriever.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AspNet/Shared/QueryStringRetriever.cs @@ -7,7 +7,7 @@ using System.Web; using NewRelic.Agent.Api; using NewRelic.Reflection; -using NewRelic.SystemExtensions.Collections; +using NewRelic.Agent.Extensions.SystemExtensions.Collections; namespace NewRelic.Providers.Wrapper.AspNet.Shared { 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/AwsLambda/HandlerMethodWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AwsLambda/HandlerMethodWrapper.cs index 7a0553489f..b4d8cb1cc4 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AwsLambda/HandlerMethodWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AwsLambda/HandlerMethodWrapper.cs @@ -8,7 +8,7 @@ using System; using NewRelic.Agent.Extensions.Lambda; using NewRelic.Reflection; -using NewRelic.Collections; +using NewRelic.Agent.Extensions.Collections; namespace NewRelic.Providers.Wrapper.AwsLambda { 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/Elasticsearch/RequestWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Elasticsearch/RequestWrapper.cs index 2b34535ad0..a74cd6042f 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Elasticsearch/RequestWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Elasticsearch/RequestWrapper.cs @@ -9,7 +9,7 @@ using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Reflection; using System.Collections.Concurrent; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; using System.Collections.ObjectModel; using System.Collections.Generic; 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/HttpClient/SendAsync.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/HttpClient/SendAsync.cs index de9d3deed0..0a4e840410 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/HttpClient/SendAsync.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/HttpClient/SendAsync.cs @@ -9,7 +9,7 @@ using NewRelic.Agent.Api; using NewRelic.Agent.Api.Experimental; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.HttpClient { diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/HttpWebRequest/GetResponseWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/HttpWebRequest/GetResponseWrapper.cs index a439c0353f..32c90f6cde 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/HttpWebRequest/GetResponseWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/HttpWebRequest/GetResponseWrapper.cs @@ -6,7 +6,7 @@ using NewRelic.Agent.Api; using NewRelic.Agent.Api.Experimental; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions.Collections; +using NewRelic.Agent.Extensions.SystemExtensions.Collections; namespace NewRelic.Providers.Wrapper.HttpWebRequest { 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/Kafka/KafkaProducerWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/KafkaProducerWrapper.cs index 00732a61d6..59e6696245 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/KafkaProducerWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Kafka/KafkaProducerWrapper.cs @@ -6,7 +6,7 @@ using Confluent.Kafka; using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.Kafka { 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/MassTransit/TransportConfigWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/TransportConfigWrapper.cs index 3c65cffe08..1c3d910296 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/TransportConfigWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransit/TransportConfigWrapper.cs @@ -4,7 +4,7 @@ using MassTransit; using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.MassTransit { 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/MassTransitLegacy/TransportConfigLegacyWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/TransportConfigLegacyWrapper.cs index 845d574fa3..7aaaa008ae 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/TransportConfigLegacyWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MassTransitLegacy/TransportConfigLegacyWrapper.cs @@ -4,7 +4,7 @@ using MassTransit; using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.MassTransitLegacy { 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/MongoDatabaseDefaultWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb/MongoDatabaseDefaultWrapper.cs index 4262eee0d9..9fe656f5b0 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb/MongoDatabaseDefaultWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb/MongoDatabaseDefaultWrapper.cs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Api; 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/MongoDatabaseWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb26/MongoDatabaseWrapper.cs index 0c30378838..39076fe5a4 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb26/MongoDatabaseWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb26/MongoDatabaseWrapper.cs @@ -7,7 +7,7 @@ using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.MongoDb26 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 e2f0587cb5..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,8 +11,6 @@ - - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb26/MongoDbHelper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb26/MongoDbHelper.cs index 54a24a1ab6..fda21adc02 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb26/MongoDbHelper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/MongoDb26/MongoDbHelper.cs @@ -7,7 +7,7 @@ using System.Net; using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Parsing.ConnectionString; +using NewRelic.Agent.Extensions.Parsing.ConnectionString; using NewRelic.Reflection; namespace NewRelic.Providers.Wrapper.MongoDb26 diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/AsyncBeginInvokeActionWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/AsyncBeginInvokeActionWrapper.cs index ccaa997927..a85571f805 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/AsyncBeginInvokeActionWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/AsyncBeginInvokeActionWrapper.cs @@ -5,7 +5,7 @@ using NewRelic.Agent.Api; using NewRelic.Agent.Api.Experimental; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.Mvc3 { diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/InvokeExceptionFiltersWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/InvokeExceptionFiltersWrapper.cs index 58ec8dfdbd..85cdae8352 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/InvokeExceptionFiltersWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/InvokeExceptionFiltersWrapper.cs @@ -4,7 +4,7 @@ using System; using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.Mvc3 { 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/Mvc3/MvcRouteNamingHelper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/MvcRouteNamingHelper.cs index 4395c44fd8..3522d60ed3 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/MvcRouteNamingHelper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/MvcRouteNamingHelper.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Web.Routing; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.Mvc3 { diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/SyncInvokeActionWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/SyncInvokeActionWrapper.cs index e85c613406..4ef72b29f8 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/SyncInvokeActionWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Mvc3/SyncInvokeActionWrapper.cs @@ -4,7 +4,7 @@ using NewRelic.Agent.Api; using NewRelic.Agent.Api.Experimental; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.Mvc3 { 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/NServiceBus/ReceiveMessageWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/NServiceBus/ReceiveMessageWrapper.cs index fc82f495c3..8b1f7f7350 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/NServiceBus/ReceiveMessageWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/NServiceBus/ReceiveMessageWrapper.cs @@ -4,7 +4,7 @@ using System; using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.NServiceBus { diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/NServiceBus/SendMessageWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/NServiceBus/SendMessageWrapper.cs index f5582165b9..cfda59889f 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/NServiceBus/SendMessageWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/NServiceBus/SendMessageWrapper.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.NServiceBus { diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/OpenRasta/GetHandlerWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/OpenRasta/GetHandlerWrapper.cs index 32fb13378a..a733c54e55 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/OpenRasta/GetHandlerWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/OpenRasta/GetHandlerWrapper.cs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 using System; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Parsing; +using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Api; namespace NewRelic.Providers.Wrapper.OpenRasta 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 644abd2118..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,8 +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/BasicGetWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/BasicGetWrapper.cs index 0c83d17ccd..e42a55337d 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/BasicGetWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/BasicGetWrapper.cs @@ -5,7 +5,7 @@ using System.Text; using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.RabbitMq { diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/HandleBasicDeliverWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/HandleBasicDeliverWrapper.cs index 94933bcbc6..1bd5e1677f 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/HandleBasicDeliverWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/HandleBasicDeliverWrapper.cs @@ -6,7 +6,7 @@ using System.Text; using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.RabbitMq { diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/QueuePurgeWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/QueuePurgeWrapper.cs index 6ba6a50b8d..17c85908ab 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/QueuePurgeWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/QueuePurgeWrapper.cs @@ -3,7 +3,7 @@ using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.RabbitMq { 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/RabbitMq/RabbitMqHelper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/RabbitMqHelper.cs index ae9fcb4a9d..1621e16dc8 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/RabbitMqHelper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RabbitMq/RabbitMqHelper.cs @@ -7,7 +7,7 @@ using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Reflection; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.RabbitMq { 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/SendCommandWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/ServiceStackRedis/SendCommandWrapper.cs index f8d08eb9b2..c51be5c3b4 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/ServiceStackRedis/SendCommandWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/ServiceStackRedis/SendCommandWrapper.cs @@ -3,8 +3,8 @@ using System; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; -using NewRelic.Parsing.ConnectionString; +using NewRelic.Agent.Extensions.SystemExtensions; +using NewRelic.Agent.Extensions.Parsing.ConnectionString; using NewRelic.Reflection; using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Api; 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 3dd865a0a2..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,8 +15,6 @@ - - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/OdbcCommandWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/OdbcCommandWrapper.cs index f2440129c7..db9dffa42c 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/OdbcCommandWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/OdbcCommandWrapper.cs @@ -6,7 +6,7 @@ using System.Data.Odbc; using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Parsing; +using NewRelic.Agent.Extensions.Parsing; namespace NewRelic.Providers.Wrapper.Sql { diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/OleDbCommandWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/OleDbCommandWrapper.cs index b418bfa146..71412d4f2a 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/OleDbCommandWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/OleDbCommandWrapper.cs @@ -6,7 +6,7 @@ using System.Data.OleDb; using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Parsing; +using NewRelic.Agent.Extensions.Parsing; namespace NewRelic.Providers.Wrapper.Sql { 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 0a0c3958d1..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,8 +14,6 @@ - - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/SqlCommandWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/SqlCommandWrapper.cs index 8258c7462e..c38f8c6e65 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/SqlCommandWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/SqlCommandWrapper.cs @@ -4,9 +4,8 @@ using System; using System.Data; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Parsing; -using NewRelic.Parsing.ConnectionString; using NewRelic.Agent.Extensions.Parsing; +using NewRelic.Agent.Extensions.Parsing.ConnectionString; using System.Linq; using NewRelic.Agent.Api; using System.Threading.Tasks; diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis/Common.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis/Common.cs index 10720f81e6..b840c9064b 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis/Common.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis/Common.cs @@ -3,7 +3,7 @@ using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Parsing.ConnectionString; +using NewRelic.Agent.Extensions.Parsing.ConnectionString; using NewRelic.Reflection; using System; using System.Collections.Concurrent; 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 701b7e27ae..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,8 +16,6 @@ - - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis2Plus/SessionCache.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis2Plus/SessionCache.cs index 89f54774fd..7e37c1a373 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis2Plus/SessionCache.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/StackExchangeRedis2Plus/SessionCache.cs @@ -10,8 +10,8 @@ using NewRelic.Agent.Extensions.Helpers; using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core.Logging; -using NewRelic.Parsing.ConnectionString; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Extensions.Parsing.ConnectionString; using StackExchange.Redis.Profiling; namespace NewRelic.Providers.Wrapper.StackExchangeRedis2Plus 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 fe175aaa00..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,8 +16,6 @@ - - diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Wcf3/MethodInvokerWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Wcf3/MethodInvokerWrapper.cs index 9c6d906ec6..30f2a6e48e 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Wcf3/MethodInvokerWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Wcf3/MethodInvokerWrapper.cs @@ -6,7 +6,7 @@ using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Reflection; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Wcf3/ServiceChannelProxyWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Wcf3/ServiceChannelProxyWrapper.cs index 977d7fa0ed..6c531db6d0 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Wcf3/ServiceChannelProxyWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Wcf3/ServiceChannelProxyWrapper.cs @@ -6,8 +6,8 @@ using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.Helpers; using NewRelic.Reflection; -using NewRelic.SystemExtensions; -using NewRelic.SystemExtensions.Collections; +using NewRelic.Agent.Extensions.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions.Collections; using System; using System.Collections.Generic; using System.Linq; 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/InvokeActionAsyncWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi1/InvokeActionAsyncWrapper.cs index b744437269..62c98153ac 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi1/InvokeActionAsyncWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi1/InvokeActionAsyncWrapper.cs @@ -6,7 +6,7 @@ using System.Web.Http.Controllers; using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.WebApi1 { 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/ExceptionLoggerWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi2/ExceptionLoggerWrapper.cs index d2bb973688..62b053b0df 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi2/ExceptionLoggerWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi2/ExceptionLoggerWrapper.cs @@ -4,7 +4,7 @@ using System.Web.Http.ExceptionHandling; using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.WebApi2 { diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi2/InvokeActionAsyncWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi2/InvokeActionAsyncWrapper.cs index c7ec1502e6..b336e5f36d 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi2/InvokeActionAsyncWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebApi2/InvokeActionAsyncWrapper.cs @@ -7,7 +7,7 @@ using NewRelic.Agent.Api; using NewRelic.Agent.Api.Experimental; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.WebApi2 { 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/StaticResourceNamingWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebOptimization/StaticResourceNamingWrapper.cs index 58b0d5ac3a..8e0ddf0c09 100644 --- a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebOptimization/StaticResourceNamingWrapper.cs +++ b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/WebOptimization/StaticResourceNamingWrapper.cs @@ -4,7 +4,7 @@ using System.Web; using NewRelic.Agent.Api; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; namespace NewRelic.Providers.Wrapper.WebOptimization { 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/Logging/ILogger.cs b/src/NewRelic.Core/Logging/ILogger.cs deleted file mode 100644 index 023326f3e4..0000000000 --- a/src/NewRelic.Core/Logging/ILogger.cs +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2020 New Relic, Inc. All rights reserved. -// SPDX-License-Identifier: Apache-2.0 - -using System; - -namespace NewRelic.Core.Logging -{ - public interface ILogger - { - bool IsDebugEnabled { get; } - bool IsErrorEnabled { get; } - bool IsFinestEnabled { get; } - bool IsInfoEnabled { get; } - bool IsWarnEnabled { get; } - - void Debug(Exception exception, string message, params object[] args); - void Debug(string message, params object[] args); - void Error(Exception exception, string message, params object[] args); - void Error(string message, params object[] args); - void Finest(Exception exception, string message, params object[] args); - void Finest(string message, params object[] args); - void Info(Exception exception, string message, params object[] args); - void Info(string message, params object[] args); - void Warn(Exception exception, string message, params object[] args); - void Warn(string message, params object[] args); - } -} 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 338eb5acc7..839885e6e6 100644 --- a/tests/Agent/Benchmarking/BenchmarkingTests/Tests/ExampleTests.cs +++ b/tests/Agent/Benchmarking/BenchmarkingTests/Tests/ExampleTests.cs @@ -9,9 +9,9 @@ using NewRelic.Agent.Extensions.Providers.Wrapper; using System.Collections.Generic; using System.Data; -using NewRelic.Core; -using NewRelic.Parsing; +using NewRelic.Agent.Extensions.Parsing; using System.Threading; +using NewRelic.Agent.Core.Utilities; namespace BenchmarkingTests.Tests { diff --git a/tests/Agent/UnitTests/CompositeTests/AgentApiTests.cs b/tests/Agent/UnitTests/CompositeTests/AgentApiTests.cs index a29beb76cc..c0da43590b 100644 --- a/tests/Agent/UnitTests/CompositeTests/AgentApiTests.cs +++ b/tests/Agent/UnitTests/CompositeTests/AgentApiTests.cs @@ -10,8 +10,7 @@ using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.CrossApplicationTracing; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.TestUtilities; -using NewRelic.Core; -using NewRelic.Core.DistributedTracing; +using NewRelic.Agent.Core.DistributedTracing; using NewRelic.Testing.Assertions; using NUnit.Framework; using System; diff --git a/tests/Agent/UnitTests/CompositeTests/ApdexTests.cs b/tests/Agent/UnitTests/CompositeTests/ApdexTests.cs index be3fdf7f3a..309147f45a 100644 --- a/tests/Agent/UnitTests/CompositeTests/ApdexTests.cs +++ b/tests/Agent/UnitTests/CompositeTests/ApdexTests.cs @@ -4,7 +4,7 @@ using NewRelic.Agent.Api; using NewRelic.Agent.Core.Attributes; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemExtensions; +using NewRelic.Agent.Extensions.SystemExtensions; using NUnit.Framework; using System; using System.Collections.Generic; diff --git a/tests/Agent/UnitTests/CompositeTests/Assertions.cs b/tests/Agent/UnitTests/CompositeTests/Assertions.cs index 4c41900f3d..16f75b87b0 100644 --- a/tests/Agent/UnitTests/CompositeTests/Assertions.cs +++ b/tests/Agent/UnitTests/CompositeTests/Assertions.cs @@ -10,7 +10,7 @@ using NewRelic.Agent.Core.Segments; using NewRelic.Agent.Core.WireModels; using NewRelic.Agent.TestUtilities; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using NUnit.Framework; namespace CompositeTests 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/CompositeTestAgent.cs b/tests/Agent/UnitTests/CompositeTests/CompositeTestAgent.cs index a4c4578f4e..8a9dc96cd3 100644 --- a/tests/Agent/UnitTests/CompositeTests/CompositeTestAgent.cs +++ b/tests/Agent/UnitTests/CompositeTests/CompositeTestAgent.cs @@ -26,9 +26,9 @@ using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Builders; using NewRelic.Agent.Extensions.Providers; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using NewRelic.Providers.Storage.AsyncLocal; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using System; using System.Collections.Generic; using System.IO; 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/CompositeTests/CrossAgentTests/DistributedTracing/TraceContextCrossAgentTests.cs b/tests/Agent/UnitTests/CompositeTests/CrossAgentTests/DistributedTracing/TraceContextCrossAgentTests.cs index 1ac9058e6b..184a7c560b 100644 --- a/tests/Agent/UnitTests/CompositeTests/CrossAgentTests/DistributedTracing/TraceContextCrossAgentTests.cs +++ b/tests/Agent/UnitTests/CompositeTests/CrossAgentTests/DistributedTracing/TraceContextCrossAgentTests.cs @@ -5,8 +5,7 @@ using NewRelic.Agent.Core.DistributedTracing; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.TestUtilities; -using NewRelic.Core; -using NewRelic.Core.DistributedTracing; +using NewRelic.Agent.Core.Utilities; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NUnit.Framework; diff --git a/tests/Agent/UnitTests/CompositeTests/CrossAgentTests/SecurityPolicies/SecurityPoliciesCrossAgentTests.cs b/tests/Agent/UnitTests/CompositeTests/CrossAgentTests/SecurityPolicies/SecurityPoliciesCrossAgentTests.cs index 66f712d1e2..1bd8476a39 100644 --- a/tests/Agent/UnitTests/CompositeTests/CrossAgentTests/SecurityPolicies/SecurityPoliciesCrossAgentTests.cs +++ b/tests/Agent/UnitTests/CompositeTests/CrossAgentTests/SecurityPolicies/SecurityPoliciesCrossAgentTests.cs @@ -15,7 +15,7 @@ using NewRelic.Agent.Core.Metrics; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.TestUtilities; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NUnit.Framework; diff --git a/tests/Agent/UnitTests/CompositeTests/CrossAgentTests/Utilization/UtilizationCrossAgentTests.cs b/tests/Agent/UnitTests/CompositeTests/CrossAgentTests/Utilization/UtilizationCrossAgentTests.cs index 592fca8d90..e51e599a30 100644 --- a/tests/Agent/UnitTests/CompositeTests/CrossAgentTests/Utilization/UtilizationCrossAgentTests.cs +++ b/tests/Agent/UnitTests/CompositeTests/CrossAgentTests/Utilization/UtilizationCrossAgentTests.cs @@ -32,7 +32,7 @@ public void Setup() { _compositeTestAgent = new CompositeTestAgent(); _agent = _compositeTestAgent.GetAgent(); - _vendorInfo = new VendorInfo(null, null, new NewRelic.SystemInterfaces.Environment(), null); + _vendorInfo = new VendorInfo(null, null, new NewRelic.Agent.Core.SharedInterfaces.Environment(), null); } [TearDown] diff --git a/tests/Agent/UnitTests/CompositeTests/CrossApplicationTracingTests.cs b/tests/Agent/UnitTests/CompositeTests/CrossApplicationTracingTests.cs index 0cb1231c93..e09e57c690 100644 --- a/tests/Agent/UnitTests/CompositeTests/CrossApplicationTracingTests.cs +++ b/tests/Agent/UnitTests/CompositeTests/CrossApplicationTracingTests.cs @@ -5,10 +5,9 @@ using NewRelic.Agent.Core.Attributes; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.TestUtilities; -using NewRelic.Core; +using NewRelic.Agent.Core.Utilities; using NewRelic.Testing.Assertions; using NUnit.Framework; -using System; using System.Collections.Generic; using System.Linq; diff --git a/tests/Agent/UnitTests/CompositeTests/DistributedTracingTests.cs b/tests/Agent/UnitTests/CompositeTests/DistributedTracingTests.cs index d8cc144421..591cab4969 100644 --- a/tests/Agent/UnitTests/CompositeTests/DistributedTracingTests.cs +++ b/tests/Agent/UnitTests/CompositeTests/DistributedTracingTests.cs @@ -7,12 +7,12 @@ using NewRelic.Agent.Core.WireModels; using NewRelic.Agent.TestUtilities; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core.DistributedTracing; using NUnit.Framework; using System; using System.Collections.Generic; using System.Linq; using NewRelic.Agent.Core.Segments; +using NewRelic.Agent.Core.DistributedTracing; namespace CompositeTests { diff --git a/tests/Agent/UnitTests/CompositeTests/EventHarvestConfigSupportabilityMetricsTests.cs b/tests/Agent/UnitTests/CompositeTests/EventHarvestConfigSupportabilityMetricsTests.cs index a8c5947517..6bba26287c 100644 --- a/tests/Agent/UnitTests/CompositeTests/EventHarvestConfigSupportabilityMetricsTests.cs +++ b/tests/Agent/UnitTests/CompositeTests/EventHarvestConfigSupportabilityMetricsTests.cs @@ -10,7 +10,7 @@ using NewRelic.Agent.Core.Labels; using NewRelic.Agent.Core.Metrics; using NewRelic.Agent.Core.Utilities; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/CompositeTests/Samplers/GcSamplerTests.cs b/tests/Agent/UnitTests/CompositeTests/Samplers/GcSamplerTests.cs index 626a71f233..0691ba3862 100644 --- a/tests/Agent/UnitTests/CompositeTests/Samplers/GcSamplerTests.cs +++ b/tests/Agent/UnitTests/CompositeTests/Samplers/GcSamplerTests.cs @@ -8,7 +8,7 @@ using CompositeTests; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Transformers; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NewRelic.Testing.Assertions; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/CompositeTests/Samplers/ThreadStatsSamplerTests.cs b/tests/Agent/UnitTests/CompositeTests/Samplers/ThreadStatsSamplerTests.cs index a278904884..e0432a319c 100644 --- a/tests/Agent/UnitTests/CompositeTests/Samplers/ThreadStatsSamplerTests.cs +++ b/tests/Agent/UnitTests/CompositeTests/Samplers/ThreadStatsSamplerTests.cs @@ -5,7 +5,7 @@ using CompositeTests; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Transformers; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/CompositeTests/SyntheticsTests.cs b/tests/Agent/UnitTests/CompositeTests/SyntheticsTests.cs index 3becca8757..9d755e42de 100644 --- a/tests/Agent/UnitTests/CompositeTests/SyntheticsTests.cs +++ b/tests/Agent/UnitTests/CompositeTests/SyntheticsTests.cs @@ -8,8 +8,8 @@ using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Synthetics; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.TestUtilities; -using NewRelic.Core; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Core.Utilities; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using NewRelic.Testing.Assertions; using NUnit.Framework; using System; diff --git a/tests/Agent/UnitTests/CompositeTests/TestTransactionContext.cs b/tests/Agent/UnitTests/CompositeTests/TestTransactionContext.cs index 20ce2d92b1..b9767b6381 100644 --- a/tests/Agent/UnitTests/CompositeTests/TestTransactionContext.cs +++ b/tests/Agent/UnitTests/CompositeTests/TestTransactionContext.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using NewRelic.Agent.Extensions.Providers; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; namespace CompositeTests { diff --git a/tests/Agent/UnitTests/Core.UnitTest/AgentHealth/AgentHealthReporterTests.cs b/tests/Agent/UnitTests/Core.UnitTest/AgentHealth/AgentHealthReporterTests.cs index d288c913c0..37d91e2fd3 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/AgentHealth/AgentHealthReporterTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/AgentHealth/AgentHealthReporterTests.cs @@ -9,8 +9,8 @@ using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core.Logging; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Logging; +using NewRelic.Agent.Core.SharedInterfaces; using NewRelic.Testing.Assertions; using NUnit.Framework; using System; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/CustomEventAggregatorTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/CustomEventAggregatorTests.cs index ec004e0126..2faabb4fa7 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/CustomEventAggregatorTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/CustomEventAggregatorTests.cs @@ -14,8 +14,7 @@ using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.Core; -using NewRelic.SystemInterfaces; +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 e19a621392..31fb840618 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/ErrorEventAggregatorTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/ErrorEventAggregatorTests.cs @@ -11,9 +11,8 @@ using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.Collections; -using NewRelic.Core; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Collections; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using System; using System.Collections.Generic; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/ErrorTraceAggregatorTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/ErrorTraceAggregatorTests.cs index 31fb5e87cb..58b37d0314 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/ErrorTraceAggregatorTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/ErrorTraceAggregatorTests.cs @@ -13,7 +13,7 @@ using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/LogEventAggregatorTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/LogEventAggregatorTests.cs index 69d9f4060a..dfd430f9ff 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/LogEventAggregatorTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/LogEventAggregatorTests.cs @@ -11,9 +11,8 @@ using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.Collections; -using NewRelic.Core; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Collections; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using System; using System.Collections.Generic; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/MetricAggregatorTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/MetricAggregatorTests.cs index d7be3dbaa9..d7ed1316a3 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/MetricAggregatorTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/MetricAggregatorTests.cs @@ -16,7 +16,6 @@ using NewRelic.Agent.Core.Transformers.TransactionTransformer; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.SystemInterfaces; using NewRelic.Testing.Assertions; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/SqlTraceAggregatorTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/SqlTraceAggregatorTests.cs index 8af8328087..c7c51b71dd 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/SqlTraceAggregatorTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/SqlTraceAggregatorTests.cs @@ -9,7 +9,7 @@ using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NewRelic.Testing.Assertions; 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 b480b34c88..0423b4e430 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/TransactionEventAggregatorTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/TransactionEventAggregatorTests.cs @@ -11,8 +11,7 @@ using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.Core; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using System; using System.Collections.Generic; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/TransactionTraceAggregatorTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/TransactionTraceAggregatorTests.cs index a34f10cb04..290042e860 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Aggregators/TransactionTraceAggregatorTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Aggregators/TransactionTraceAggregatorTests.cs @@ -13,7 +13,7 @@ using NewRelic.Agent.Core.Transformers.TransactionTransformer; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NewRelic.Testing.Assertions; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Attributes/AttributeDefinitionServiceTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Attributes/AttributeDefinitionServiceTests.cs index 844c479097..e95b099766 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Attributes/AttributeDefinitionServiceTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Attributes/AttributeDefinitionServiceTests.cs @@ -9,8 +9,8 @@ using NewRelic.Agent.Core.Transformers.TransactionTransformer; using NewRelic.Agent.Core.Config; using NewRelic.Agent.Core.Configuration; -using NewRelic.SystemInterfaces; -using NewRelic.SystemInterfaces.Web; +using NewRelic.Agent.Core.SharedInterfaces; +using NewRelic.Agent.Core.SharedInterfaces.Web; using NewRelic.Agent.Core.Fixtures; using Telerik.JustMock; using NewRelic.Agent.Core.Configuration.UnitTest; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Attributes/LogContextDataFilterTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Attributes/LogContextDataFilterTests.cs index acdb12f97d..ec5c4527b2 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Attributes/LogContextDataFilterTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Attributes/LogContextDataFilterTests.cs @@ -9,9 +9,9 @@ using NewRelic.Agent.Configuration; using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Utilities; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NewRelic.Agent.Core.Configuration; -using NewRelic.SystemInterfaces.Web; +using NewRelic.Agent.Core.SharedInterfaces.Web; using NewRelic.Agent.Core.Config; using NewRelic.Agent.Core.Configuration.UnitTest; using NUnit.Framework.Constraints; 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/Config/BootstrapConfigurationTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Config/BootstrapConfigurationTests.cs index 854b3a4538..e72f05333c 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Config/BootstrapConfigurationTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Config/BootstrapConfigurationTests.cs @@ -4,7 +4,7 @@ using System; using System.IO; using NewRelic.Agent.Core.Configuration; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Config/BootstrapLogConfigurationTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Config/BootstrapLogConfigurationTests.cs index 901897e5fb..8b3524ba49 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Config/BootstrapLogConfigurationTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Config/BootstrapLogConfigurationTests.cs @@ -6,7 +6,7 @@ #endif using System.Collections.Generic; using NewRelic.Agent.Core.Configuration; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Config/ServerlessModeConfigurationTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Config/ServerlessModeConfigurationTests.cs index 51a4e6dbdf..1676ac2fd8 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Config/ServerlessModeConfigurationTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Config/ServerlessModeConfigurationTests.cs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 using System.Collections.Generic; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Configuration/ConfigurationService.cs b/tests/Agent/UnitTests/Core.UnitTest/Configuration/ConfigurationService.cs index c3c6c21dd0..987fb13df9 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Configuration/ConfigurationService.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Configuration/ConfigurationService.cs @@ -6,8 +6,8 @@ using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Requests; using NewRelic.Agent.Core.Utilities; -using NewRelic.SystemInterfaces; -using NewRelic.SystemInterfaces.Web; +using NewRelic.Agent.Core.SharedInterfaces; +using NewRelic.Agent.Core.SharedInterfaces.Web; using NUnit.Framework; using System; using System.Collections.Generic; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Configuration/DefaultConfigurationTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Configuration/DefaultConfigurationTests.cs index 5cacc2fee2..f202358e8f 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Configuration/DefaultConfigurationTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Configuration/DefaultConfigurationTests.cs @@ -8,8 +8,8 @@ using System.Xml.Serialization; using NewRelic.Agent.Core.Config; using NewRelic.Agent.Core.DataTransport; -using NewRelic.SystemInterfaces; -using NewRelic.SystemInterfaces.Web; +using NewRelic.Agent.Core.SharedInterfaces; +using NewRelic.Agent.Core.SharedInterfaces.Web; using NewRelic.Testing.Assertions; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Core.UnitTest.csproj b/tests/Agent/UnitTests/Core.UnitTest/Core.UnitTest.csproj index 7f2ae3fcdd..e15e5eb923 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Core.UnitTest.csproj +++ b/tests/Agent/UnitTests/Core.UnitTest/Core.UnitTest.csproj @@ -43,8 +43,6 @@ - - diff --git a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/CatMapTests.cs b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/CatMapTests.cs index 06514be250..071c2018ec 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/CatMapTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/CatMapTests.cs @@ -22,7 +22,7 @@ using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.CrossApplicationTracing; using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Synthetics; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NewRelic.Testing.Assertions; using Newtonsoft.Json; using NUnit.Framework; diff --git a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/DataTransport/CollectorHostNameTests.cs b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/DataTransport/CollectorHostNameTests.cs index 8bdd611e5d..72f3f3092a 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/DataTransport/CollectorHostNameTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/DataTransport/CollectorHostNameTests.cs @@ -6,8 +6,8 @@ using System.IO; using NUnit.Framework; using NewRelic.Agent.Core.Config; -using NewRelic.SystemInterfaces; -using NewRelic.SystemInterfaces.Web; +using NewRelic.Agent.Core.SharedInterfaces; +using NewRelic.Agent.Core.SharedInterfaces.Web; using Telerik.JustMock; using Newtonsoft.Json.Linq; using NewRelic.Agent.Core.Configuration; diff --git a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/RumTests/RumClientConfigTests.cs b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/RumTests/RumClientConfigTests.cs index e68dbd5356..039a9de4c0 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/RumTests/RumClientConfigTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/RumTests/RumClientConfigTests.cs @@ -24,12 +24,11 @@ using NewRelic.Agent.Core.Fixtures; using NewRelic.Agent.Core.Config; using NewRelic.Agent.Core.Configuration; -using NewRelic.SystemInterfaces; -using NewRelic.SystemInterfaces.Web; +using NewRelic.Agent.Core.SharedInterfaces; +using NewRelic.Agent.Core.SharedInterfaces.Web; 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/CrossAgentTests/ServerSentEvent/ServerSentEventTests.cs b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/ServerSentEvent/ServerSentEventTests.cs index b603a4ef03..0bd5b7b310 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/ServerSentEvent/ServerSentEventTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/ServerSentEvent/ServerSentEventTests.cs @@ -16,8 +16,8 @@ using NewRelic.Agent.Core.Transformers.TransactionTransformer; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.SystemInterfaces; -using NewRelic.SystemInterfaces.Web; +using NewRelic.Agent.Core.SharedInterfaces; +using NewRelic.Agent.Core.SharedInterfaces.Web; using Newtonsoft.Json; using NUnit.Framework; using System; diff --git a/tests/Agent/UnitTests/Core.UnitTest/CustomEvents/CustomEventWireModelTests.cs b/tests/Agent/UnitTests/Core.UnitTest/CustomEvents/CustomEventWireModelTests.cs index c5beda91f5..68416ee456 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/CustomEvents/CustomEventWireModelTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/CustomEvents/CustomEventWireModelTests.cs @@ -7,9 +7,9 @@ using System.Collections.Generic; using NewRelic.Agent.Core.WireModels; using NewRelic.Agent.Core.Transformers; +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/DataTransport/DataTransportServiceTests.cs b/tests/Agent/UnitTests/Core.UnitTest/DataTransport/DataTransportServiceTests.cs index e26ddd0abc..1585c6679c 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/DataTransport/DataTransportServiceTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/DataTransport/DataTransportServiceTests.cs @@ -14,7 +14,7 @@ using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/DataTransport/ServerlessModePayloadManagerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/DataTransport/ServerlessModePayloadManagerTests.cs index 2d3eccd085..6b40009070 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/DataTransport/ServerlessModePayloadManagerTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/DataTransport/ServerlessModePayloadManagerTests.cs @@ -10,7 +10,7 @@ using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; using NewRelic.Agent.TestUtilities; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using Newtonsoft.Json; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Database/SqlParsingCrossAgentTest.cs b/tests/Agent/UnitTests/Core.UnitTest/Database/SqlParsingCrossAgentTest.cs index 725c5b2bfe..b980940190 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Database/SqlParsingCrossAgentTest.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Database/SqlParsingCrossAgentTest.cs @@ -2,13 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Parsing; +using NewRelic.Agent.Extensions.Parsing; using Newtonsoft.Json; using NUnit.Framework; using System; using System.Collections.Generic; using System.Data; -using System.Diagnostics; using System.Linq; using System.Text; using System.Text.RegularExpressions; diff --git a/tests/Agent/UnitTests/Core.UnitTest/DistributedTracing/DistributedTracePayloadTests.cs b/tests/Agent/UnitTests/Core.UnitTest/DistributedTracing/DistributedTracePayloadTests.cs index ec44a25630..7201335894 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/DistributedTracing/DistributedTracePayloadTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/DistributedTracing/DistributedTracePayloadTests.cs @@ -2,11 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 using NewRelic.Agent.Configuration; +using NewRelic.Agent.Core.Utilities; using NUnit.Framework; using System; using Telerik.JustMock; -using NewRelic.Core.DistributedTracing; -using NewRelic.Core; namespace NewRelic.Agent.Core.DistributedTracing { diff --git a/tests/Agent/UnitTests/Core.UnitTest/DistributedTracing/TracingStateTests.cs b/tests/Agent/UnitTests/Core.UnitTest/DistributedTracing/TracingStateTests.cs index cf9aae5992..8ff4072723 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/DistributedTracing/TracingStateTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/DistributedTracing/TracingStateTests.cs @@ -4,9 +4,9 @@ using NUnit.Framework; using System; using System.Collections.Generic; -using NewRelic.Core.DistributedTracing; +using NewRelic.Agent.Core.DistributedTracing; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Core; +using NewRelic.Agent.Core.Utilities; namespace NewRelic.Agent.Core.DistributedTracing { diff --git a/tests/Agent/UnitTests/Core.UnitTest/DistributedTracing/W3CTraceparentTests.cs b/tests/Agent/UnitTests/Core.UnitTest/DistributedTracing/W3CTraceparentTests.cs index 9c3c492bf9..f38751555a 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/DistributedTracing/W3CTraceparentTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/DistributedTracing/W3CTraceparentTests.cs @@ -1,7 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core.DistributedTracing; +using NewRelic.Agent.Core.DistributedTracing; using NUnit.Framework; namespace NewRelic.Agent.Core.DistributedTracing diff --git a/tests/Agent/UnitTests/Core.UnitTest/DistributedTracing/W3CTracestateTests.cs b/tests/Agent/UnitTests/Core.UnitTest/DistributedTracing/W3CTracestateTests.cs index 46e45df39a..82e017beab 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/DistributedTracing/W3CTracestateTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/DistributedTracing/W3CTracestateTests.cs @@ -1,7 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core.DistributedTracing; +using NewRelic.Agent.Core.DistributedTracing; using NUnit.Framework; using System.Collections.Generic; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Errors/ErrorServiceTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Errors/ErrorServiceTests.cs index 9c06a439ed..310879020b 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Errors/ErrorServiceTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Errors/ErrorServiceTests.cs @@ -9,8 +9,8 @@ using NewRelic.Agent.Core.Configuration; using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Utilities; -using NewRelic.SystemInterfaces; -using NewRelic.SystemInterfaces.Web; +using NewRelic.Agent.Core.SharedInterfaces; +using NewRelic.Agent.Core.SharedInterfaces.Web; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/ConvertMetricDataToJsonTests.cs b/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/ConvertMetricDataToJsonTests.cs index b46c34d70d..23f7c0b55e 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/ConvertMetricDataToJsonTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/ConvertMetricDataToJsonTests.cs @@ -9,7 +9,7 @@ using NewRelic.Agent.Core.Metrics; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/DistributedTracePayloadJsonConverterTests.cs b/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/DistributedTracePayloadJsonConverterTests.cs index dcc917a472..26d74e3c38 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/DistributedTracePayloadJsonConverterTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/DistributedTracePayloadJsonConverterTests.cs @@ -1,7 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core.DistributedTracing; +using NewRelic.Agent.Core.DistributedTracing; using NUnit.Framework; using NUnit.Framework.Constraints; using System; diff --git a/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/JsonArrayConverterTests.cs b/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/JsonArrayConverterTests.cs index e6e991b90e..193051abdc 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/JsonArrayConverterTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/JsonArrayConverterTests.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using NewRelic.Agent.Core.Utilities; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using NewRelic.Testing.Assertions; using Newtonsoft.Json; using NUnit.Framework; diff --git a/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/ValidationConstraintTests.cs b/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/ValidationConstraintTests.cs index 26a70e3083..083e78734f 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/ValidationConstraintTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/JsonConverters/ValidationConstraintTests.cs @@ -1,8 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core.DistributedTracing; -using NewRelic.Core.JsonConverters; +using NewRelic.Agent.Core.DistributedTracing; using Newtonsoft.Json.Linq; using NUnit.Framework; using System; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Logging/LoggerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Logging/LoggerTests.cs index a9010a6a46..4950854a9d 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Logging/LoggerTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Logging/LoggerTests.cs @@ -1,4 +1,4 @@ -// Copyright 2020 New Relic, Inc. All rights reserved. +// Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 using System; @@ -25,7 +25,7 @@ public class LoggerTests public void SetUp() { _serilogLogger = Mock.Create(); - Log.Logger = _serilogLogger; + Serilog.Log.Logger = _serilogLogger; _logger = new Logger(); _testMessage = "Test message"; diff --git a/tests/Agent/UnitTests/Core.UnitTest/NewRelic.Agent.Core.FromLegacy/EnvironmentTest.cs b/tests/Agent/UnitTests/Core.UnitTest/NewRelic.Agent.Core.FromLegacy/EnvironmentTest.cs index e5e4f1f926..8c66a034cf 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/NewRelic.Agent.Core.FromLegacy/EnvironmentTest.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/NewRelic.Agent.Core.FromLegacy/EnvironmentTest.cs @@ -5,7 +5,7 @@ using NewRelic.Agent.Configuration; using NewRelic.Agent.Core.Fixtures; using NewRelic.Agent.Core.Utilities; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/NewRelic.Agent.Core.FromLegacy/LoggerBootstrapperTest.cs b/tests/Agent/UnitTests/Core.UnitTest/NewRelic.Agent.Core.FromLegacy/LoggerBootstrapperTest.cs index 2d55b8cb00..26adcd4408 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/NewRelic.Agent.Core.FromLegacy/LoggerBootstrapperTest.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/NewRelic.Agent.Core.FromLegacy/LoggerBootstrapperTest.cs @@ -3,7 +3,7 @@ using System; using NewRelic.Agent.Core.Config; -using NewRelic.Core.Logging; +using NewRelic.Agent.Extensions.Logging; using NUnit.Framework; using System.IO; using NewRelic.Testing.Assertions; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Samplers/CpuSamplerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Samplers/CpuSamplerTests.cs index ea2568d8ca..506c7c477e 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Samplers/CpuSamplerTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Samplers/CpuSamplerTests.cs @@ -4,7 +4,7 @@ using System; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Transformers; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Samplers/MemorySamplerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Samplers/MemorySamplerTests.cs index 398b18fe77..98492f4af6 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Samplers/MemorySamplerTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Samplers/MemorySamplerTests.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Transformers; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Segments/ExternalSegmentDataTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Segments/ExternalSegmentDataTests.cs index 2234d18388..17f1de8812 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Segments/ExternalSegmentDataTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Segments/ExternalSegmentDataTests.cs @@ -8,7 +8,7 @@ using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Data; using NewRelic.Testing.Assertions; using NUnit.Framework; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using NewRelic.Agent.Core.Spans; namespace NewRelic.Agent.Core.Segments.Tests diff --git a/tests/Agent/UnitTests/Core.UnitTest/Segments/ExternalSegmentTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Segments/ExternalSegmentTests.cs index aeac86e27e..a5e47bc1a1 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Segments/ExternalSegmentTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Segments/ExternalSegmentTests.cs @@ -5,7 +5,7 @@ using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.CrossApplicationTracing; using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Data; using NUnit.Framework; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using NewRelic.Agent.Core.Spans; namespace NewRelic.Agent.Core.Segments.Tests diff --git a/tests/Agent/UnitTests/Core.UnitTest/Segments/MessageBrokerSegmentDataTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Segments/MessageBrokerSegmentDataTests.cs index b64227a65f..481a45a33c 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Segments/MessageBrokerSegmentDataTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Segments/MessageBrokerSegmentDataTests.cs @@ -7,7 +7,7 @@ using NewRelic.Agent.Core.Metrics; using NewRelic.Agent.Core.Spans; using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Data; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using NewRelic.Testing.Assertions; using NUnit.Framework; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Segments/MethodSegmentDataTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Segments/MethodSegmentDataTests.cs index 6e4698d875..7cd3a22fda 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Segments/MethodSegmentDataTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Segments/MethodSegmentDataTests.cs @@ -7,7 +7,7 @@ using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Data; using NewRelic.Testing.Assertions; using NUnit.Framework; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using NewRelic.Agent.Core.Spans; namespace NewRelic.Agent.Core.Segments.Tests diff --git a/tests/Agent/UnitTests/Core.UnitTest/Segments/SimpleSegmentDataTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Segments/SimpleSegmentDataTests.cs index 67ea7815c0..e6a7f4bf4c 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Segments/SimpleSegmentDataTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Segments/SimpleSegmentDataTests.cs @@ -7,7 +7,7 @@ using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Data; using NewRelic.Testing.Assertions; using NUnit.Framework; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using Telerik.JustMock; using NewRelic.Agent.Core.Transactions; using NewRelic.Agent.Core.Attributes; diff --git a/tests/NewRelic.Core.Tests/NewRelic.SystemInterfaces/DnsStaticTests.cs b/tests/Agent/UnitTests/Core.UnitTest/SharedInterfaces/DnsStaticTests.cs similarity index 98% rename from tests/NewRelic.Core.Tests/NewRelic.SystemInterfaces/DnsStaticTests.cs rename to tests/Agent/UnitTests/Core.UnitTest/SharedInterfaces/DnsStaticTests.cs index 1f00a9a947..f39952d2af 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.SystemInterfaces/DnsStaticTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/SharedInterfaces/DnsStaticTests.cs @@ -1,14 +1,14 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using System.Collections.Generic; using System.Net; using System.Net.NetworkInformation; using Telerik.JustMock; -namespace NewRelic.Core.Tests.NewRelic.SystemInterfaces +namespace NewRelic.Agent.Core.Tests.SharedInterfaces { [TestFixture] public class DnsStaticTests diff --git a/tests/NewRelic.Core.Tests/NewRelic.SystemInterfaces/NetworkDataTests.cs b/tests/Agent/UnitTests/Core.UnitTest/SharedInterfaces/NetworkDataTests.cs similarity index 98% rename from tests/NewRelic.Core.Tests/NewRelic.SystemInterfaces/NetworkDataTests.cs rename to tests/Agent/UnitTests/Core.UnitTest/SharedInterfaces/NetworkDataTests.cs index 8444cfb15a..f66bc545bd 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.SystemInterfaces/NetworkDataTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/SharedInterfaces/NetworkDataTests.cs @@ -1,14 +1,14 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using System.Collections.Generic; using System.Net; using System.Net.NetworkInformation; using Telerik.JustMock; -namespace NewRelic.Core.Tests.NewRelic.SystemInterfaces +namespace NewRelic.Agent.Core.Tests.SharedInterfaces { [TestFixture] public class NetworkDataTests diff --git a/tests/NewRelic.Core.Tests/NewRelic.SystemInterfaces/PerformanceCounterProxyFactoryTests.cs b/tests/Agent/UnitTests/Core.UnitTest/SharedInterfaces/PerformanceCounterProxyFactoryTests.cs similarity index 99% rename from tests/NewRelic.Core.Tests/NewRelic.SystemInterfaces/PerformanceCounterProxyFactoryTests.cs rename to tests/Agent/UnitTests/Core.UnitTest/SharedInterfaces/PerformanceCounterProxyFactoryTests.cs index 52b6318fcb..89e22a32fd 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.SystemInterfaces/PerformanceCounterProxyFactoryTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/SharedInterfaces/PerformanceCounterProxyFactoryTests.cs @@ -2,14 +2,14 @@ // SPDX-License-Identifier: Apache-2.0 #if NETFRAMEWORK -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using System; using System.Collections.Generic; using System.Linq; using Telerik.JustMock; -namespace NewRelic.Core.Tests.NewRelic.SystemInterfaces +namespace NewRelic.Agent.Core.Tests.SharedInterfaces { [TestFixture] public class PerformanceCounterProxyFactoryTests diff --git a/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventAggregatorInfiniteTracingTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventAggregatorInfiniteTracingTests.cs index 07b53ed41b..eaa81162a5 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventAggregatorInfiniteTracingTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventAggregatorInfiniteTracingTests.cs @@ -14,7 +14,7 @@ using Telerik.JustMock; using NewRelic.Agent.Core.Aggregators; using NewRelic.Agent.Core.AgentHealth; -using NewRelic.Collections; +using NewRelic.Agent.Extensions.Collections; using NewRelic.Agent.Core.Time; namespace NewRelic.Agent.Core.Spans.Tests diff --git a/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventAggregatorTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventAggregatorTests.cs index 0d940d1855..d4bf60b953 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventAggregatorTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventAggregatorTests.cs @@ -11,8 +11,7 @@ using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.Segments; -using NewRelic.Core; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using System; using System.Collections.Generic; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventMakerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventMakerTests.cs index bd1201ef88..916e6b0d54 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventMakerTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanEventMakerTests.cs @@ -24,10 +24,8 @@ using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.TestUtilities; -using NewRelic.Core; -using NewRelic.Parsing; -using NewRelic.SystemInterfaces; -using NewRelic.SystemInterfaces.Web; +using NewRelic.Agent.Core.SharedInterfaces; +using NewRelic.Agent.Core.SharedInterfaces.Web; using NewRelic.Testing.Assertions; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanStreamingServiceTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanStreamingServiceTests.cs index 0faa970afa..f47cec8816 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanStreamingServiceTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Spans/SpanStreamingServiceTests.cs @@ -16,8 +16,8 @@ using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.WireModels; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Collections; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Collections; +using NewRelic.Agent.Core.SharedInterfaces; using NewRelic.Testing.Assertions; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Transactions/ImmutableTransactionBuilder.cs b/tests/Agent/UnitTests/Core.UnitTest/Transactions/ImmutableTransactionBuilder.cs index e89eb10c69..07531232db 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Transactions/ImmutableTransactionBuilder.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Transactions/ImmutableTransactionBuilder.cs @@ -4,8 +4,8 @@ using NewRelic.Agent.Core.Attributes; using NewRelic.Agent.Core.Segments; 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/Transactions/SyntheticsModelTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Transactions/SyntheticsModelTests.cs index 62f38d420e..d854820eb4 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Transactions/SyntheticsModelTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Transactions/SyntheticsModelTests.cs @@ -1,7 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core; +using NewRelic.Agent.Core.Utilities; using NewRelic.Testing.Assertions; using NUnit.Framework; using System.Collections.Generic; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Transactions/TransactionBuilderServiceTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Transactions/TransactionBuilderServiceTests.cs index 3b095ad3dc..3a40357224 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Transactions/TransactionBuilderServiceTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Transactions/TransactionBuilderServiceTests.cs @@ -10,7 +10,6 @@ using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Builders; using NewRelic.Agent.Extensions.Providers; -using NewRelic.Core.DistributedTracing; using NUnit.Framework; using System; using System.Collections.Generic; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/SegmentTreeMakerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/SegmentTreeMakerTests.cs index d8bb8321e0..dcdd54d2ad 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/SegmentTreeMakerTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/SegmentTreeMakerTests.cs @@ -7,7 +7,7 @@ using NewRelic.Agent.Core.Segments; using NewRelic.Agent.Core.Segments.Tests; using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Data; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using NewRelic.Testing.Assertions; using NUnit.Framework; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionAttributeMakerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionAttributeMakerTests.cs index 3de963bc79..364d0073a0 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionAttributeMakerTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionAttributeMakerTests.cs @@ -22,10 +22,8 @@ using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Builders; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.TestUtilities; -using NewRelic.Core; -using NewRelic.Core.DistributedTracing; -using NewRelic.SystemInterfaces; -using NewRelic.SystemInterfaces.Web; +using NewRelic.Agent.Core.SharedInterfaces; +using NewRelic.Agent.Core.SharedInterfaces.Web; using NewRelic.Testing.Assertions; using NUnit.Framework; using System; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionEventMakerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionEventMakerTests.cs index 38afeca11c..d25df0d116 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionEventMakerTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionEventMakerTests.cs @@ -18,7 +18,6 @@ using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Builders; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.TestUtilities; -using NewRelic.Core.DistributedTracing; using NewRelic.Testing.Assertions; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionTransformerSqlTraceTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionTransformerSqlTraceTests.cs index af0ca267f4..f6cf20fa32 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionTransformerSqlTraceTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionTransformerSqlTraceTests.cs @@ -114,7 +114,7 @@ public void SetUp() var dataTransportService = Mock.Create(); var scheduler = Mock.Create(); - var processStatic = Mock.Create(); + var processStatic = Mock.Create(); var agentHealthReporter = Mock.Create(); _sqlTraceAggregator = new SqlTraceAggregator(dataTransportService, scheduler, processStatic, agentHealthReporter); diff --git a/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionTransformerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionTransformerTests.cs index 552fdf7aeb..f06743e099 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionTransformerTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Transformers/TransactionTransformer/TransactionTransformerTests.cs @@ -25,8 +25,8 @@ using NewRelic.Agent.Core.WireModels; using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Builders; using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Data; -using NewRelic.Collections; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Collections; +using NewRelic.Agent.Core.SharedInterfaces; using NewRelic.Testing.Assertions; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/NewRelic.Core.Tests/NewRelic.TypeInstantiation/AppDomainExtensions.cs b/tests/Agent/UnitTests/Core.UnitTest/Utilities/AppDomainExtensions.cs similarity index 98% rename from tests/NewRelic.Core.Tests/NewRelic.TypeInstantiation/AppDomainExtensions.cs rename to tests/Agent/UnitTests/Core.UnitTest/Utilities/AppDomainExtensions.cs index c9808d2302..4453572a8e 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.TypeInstantiation/AppDomainExtensions.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Utilities/AppDomainExtensions.cs @@ -5,7 +5,7 @@ using System; using System.Reflection; -namespace NewRelic.TypeInstantiation.UnitTests +namespace NewRelic.Agent.Core.Utilities { public static class AppDomainExtensions { 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/NewRelic.Core.Tests/DotnetVersionTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Utilities/DotnetVersionTests.cs similarity index 98% rename from tests/NewRelic.Core.Tests/DotnetVersionTests.cs rename to tests/Agent/UnitTests/Core.UnitTest/Utilities/DotnetVersionTests.cs index d3a58feabf..fab02715df 100644 --- a/tests/NewRelic.Core.Tests/DotnetVersionTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Utilities/DotnetVersionTests.cs @@ -3,7 +3,7 @@ using NUnit.Framework; -namespace NewRelic.Core.Tests +namespace NewRelic.Agent.Core.Utilities { [TestFixture] public class DotnetVersionTests diff --git a/tests/NewRelic.Core.Tests/NewRelic.Memoization/MemozierTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Utilities/MemozierTests.cs similarity index 98% rename from tests/NewRelic.Core.Tests/NewRelic.Memoization/MemozierTests.cs rename to tests/Agent/UnitTests/Core.UnitTest/Utilities/MemozierTests.cs index 008a57eba3..504538bfbd 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.Memoization/MemozierTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Utilities/MemozierTests.cs @@ -4,8 +4,7 @@ using System; using NUnit.Framework; - -namespace NewRelic.Memoization.UnitTests +namespace NewRelic.Agent.Core.Utilities { public class MemozierTests { diff --git a/tests/Agent/UnitTests/Core.UnitTest/Utilities/StringsTest.cs b/tests/Agent/UnitTests/Core.UnitTest/Utilities/StringsTest.cs index af027b68dc..3be6cf8d62 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Utilities/StringsTest.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Utilities/StringsTest.cs @@ -1,7 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Core; +using NewRelic.Agent.Core.Utilities; using NUnit.Framework; using System; using System.Collections.Generic; diff --git a/tests/NewRelic.Core.Tests/NewRelic.TypeInstantiation/TypeInstantiator.cs b/tests/Agent/UnitTests/Core.UnitTest/Utilities/TypeInstantiator.cs similarity index 99% rename from tests/NewRelic.Core.Tests/NewRelic.TypeInstantiation/TypeInstantiator.cs rename to tests/Agent/UnitTests/Core.UnitTest/Utilities/TypeInstantiator.cs index b049543842..e8c8d053de 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.TypeInstantiation/TypeInstantiator.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Utilities/TypeInstantiator.cs @@ -16,7 +16,7 @@ public interface IInterface2 { } public interface IInterface3 : IInterface { } -namespace NewRelic.TypeInstantiation.UnitTests +namespace NewRelic.Agent.Core.Utilities { [TestFixture] public class Class_TypeInstantiator diff --git a/tests/Agent/UnitTests/Core.UnitTest/Utilization/UtilizationStoreTest.cs b/tests/Agent/UnitTests/Core.UnitTest/Utilization/UtilizationStoreTest.cs index 7cb1f96502..482e25d87b 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Utilization/UtilizationStoreTest.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Utilization/UtilizationStoreTest.cs @@ -4,7 +4,7 @@ using NewRelic.Agent.Configuration; using NewRelic.Agent.Core.AgentHealth; using NewRelic.Agent.Core.Utilities; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using System.Collections.Generic; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Utilization/VendorInfoTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Utilization/VendorInfoTests.cs index 894883d3f3..18ed7745d5 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Utilization/VendorInfoTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Utilization/VendorInfoTests.cs @@ -7,7 +7,7 @@ using System.Linq; using NewRelic.Agent.Configuration; using NewRelic.Agent.Core.AgentHealth; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Core.SharedInterfaces; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/WireModels/ConcurrentPriorityQueueTests.cs b/tests/Agent/UnitTests/Core.UnitTest/WireModels/ConcurrentPriorityQueueTests.cs index afc903ada1..bba8526afa 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/WireModels/ConcurrentPriorityQueueTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/WireModels/ConcurrentPriorityQueueTests.cs @@ -1,6 +1,7 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 +using NewRelic.Agent.Extensions.Collections; using NUnit.Framework; using System; using System.Collections; 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/LogEventWireModelTests.cs b/tests/Agent/UnitTests/Core.UnitTest/WireModels/LogEventWireModelTests.cs index 5a4222fe21..8fb2774bc7 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/WireModels/LogEventWireModelTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/WireModels/LogEventWireModelTests.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Text; using NewRelic.Agent.Core.Metrics; -using NewRelic.Collections; +using NewRelic.Agent.Extensions.Collections; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/WireModels/MetricWireModelTests.cs b/tests/Agent/UnitTests/Core.UnitTest/WireModels/MetricWireModelTests.cs index 8e1cea281d..fe8b5279b9 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/WireModels/MetricWireModelTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/WireModels/MetricWireModelTests.cs @@ -4,7 +4,7 @@ using NewRelic.Agent.Core.Aggregators; using NewRelic.Agent.Core.Metrics; using NewRelic.Agent.Core.Transformers.TransactionTransformer; -using NewRelic.Core; +using NewRelic.Agent.Core.Utilities; using NewRelic.Testing.Assertions; using Newtonsoft.Json; using NUnit.Framework; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/AgentWrapperApiTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/AgentWrapperApiTests.cs index a32e8dacfb..9740aa5a79 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/AgentWrapperApiTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/AgentWrapperApiTests.cs @@ -34,11 +34,9 @@ using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Synthetics; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.TestUtilities; -using NewRelic.Collections; -using NewRelic.Core; -using NewRelic.Core.DistributedTracing; -using NewRelic.SystemExtensions.Collections.Generic; -using NewRelic.SystemInterfaces; +using NewRelic.Agent.Extensions.Collections; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Core.SharedInterfaces; using NewRelic.Testing.Assertions; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/Builders/DatabaseStatementParserTest.cs b/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/Builders/DatabaseStatementParserTest.cs index bcad02a377..e0d0f3c412 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/Builders/DatabaseStatementParserTest.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/Builders/DatabaseStatementParserTest.cs @@ -6,8 +6,8 @@ using NewRelic.Agent.Core.Events; using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.SystemInterfaces; -using NewRelic.SystemInterfaces.Web; +using NewRelic.Agent.Core.SharedInterfaces; +using NewRelic.Agent.Core.SharedInterfaces.Web; using NUnit.Framework; using System.Data; using System.Threading; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/CrossApplicationTracing/CatHeaderHandlerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/CrossApplicationTracing/CatHeaderHandlerTests.cs index 24f2d0393a..aef38263d4 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/CrossApplicationTracing/CatHeaderHandlerTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/CrossApplicationTracing/CatHeaderHandlerTests.cs @@ -12,8 +12,8 @@ using NewRelic.Agent.Core.Transactions; using NewRelic.Agent.Core.Transformers.TransactionTransformer; using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Builders; -using NewRelic.Core; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Core.Utilities; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using NewRelic.Testing.Assertions; using NUnit.Framework; using System; 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 ac7dcb2e25..6dd22ff559 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/DistributedTracing/DistributedTracePayloadHandlerTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/DistributedTracing/DistributedTracePayloadHandlerTests.cs @@ -13,11 +13,10 @@ using NewRelic.Agent.Core.Segments; using NewRelic.Agent.Core.Time; using NewRelic.Agent.Core.Transactions; +using NewRelic.Agent.Core.Utilities; using NewRelic.Agent.Core.Wrapper.AgentWrapperApi.Builders; using NewRelic.Agent.Extensions.Providers.Wrapper; using NewRelic.Agent.TestUtilities; -using NewRelic.Core; -using NewRelic.Core.DistributedTracing; using NewRelic.Testing.Assertions; using NUnit.Framework; using System; diff --git a/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/DistributedTracing/TracePriorityManagerTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/DistributedTracing/TracePriorityManagerTests.cs index 6be990197d..4816cea208 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/DistributedTracing/TracePriorityManagerTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/DistributedTracing/TracePriorityManagerTests.cs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 using NUnit.Framework; -using NewRelicCore = NewRelic.Core; +using NewRelic.Agent.Core.DistributedTracing; namespace NewRelic.Agent.Core.Wrapper.AgentWrapperApi.DistributedTracing { @@ -14,7 +14,7 @@ public class TracePriorityManagerTests [Test] public void TracePriorityManager_CreateNoSeed() { - var priorityManager = new NewRelicCore.DistributedTracing.TracePriorityManager(); + var priorityManager = new TracePriorityManager(); for (var i = 0; i < 50; ++i) { var priority = priorityManager.Create(); @@ -34,7 +34,7 @@ public void TracePriorityManager_CreateNoSeed() [Test] public void TracePriorityManager_CreateWithSeed() { - var priorityManager = new NewRelicCore.DistributedTracing.TracePriorityManager(SeedForTesting); + var priorityManager = new TracePriorityManager(SeedForTesting); foreach (var expect in Expected) { var priority = priorityManager.Create(); @@ -48,7 +48,7 @@ public void TracePriorityManager_Adjust( [Values(0.0f, 1.0f, 0.5f, 0.000001f)] float adjust ) { - var adjustedPriority = NewRelicCore.DistributedTracing.TracePriorityManager.Adjust(priority, adjust); + var adjustedPriority = TracePriorityManager.Adjust(priority, adjust); Assert.That(adjustedPriority, Is.EqualTo(priority + adjust).Within(Epsilon)); } } diff --git a/tests/NewRelic.Core.Tests/NewRelic.Cache/SimpleCacheTests.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Cache/SimpleCacheTests.cs similarity index 99% rename from tests/NewRelic.Core.Tests/NewRelic.Cache/SimpleCacheTests.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Cache/SimpleCacheTests.cs index d111c1b8a0..e1d2d375b2 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.Cache/SimpleCacheTests.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Cache/SimpleCacheTests.cs @@ -3,10 +3,10 @@ using System; using System.Threading; -using NewRelic.Core.Caching; +using NewRelic.Agent.Extensions.Caching; using NUnit.Framework; -namespace NewRelic.Core.Tests.NewRelic.Cache +namespace Agent.Extensions.Tests.Cache { public class SimpleCacheTests { diff --git a/tests/NewRelic.Core.Tests/NewRelic.Collections/ConcurrentHashSet.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/ConcurrentHashSet.cs similarity index 98% rename from tests/NewRelic.Core.Tests/NewRelic.Collections/ConcurrentHashSet.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/ConcurrentHashSet.cs index 94c2c41b61..85a69a634d 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.Collections/ConcurrentHashSet.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/ConcurrentHashSet.cs @@ -6,11 +6,9 @@ using System.Linq; using System.Threading.Tasks; using NUnit.Framework; +using NewRelic.Agent.Extensions.Collections; - - - -namespace NewRelic.Collections.UnitTests +namespace Agent.Extensions.Tests.Collections { public class Class_ConcurrentHashSet { diff --git a/tests/NewRelic.Core.Tests/NewRelic.Collections/ConcurrentList.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/ConcurrentList.cs similarity index 98% rename from tests/NewRelic.Core.Tests/NewRelic.Collections/ConcurrentList.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/ConcurrentList.cs index 712d12e6a8..50eb5efca7 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.Collections/ConcurrentList.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/ConcurrentList.cs @@ -7,11 +7,9 @@ using System.Linq; using System.Threading.Tasks; using NUnit.Framework; +using NewRelic.Agent.Extensions.Collections; - - - -namespace NewRelic.Collections.UnitTests +namespace Agent.Extensions.Tests.Collections { public class Class_ConcurrentList { diff --git a/tests/NewRelic.Core.Tests/NewRelic.Collections/ConcurrentQueueTests.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/ConcurrentQueueTests.cs similarity index 98% rename from tests/NewRelic.Core.Tests/NewRelic.Collections/ConcurrentQueueTests.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/ConcurrentQueueTests.cs index 6ce4db0e11..7a65aa650e 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.Collections/ConcurrentQueueTests.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/ConcurrentQueueTests.cs @@ -6,11 +6,9 @@ using System.Linq; using System.Threading.Tasks; using NUnit.Framework; +using NewRelic.Agent.Extensions.Collections; - - - -namespace NewRelic.Collections.UnitTests +namespace Agent.Extensions.Tests.Collections { public class ConcurrentQueueTests { diff --git a/tests/NewRelic.Core.Tests/NewRelic.Collections/DisposableCollection.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/DisposableCollection.cs similarity index 97% rename from tests/NewRelic.Core.Tests/NewRelic.Collections/DisposableCollection.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/DisposableCollection.cs index c4264cab38..8763541a1d 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.Collections/DisposableCollection.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/DisposableCollection.cs @@ -3,9 +3,9 @@ using System; using NUnit.Framework; +using NewRelic.Agent.Extensions.Collections; - -namespace NewRelic.Collections.UnitTests +namespace Agent.Extensions.Tests.Collections { [TestFixture] public class Class_DisposableCollection diff --git a/tests/Agent/UnitTests/Core.UnitTest/Utilities/IEnumerableExtensions.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/IEnumerableExtensions.cs similarity index 93% rename from tests/Agent/UnitTests/Core.UnitTest/Utilities/IEnumerableExtensions.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/IEnumerableExtensions.cs index b9f4f0b6bf..cc60a9e39b 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Utilities/IEnumerableExtensions.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/IEnumerableExtensions.cs @@ -3,9 +3,10 @@ using System; using System.Linq; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using NUnit.Framework; -namespace NewRelic.Agent.Core.Utilities +namespace Agent.Extensions.Tests.Collections { [TestFixture] public class Class_IEnumerableExtensions diff --git a/tests/NewRelic.Core.Tests/NewRelic.Collections/PrioritizedNodeTests.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/PrioritizedNodeTests.cs similarity index 99% rename from tests/NewRelic.Core.Tests/NewRelic.Collections/PrioritizedNodeTests.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/PrioritizedNodeTests.cs index b138b0fd31..dc4e42bff3 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.Collections/PrioritizedNodeTests.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/PrioritizedNodeTests.cs @@ -1,11 +1,11 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Collections; +using NewRelic.Agent.Extensions.Collections; using NUnit.Framework; using System.Text; -namespace NewRelic.Core.Tests.NewRelic.Collections +namespace Agent.Extensions.Tests.Collections { internal class Prioritizable : IHasPriority { diff --git a/tests/NewRelic.Core.Tests/NewRelic.Collections/StaticCounterTests.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/StaticCounterTests.cs similarity index 93% rename from tests/NewRelic.Core.Tests/NewRelic.Collections/StaticCounterTests.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/StaticCounterTests.cs index aa9ab39bce..4a3eeb1ccc 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.Collections/StaticCounterTests.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Collections/StaticCounterTests.cs @@ -1,10 +1,10 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -using NewRelic.Collections; +using NewRelic.Agent.Extensions.Collections; using NUnit.Framework; -namespace NewRelic.Core.Tests.NewRelic.Collections +namespace Agent.Extensions.Tests.Collections { class StaticCounterTests { diff --git a/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/NewRelic.Agent.Extensions.Tests.csproj b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/NewRelic.Agent.Extensions.Tests.csproj index 34094b2e8f..fdcc419e94 100644 --- a/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/NewRelic.Agent.Extensions.Tests.csproj +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/NewRelic.Agent.Extensions.Tests.csproj @@ -1,6 +1,6 @@ - net462 + net462;net8.0 Agent.Extensions.Tests NewRelic.Agent.Extensions.Tests Full @@ -22,18 +22,22 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + - + + + + diff --git a/tests/Agent/UnitTests/ParsingTests/ConnectionStringParserTests.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/ConnectionStringParserTests.cs similarity index 99% rename from tests/Agent/UnitTests/ParsingTests/ConnectionStringParserTests.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/ConnectionStringParserTests.cs index 3edc36412c..8c7ff867ea 100644 --- a/tests/Agent/UnitTests/ParsingTests/ConnectionStringParserTests.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/ConnectionStringParserTests.cs @@ -3,7 +3,7 @@ using System.Net; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Parsing.ConnectionString; +using NewRelic.Agent.Extensions.Parsing.ConnectionString; using NUnit.Framework; namespace ParsingTests diff --git a/tests/Agent/UnitTests/ParsingTests/MockDbCommand.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/MockDbCommand.cs similarity index 100% rename from tests/Agent/UnitTests/ParsingTests/MockDbCommand.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/MockDbCommand.cs diff --git a/tests/Agent/UnitTests/ParsingTests/MockDbConnection.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/MockDbConnection.cs similarity index 100% rename from tests/Agent/UnitTests/ParsingTests/MockDbConnection.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/MockDbConnection.cs diff --git a/tests/Agent/UnitTests/ParsingTests/MySqlExplainPlanActionTests.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/MySqlExplainPlanActionTests.cs similarity index 99% rename from tests/Agent/UnitTests/ParsingTests/MySqlExplainPlanActionTests.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/MySqlExplainPlanActionTests.cs index 79c5ac0d9f..0ce5148979 100644 --- a/tests/Agent/UnitTests/ParsingTests/MySqlExplainPlanActionTests.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/MySqlExplainPlanActionTests.cs @@ -6,7 +6,6 @@ using System.Data.SqlClient; using NewRelic.Agent.Extensions.Parsing; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Parsing; using NewRelic.Testing.Assertions; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/ParsingTests/SqlParserTests.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/SqlParserTests.cs similarity index 99% rename from tests/Agent/UnitTests/ParsingTests/SqlParserTests.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/SqlParserTests.cs index 2140289768..ba5ea14fe4 100644 --- a/tests/Agent/UnitTests/ParsingTests/SqlParserTests.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/SqlParserTests.cs @@ -2,7 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 using System; -using NewRelic.Parsing; using System.Data; using System.Text; using NUnit.Framework; diff --git a/tests/Agent/UnitTests/ParsingTests/SqlServerExplainPlanActionTests.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/SqlServerExplainPlanActionTests.cs similarity index 99% rename from tests/Agent/UnitTests/ParsingTests/SqlServerExplainPlanActionTests.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/SqlServerExplainPlanActionTests.cs index c31ce07c24..f2b7f4ef2e 100644 --- a/tests/Agent/UnitTests/ParsingTests/SqlServerExplainPlanActionTests.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/SqlServerExplainPlanActionTests.cs @@ -5,7 +5,7 @@ using System.Data; using System.Data.SqlClient; using System.Linq; -using NewRelic.Parsing; +using NewRelic.Agent.Extensions.Parsing; using NewRelic.Testing.Assertions; using NUnit.Framework; using Telerik.JustMock; diff --git a/tests/Agent/UnitTests/ParsingTests/SqlWrapperHelperTests.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/SqlWrapperHelperTests.cs similarity index 98% rename from tests/Agent/UnitTests/ParsingTests/SqlWrapperHelperTests.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/SqlWrapperHelperTests.cs index 1fadf4ebd4..06be0867cb 100644 --- a/tests/Agent/UnitTests/ParsingTests/SqlWrapperHelperTests.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/SqlWrapperHelperTests.cs @@ -9,10 +9,10 @@ #endif using System.Data.SqlClient; using NewRelic.Agent.Extensions.Providers.Wrapper; -using NewRelic.Parsing; +using NewRelic.Agent.Extensions.Parsing; using NUnit.Framework; -namespace SqlTests +namespace ParsingTests { [TestFixture] public class SqlWrapperHelperTests diff --git a/tests/Agent/UnitTests/ParsingTests/StringsHelperTest.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/StringsHelperTest.cs similarity index 98% rename from tests/Agent/UnitTests/ParsingTests/StringsHelperTest.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/StringsHelperTest.cs index a48bac9799..72ff4eead0 100644 --- a/tests/Agent/UnitTests/ParsingTests/StringsHelperTest.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Parsing/StringsHelperTest.cs @@ -1,10 +1,11 @@ // Copyright 2020 New Relic, Inc. All rights reserved. // SPDX-License-Identifier: Apache-2.0 +using NewRelic.Agent.Extensions.Parsing; using NUnit.Framework; using System; -namespace NewRelic.Parsing +namespace ParsingTests { [TestFixture] public class StringsHelperTest diff --git a/tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/Collections/Generic/DictionaryExtensions.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/Collections/Generic/DictionaryExtensions.cs similarity index 97% rename from tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/Collections/Generic/DictionaryExtensions.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/Collections/Generic/DictionaryExtensions.cs index a60aee4ca7..65c7cf4f50 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/Collections/Generic/DictionaryExtensions.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/Collections/Generic/DictionaryExtensions.cs @@ -4,11 +4,11 @@ #if NETFRAMEWORK using System; using System.Collections.Generic; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using NUnit.Framework; -namespace NewRelic.SystemExtensions.UnitTests.Collections.Generic +namespace Agent.Extensions.Tests.SystemExtensions.Collections.Generic { public class DictionaryExtensions { diff --git a/tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/Collections/Generic/IEnumerableExtensionsTests.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/Collections/Generic/IEnumerableExtensionsTests.cs similarity index 98% rename from tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/Collections/Generic/IEnumerableExtensionsTests.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/Collections/Generic/IEnumerableExtensionsTests.cs index b34ca037e4..4cc88d112e 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/Collections/Generic/IEnumerableExtensionsTests.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/Collections/Generic/IEnumerableExtensionsTests.cs @@ -4,11 +4,11 @@ using System; using System.Collections.Generic; using System.Linq; -using NewRelic.SystemExtensions.Collections.Generic; +using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic; using NUnit.Framework; -namespace NewRelic.SystemExtensions.UnitTests.Collections.Generic +namespace Agent.Extensions.Tests.SystemExtensions.Collections.Generic { public class IEnumerableExtensionsTests { diff --git a/tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/Collections/NameValueCollectionExtensions.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/Collections/NameValueCollectionExtensions.cs similarity index 96% rename from tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/Collections/NameValueCollectionExtensions.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/Collections/NameValueCollectionExtensions.cs index 59420eb230..f0421dc59d 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/Collections/NameValueCollectionExtensions.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/Collections/NameValueCollectionExtensions.cs @@ -3,11 +3,11 @@ using System; using System.Collections.Specialized; -using NewRelic.SystemExtensions.Collections; +using NewRelic.Agent.Extensions.SystemExtensions.Collections; using NUnit.Framework; -namespace NewRelic.SystemExtensions.UnitTests.Collections +namespace Agent.Extensions.Tests.SystemExtensions.Collections { public class NameValueCollectionExtensions { diff --git a/tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/ObjectArrayExtensionsTests.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/ObjectArrayExtensionsTests.cs similarity index 97% rename from tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/ObjectArrayExtensionsTests.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/ObjectArrayExtensionsTests.cs index 06625a586b..30fc4acfa8 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/ObjectArrayExtensionsTests.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/ObjectArrayExtensionsTests.cs @@ -3,9 +3,9 @@ using System; using NUnit.Framework; +using NewRelic.Agent.Extensions.SystemExtensions; - -namespace NewRelic.SystemExtensions.UnitTests +namespace Agent.Extensions.Tests.SystemExtensions { public class ObjectArrayExtensionsTests { diff --git a/tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/StringExtensionsTests.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/StringExtensionsTests.cs similarity index 98% rename from tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/StringExtensionsTests.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/StringExtensionsTests.cs index 49794c6e53..7ac95be547 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/StringExtensionsTests.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/StringExtensionsTests.cs @@ -2,13 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 using System; -using System.Collections.Generic; using System.Text; -using NewRelic.SystemExtensions; -using Newtonsoft.Json.Linq; +using NewRelic.Agent.Extensions.SystemExtensions; using NUnit.Framework; -namespace NewRelic.Core.Tests.NewRelic.SystemExtensions +namespace Agent.Extensions.Tests.SystemExtensions { [TestFixture] public class StringExtensionsTests diff --git a/tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/Threading/ReaderWriterLockSlimExtensions.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/Threading/ReaderWriterLockSlimExtensions.cs similarity index 96% rename from tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/Threading/ReaderWriterLockSlimExtensions.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/Threading/ReaderWriterLockSlimExtensions.cs index 60bd782878..24c65b98ed 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/Threading/ReaderWriterLockSlimExtensions.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/Threading/ReaderWriterLockSlimExtensions.cs @@ -4,11 +4,11 @@ using System; using System.Threading; using System.Threading.Tasks; -using NewRelic.SystemExtensions.Threading; +using NewRelic.Agent.Extensions.SystemExtensions.Threading; using NUnit.Framework; -namespace NewRelic.SystemExtensions.UnitTests.Threading +namespace Agent.Extensions.Tests.SystemExtensions.Threading { public class ReaderWriterLockSlimExtensions { diff --git a/tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/TimeSpanExtensionsTests.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/TimeSpanExtensionsTests.cs similarity index 92% rename from tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/TimeSpanExtensionsTests.cs rename to tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/TimeSpanExtensionsTests.cs index b7b026b7b6..8316728717 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.SystemExtensions/TimeSpanExtensionsTests.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/SystemExtensions/TimeSpanExtensionsTests.cs @@ -3,9 +3,9 @@ using System; using NUnit.Framework; +using NewRelic.Agent.Extensions.SystemExtensions; - -namespace NewRelic.SystemExtensions.UnitTests +namespace NewRAgent.Extensions.Tests.SystemExtensions { public class TimeSpanExtensionsTests { diff --git a/tests/Agent/UnitTests/NewRelic.Agent.TestUtilities/Logging.cs b/tests/Agent/UnitTests/NewRelic.Agent.TestUtilities/Logging.cs index a44bff40d7..627f29eb25 100644 --- a/tests/Agent/UnitTests/NewRelic.Agent.TestUtilities/Logging.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.TestUtilities/Logging.cs @@ -8,7 +8,7 @@ using NewRelic.Agent.Core.Logging; using Serilog.Events; using Serilog; -using Log = NewRelic.Core.Logging.Log; +using Log = NewRelic.Agent.Extensions.Logging.Log; using Logger = NewRelic.Agent.Core.Logging.Logger; namespace NewRelic.Agent.TestUtilities 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 @@ - diff --git a/tests/Agent/UnitTests/ParsingTests/ParsingTests.csproj b/tests/Agent/UnitTests/ParsingTests/ParsingTests.csproj index 4df36323d5..238932baa8 100644 --- a/tests/Agent/UnitTests/ParsingTests/ParsingTests.csproj +++ b/tests/Agent/UnitTests/ParsingTests/ParsingTests.csproj @@ -32,7 +32,6 @@ -