diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 26f8e3bcd..8501480d4 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -101,7 +101,7 @@ jobs: uses: ./.github/workflows/test with: name: 'profiler' - project: 'test/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj' + project: 'test/profiler/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj' - name: Create Docker Image run: .ci/linux/build_docker.sh \ No newline at end of file diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index eb8e81e2f..381b93c3c 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -83,4 +83,4 @@ jobs: uses: ./.github/workflows/test with: name: 'profiler' - project: 'test/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj' \ No newline at end of file + project: 'test/profiler/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj' \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 87c6ed3d7..899af24a8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -17,6 +17,10 @@ 002400000480000094000000060200000024000052534131000400000100010051df3e4d8341d66c6dfbf35b2fda3627d08073156ed98eef81122b94e86ef2e44e7980202d21826e367db9f494c265666ae30869fb4cd1a434d171f6b634aa67fa8ca5b9076d55dc3baa203d3a23b9c1296c9f45d06a45cf89520bef98325958b066d8c626db76dd60d0508af877580accdd0e9f88e46b6421bf09a33de53fe1 0024000004800000940000000602000000240000525341310004000001000100553bc065771cba5728dd48f670a8f93d119fe6f165a3b65dbff073687a014dd033b9a0019cb7d790c7ffaff9e8b5204eb56364ea7e3da5b681136e3082a2c5ae826018f9d1578536923205ad6e9d7d877dffc22d33099c561f3409874fb286641bac5ec51017baf7817cef7dbf727b05d26e1dccc54de08d786398381b5085b2 false + + false + false diff --git a/ElasticApmAgent.sln b/ElasticApmAgent.sln index 97e8910a5..ea46a0cc5 100644 --- a/ElasticApmAgent.sln +++ b/ElasticApmAgent.sln @@ -30,13 +30,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiSamples", "sample\ApiSam EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpListenerSample", "sample\HttpListenerSample\HttpListenerSample.csproj", "{1AAB1A30-42C0-4C76-AE2E-9D7293945D80}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.Benchmarks", "test\Elastic.Apm.Benchmarks\Elastic.Apm.Benchmarks.csproj", "{F069CE99-F418-4BC2-9E44-8F03497D8DA8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.Benchmarks", "benchmarks\Elastic.Apm.Benchmarks\Elastic.Apm.Benchmarks.csproj", "{F069CE99-F418-4BC2-9E44-8F03497D8DA8}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNetFullFrameworkSampleApp", "sample\AspNetFullFrameworkSampleApp\AspNetFullFrameworkSampleApp.csproj", "{C45DCD78-7E8A-437C-ABBB-01D154ABCFC4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApiSample", "sample\WebApiSample\WebApiSample.csproj", "{319E2094-D2E1-46C5-8985-9693CD8DDCBD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.Docker.Tests", "test\Elastic.Apm.Docker.Tests\Elastic.Apm.Docker.Tests.csproj", "{40B47FD4-6E67-4D52-B9A4-607B9D01D9F5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.Docker.Tests", "test\instrumentations\Elastic.Apm.Docker.Tests\Elastic.Apm.Docker.Tests.csproj", "{40B47FD4-6E67-4D52-B9A4-607B9D01D9F5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.AspNetFullFramework.Tests", "test\Elastic.Apm.AspNetFullFramework.Tests\Elastic.Apm.AspNetFullFramework.Tests.csproj", "{4253798D-A160-40B3-8F16-5BF64C559B93}" EndProject @@ -44,29 +44,29 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.Tests.MockApmSe EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ci", ".ci\ci.csproj", "{9AAC1E7A-5887-46BC-96DA-DDFFF0F7CDC2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.EntityFrameworkCore.Tests", "test\Elastic.Apm.EntityFrameworkCore.Tests\Elastic.Apm.EntityFrameworkCore.Tests.csproj", "{79BEA612-E2C8-47FD-84DC-A1B17AAD5038}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.EntityFrameworkCore.Tests", "test\instrumentations\Elastic.Apm.EntityFrameworkCore.Tests\Elastic.Apm.EntityFrameworkCore.Tests.csproj", "{79BEA612-E2C8-47FD-84DC-A1B17AAD5038}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.SqlClient.Tests", "test\Elastic.Apm.SqlClient.Tests\Elastic.Apm.SqlClient.Tests.csproj", "{968E1E85-E996-42DE-9845-D20DAE16165A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.SqlClient.Tests", "test\instrumentations\Elastic.Apm.SqlClient.Tests\Elastic.Apm.SqlClient.Tests.csproj", "{968E1E85-E996-42DE-9845-D20DAE16165A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.Feature.Tests", "test\Elastic.Apm.Feature.Tests\Elastic.Apm.Feature.Tests.csproj", "{A4EF875C-92AD-4538-AFF1-1DA277F1085A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleConsoleNetCoreApp", "sample\SampleConsoleNetCoreApp\SampleConsoleNetCoreApp.csproj", "{00AD0047-92A6-48CC-B67D-A3DB2812CE28}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.Elasticsearch.Tests", "test\Elastic.Apm.Elasticsearch.Tests\Elastic.Apm.Elasticsearch.Tests.csproj", "{E30DEF03-4E0B-46A0-87D0-E80545D99BBA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.Elasticsearch.Tests", "test\instrumentations\Elastic.Apm.Elasticsearch.Tests\Elastic.Apm.Elasticsearch.Tests.csproj", "{E30DEF03-4E0B-46A0-87D0-E80545D99BBA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ElasticsearchSample", "sample\ElasticsearchSample\ElasticsearchSample.csproj", "{0FE5E852-E3AF-45F9-BF3A-8CD739C0807F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GrpcServiceSample", "sample\GrpcServiceSample\GrpcServiceSample.csproj", "{6E6B9E49-EE42-4EB6-8248-BEEC8522937B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GrpcServiceSample", "test\instrumentations\grpc\GrpcServiceSample\GrpcServiceSample.csproj", "{6E6B9E49-EE42-4EB6-8248-BEEC8522937B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GrpcClientSample", "sample\GrpcClientSample\GrpcClientSample.csproj", "{CC52EA80-5E18-4370-ACB3-9424B6BB6B68}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GrpcClientSample", "test\instrumentations\grpc\GrpcClientSample\GrpcClientSample.csproj", "{CC52EA80-5E18-4370-ACB3-9424B6BB6B68}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.Grpc.Tests", "test\Elastic.Apm.Grpc.Tests\Elastic.Apm.Grpc.Tests.csproj", "{3AD5584E-057A-4C52-84EA-32A9BBE12F03}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.Grpc.Tests", "test\instrumentations\grpc\Elastic.Apm.Grpc.Tests\Elastic.Apm.Grpc.Tests.csproj", "{3AD5584E-057A-4C52-84EA-32A9BBE12F03}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.Extensions.Hosting.Tests", "test\Elastic.Apm.Extensions.Hosting.Tests\Elastic.Apm.Extensions.Hosting.Tests.csproj", "{3CCB9193-8416-49AF-A1A3-8D1118CFB25B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StackExchangeRedisSample", "sample\StackExchangeRedisSample\StackExchangeRedisSample.csproj", "{9FBC8D8C-E600-464D-AE4E-AC1FB59485F6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.StackExchange.Redis.Tests", "test\Elastic.Apm.StackExchange.Redis.Tests\Elastic.Apm.StackExchange.Redis.Tests.csproj", "{6D413E0A-1CB7-4A2D-8E99-DB4F58D3463E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.StackExchange.Redis.Tests", "test\instrumentations\Elastic.Apm.StackExchange.Redis.Tests\Elastic.Apm.StackExchange.Redis.Tests.csproj", "{6D413E0A-1CB7-4A2D-8E99-DB4F58D3463E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.Specification", "src\Elastic.Apm.Specification\Elastic.Apm.Specification.csproj", "{5D076C7F-1F8B-4B11-9910-48717D133963}" EndProject @@ -84,47 +84,47 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.StartupHook.Tes EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.Extensions.Logging.Tests", "test\Elastic.Apm.Extensions.Logging.Tests\Elastic.Apm.Extensions.Logging.Tests.csproj", "{B235B13F-42AE-42DA-A3C8-20D047F38685}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.MongoDb.Tests", "test\Elastic.Apm.MongoDb.Tests\Elastic.Apm.MongoDb.Tests.csproj", "{FB07C133-C353-4061-A308-B9A6EF48AB7E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Apm.MongoDb.Tests", "test\instrumentations\Elastic.Apm.MongoDb.Tests\Elastic.Apm.MongoDb.Tests.csproj", "{FB07C133-C353-4061-A308-B9A6EF48AB7E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Apm.Azure.ServiceBus.Tests", "test\Elastic.Apm.Azure.ServiceBus.Tests\Elastic.Apm.Azure.ServiceBus.Tests.csproj", "{D9CC53B2-5F6B-434B-8689-2350F3A9FB2D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Apm.Azure.ServiceBus.Tests", "test\azure\Elastic.Apm.Azure.ServiceBus.Tests\Elastic.Apm.Azure.ServiceBus.Tests.csproj", "{D9CC53B2-5F6B-434B-8689-2350F3A9FB2D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Apm.Azure.ServiceBus.Sample", "sample\Elastic.Apm.Azure.ServiceBus.Sample\Elastic.Apm.Azure.ServiceBus.Sample.csproj", "{27563B4E-ECB1-4F1B-B9F1-22C2C165B270}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Apm.Azure.Storage.Tests", "test\Elastic.Apm.Azure.Storage.Tests\Elastic.Apm.Azure.Storage.Tests.csproj", "{37BD6194-A47B-4D17-BB9A-642E8909DED9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Apm.Azure.Storage.Tests", "test\azure\Elastic.Apm.Azure.Storage.Tests\Elastic.Apm.Azure.Storage.Tests.csproj", "{37BD6194-A47B-4D17-BB9A-642E8909DED9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Apm.Azure.CosmosDb.Tests", "test\Elastic.Apm.Azure.CosmosDb.Tests\Elastic.Apm.Azure.CosmosDb.Tests.csproj", "{0EEA16C4-C7DF-4D90-94C2-009417D765AC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Apm.Azure.CosmosDb.Tests", "test\azure\Elastic.Apm.Azure.CosmosDb.Tests\Elastic.Apm.Azure.CosmosDb.Tests.csproj", "{0EEA16C4-C7DF-4D90-94C2-009417D765AC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NpgsqlSample", "sample\NpgsqlSample\NpgsqlSample.csproj", "{BA2D3FCD-C25E-4E34-9A30-BE1FB16E1841}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NpgsqlSample", "test\profiler\applications\NpgsqlSample\NpgsqlSample.csproj", "{BA2D3FCD-C25E-4E34-9A30-BE1FB16E1841}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Apm.Profiler.Managed.Tests", "test\Elastic.Apm.Profiler.Managed.Tests\Elastic.Apm.Profiler.Managed.Tests.csproj", "{4983083A-87AD-496E-B0BC-84C8097D0590}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Apm.Profiler.Managed.Tests", "test\profiler\Elastic.Apm.Profiler.Managed.Tests\Elastic.Apm.Profiler.Managed.Tests.csproj", "{4983083A-87AD-496E-B0BC-84C8097D0590}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Apm.AdoNet", "sample\Elastic.Apm.AdoNet\Elastic.Apm.AdoNet.csproj", "{14BEE605-6180-4B9E-87F5-A24BA79461B5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Apm.AdoNet", "test\profiler\applications\Elastic.Apm.AdoNet\Elastic.Apm.AdoNet.csproj", "{14BEE605-6180-4B9E-87F5-A24BA79461B5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Apm.AdoNet.NetStandard", "sample\Elastic.Apm.AdoNet.NetStandard\Elastic.Apm.AdoNet.NetStandard.csproj", "{AAB983A1-6080-449D-95D8-7E7BA05DDFAA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Apm.AdoNet.NetStandard", "test\profiler\applications\Elastic.Apm.AdoNet.NetStandard\Elastic.Apm.AdoNet.NetStandard.csproj", "{AAB983A1-6080-449D-95D8-7E7BA05DDFAA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySqlDataSample", "sample\MySqlDataSample\MySqlDataSample.csproj", "{346D3A9A-1296-4915-BB6C-8533731D3B3B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySqlDataSample", "test\profiler\applications\MySqlDataSample\MySqlDataSample.csproj", "{346D3A9A-1296-4915-BB6C-8533731D3B3B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqliteSample", "sample\SqliteSample\SqliteSample.csproj", "{F72182DC-A933-4C4B-8321-830D0DFB857C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqliteSample", "test\profiler\applications\SqliteSample\SqliteSample.csproj", "{F72182DC-A933-4C4B-8321-830D0DFB857C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OracleManagedDataAccessSample", "sample\OracleManagedDataAccessSample\OracleManagedDataAccessSample.csproj", "{FFA9A7E4-954F-47A1-A9FD-0FE07EB846C6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OracleManagedDataAccessSample", "test\profiler\applications\OracleManagedDataAccessSample\OracleManagedDataAccessSample.csproj", "{FFA9A7E4-954F-47A1-A9FD-0FE07EB846C6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OracleManagedDataAccessCoreSample", "sample\OracleManagedDataAccessCoreSample\OracleManagedDataAccessCoreSample.csproj", "{8CF18906-150C-4AD9-B108-2A39B31105C5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OracleManagedDataAccessCoreSample", "test\profiler\applications\OracleManagedDataAccessCoreSample\OracleManagedDataAccessCoreSample.csproj", "{8CF18906-150C-4AD9-B108-2A39B31105C5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlClientSample", "sample\SqlClientSample\SqlClientSample.csproj", "{456A8639-FE1B-426A-9C72-5252AB4D3AD5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlClientSample", "test\profiler\applications\SqlClientSample\SqlClientSample.csproj", "{456A8639-FE1B-426A-9C72-5252AB4D3AD5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KafkaSample", "sample\KafkaSample\KafkaSample.csproj", "{2B23487A-B340-4F5C-A49B-9B829F437A5A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KafkaSample", "test\profiler\applications\KafkaSample\KafkaSample.csproj", "{2B23487A-B340-4F5C-A49B-9B829F437A5A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMqSample", "sample\RabbitMqSample\RabbitMqSample.csproj", "{1D6B0C67-42C8-4AB4-A795-B6FF8EF7196E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMqSample", "test\profiler\applications\RabbitMqSample\RabbitMqSample.csproj", "{1D6B0C67-42C8-4AB4-A795-B6FF8EF7196E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTelemetrySample", "sample\OpenTelemetrySample\OpenTelemetrySample.csproj", "{3D31589A-CA44-4D6D-9944-26CE9640A283}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SatelliteAssemblySample", "sample\SatelliteAssemblySample\SatelliteAssemblySample.csproj", "{2B62E740-A493-42D6-BE5E-709BD07F877E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SatelliteAssemblySample", "test\profiler\applications\SatelliteAssemblySample\SatelliteAssemblySample.csproj", "{2B62E740-A493-42D6-BE5E-709BD07F877E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Apm.Azure.Functions.Tests", "test\Elastic.Apm.Azure.Functions.Tests\Elastic.Apm.Azure.Functions.Tests.csproj", "{8E3D94CD-3378-4431-8956-07644A64D4E8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Apm.Azure.Functions.Tests", "test\azure\Elastic.Apm.Azure.Functions.Tests\Elastic.Apm.Azure.Functions.Tests.csproj", "{8E3D94CD-3378-4431-8956-07644A64D4E8}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.AzureFunctionApp.Isolated", "sample\Elastic.AzureFunctionApp.Isolated\Elastic.AzureFunctionApp.Isolated.csproj", "{9879E646-63ED-474C-905B-1B469403F0A5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Clients.Elasticsearch.Tests", "test\Elastic.Clients.Elasticsearch.Tests\Elastic.Clients.Elasticsearch.Tests.csproj", "{E6217549-8C21-4E95-BDF2-E782922CD104}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Clients.Elasticsearch.Tests", "test\instrumentations\Elastic.Clients.Elasticsearch.Tests\Elastic.Clients.Elasticsearch.Tests.csproj", "{E6217549-8C21-4E95-BDF2-E782922CD104}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = ".github", ".github\.github.csproj", "{A880940E-31FC-4934-80FC-5A9E3DFED7CA}" EndProject @@ -194,6 +194,21 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "docs", "docs\docs.csproj", EndProject Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "build", "build\build.fsproj", "{69C34D4F-13A5-43DE-A126-954B85F8A33E}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{2825A761-5372-4620-99AB-253AD953E8CD}" + ProjectSection(SolutionItems) = preProject + benchmarks\Directory.Build.props = benchmarks\Directory.Build.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "profiler", "profiler", "{E38F295C-05DD-4328-A2BD-2868754624B7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "applications", "applications", "{6BBD3167-D9DE-4165-9A95-84940CD37D93}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "azure", "azure", "{C2378D3C-2BA8-410F-AEF7-547C411C71C7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "instrumentations", "instrumentations", "{4F060027-5614-4C64-9338-128C7E9CE8A4}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "grpc", "grpc", "{8B6EE9D6-8A1B-4F85-AE4C-D03E42DBDDEA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -533,24 +548,15 @@ Global {36D72723-2161-4322-A04B-E97D0CB48EF6} = {267A241E-571F-458F-B04C-B6C4DE79E735} {19C9C1BA-4BCC-4708-92C3-8F5AE18B44F8} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} {1AAB1A30-42C0-4C76-AE2E-9D7293945D80} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {F069CE99-F418-4BC2-9E44-8F03497D8DA8} = {267A241E-571F-458F-B04C-B6C4DE79E735} {C45DCD78-7E8A-437C-ABBB-01D154ABCFC4} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} {319E2094-D2E1-46C5-8985-9693CD8DDCBD} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {40B47FD4-6E67-4D52-B9A4-607B9D01D9F5} = {267A241E-571F-458F-B04C-B6C4DE79E735} {4253798D-A160-40B3-8F16-5BF64C559B93} = {267A241E-571F-458F-B04C-B6C4DE79E735} {AFFB238B-10C0-4229-9527-184EFCF0F5AC} = {267A241E-571F-458F-B04C-B6C4DE79E735} - {79BEA612-E2C8-47FD-84DC-A1B17AAD5038} = {267A241E-571F-458F-B04C-B6C4DE79E735} - {968E1E85-E996-42DE-9845-D20DAE16165A} = {267A241E-571F-458F-B04C-B6C4DE79E735} {A4EF875C-92AD-4538-AFF1-1DA277F1085A} = {267A241E-571F-458F-B04C-B6C4DE79E735} {00AD0047-92A6-48CC-B67D-A3DB2812CE28} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {E30DEF03-4E0B-46A0-87D0-E80545D99BBA} = {267A241E-571F-458F-B04C-B6C4DE79E735} {0FE5E852-E3AF-45F9-BF3A-8CD739C0807F} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {6E6B9E49-EE42-4EB6-8248-BEEC8522937B} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {CC52EA80-5E18-4370-ACB3-9424B6BB6B68} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {3AD5584E-057A-4C52-84EA-32A9BBE12F03} = {267A241E-571F-458F-B04C-B6C4DE79E735} {3CCB9193-8416-49AF-A1A3-8D1118CFB25B} = {267A241E-571F-458F-B04C-B6C4DE79E735} {9FBC8D8C-E600-464D-AE4E-AC1FB59485F6} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {6D413E0A-1CB7-4A2D-8E99-DB4F58D3463E} = {267A241E-571F-458F-B04C-B6C4DE79E735} {5D076C7F-1F8B-4B11-9910-48717D133963} = {3734A52F-2222-454B-BF58-1BA5C1F29D77} {2250D888-E4CC-4B2B-AF31-5C78D76EC73D} = {267A241E-571F-458F-B04C-B6C4DE79E735} {43F9247D-544B-49FB-9E50-FC236D90DE1A} = {267A241E-571F-458F-B04C-B6C4DE79E735} @@ -559,27 +565,9 @@ Global {B168C594-0314-4201-A55B-13DBBE2796FE} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} {9AE4805D-2586-4FA5-A0D0-885264EBC565} = {267A241E-571F-458F-B04C-B6C4DE79E735} {B235B13F-42AE-42DA-A3C8-20D047F38685} = {267A241E-571F-458F-B04C-B6C4DE79E735} - {D9CC53B2-5F6B-434B-8689-2350F3A9FB2D} = {267A241E-571F-458F-B04C-B6C4DE79E735} {27563B4E-ECB1-4F1B-B9F1-22C2C165B270} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {37BD6194-A47B-4D17-BB9A-642E8909DED9} = {267A241E-571F-458F-B04C-B6C4DE79E735} - {FB07C133-C353-4061-A308-B9A6EF48AB7E} = {267A241E-571F-458F-B04C-B6C4DE79E735} - {0EEA16C4-C7DF-4D90-94C2-009417D765AC} = {267A241E-571F-458F-B04C-B6C4DE79E735} - {BA2D3FCD-C25E-4E34-9A30-BE1FB16E1841} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {4983083A-87AD-496E-B0BC-84C8097D0590} = {267A241E-571F-458F-B04C-B6C4DE79E735} - {14BEE605-6180-4B9E-87F5-A24BA79461B5} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {AAB983A1-6080-449D-95D8-7E7BA05DDFAA} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {346D3A9A-1296-4915-BB6C-8533731D3B3B} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {F72182DC-A933-4C4B-8321-830D0DFB857C} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {FFA9A7E4-954F-47A1-A9FD-0FE07EB846C6} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {8CF18906-150C-4AD9-B108-2A39B31105C5} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {456A8639-FE1B-426A-9C72-5252AB4D3AD5} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {2B23487A-B340-4F5C-A49B-9B829F437A5A} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {1D6B0C67-42C8-4AB4-A795-B6FF8EF7196E} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} {3D31589A-CA44-4D6D-9944-26CE9640A283} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {2B62E740-A493-42D6-BE5E-709BD07F877E} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {8E3D94CD-3378-4431-8956-07644A64D4E8} = {267A241E-571F-458F-B04C-B6C4DE79E735} {9879E646-63ED-474C-905B-1B469403F0A5} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} - {E6217549-8C21-4E95-BDF2-E782922CD104} = {267A241E-571F-458F-B04C-B6C4DE79E735} {BCE93684-0A40-4F5F-8FB5-94DE94B111E1} = {3C791D9C-6F19-4F46-B367-2EC0F818762D} {C6A7CA94-9D06-4CA1-BAEA-43B607BF939D} = {3734A52F-2222-454B-BF58-1BA5C1F29D77} {42F4F13C-0515-4501-A27B-9815BFF63807} = {C6A7CA94-9D06-4CA1-BAEA-43B607BF939D} @@ -611,6 +599,38 @@ Global {439BA5FA-5977-48E3-9FED-10F28CD2D3D1} = {3AC678A8-121F-4E78-A926-66ACA382D5AA} {CD8BF331-B689-48F8-9858-368B7196EBD5} = {3AC678A8-121F-4E78-A926-66ACA382D5AA} {235596AC-E683-4D2E-B328-CDA79CDB7DC8} = {3AC678A8-121F-4E78-A926-66ACA382D5AA} + {F069CE99-F418-4BC2-9E44-8F03497D8DA8} = {2825A761-5372-4620-99AB-253AD953E8CD} + {E38F295C-05DD-4328-A2BD-2868754624B7} = {267A241E-571F-458F-B04C-B6C4DE79E735} + {4983083A-87AD-496E-B0BC-84C8097D0590} = {E38F295C-05DD-4328-A2BD-2868754624B7} + {6BBD3167-D9DE-4165-9A95-84940CD37D93} = {E38F295C-05DD-4328-A2BD-2868754624B7} + {346D3A9A-1296-4915-BB6C-8533731D3B3B} = {6BBD3167-D9DE-4165-9A95-84940CD37D93} + {8CF18906-150C-4AD9-B108-2A39B31105C5} = {6BBD3167-D9DE-4165-9A95-84940CD37D93} + {FFA9A7E4-954F-47A1-A9FD-0FE07EB846C6} = {6BBD3167-D9DE-4165-9A95-84940CD37D93} + {456A8639-FE1B-426A-9C72-5252AB4D3AD5} = {6BBD3167-D9DE-4165-9A95-84940CD37D93} + {F72182DC-A933-4C4B-8321-830D0DFB857C} = {6BBD3167-D9DE-4165-9A95-84940CD37D93} + {2B23487A-B340-4F5C-A49B-9B829F437A5A} = {6BBD3167-D9DE-4165-9A95-84940CD37D93} + {1D6B0C67-42C8-4AB4-A795-B6FF8EF7196E} = {6BBD3167-D9DE-4165-9A95-84940CD37D93} + {2B62E740-A493-42D6-BE5E-709BD07F877E} = {6BBD3167-D9DE-4165-9A95-84940CD37D93} + {BA2D3FCD-C25E-4E34-9A30-BE1FB16E1841} = {6BBD3167-D9DE-4165-9A95-84940CD37D93} + {14BEE605-6180-4B9E-87F5-A24BA79461B5} = {6BBD3167-D9DE-4165-9A95-84940CD37D93} + {AAB983A1-6080-449D-95D8-7E7BA05DDFAA} = {6BBD3167-D9DE-4165-9A95-84940CD37D93} + {C2378D3C-2BA8-410F-AEF7-547C411C71C7} = {267A241E-571F-458F-B04C-B6C4DE79E735} + {0EEA16C4-C7DF-4D90-94C2-009417D765AC} = {C2378D3C-2BA8-410F-AEF7-547C411C71C7} + {8E3D94CD-3378-4431-8956-07644A64D4E8} = {C2378D3C-2BA8-410F-AEF7-547C411C71C7} + {D9CC53B2-5F6B-434B-8689-2350F3A9FB2D} = {C2378D3C-2BA8-410F-AEF7-547C411C71C7} + {37BD6194-A47B-4D17-BB9A-642E8909DED9} = {C2378D3C-2BA8-410F-AEF7-547C411C71C7} + {4F060027-5614-4C64-9338-128C7E9CE8A4} = {267A241E-571F-458F-B04C-B6C4DE79E735} + {E6217549-8C21-4E95-BDF2-E782922CD104} = {4F060027-5614-4C64-9338-128C7E9CE8A4} + {6D413E0A-1CB7-4A2D-8E99-DB4F58D3463E} = {4F060027-5614-4C64-9338-128C7E9CE8A4} + {968E1E85-E996-42DE-9845-D20DAE16165A} = {4F060027-5614-4C64-9338-128C7E9CE8A4} + {FB07C133-C353-4061-A308-B9A6EF48AB7E} = {4F060027-5614-4C64-9338-128C7E9CE8A4} + {E30DEF03-4E0B-46A0-87D0-E80545D99BBA} = {4F060027-5614-4C64-9338-128C7E9CE8A4} + {79BEA612-E2C8-47FD-84DC-A1B17AAD5038} = {4F060027-5614-4C64-9338-128C7E9CE8A4} + {40B47FD4-6E67-4D52-B9A4-607B9D01D9F5} = {4F060027-5614-4C64-9338-128C7E9CE8A4} + {8B6EE9D6-8A1B-4F85-AE4C-D03E42DBDDEA} = {4F060027-5614-4C64-9338-128C7E9CE8A4} + {CC52EA80-5E18-4370-ACB3-9424B6BB6B68} = {8B6EE9D6-8A1B-4F85-AE4C-D03E42DBDDEA} + {6E6B9E49-EE42-4EB6-8248-BEEC8522937B} = {8B6EE9D6-8A1B-4F85-AE4C-D03E42DBDDEA} + {3AD5584E-057A-4C52-84EA-32A9BBE12F03} = {8B6EE9D6-8A1B-4F85-AE4C-D03E42DBDDEA} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {69E02FD9-C9DE-412C-AB6B-5B8BECC6BFA5} diff --git a/benchmarks/Directory.Build.props b/benchmarks/Directory.Build.props new file mode 100644 index 000000000..7dd58a749 --- /dev/null +++ b/benchmarks/Directory.Build.props @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/test/Elastic.Apm.Benchmarks/AspNetCorePerf/AspNetCoreLoadTestWithAgent.cs b/benchmarks/Elastic.Apm.Benchmarks/AspNetCorePerf/AspNetCoreLoadTestWithAgent.cs similarity index 100% rename from test/Elastic.Apm.Benchmarks/AspNetCorePerf/AspNetCoreLoadTestWithAgent.cs rename to benchmarks/Elastic.Apm.Benchmarks/AspNetCorePerf/AspNetCoreLoadTestWithAgent.cs diff --git a/test/Elastic.Apm.Benchmarks/AspNetCorePerf/AspNetCoreLoadTestWithoutAgent.cs b/benchmarks/Elastic.Apm.Benchmarks/AspNetCorePerf/AspNetCoreLoadTestWithoutAgent.cs similarity index 100% rename from test/Elastic.Apm.Benchmarks/AspNetCorePerf/AspNetCoreLoadTestWithoutAgent.cs rename to benchmarks/Elastic.Apm.Benchmarks/AspNetCorePerf/AspNetCoreLoadTestWithoutAgent.cs diff --git a/test/Elastic.Apm.Benchmarks/AspNetCorePerf/AspNetCoreSampleRunner.cs b/benchmarks/Elastic.Apm.Benchmarks/AspNetCorePerf/AspNetCoreSampleRunner.cs similarity index 100% rename from test/Elastic.Apm.Benchmarks/AspNetCorePerf/AspNetCoreSampleRunner.cs rename to benchmarks/Elastic.Apm.Benchmarks/AspNetCorePerf/AspNetCoreSampleRunner.cs diff --git a/test/Elastic.Apm.Benchmarks/DroppedSpansStats.cs b/benchmarks/Elastic.Apm.Benchmarks/DroppedSpansStats.cs similarity index 100% rename from test/Elastic.Apm.Benchmarks/DroppedSpansStats.cs rename to benchmarks/Elastic.Apm.Benchmarks/DroppedSpansStats.cs diff --git a/test/Elastic.Apm.Benchmarks/Elastic.Apm.Benchmarks.csproj b/benchmarks/Elastic.Apm.Benchmarks/Elastic.Apm.Benchmarks.csproj similarity index 82% rename from test/Elastic.Apm.Benchmarks/Elastic.Apm.Benchmarks.csproj rename to benchmarks/Elastic.Apm.Benchmarks/Elastic.Apm.Benchmarks.csproj index 41c1640d5..a4c2cc060 100644 --- a/test/Elastic.Apm.Benchmarks/Elastic.Apm.Benchmarks.csproj +++ b/benchmarks/Elastic.Apm.Benchmarks/Elastic.Apm.Benchmarks.csproj @@ -16,8 +16,7 @@ - - + diff --git a/test/Elastic.Apm.Benchmarks/Helpers/GitInfo.cs b/benchmarks/Elastic.Apm.Benchmarks/Helpers/GitInfo.cs similarity index 100% rename from test/Elastic.Apm.Benchmarks/Helpers/GitInfo.cs rename to benchmarks/Elastic.Apm.Benchmarks/Helpers/GitInfo.cs diff --git a/test/Elastic.Apm.Benchmarks/MetricsBenchmarks.cs b/benchmarks/Elastic.Apm.Benchmarks/MetricsBenchmarks.cs similarity index 100% rename from test/Elastic.Apm.Benchmarks/MetricsBenchmarks.cs rename to benchmarks/Elastic.Apm.Benchmarks/MetricsBenchmarks.cs diff --git a/test/Elastic.Apm.Benchmarks/PerfTestLogger.cs b/benchmarks/Elastic.Apm.Benchmarks/PerfTestLogger.cs similarity index 100% rename from test/Elastic.Apm.Benchmarks/PerfTestLogger.cs rename to benchmarks/Elastic.Apm.Benchmarks/PerfTestLogger.cs diff --git a/test/Elastic.Apm.Benchmarks/Program.cs b/benchmarks/Elastic.Apm.Benchmarks/Program.cs similarity index 100% rename from test/Elastic.Apm.Benchmarks/Program.cs rename to benchmarks/Elastic.Apm.Benchmarks/Program.cs diff --git a/test/Elastic.Apm.Benchmarks/PropertyFetcherBenchmark.cs b/benchmarks/Elastic.Apm.Benchmarks/PropertyFetcherBenchmark.cs similarity index 100% rename from test/Elastic.Apm.Benchmarks/PropertyFetcherBenchmark.cs rename to benchmarks/Elastic.Apm.Benchmarks/PropertyFetcherBenchmark.cs diff --git a/test/Elastic.Apm.Benchmarks/SignatureParserBenchmark.cs b/benchmarks/Elastic.Apm.Benchmarks/SignatureParserBenchmark.cs similarity index 100% rename from test/Elastic.Apm.Benchmarks/SignatureParserBenchmark.cs rename to benchmarks/Elastic.Apm.Benchmarks/SignatureParserBenchmark.cs diff --git a/test/Elastic.Apm.Benchmarks/TestResources/db/sql_signature_examples.json b/benchmarks/Elastic.Apm.Benchmarks/TestResources/db/sql_signature_examples.json similarity index 100% rename from test/Elastic.Apm.Benchmarks/TestResources/db/sql_signature_examples.json rename to benchmarks/Elastic.Apm.Benchmarks/TestResources/db/sql_signature_examples.json diff --git a/test/Elastic.Apm.Benchmarks/TraceParentBenchmarks.cs b/benchmarks/Elastic.Apm.Benchmarks/TraceParentBenchmarks.cs similarity index 100% rename from test/Elastic.Apm.Benchmarks/TraceParentBenchmarks.cs rename to benchmarks/Elastic.Apm.Benchmarks/TraceParentBenchmarks.cs diff --git a/test/Elastic.Apm.Benchmarks/TracerBenchmarks.cs b/benchmarks/Elastic.Apm.Benchmarks/TracerBenchmarks.cs similarity index 100% rename from test/Elastic.Apm.Benchmarks/TracerBenchmarks.cs rename to benchmarks/Elastic.Apm.Benchmarks/TracerBenchmarks.cs diff --git a/test/Elastic.Apm.Benchmarks/WildcardMatcherBenchmark.cs b/benchmarks/Elastic.Apm.Benchmarks/WildcardMatcherBenchmark.cs similarity index 100% rename from test/Elastic.Apm.Benchmarks/WildcardMatcherBenchmark.cs rename to benchmarks/Elastic.Apm.Benchmarks/WildcardMatcherBenchmark.cs diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 79ba41bf3..36b3bec8d 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -2,28 +2,37 @@ - false - - false True - - true + + + true + true + - + - - - - + + + true + + + + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - \ No newline at end of file diff --git a/test/Elastic.Apm.AspNetCore.Static.Tests/Elastic.Apm.AspNetCore.Static.Tests.csproj b/test/Elastic.Apm.AspNetCore.Static.Tests/Elastic.Apm.AspNetCore.Static.Tests.csproj index bc60be645..f01d5fcaa 100644 --- a/test/Elastic.Apm.AspNetCore.Static.Tests/Elastic.Apm.AspNetCore.Static.Tests.csproj +++ b/test/Elastic.Apm.AspNetCore.Static.Tests/Elastic.Apm.AspNetCore.Static.Tests.csproj @@ -3,18 +3,7 @@ net7.0 - - - - - - all - runtime; build; native; contentfiles; analyzers - - - - diff --git a/test/Elastic.Apm.AspNetCore.Tests/Elastic.Apm.AspNetCore.Tests.csproj b/test/Elastic.Apm.AspNetCore.Tests/Elastic.Apm.AspNetCore.Tests.csproj index 4a5240541..87646cfea 100644 --- a/test/Elastic.Apm.AspNetCore.Tests/Elastic.Apm.AspNetCore.Tests.csproj +++ b/test/Elastic.Apm.AspNetCore.Tests/Elastic.Apm.AspNetCore.Tests.csproj @@ -11,19 +11,7 @@ - - - - - - all - runtime; build; native; contentfiles; analyzers - - - - - diff --git a/test/Elastic.Apm.Azure.CosmosDb.Tests/Elastic.Apm.Azure.CosmosDb.Tests.csproj b/test/Elastic.Apm.Azure.CosmosDb.Tests/Elastic.Apm.Azure.CosmosDb.Tests.csproj deleted file mode 100644 index 74f544f93..000000000 --- a/test/Elastic.Apm.Azure.CosmosDb.Tests/Elastic.Apm.Azure.CosmosDb.Tests.csproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - net7.0 - false - Elastic.Apm.Azure.CosmosDb.Tests - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers - - - - - - - - - - - diff --git a/test/Elastic.Apm.Azure.Functions.Tests/Elastic.Apm.Azure.Functions.Tests.csproj b/test/Elastic.Apm.Azure.Functions.Tests/Elastic.Apm.Azure.Functions.Tests.csproj deleted file mode 100644 index aa0c9336a..000000000 --- a/test/Elastic.Apm.Azure.Functions.Tests/Elastic.Apm.Azure.Functions.Tests.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - net7.0 - false - Elastic.Apm.Azure.Functions.Tests - - - - - - - - - all - runtime; build; native; contentfiles; analyzers - - - - - - - - - diff --git a/test/Elastic.Apm.Azure.ServiceBus.Tests/Elastic.Apm.Azure.ServiceBus.Tests.csproj b/test/Elastic.Apm.Azure.ServiceBus.Tests/Elastic.Apm.Azure.ServiceBus.Tests.csproj deleted file mode 100644 index 6c88dca32..000000000 --- a/test/Elastic.Apm.Azure.ServiceBus.Tests/Elastic.Apm.Azure.ServiceBus.Tests.csproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - net7.0 - false - Elastic.Apm.Azure.ServiceBus.Tests - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers - - - - - - - - - diff --git a/test/Elastic.Apm.Docker.Tests/Elastic.Apm.Docker.Tests.csproj b/test/Elastic.Apm.Docker.Tests/Elastic.Apm.Docker.Tests.csproj deleted file mode 100644 index ef55ad04b..000000000 --- a/test/Elastic.Apm.Docker.Tests/Elastic.Apm.Docker.Tests.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - net7.0 - - - - - - - - all - runtime; build; native; contentfiles; analyzers - - - - - - - - - diff --git a/test/Elastic.Apm.Elasticsearch.Tests/Elastic.Apm.Elasticsearch.Tests.csproj b/test/Elastic.Apm.Elasticsearch.Tests/Elastic.Apm.Elasticsearch.Tests.csproj deleted file mode 100644 index aff7485fe..000000000 --- a/test/Elastic.Apm.Elasticsearch.Tests/Elastic.Apm.Elasticsearch.Tests.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - net7.0 - - false - - - - - - - - - all - runtime; build; native; contentfiles; analyzers - - - - - - - - - - - - diff --git a/test/Elastic.Apm.Extensions.Hosting.Tests/Elastic.Apm.Extensions.Hosting.Tests.csproj b/test/Elastic.Apm.Extensions.Hosting.Tests/Elastic.Apm.Extensions.Hosting.Tests.csproj index fcd5c666f..eaf2e363e 100644 --- a/test/Elastic.Apm.Extensions.Hosting.Tests/Elastic.Apm.Extensions.Hosting.Tests.csproj +++ b/test/Elastic.Apm.Extensions.Hosting.Tests/Elastic.Apm.Extensions.Hosting.Tests.csproj @@ -6,15 +6,7 @@ - - - - - all - runtime; build; native; contentfiles; analyzers - - diff --git a/test/Elastic.Apm.Extensions.Logging.Tests/Elastic.Apm.Extensions.Logging.Tests.csproj b/test/Elastic.Apm.Extensions.Logging.Tests/Elastic.Apm.Extensions.Logging.Tests.csproj index 129460832..dca23f266 100644 --- a/test/Elastic.Apm.Extensions.Logging.Tests/Elastic.Apm.Extensions.Logging.Tests.csproj +++ b/test/Elastic.Apm.Extensions.Logging.Tests/Elastic.Apm.Extensions.Logging.Tests.csproj @@ -6,15 +6,7 @@ - - - - - all - runtime; build; native; contentfiles; analyzers - - diff --git a/test/Elastic.Apm.Feature.Tests/CloudProviderSteps.cs b/test/Elastic.Apm.Feature.Tests/CloudProviderSteps.cs index f7f874b45..7911139f0 100644 --- a/test/Elastic.Apm.Feature.Tests/CloudProviderSteps.cs +++ b/test/Elastic.Apm.Feature.Tests/CloudProviderSteps.cs @@ -131,7 +131,10 @@ public void CloudMetadataKeyEqualsValue(string key, string value) var token = payloadCollector.Payloads[0].Body[0].SelectToken($"metadata.cloud.{key}"); token.Should().NotBeNull(); - token.Value().Should().Be(value); + var prop = token as JProperty; + prop.Should().NotBeNull(); + prop.Value().Should().Be(value); + } } } diff --git a/test/Elastic.Apm.Feature.Tests/Elastic.Apm.Feature.Tests.csproj b/test/Elastic.Apm.Feature.Tests/Elastic.Apm.Feature.Tests.csproj index 07a76b41e..d9d3a87d3 100644 --- a/test/Elastic.Apm.Feature.Tests/Elastic.Apm.Feature.Tests.csproj +++ b/test/Elastic.Apm.Feature.Tests/Elastic.Apm.Feature.Tests.csproj @@ -6,13 +6,9 @@ - - - - diff --git a/test/Elastic.Apm.MongoDb.Tests/Elastic.Apm.MongoDb.Tests.csproj b/test/Elastic.Apm.MongoDb.Tests/Elastic.Apm.MongoDb.Tests.csproj deleted file mode 100644 index da6b44c04..000000000 --- a/test/Elastic.Apm.MongoDb.Tests/Elastic.Apm.MongoDb.Tests.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - net7.0 - - - - - - - - - - - - - - - - - - diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj b/test/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj deleted file mode 100644 index e5993773a..000000000 --- a/test/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj +++ /dev/null @@ -1,34 +0,0 @@ - - - - - net7.0 - false - - false - false - false - - - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers - - - - - - - diff --git a/test/Elastic.Apm.StackExchange.Redis.Tests/Elastic.Apm.StackExchange.Redis.Tests.csproj b/test/Elastic.Apm.StackExchange.Redis.Tests/Elastic.Apm.StackExchange.Redis.Tests.csproj deleted file mode 100644 index 8dbe8f2cb..000000000 --- a/test/Elastic.Apm.StackExchange.Redis.Tests/Elastic.Apm.StackExchange.Redis.Tests.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - net7.0 - false - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers - - - - - - - - - - - - diff --git a/test/Elastic.Apm.StartupHook.Tests/Elastic.Apm.StartupHook.Tests.csproj b/test/Elastic.Apm.StartupHook.Tests/Elastic.Apm.StartupHook.Tests.csproj index d837504ea..17b320ccf 100644 --- a/test/Elastic.Apm.StartupHook.Tests/Elastic.Apm.StartupHook.Tests.csproj +++ b/test/Elastic.Apm.StartupHook.Tests/Elastic.Apm.StartupHook.Tests.csproj @@ -5,15 +5,7 @@ - - - - - all - runtime; build; native; contentfiles; analyzers - - diff --git a/test/Elastic.Apm.StaticExplicitInitialization.Tests/Elastic.Apm.StaticExplicitInitialization.Tests.csproj b/test/Elastic.Apm.StaticExplicitInitialization.Tests/Elastic.Apm.StaticExplicitInitialization.Tests.csproj index 6160342d5..285080074 100644 --- a/test/Elastic.Apm.StaticExplicitInitialization.Tests/Elastic.Apm.StaticExplicitInitialization.Tests.csproj +++ b/test/Elastic.Apm.StaticExplicitInitialization.Tests/Elastic.Apm.StaticExplicitInitialization.Tests.csproj @@ -9,14 +9,4 @@ - - - - - - all - runtime; build; native; contentfiles; analyzers - - - diff --git a/test/Elastic.Apm.StaticImplicitInitialization.Tests/Elastic.Apm.StaticImplicitInitialization.Tests.csproj b/test/Elastic.Apm.StaticImplicitInitialization.Tests/Elastic.Apm.StaticImplicitInitialization.Tests.csproj index 0643e2362..93176b37c 100644 --- a/test/Elastic.Apm.StaticImplicitInitialization.Tests/Elastic.Apm.StaticImplicitInitialization.Tests.csproj +++ b/test/Elastic.Apm.StaticImplicitInitialization.Tests/Elastic.Apm.StaticImplicitInitialization.Tests.csproj @@ -8,14 +8,4 @@ - - - - - - all - runtime; build; native; contentfiles; analyzers - - - diff --git a/test/Elastic.Apm.Tests/ApiTests/ApiTests.cs b/test/Elastic.Apm.Tests/ApiTests/ApiTests.cs index 6e51bc845..29753fdf1 100644 --- a/test/Elastic.Apm.Tests/ApiTests/ApiTests.cs +++ b/test/Elastic.Apm.Tests/ApiTests/ApiTests.cs @@ -945,17 +945,17 @@ public void CustomServiceTest() var recordedTransaction1 = payloadSender.Transactions.FirstOrDefault(t => t.Name == "Transaction1"); recordedTransaction1.Should().NotBeNull(); - recordedTransaction1?.Context.Service.Name.Should().Be("Service1"); - recordedTransaction1?.Context.Service.Version.Should().Be("1.0-beta1"); + recordedTransaction1.Context.Service.Name.Should().Be("Service1"); + recordedTransaction1.Context.Service.Version.Should().Be("1.0-beta1"); var recordedTransaction2 = payloadSender.Transactions.FirstOrDefault(t => t.Name == "Transaction2"); recordedTransaction2.Should().NotBeNull(); - recordedTransaction2?.Context.Service.Name.Should().Be("Service2"); - recordedTransaction2?.Context.Service.Version.Should().Be("1.0-beta2"); + recordedTransaction2.Context.Service.Name.Should().Be("Service2"); + recordedTransaction2.Context.Service.Version.Should().Be("1.0-beta2"); var recordedTransaction3 = payloadSender.Transactions.FirstOrDefault(t => t.Name == "Transaction3"); recordedTransaction3.Should().NotBeNull(); - recordedTransaction3?.Context.Service.Should().BeNull(); + recordedTransaction3.Context.Service.Should().BeNull(); } /// @@ -976,8 +976,8 @@ public void CustomServiceSetTwice() payloadSender.WaitForTransactions(); payloadSender.FirstTransaction.Should().NotBeNull(); - payloadSender.FirstTransaction?.Context.Service.Name.Should().Be("Service2"); - payloadSender.FirstTransaction?.Context.Service.Version.Should().Be("1.0-beta2"); + payloadSender.FirstTransaction.Context.Service.Name.Should().Be("Service2"); + payloadSender.FirstTransaction.Context.Service.Version.Should().Be("1.0-beta2"); } [Fact] diff --git a/test/Elastic.Apm.Tests/ConstructorTests.cs b/test/Elastic.Apm.Tests/ConstructorTests.cs index 34b4ca3c7..55fe29c58 100644 --- a/test/Elastic.Apm.Tests/ConstructorTests.cs +++ b/test/Elastic.Apm.Tests/ConstructorTests.cs @@ -30,8 +30,8 @@ public void Compose() var logger = agent.Logger as ConsoleLogger; logger.Should().NotBeNull(); - logger?.IsEnabled(LogLevel.Warning).Should().BeTrue(); - logger?.IsEnabled(LogLevel.Information).Should().BeFalse(); + logger.IsEnabled(LogLevel.Warning).Should().BeTrue(); + logger.IsEnabled(LogLevel.Information).Should().BeFalse(); } [Fact] diff --git a/test/Elastic.Apm.Tests/Elastic.Apm.Tests.csproj b/test/Elastic.Apm.Tests/Elastic.Apm.Tests.csproj index 9b41aef50..b29479e20 100644 --- a/test/Elastic.Apm.Tests/Elastic.Apm.Tests.csproj +++ b/test/Elastic.Apm.Tests/Elastic.Apm.Tests.csproj @@ -27,16 +27,8 @@ - - - - - all - runtime; build; native; contentfiles; analyzers - - diff --git a/test/Elastic.Apm.Tests/HelpersTests/AssertionTests.cs b/test/Elastic.Apm.Tests/HelpersTests/AssertionTests.cs index 879bf345b..28fa91e05 100644 --- a/test/Elastic.Apm.Tests/HelpersTests/AssertionTests.cs +++ b/test/Elastic.Apm.Tests/HelpersTests/AssertionTests.cs @@ -8,6 +8,7 @@ using static Elastic.Apm.Tests.Utilities.FluentAssertionsUtils; // ReSharper disable ImplicitlyCapturedClosure +#pragma warning disable NullConditionalAssertion namespace Elastic.Apm.Tests.HelpersTests { diff --git a/test/Elastic.Apm.Tests/HelpersTests/ObjectExtensionsTests.cs b/test/Elastic.Apm.Tests/HelpersTests/ObjectExtensionsTests.cs index e0c71869e..169b66464 100644 --- a/test/Elastic.Apm.Tests/HelpersTests/ObjectExtensionsTests.cs +++ b/test/Elastic.Apm.Tests/HelpersTests/ObjectExtensionsTests.cs @@ -26,11 +26,13 @@ public void Let_null_or_string(string possiblyNull) { var sideEffect = 0; +#pragma warning disable NullConditionalAssertion possiblyNull?.Let(x => { sideEffect = 1; x.Should().NotBeNull(); }); +#pragma warning restore NullConditionalAssertion sideEffect.Should().Be(possiblyNull == null ? 0 : 1); } @@ -43,11 +45,13 @@ public void Let_nullable_bool(bool? possiblyNull) { var sideEffect = 0; +#pragma warning disable NullConditionalAssertion possiblyNull?.Let(x => { sideEffect = 1; x.Should().Be(possiblyNull.Value); }); +#pragma warning restore NullConditionalAssertion sideEffect.Should().Be(possiblyNull == null ? 0 : 1); } diff --git a/test/Elastic.Apm.Tests/Metrics/CgroupMetricsProviderTests.cs b/test/Elastic.Apm.Tests/Metrics/CgroupMetricsProviderTests.cs index 993fa30e7..ea408022e 100644 --- a/test/Elastic.Apm.Tests/Metrics/CgroupMetricsProviderTests.cs +++ b/test/Elastic.Apm.Tests/Metrics/CgroupMetricsProviderTests.cs @@ -95,7 +95,7 @@ public void TestUnlimitedCgroup1() var memUsageSample = samples.First().Samples.SingleOrDefault(s => s.KeyValue.Key == SystemProcessCgroupMemoryMemUsageBytes); memUsageSample.Should().NotBeNull(); - memUsageSample?.KeyValue.Value.Should().Be(964778496); + memUsageSample.KeyValue.Value.Should().Be(964778496); } [DisabledTestFact("Flaky")] @@ -109,7 +109,7 @@ public void TestUnlimitedCgroup2() var memUsageSample = samples.First().Samples.SingleOrDefault(s => s.KeyValue.Key == SystemProcessCgroupMemoryMemUsageBytes); memUsageSample.Should().NotBeNull(); - memUsageSample?.KeyValue.Value.Should().Be(964778496); + memUsageSample.KeyValue.Value.Should().Be(964778496); } /// diff --git a/test/Elastic.Apm.Tests/SamplerTests.cs b/test/Elastic.Apm.Tests/SamplerTests.cs index 0f4ccb0a8..dc48e6688 100644 --- a/test/Elastic.Apm.Tests/SamplerTests.cs +++ b/test/Elastic.Apm.Tests/SamplerTests.cs @@ -47,12 +47,14 @@ public void ConstantSampler(double rate) break; } +#pragma warning disable NullConditionalAssertion sampler.Constant?.Let(c => 10.Repeat(() => { var randomBytes = new byte[8]; RandomGenerator.GenerateRandomBytes(randomBytes); sampler.DecideIfToSample(randomBytes).Should().Be(c); })); +#pragma warning restore NullConditionalAssertion } [Theory] diff --git a/test/Elastic.Apm.Tests/StackTraceTests.cs b/test/Elastic.Apm.Tests/StackTraceTests.cs index 38afcd5af..c2239facc 100644 --- a/test/Elastic.Apm.Tests/StackTraceTests.cs +++ b/test/Elastic.Apm.Tests/StackTraceTests.cs @@ -29,14 +29,16 @@ public class StackTraceTests /// This test assumes that LineNo capturing is enabled and pdb files are also present /// [Fact] - public void StackTraceContainsLineNumber() - => AssertWithAgent("-1", "-1", payloadSender => + public void StackTraceContainsLineNumber() => +#pragma warning disable NullConditionalAssertion + AssertWithAgent("-1", "-1", payloadSender => { payloadSender.FirstSpan.Should().NotBeNull(); payloadSender.FirstSpan.StackTrace.Should().NotBeEmpty(); var stackFrames = payloadSender.FirstSpan?.StackTrace; stackFrames.Should().NotBeEmpty().And.Contain(frame => frame.LineNo != 0); }); +#pragma warning restore NullConditionalAssertion /// /// Makes sure that the name of the async method is captured correctly @@ -61,7 +63,7 @@ public async Task AsyncCallStackTest() payloadSender.Errors.Should().NotBeEmpty(); (payloadSender.Errors.First() as Error).Should().NotBeNull(); - (payloadSender.Errors.First() as Error)?.Exception.StackTrace.Should() + (payloadSender.Errors.First() as Error).Exception.StackTrace.Should() .Contain(m => m.Function == nameof(ClassWithAsync.TestMethodAsync) && m.LineNo != 0); } @@ -86,8 +88,8 @@ public void CallStackWithMoveNextWithoutAsync() payloadSender.Errors.Should().NotBeEmpty(); (payloadSender.Errors.First() as Error).Should().NotBeNull(); - (payloadSender.Errors.First() as Error)?.Exception.StackTrace.Should().Contain(m => m.Function == nameof(ClassWithSyncMethods.MoveNext)); - (payloadSender.Errors.First() as Error)?.Exception.StackTrace.Should().Contain(m => m.Function == nameof(ClassWithSyncMethods.M2)); + (payloadSender.Errors.First() as Error).Exception.StackTrace.Should().Contain(m => m.Function == nameof(ClassWithSyncMethods.MoveNext)); + (payloadSender.Errors.First() as Error).Exception.StackTrace.Should().Contain(m => m.Function == nameof(ClassWithSyncMethods.M2)); } /// @@ -114,14 +116,14 @@ public void TypeAndMethodNameTest() var currentFileName = new StackTrace(true).GetFrame(0).GetFileName(); - (payloadSender.Errors.First() as Error)?.Exception.StackTrace.Should() + (payloadSender.Errors.First() as Error).Exception.StackTrace.Should() .Contain(m => m.ClassName == typeof(Base).FullName && m.Function == nameof(Base.Method1) && m.Module == typeof(Base).Assembly.FullName && m.FileName == currentFileName ); - (payloadSender.Errors.First() as Error)?.Exception.StackTrace.Should() + (payloadSender.Errors.First() as Error).Exception.StackTrace.Should() .Contain(m => m.ClassName == typeof(Derived).FullName && m.Function == nameof(Derived.TestMethod) && m.Module == typeof(Derived).Assembly.FullName @@ -143,7 +145,7 @@ public void StackTraceWithLambda() payloadSender.Errors.Should().NotBeEmpty(); (payloadSender.Errors.First() as Error).Should().NotBeNull(); - (payloadSender.Errors.First() as Error)?.Exception.StackTrace.Should().NotContain(frame => string.IsNullOrWhiteSpace(frame.FileName)); + (payloadSender.Errors.First() as Error).Exception.StackTrace.Should().NotContain(frame => string.IsNullOrWhiteSpace(frame.FileName)); } [Fact] @@ -159,14 +161,14 @@ public void InheritedChainWithVirtualMethod() payloadSender.Errors.First().Should().NotBeNull(); payloadSender.Errors.First().Should().BeOfType(typeof(Error)); - (payloadSender.Errors.First() as Error)?.Exception.StackTrace[0].ClassName.Should().Be(typeof(Derived).FullName); - (payloadSender.Errors.First() as Error)?.Exception.StackTrace[0].Function.Should().Be(nameof(Derived.MethodThrowingIDerived)); + (payloadSender.Errors.First() as Error).Exception.StackTrace[0].ClassName.Should().Be(typeof(Derived).FullName); + (payloadSender.Errors.First() as Error).Exception.StackTrace[0].Function.Should().Be(nameof(Derived.MethodThrowingIDerived)); var fileName = new StackTrace(true).GetFrame(0).GetFileName(); - (payloadSender.Errors.First() as Error)?.Exception.StackTrace[0].FileName.Should().Be(fileName); + (payloadSender.Errors.First() as Error).Exception.StackTrace[0].FileName.Should().Be(fileName); - (payloadSender.Errors.First() as Error)?.Exception.StackTrace[1].ClassName.Should().Be(typeof(Derived).FullName); - (payloadSender.Errors.First() as Error)?.Exception.StackTrace[1].Function.Should().Be(nameof(Base.MyMethod)); + (payloadSender.Errors.First() as Error).Exception.StackTrace[1].ClassName.Should().Be(typeof(Derived).FullName); + (payloadSender.Errors.First() as Error).Exception.StackTrace[1].Function.Should().Be(nameof(Base.MyMethod)); } [Fact] @@ -182,11 +184,11 @@ public void InheritedChain() payloadSender.Errors.First().Should().NotBeNull(); payloadSender.Errors.First().Should().BeOfType(typeof(Error)); - (payloadSender.Errors.First() as Error)?.Exception.StackTrace[0].ClassName.Should().Be(typeof(Base).FullName); - (payloadSender.Errors.First() as Error)?.Exception.StackTrace[0].Function.Should().Be(nameof(Base.JustThrow)); + (payloadSender.Errors.First() as Error).Exception.StackTrace[0].ClassName.Should().Be(typeof(Base).FullName); + (payloadSender.Errors.First() as Error).Exception.StackTrace[0].Function.Should().Be(nameof(Base.JustThrow)); var fileName = new StackTrace(true).GetFrame(0).GetFileName(); - (payloadSender.Errors.First() as Error)?.Exception.StackTrace[0].FileName.Should().Be(fileName); + (payloadSender.Errors.First() as Error).Exception.StackTrace[0].FileName.Should().Be(fileName); } /// @@ -208,9 +210,9 @@ public void InheritedChainWithOldAgents() payloadSender.Errors.First().Should().NotBeNull(); payloadSender.Errors.First().Should().BeOfType(typeof(Error)); - (payloadSender.Errors.First() as Error)?.Exception.StackTrace[0].FileName.Should().Be(typeof(Base).FullName); - (payloadSender.Errors.First() as Error)?.Exception.StackTrace[0].Function.Should().Be(nameof(Base.JustThrow)); - (payloadSender.Errors.First() as Error)?.Exception.StackTrace[0].ClassName.Should().BeNullOrEmpty(); + (payloadSender.Errors.First() as Error).Exception.StackTrace[0].FileName.Should().Be(typeof(Base).FullName); + (payloadSender.Errors.First() as Error).Exception.StackTrace[0].Function.Should().Be(nameof(Base.JustThrow)); + (payloadSender.Errors.First() as Error).Exception.StackTrace[0].ClassName.Should().BeNullOrEmpty(); } [Fact] diff --git a/test/Elastic.Apm.Azure.CosmosDb.Tests/AzureCosmosDbTestEnvironment.cs b/test/azure/Elastic.Apm.Azure.CosmosDb.Tests/AzureCosmosDbTestEnvironment.cs similarity index 100% rename from test/Elastic.Apm.Azure.CosmosDb.Tests/AzureCosmosDbTestEnvironment.cs rename to test/azure/Elastic.Apm.Azure.CosmosDb.Tests/AzureCosmosDbTestEnvironment.cs diff --git a/test/Elastic.Apm.Azure.CosmosDb.Tests/DocumentItem.cs b/test/azure/Elastic.Apm.Azure.CosmosDb.Tests/DocumentItem.cs similarity index 100% rename from test/Elastic.Apm.Azure.CosmosDb.Tests/DocumentItem.cs rename to test/azure/Elastic.Apm.Azure.CosmosDb.Tests/DocumentItem.cs diff --git a/test/azure/Elastic.Apm.Azure.CosmosDb.Tests/Elastic.Apm.Azure.CosmosDb.Tests.csproj b/test/azure/Elastic.Apm.Azure.CosmosDb.Tests/Elastic.Apm.Azure.CosmosDb.Tests.csproj new file mode 100644 index 000000000..6eb9b790c --- /dev/null +++ b/test/azure/Elastic.Apm.Azure.CosmosDb.Tests/Elastic.Apm.Azure.CosmosDb.Tests.csproj @@ -0,0 +1,22 @@ + + + + net7.0 + false + Elastic.Apm.Azure.CosmosDb.Tests + + + + + + + + + + + + + + + + diff --git a/test/Elastic.Apm.Azure.CosmosDb.Tests/MicrosoftAzureCosmosTests.cs b/test/azure/Elastic.Apm.Azure.CosmosDb.Tests/MicrosoftAzureCosmosTests.cs similarity index 100% rename from test/Elastic.Apm.Azure.CosmosDb.Tests/MicrosoftAzureCosmosTests.cs rename to test/azure/Elastic.Apm.Azure.CosmosDb.Tests/MicrosoftAzureCosmosTests.cs diff --git a/test/Elastic.Apm.Azure.CosmosDb.Tests/MicrosoftAzureDocumentDbTests.cs b/test/azure/Elastic.Apm.Azure.CosmosDb.Tests/MicrosoftAzureDocumentDbTests.cs similarity index 100% rename from test/Elastic.Apm.Azure.CosmosDb.Tests/MicrosoftAzureDocumentDbTests.cs rename to test/azure/Elastic.Apm.Azure.CosmosDb.Tests/MicrosoftAzureDocumentDbTests.cs diff --git a/test/Elastic.Apm.Azure.Functions.Tests/AzureFunctionsTestFixture.cs b/test/azure/Elastic.Apm.Azure.Functions.Tests/AzureFunctionsTestFixture.cs similarity index 94% rename from test/Elastic.Apm.Azure.Functions.Tests/AzureFunctionsTestFixture.cs rename to test/azure/Elastic.Apm.Azure.Functions.Tests/AzureFunctionsTestFixture.cs index 6ca86f3cb..49517f81b 100644 --- a/test/Elastic.Apm.Azure.Functions.Tests/AzureFunctionsTestFixture.cs +++ b/test/azure/Elastic.Apm.Azure.Functions.Tests/AzureFunctionsTestFixture.cs @@ -33,9 +33,8 @@ public AzureFunctionsTestFixture() LogLines.Add($"Starting APM Server on port: {port}"); _apmServer.RunInBackground(port); - var workingDir = Path.Combine(Directory.GetCurrentDirectory(), - "../../../../../sample/Elastic.AzureFunctionApp.Isolated"); - workingDir = Path.GetFullPath(workingDir); + var solutionRoot = SolutionPaths.Root; + var workingDir = Path.Combine(solutionRoot, "sample", "Elastic.AzureFunctionApp.Isolated"); LogLines.Add($"func working directory: {workingDir}"); Directory.Exists(workingDir).Should().BeTrue(); diff --git a/test/Elastic.Apm.Azure.Functions.Tests/AzureFunctionsTests.cs b/test/azure/Elastic.Apm.Azure.Functions.Tests/AzureFunctionsTests.cs similarity index 100% rename from test/Elastic.Apm.Azure.Functions.Tests/AzureFunctionsTests.cs rename to test/azure/Elastic.Apm.Azure.Functions.Tests/AzureFunctionsTests.cs diff --git a/test/azure/Elastic.Apm.Azure.Functions.Tests/Elastic.Apm.Azure.Functions.Tests.csproj b/test/azure/Elastic.Apm.Azure.Functions.Tests/Elastic.Apm.Azure.Functions.Tests.csproj new file mode 100644 index 000000000..f14dc068a --- /dev/null +++ b/test/azure/Elastic.Apm.Azure.Functions.Tests/Elastic.Apm.Azure.Functions.Tests.csproj @@ -0,0 +1,13 @@ + + + + net7.0 + false + Elastic.Apm.Azure.Functions.Tests + + + + + + + diff --git a/test/Elastic.Apm.Azure.ServiceBus.Tests/Azure/AzureServiceBusTestEnvironment.cs b/test/azure/Elastic.Apm.Azure.ServiceBus.Tests/Azure/AzureServiceBusTestEnvironment.cs similarity index 100% rename from test/Elastic.Apm.Azure.ServiceBus.Tests/Azure/AzureServiceBusTestEnvironment.cs rename to test/azure/Elastic.Apm.Azure.ServiceBus.Tests/Azure/AzureServiceBusTestEnvironment.cs diff --git a/test/Elastic.Apm.Azure.ServiceBus.Tests/Azure/QueueScope.cs b/test/azure/Elastic.Apm.Azure.ServiceBus.Tests/Azure/QueueScope.cs similarity index 100% rename from test/Elastic.Apm.Azure.ServiceBus.Tests/Azure/QueueScope.cs rename to test/azure/Elastic.Apm.Azure.ServiceBus.Tests/Azure/QueueScope.cs diff --git a/test/Elastic.Apm.Azure.ServiceBus.Tests/Azure/TopicScope.cs b/test/azure/Elastic.Apm.Azure.ServiceBus.Tests/Azure/TopicScope.cs similarity index 100% rename from test/Elastic.Apm.Azure.ServiceBus.Tests/Azure/TopicScope.cs rename to test/azure/Elastic.Apm.Azure.ServiceBus.Tests/Azure/TopicScope.cs diff --git a/test/Elastic.Apm.Azure.ServiceBus.Tests/AzureMessagingServiceBusDiagnosticListenerTests.cs b/test/azure/Elastic.Apm.Azure.ServiceBus.Tests/AzureMessagingServiceBusDiagnosticListenerTests.cs similarity index 100% rename from test/Elastic.Apm.Azure.ServiceBus.Tests/AzureMessagingServiceBusDiagnosticListenerTests.cs rename to test/azure/Elastic.Apm.Azure.ServiceBus.Tests/AzureMessagingServiceBusDiagnosticListenerTests.cs diff --git a/test/azure/Elastic.Apm.Azure.ServiceBus.Tests/Elastic.Apm.Azure.ServiceBus.Tests.csproj b/test/azure/Elastic.Apm.Azure.ServiceBus.Tests/Elastic.Apm.Azure.ServiceBus.Tests.csproj new file mode 100644 index 000000000..3e8096234 --- /dev/null +++ b/test/azure/Elastic.Apm.Azure.ServiceBus.Tests/Elastic.Apm.Azure.ServiceBus.Tests.csproj @@ -0,0 +1,20 @@ + + + + net7.0 + false + Elastic.Apm.Azure.ServiceBus.Tests + + + + + + + + + + + + + + diff --git a/test/Elastic.Apm.Azure.ServiceBus.Tests/MicrosoftAzureServiceBusDiagnosticListenerTests.cs b/test/azure/Elastic.Apm.Azure.ServiceBus.Tests/MicrosoftAzureServiceBusDiagnosticListenerTests.cs similarity index 100% rename from test/Elastic.Apm.Azure.ServiceBus.Tests/MicrosoftAzureServiceBusDiagnosticListenerTests.cs rename to test/azure/Elastic.Apm.Azure.ServiceBus.Tests/MicrosoftAzureServiceBusDiagnosticListenerTests.cs diff --git a/test/Elastic.Apm.Azure.Storage.Tests/AzureBlobStorageDiagnosticListenerTests.cs b/test/azure/Elastic.Apm.Azure.Storage.Tests/AzureBlobStorageDiagnosticListenerTests.cs similarity index 100% rename from test/Elastic.Apm.Azure.Storage.Tests/AzureBlobStorageDiagnosticListenerTests.cs rename to test/azure/Elastic.Apm.Azure.Storage.Tests/AzureBlobStorageDiagnosticListenerTests.cs diff --git a/test/Elastic.Apm.Azure.Storage.Tests/AzureFileShareStorageDiagnosticListenerTests.cs b/test/azure/Elastic.Apm.Azure.Storage.Tests/AzureFileShareStorageDiagnosticListenerTests.cs similarity index 100% rename from test/Elastic.Apm.Azure.Storage.Tests/AzureFileShareStorageDiagnosticListenerTests.cs rename to test/azure/Elastic.Apm.Azure.Storage.Tests/AzureFileShareStorageDiagnosticListenerTests.cs diff --git a/test/Elastic.Apm.Azure.Storage.Tests/AzureQueueStorageDiagnosticListenerTests.cs b/test/azure/Elastic.Apm.Azure.Storage.Tests/AzureQueueStorageDiagnosticListenerTests.cs similarity index 100% rename from test/Elastic.Apm.Azure.Storage.Tests/AzureQueueStorageDiagnosticListenerTests.cs rename to test/azure/Elastic.Apm.Azure.Storage.Tests/AzureQueueStorageDiagnosticListenerTests.cs diff --git a/test/Elastic.Apm.Azure.Storage.Tests/AzureStorageTestEnvironment.cs b/test/azure/Elastic.Apm.Azure.Storage.Tests/AzureStorageTestEnvironment.cs similarity index 100% rename from test/Elastic.Apm.Azure.Storage.Tests/AzureStorageTestEnvironment.cs rename to test/azure/Elastic.Apm.Azure.Storage.Tests/AzureStorageTestEnvironment.cs diff --git a/test/Elastic.Apm.Azure.Storage.Tests/BlobContainerScope.cs b/test/azure/Elastic.Apm.Azure.Storage.Tests/BlobContainerScope.cs similarity index 100% rename from test/Elastic.Apm.Azure.Storage.Tests/BlobContainerScope.cs rename to test/azure/Elastic.Apm.Azure.Storage.Tests/BlobContainerScope.cs diff --git a/test/Elastic.Apm.Azure.Storage.Tests/BlobStorageTestsBase.cs b/test/azure/Elastic.Apm.Azure.Storage.Tests/BlobStorageTestsBase.cs similarity index 100% rename from test/Elastic.Apm.Azure.Storage.Tests/BlobStorageTestsBase.cs rename to test/azure/Elastic.Apm.Azure.Storage.Tests/BlobStorageTestsBase.cs diff --git a/test/Elastic.Apm.Azure.Storage.Tests/Elastic.Apm.Azure.Storage.Tests.csproj b/test/azure/Elastic.Apm.Azure.Storage.Tests/Elastic.Apm.Azure.Storage.Tests.csproj similarity index 53% rename from test/Elastic.Apm.Azure.Storage.Tests/Elastic.Apm.Azure.Storage.Tests.csproj rename to test/azure/Elastic.Apm.Azure.Storage.Tests/Elastic.Apm.Azure.Storage.Tests.csproj index 6882a3b2d..566ed84cc 100644 --- a/test/Elastic.Apm.Azure.Storage.Tests/Elastic.Apm.Azure.Storage.Tests.csproj +++ b/test/azure/Elastic.Apm.Azure.Storage.Tests/Elastic.Apm.Azure.Storage.Tests.csproj @@ -7,25 +7,16 @@ - - - - - - all - runtime; build; native; contentfiles; analyzers - - - + diff --git a/test/Elastic.Apm.Azure.Storage.Tests/FileShareScope.cs b/test/azure/Elastic.Apm.Azure.Storage.Tests/FileShareScope.cs similarity index 100% rename from test/Elastic.Apm.Azure.Storage.Tests/FileShareScope.cs rename to test/azure/Elastic.Apm.Azure.Storage.Tests/FileShareScope.cs diff --git a/test/Elastic.Apm.Azure.Storage.Tests/MicrosoftAzureBlobStorageTracerTests.cs b/test/azure/Elastic.Apm.Azure.Storage.Tests/MicrosoftAzureBlobStorageTracerTests.cs similarity index 100% rename from test/Elastic.Apm.Azure.Storage.Tests/MicrosoftAzureBlobStorageTracerTests.cs rename to test/azure/Elastic.Apm.Azure.Storage.Tests/MicrosoftAzureBlobStorageTracerTests.cs diff --git a/test/Elastic.Apm.Docker.Tests/BasicDockerTests.cs b/test/instrumentations/Elastic.Apm.Docker.Tests/BasicDockerTests.cs similarity index 78% rename from test/Elastic.Apm.Docker.Tests/BasicDockerTests.cs rename to test/instrumentations/Elastic.Apm.Docker.Tests/BasicDockerTests.cs index bea1cc697..04094d17f 100644 --- a/test/Elastic.Apm.Docker.Tests/BasicDockerTests.cs +++ b/test/instrumentations/Elastic.Apm.Docker.Tests/BasicDockerTests.cs @@ -18,9 +18,9 @@ public void ContainerIdExistsTest() using var agent = new ApmAgent(new AgentComponents()); var payloadSender = agent.PayloadSender as PayloadSenderV2; payloadSender.Should().NotBeNull(); - payloadSender?.System.Should().NotBeNull(); - payloadSender?.System.Container.Should().NotBeNull(); - payloadSender?.System.Container.Id.Should().NotBeNullOrWhiteSpace(); + payloadSender.System.Should().NotBeNull(); + payloadSender.System.Container.Should().NotBeNull(); + payloadSender.System.Container.Id.Should().NotBeNullOrWhiteSpace(); } } } diff --git a/test/Elastic.Apm.Docker.Tests/ContainerIdCalculationTests.cs b/test/instrumentations/Elastic.Apm.Docker.Tests/ContainerIdCalculationTests.cs similarity index 100% rename from test/Elastic.Apm.Docker.Tests/ContainerIdCalculationTests.cs rename to test/instrumentations/Elastic.Apm.Docker.Tests/ContainerIdCalculationTests.cs diff --git a/test/instrumentations/Elastic.Apm.Docker.Tests/Elastic.Apm.Docker.Tests.csproj b/test/instrumentations/Elastic.Apm.Docker.Tests/Elastic.Apm.Docker.Tests.csproj new file mode 100644 index 000000000..45d3cd40c --- /dev/null +++ b/test/instrumentations/Elastic.Apm.Docker.Tests/Elastic.Apm.Docker.Tests.csproj @@ -0,0 +1,13 @@ + + + net7.0 + + + + + + + + + + diff --git a/test/instrumentations/Elastic.Apm.Elasticsearch.Tests/Elastic.Apm.Elasticsearch.Tests.csproj b/test/instrumentations/Elastic.Apm.Elasticsearch.Tests/Elastic.Apm.Elasticsearch.Tests.csproj new file mode 100644 index 000000000..0630d5b26 --- /dev/null +++ b/test/instrumentations/Elastic.Apm.Elasticsearch.Tests/Elastic.Apm.Elasticsearch.Tests.csproj @@ -0,0 +1,19 @@ + + + + net7.0 + + false + + + + + + + + + + + + + diff --git a/test/Elastic.Apm.Elasticsearch.Tests/ElasticsearchFixture.cs b/test/instrumentations/Elastic.Apm.Elasticsearch.Tests/ElasticsearchFixture.cs similarity index 100% rename from test/Elastic.Apm.Elasticsearch.Tests/ElasticsearchFixture.cs rename to test/instrumentations/Elastic.Apm.Elasticsearch.Tests/ElasticsearchFixture.cs diff --git a/test/Elastic.Apm.Elasticsearch.Tests/ElasticsearchTests.cs b/test/instrumentations/Elastic.Apm.Elasticsearch.Tests/ElasticsearchTests.cs similarity index 100% rename from test/Elastic.Apm.Elasticsearch.Tests/ElasticsearchTests.cs rename to test/instrumentations/Elastic.Apm.Elasticsearch.Tests/ElasticsearchTests.cs diff --git a/test/Elastic.Apm.Elasticsearch.Tests/TraceContextTests.cs b/test/instrumentations/Elastic.Apm.Elasticsearch.Tests/TraceContextTests.cs similarity index 100% rename from test/Elastic.Apm.Elasticsearch.Tests/TraceContextTests.cs rename to test/instrumentations/Elastic.Apm.Elasticsearch.Tests/TraceContextTests.cs diff --git a/test/Elastic.Apm.Elasticsearch.Tests/VirtualElasticsearchTests.cs b/test/instrumentations/Elastic.Apm.Elasticsearch.Tests/VirtualElasticsearchTests.cs similarity index 100% rename from test/Elastic.Apm.Elasticsearch.Tests/VirtualElasticsearchTests.cs rename to test/instrumentations/Elastic.Apm.Elasticsearch.Tests/VirtualElasticsearchTests.cs diff --git a/test/Elastic.Apm.EntityFramework6.Tests/Ef6Tests.cs b/test/instrumentations/Elastic.Apm.EntityFramework6.Tests/Ef6Tests.cs similarity index 100% rename from test/Elastic.Apm.EntityFramework6.Tests/Ef6Tests.cs rename to test/instrumentations/Elastic.Apm.EntityFramework6.Tests/Ef6Tests.cs diff --git a/test/Elastic.Apm.EntityFramework6.Tests/Elastic.Apm.EntityFramework6.Tests.csproj b/test/instrumentations/Elastic.Apm.EntityFramework6.Tests/Elastic.Apm.EntityFramework6.Tests.csproj similarity index 100% rename from test/Elastic.Apm.EntityFramework6.Tests/Elastic.Apm.EntityFramework6.Tests.csproj rename to test/instrumentations/Elastic.Apm.EntityFramework6.Tests/Elastic.Apm.EntityFramework6.Tests.csproj diff --git a/test/Elastic.Apm.EntityFrameworkCore.Tests/EfCoreDiagnosticListenerTests.cs b/test/instrumentations/Elastic.Apm.EntityFrameworkCore.Tests/EfCoreDiagnosticListenerTests.cs similarity index 100% rename from test/Elastic.Apm.EntityFrameworkCore.Tests/EfCoreDiagnosticListenerTests.cs rename to test/instrumentations/Elastic.Apm.EntityFrameworkCore.Tests/EfCoreDiagnosticListenerTests.cs diff --git a/test/Elastic.Apm.EntityFrameworkCore.Tests/Elastic.Apm.EntityFrameworkCore.Tests.csproj b/test/instrumentations/Elastic.Apm.EntityFrameworkCore.Tests/Elastic.Apm.EntityFrameworkCore.Tests.csproj similarity index 57% rename from test/Elastic.Apm.EntityFrameworkCore.Tests/Elastic.Apm.EntityFrameworkCore.Tests.csproj rename to test/instrumentations/Elastic.Apm.EntityFrameworkCore.Tests/Elastic.Apm.EntityFrameworkCore.Tests.csproj index a4640d465..0bb6e27fc 100644 --- a/test/Elastic.Apm.EntityFrameworkCore.Tests/Elastic.Apm.EntityFrameworkCore.Tests.csproj +++ b/test/instrumentations/Elastic.Apm.EntityFrameworkCore.Tests/Elastic.Apm.EntityFrameworkCore.Tests.csproj @@ -7,23 +7,15 @@ - - - - - all - runtime; build; native; contentfiles; analyzers - - - + diff --git a/test/Elastic.Apm.EntityFrameworkCore.Tests/ExternalDbTests.cs b/test/instrumentations/Elastic.Apm.EntityFrameworkCore.Tests/ExternalDbTests.cs similarity index 100% rename from test/Elastic.Apm.EntityFrameworkCore.Tests/ExternalDbTests.cs rename to test/instrumentations/Elastic.Apm.EntityFrameworkCore.Tests/ExternalDbTests.cs diff --git a/test/Elastic.Apm.EntityFrameworkCore.Tests/FakeDbContext.cs b/test/instrumentations/Elastic.Apm.EntityFrameworkCore.Tests/FakeDbContext.cs similarity index 100% rename from test/Elastic.Apm.EntityFrameworkCore.Tests/FakeDbContext.cs rename to test/instrumentations/Elastic.Apm.EntityFrameworkCore.Tests/FakeDbContext.cs diff --git a/test/instrumentations/Elastic.Apm.MongoDb.Tests/Elastic.Apm.MongoDb.Tests.csproj b/test/instrumentations/Elastic.Apm.MongoDb.Tests/Elastic.Apm.MongoDb.Tests.csproj new file mode 100644 index 000000000..4d10e7af6 --- /dev/null +++ b/test/instrumentations/Elastic.Apm.MongoDb.Tests/Elastic.Apm.MongoDb.Tests.csproj @@ -0,0 +1,16 @@ + + + net7.0 + + + + + + + + + + + + + diff --git a/test/Elastic.Apm.MongoDb.Tests/Fixture/IMongoConfiguration.cs b/test/instrumentations/Elastic.Apm.MongoDb.Tests/Fixture/IMongoConfiguration.cs similarity index 100% rename from test/Elastic.Apm.MongoDb.Tests/Fixture/IMongoConfiguration.cs rename to test/instrumentations/Elastic.Apm.MongoDb.Tests/Fixture/IMongoConfiguration.cs diff --git a/test/Elastic.Apm.MongoDb.Tests/Fixture/MongoFixture.cs b/test/instrumentations/Elastic.Apm.MongoDb.Tests/Fixture/MongoFixture.cs similarity index 100% rename from test/Elastic.Apm.MongoDb.Tests/Fixture/MongoFixture.cs rename to test/instrumentations/Elastic.Apm.MongoDb.Tests/Fixture/MongoFixture.cs diff --git a/test/Elastic.Apm.MongoDb.Tests/LICENSE b/test/instrumentations/Elastic.Apm.MongoDb.Tests/LICENSE similarity index 100% rename from test/Elastic.Apm.MongoDb.Tests/LICENSE rename to test/instrumentations/Elastic.Apm.MongoDb.Tests/LICENSE diff --git a/test/Elastic.Apm.MongoDb.Tests/MongoApmTests.cs b/test/instrumentations/Elastic.Apm.MongoDb.Tests/MongoApmTests.cs similarity index 100% rename from test/Elastic.Apm.MongoDb.Tests/MongoApmTests.cs rename to test/instrumentations/Elastic.Apm.MongoDb.Tests/MongoApmTests.cs diff --git a/test/Elastic.Apm.SqlClient.Tests/EfCoreWithMsSqlTests.cs b/test/instrumentations/Elastic.Apm.SqlClient.Tests/EfCoreWithMsSqlTests.cs similarity index 91% rename from test/Elastic.Apm.SqlClient.Tests/EfCoreWithMsSqlTests.cs rename to test/instrumentations/Elastic.Apm.SqlClient.Tests/EfCoreWithMsSqlTests.cs index 24a5d505d..53a4f1c8a 100644 --- a/test/Elastic.Apm.SqlClient.Tests/EfCoreWithMsSqlTests.cs +++ b/test/instrumentations/Elastic.Apm.SqlClient.Tests/EfCoreWithMsSqlTests.cs @@ -63,11 +63,10 @@ public void BothEfCoreAndSqlClientCapturingActive() _payloadSender.SpansOnFirstTransaction.Should().HaveCount(1); _payloadSender.FirstSpan.Should().NotBeNull(); - _payloadSender.FirstSpan.Context?.Db?.Should().NotBeNull(); - _payloadSender.FirstSpan.Context?.Db?.Should().NotBeNull(); - - _payloadSender.FirstSpan.Context?.Db?.Instance.Should().Be("master"); - _payloadSender.FirstSpan.Context?.Db?.Type.Should().Be("sql"); + _payloadSender.FirstSpan.Context.Should().NotBeNull(); + _payloadSender.FirstSpan.Context.Db.Should().NotBeNull(); + _payloadSender.FirstSpan.Context.Db.Instance.Should().Be("master"); + _payloadSender.FirstSpan.Context.Db.Type.Should().Be("sql"); } public void Dispose() => _apmAgent?.Dispose(); diff --git a/test/Elastic.Apm.SqlClient.Tests/Elastic.Apm.SqlClient.Tests.csproj b/test/instrumentations/Elastic.Apm.SqlClient.Tests/Elastic.Apm.SqlClient.Tests.csproj similarity index 65% rename from test/Elastic.Apm.SqlClient.Tests/Elastic.Apm.SqlClient.Tests.csproj rename to test/instrumentations/Elastic.Apm.SqlClient.Tests/Elastic.Apm.SqlClient.Tests.csproj index 4b6cb1401..a2ad6d81e 100644 --- a/test/Elastic.Apm.SqlClient.Tests/Elastic.Apm.SqlClient.Tests.csproj +++ b/test/instrumentations/Elastic.Apm.SqlClient.Tests/Elastic.Apm.SqlClient.Tests.csproj @@ -6,17 +6,9 @@ - - - - - all - runtime; build; native; contentfiles; analyzers - - @@ -28,7 +20,7 @@ - + diff --git a/test/Elastic.Apm.SqlClient.Tests/SqlClientListenerTests.cs b/test/instrumentations/Elastic.Apm.SqlClient.Tests/SqlClientListenerTests.cs similarity index 100% rename from test/Elastic.Apm.SqlClient.Tests/SqlClientListenerTests.cs rename to test/instrumentations/Elastic.Apm.SqlClient.Tests/SqlClientListenerTests.cs diff --git a/test/Elastic.Apm.SqlClient.Tests/SqlServerCollection.cs b/test/instrumentations/Elastic.Apm.SqlClient.Tests/SqlServerCollection.cs similarity index 100% rename from test/Elastic.Apm.SqlClient.Tests/SqlServerCollection.cs rename to test/instrumentations/Elastic.Apm.SqlClient.Tests/SqlServerCollection.cs diff --git a/test/Elastic.Apm.SqlClient.Tests/SqlServerFixture.cs b/test/instrumentations/Elastic.Apm.SqlClient.Tests/SqlServerFixture.cs similarity index 100% rename from test/Elastic.Apm.SqlClient.Tests/SqlServerFixture.cs rename to test/instrumentations/Elastic.Apm.SqlClient.Tests/SqlServerFixture.cs diff --git a/test/Elastic.Apm.StackExchange.Redis.Tests/ConnectionMultiplexerExtensionTests.cs b/test/instrumentations/Elastic.Apm.StackExchange.Redis.Tests/ConnectionMultiplexerExtensionTests.cs similarity index 100% rename from test/Elastic.Apm.StackExchange.Redis.Tests/ConnectionMultiplexerExtensionTests.cs rename to test/instrumentations/Elastic.Apm.StackExchange.Redis.Tests/ConnectionMultiplexerExtensionTests.cs diff --git a/test/instrumentations/Elastic.Apm.StackExchange.Redis.Tests/Elastic.Apm.StackExchange.Redis.Tests.csproj b/test/instrumentations/Elastic.Apm.StackExchange.Redis.Tests/Elastic.Apm.StackExchange.Redis.Tests.csproj new file mode 100644 index 000000000..1afc3afc0 --- /dev/null +++ b/test/instrumentations/Elastic.Apm.StackExchange.Redis.Tests/Elastic.Apm.StackExchange.Redis.Tests.csproj @@ -0,0 +1,19 @@ + + + + net7.0 + false + + + + + + + + + + + + + + diff --git a/test/Elastic.Apm.StackExchange.Redis.Tests/ProfilingSessionTests.cs b/test/instrumentations/Elastic.Apm.StackExchange.Redis.Tests/ProfilingSessionTests.cs similarity index 100% rename from test/Elastic.Apm.StackExchange.Redis.Tests/ProfilingSessionTests.cs rename to test/instrumentations/Elastic.Apm.StackExchange.Redis.Tests/ProfilingSessionTests.cs diff --git a/test/Elastic.Clients.Elasticsearch.Tests/Elastic.Clients.Elasticsearch.Tests.csproj b/test/instrumentations/Elastic.Clients.Elasticsearch.Tests/Elastic.Clients.Elasticsearch.Tests.csproj similarity index 57% rename from test/Elastic.Clients.Elasticsearch.Tests/Elastic.Clients.Elasticsearch.Tests.csproj rename to test/instrumentations/Elastic.Clients.Elasticsearch.Tests/Elastic.Clients.Elasticsearch.Tests.csproj index 08d496a2b..ed2d24b3a 100644 --- a/test/Elastic.Clients.Elasticsearch.Tests/Elastic.Clients.Elasticsearch.Tests.csproj +++ b/test/instrumentations/Elastic.Clients.Elasticsearch.Tests/Elastic.Clients.Elasticsearch.Tests.csproj @@ -7,20 +7,15 @@ - - - - - - - + + diff --git a/test/Elastic.Clients.Elasticsearch.Tests/ElasticsearchTestFixture.cs b/test/instrumentations/Elastic.Clients.Elasticsearch.Tests/ElasticsearchTestFixture.cs similarity index 100% rename from test/Elastic.Clients.Elasticsearch.Tests/ElasticsearchTestFixture.cs rename to test/instrumentations/Elastic.Clients.Elasticsearch.Tests/ElasticsearchTestFixture.cs diff --git a/test/Elastic.Clients.Elasticsearch.Tests/ElasticsearchTests.cs b/test/instrumentations/Elastic.Clients.Elasticsearch.Tests/ElasticsearchTests.cs similarity index 100% rename from test/Elastic.Clients.Elasticsearch.Tests/ElasticsearchTests.cs rename to test/instrumentations/Elastic.Clients.Elasticsearch.Tests/ElasticsearchTests.cs diff --git a/test/Elastic.Clients.Elasticsearch.Tests/README.md b/test/instrumentations/Elastic.Clients.Elasticsearch.Tests/README.md similarity index 100% rename from test/Elastic.Clients.Elasticsearch.Tests/README.md rename to test/instrumentations/Elastic.Clients.Elasticsearch.Tests/README.md diff --git a/test/Elastic.Apm.Grpc.Tests/Elastic.Apm.Grpc.Tests.csproj b/test/instrumentations/grpc/Elastic.Apm.Grpc.Tests/Elastic.Apm.Grpc.Tests.csproj similarity index 56% rename from test/Elastic.Apm.Grpc.Tests/Elastic.Apm.Grpc.Tests.csproj rename to test/instrumentations/grpc/Elastic.Apm.Grpc.Tests/Elastic.Apm.Grpc.Tests.csproj index 16b39ce27..02c1b4978 100644 --- a/test/Elastic.Apm.Grpc.Tests/Elastic.Apm.Grpc.Tests.csproj +++ b/test/instrumentations/grpc/Elastic.Apm.Grpc.Tests/Elastic.Apm.Grpc.Tests.csproj @@ -6,17 +6,7 @@ - - - - - - all - runtime; build; native; contentfiles; analyzers - - - @@ -27,23 +17,23 @@ - - + + - + Protos\greet.proto - + appsettings.Development.json Always - + appsettings.json Always diff --git a/test/Elastic.Apm.Grpc.Tests/GrpcTests.cs b/test/instrumentations/grpc/Elastic.Apm.Grpc.Tests/GrpcTests.cs similarity index 100% rename from test/Elastic.Apm.Grpc.Tests/GrpcTests.cs rename to test/instrumentations/grpc/Elastic.Apm.Grpc.Tests/GrpcTests.cs diff --git a/test/Elastic.Apm.Grpc.Tests/SampleAppHostBuilder.cs b/test/instrumentations/grpc/Elastic.Apm.Grpc.Tests/SampleAppHostBuilder.cs similarity index 100% rename from test/Elastic.Apm.Grpc.Tests/SampleAppHostBuilder.cs rename to test/instrumentations/grpc/Elastic.Apm.Grpc.Tests/SampleAppHostBuilder.cs diff --git a/test/Elastic.Apm.Grpc.Tests/Services/GreeterService.cs b/test/instrumentations/grpc/Elastic.Apm.Grpc.Tests/Services/GreeterService.cs similarity index 100% rename from test/Elastic.Apm.Grpc.Tests/Services/GreeterService.cs rename to test/instrumentations/grpc/Elastic.Apm.Grpc.Tests/Services/GreeterService.cs diff --git a/sample/GrpcClientSample/GrpcClientSample.csproj b/test/instrumentations/grpc/GrpcClientSample/GrpcClientSample.csproj similarity index 100% rename from sample/GrpcClientSample/GrpcClientSample.csproj rename to test/instrumentations/grpc/GrpcClientSample/GrpcClientSample.csproj diff --git a/sample/GrpcClientSample/Program.cs b/test/instrumentations/grpc/GrpcClientSample/Program.cs similarity index 100% rename from sample/GrpcClientSample/Program.cs rename to test/instrumentations/grpc/GrpcClientSample/Program.cs diff --git a/sample/GrpcServiceSample/GrpcServiceSample.csproj b/test/instrumentations/grpc/GrpcServiceSample/GrpcServiceSample.csproj similarity index 100% rename from sample/GrpcServiceSample/GrpcServiceSample.csproj rename to test/instrumentations/grpc/GrpcServiceSample/GrpcServiceSample.csproj diff --git a/sample/GrpcServiceSample/Program.cs b/test/instrumentations/grpc/GrpcServiceSample/Program.cs similarity index 100% rename from sample/GrpcServiceSample/Program.cs rename to test/instrumentations/grpc/GrpcServiceSample/Program.cs diff --git a/sample/GrpcServiceSample/Protos/greet.proto b/test/instrumentations/grpc/GrpcServiceSample/Protos/greet.proto similarity index 100% rename from sample/GrpcServiceSample/Protos/greet.proto rename to test/instrumentations/grpc/GrpcServiceSample/Protos/greet.proto diff --git a/sample/GrpcServiceSample/Services/GreeterService.cs b/test/instrumentations/grpc/GrpcServiceSample/Services/GreeterService.cs similarity index 100% rename from sample/GrpcServiceSample/Services/GreeterService.cs rename to test/instrumentations/grpc/GrpcServiceSample/Services/GreeterService.cs diff --git a/sample/GrpcServiceSample/Startup.cs b/test/instrumentations/grpc/GrpcServiceSample/Startup.cs similarity index 100% rename from sample/GrpcServiceSample/Startup.cs rename to test/instrumentations/grpc/GrpcServiceSample/Startup.cs diff --git a/sample/GrpcServiceSample/appsettings.Development.json b/test/instrumentations/grpc/GrpcServiceSample/appsettings.Development.json similarity index 100% rename from sample/GrpcServiceSample/appsettings.Development.json rename to test/instrumentations/grpc/GrpcServiceSample/appsettings.Development.json diff --git a/sample/GrpcServiceSample/appsettings.json b/test/instrumentations/grpc/GrpcServiceSample/appsettings.json similarity index 100% rename from sample/GrpcServiceSample/appsettings.json rename to test/instrumentations/grpc/GrpcServiceSample/appsettings.json diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/AdoNetTestData.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/AdoNetTestData.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/AdoNetTestData.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/AdoNetTestData.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/MySqlCommandTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/MySqlCommandTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/MySqlCommandTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/MySqlCommandTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/MySqlFixture.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/MySqlFixture.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/MySqlFixture.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/MySqlFixture.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/NpgSqlCommandTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/NpgSqlCommandTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/NpgSqlCommandTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/NpgSqlCommandTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleManagedDataAccessCommandTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleManagedDataAccessCommandTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleManagedDataAccessCommandTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleManagedDataAccessCommandTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleManagedDataAccessCoreCommandTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleManagedDataAccessCoreCommandTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleManagedDataAccessCoreCommandTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleManagedDataAccessCoreCommandTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleSqlFixture.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleSqlFixture.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleSqlFixture.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleSqlFixture.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/PostgreSqlFixture.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/PostgreSqlFixture.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/PostgreSqlFixture.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/PostgreSqlFixture.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/SqlCommandTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/SqlCommandTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/SqlCommandTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/SqlCommandTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/SqlServerFixture.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/SqlServerFixture.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/SqlServerFixture.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/SqlServerFixture.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/SqliteCommandTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/SqliteCommandTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/AdoNet/SqliteCommandTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/SqliteCommandTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/AspNetCore/AspNetCoreTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AspNetCore/AspNetCoreTests.cs similarity index 98% rename from test/Elastic.Apm.Profiler.Managed.Tests/AspNetCore/AspNetCoreTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/AspNetCore/AspNetCoreTests.cs index 2f85994e0..ddbe3ea6b 100644 --- a/test/Elastic.Apm.Profiler.Managed.Tests/AspNetCore/AspNetCoreTests.cs +++ b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/AspNetCore/AspNetCoreTests.cs @@ -33,7 +33,7 @@ public async void AspNetCoreTest(string framework) var port = apmServer.FindAvailablePortToListen(); apmServer.RunInBackground(port); - using (var profiledApplication = new ProfiledApplication("SampleAspNetCoreApp")) + using (var profiledApplication = new ProfiledApplication("SampleAspNetCoreApp", genericSampleApp: true)) { IDictionary environmentVariables = new Dictionary { diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/BasicTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/BasicTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/BasicTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/BasicTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/Continuations/TaskContinuationGeneratorTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/Continuations/TaskContinuationGeneratorTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/Continuations/TaskContinuationGeneratorTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/Continuations/TaskContinuationGeneratorTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/Continuations/ValueTaskContinuationGeneratorTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/Continuations/ValueTaskContinuationGeneratorTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/Continuations/ValueTaskContinuationGeneratorTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/Continuations/ValueTaskContinuationGeneratorTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/DuckExplicitInterfaceTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/DuckExplicitInterfaceTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/DuckExplicitInterfaceTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/DuckExplicitInterfaceTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/DuckIgnoreTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/DuckIgnoreTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/DuckIgnoreTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/DuckIgnoreTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/DuckIncludeTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/DuckIncludeTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/DuckIncludeTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/DuckIncludeTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/DuckTypeExtensionsTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/DuckTypeExtensionsTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/DuckTypeExtensionsTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/DuckTypeExtensionsTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/ExceptionsTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/ExceptionsTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/ExceptionsTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/ExceptionsTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/IObscureDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/IObscureDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/IObscureDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/IObscureDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/IObscureReadonlyErrorDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/IObscureReadonlyErrorDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/IObscureReadonlyErrorDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/IObscureReadonlyErrorDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/IObscureStaticReadonlyErrorDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/IObscureStaticReadonlyErrorDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/IObscureStaticReadonlyErrorDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/IObscureStaticReadonlyErrorDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ReferenceTypeFieldTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ReferenceTypeFieldTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ReferenceTypeFieldTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ReferenceType/ReferenceTypeFieldTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/IDummyFieldObject.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/IDummyFieldObject.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/IDummyFieldObject.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/IDummyFieldObject.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/IObscureDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/IObscureDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/IObscureDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/IObscureDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/IObscureReadonlyErrorDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/IObscureReadonlyErrorDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/IObscureReadonlyErrorDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/IObscureReadonlyErrorDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/IObscureStaticReadonlyErrorDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/IObscureStaticReadonlyErrorDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/IObscureStaticReadonlyErrorDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/IObscureStaticReadonlyErrorDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/TypeChainingFieldTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/TypeChainingFieldTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/TypeChainingFieldTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/TypeChaining/TypeChainingFieldTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/IObscureDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/IObscureDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/IObscureDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/IObscureDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/IObscureReadonlyErrorDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/IObscureReadonlyErrorDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/IObscureReadonlyErrorDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/IObscureReadonlyErrorDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/IObscureStaticReadonlyErrorDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/IObscureStaticReadonlyErrorDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/IObscureStaticReadonlyErrorDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/IObscureStaticReadonlyErrorDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ValueTypeFieldTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ValueTypeFieldTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ValueTypeFieldTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Fields/ValueType/ValueTypeFieldTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/MethodTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/MethodTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/MethodTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/MethodTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/AbstractGenericsWithAttribute.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/AbstractGenericsWithAttribute.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/AbstractGenericsWithAttribute.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/AbstractGenericsWithAttribute.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/DefaultGenericMethodDuckTypeAbstractClass.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/DefaultGenericMethodDuckTypeAbstractClass.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/DefaultGenericMethodDuckTypeAbstractClass.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/DefaultGenericMethodDuckTypeAbstractClass.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/DefaultGenericMethodDuckTypeVirtualClass.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/DefaultGenericMethodDuckTypeVirtualClass.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/DefaultGenericMethodDuckTypeVirtualClass.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/DefaultGenericMethodDuckTypeVirtualClass.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IDefaultGenericMethodDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IDefaultGenericMethodDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IDefaultGenericMethodDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IDefaultGenericMethodDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IDictioDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IDictioDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IDictioDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IDictioDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IDictioValue.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IDictioValue.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IDictioValue.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IDictioValue.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IDummyFieldObject.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IDummyFieldObject.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IDummyFieldObject.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IDummyFieldObject.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IGenericsWithAttribute.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IGenericsWithAttribute.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IGenericsWithAttribute.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IGenericsWithAttribute.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IObscureDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IObscureDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IObscureDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/IObscureDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/TestEnum2.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/TestEnum2.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/TestEnum2.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/TestEnum2.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/VirtualGenericsWithAttribute.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/VirtualGenericsWithAttribute.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/VirtualGenericsWithAttribute.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Methods/ProxiesDefinitions/VirtualGenericsWithAttribute.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/ObscureObject.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/ObscureObject.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/ObscureObject.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/ObscureObject.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/IDuckTypeUnion.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/IDuckTypeUnion.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/IDuckTypeUnion.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/IDuckTypeUnion.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/IObscureDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/IObscureDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/IObscureDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/IObscureDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/IObscureErrorDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/IObscureErrorDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/IObscureErrorDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/IObscureErrorDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/IObscureStaticErrorDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/IObscureStaticErrorDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/IObscureStaticErrorDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/IObscureStaticErrorDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/ObscureDuckTypeStruct.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/ObscureDuckTypeStruct.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/ObscureDuckTypeStruct.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/ObscureDuckTypeStruct.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ReferenceTypePropertyTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ReferenceTypePropertyTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ReferenceTypePropertyTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ReferenceType/ReferenceTypePropertyTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/DummyFieldStruct.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/DummyFieldStruct.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/DummyFieldStruct.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/DummyFieldStruct.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/IDummyFieldObject.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/IDummyFieldObject.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/IDummyFieldObject.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/IDummyFieldObject.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/IObscureDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/IObscureDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/IObscureDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/IObscureDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/IObscureErrorDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/IObscureErrorDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/IObscureErrorDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/IObscureErrorDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/IObscureStaticErrorDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/IObscureStaticErrorDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/IObscureStaticErrorDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/IObscureStaticErrorDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/ITypesTuple.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/ITypesTuple.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/ITypesTuple.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/ITypesTuple.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/ObscureDuckTypeStruct.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/ObscureDuckTypeStruct.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/ObscureDuckTypeStruct.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/ObscureDuckTypeStruct.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/TypeChainingPropertyTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/TypeChainingPropertyTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/TypeChainingPropertyTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/TypeChaining/TypeChainingPropertyTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/IObscureDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/IObscureDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/IObscureDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/IObscureDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/IObscureErrorDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/IObscureErrorDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/IObscureErrorDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/IObscureErrorDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/IObscureStaticErrorDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/IObscureStaticErrorDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/IObscureStaticErrorDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/IObscureStaticErrorDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/IStructDuckType.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/IStructDuckType.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/IStructDuckType.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/IStructDuckType.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/ObscureDuckTypeAbstractClass.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/ObscureDuckTypeStruct.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/ObscureDuckTypeStruct.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/ObscureDuckTypeStruct.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/ObscureDuckTypeStruct.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ProxiesDefinitions/ObscureDuckTypeVirtualClass.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ValueTypePropertyTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ValueTypePropertyTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ValueTypePropertyTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/Properties/ValueType/ValueTypePropertyTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/StructTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/StructTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/StructTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/StructTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/TypesTupleTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/TypesTupleTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/TypesTupleTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/DuckTyping/TypesTupleTests.cs diff --git a/test/profiler/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj new file mode 100644 index 000000000..6e25e6c42 --- /dev/null +++ b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj @@ -0,0 +1,29 @@ + + + + + net7.0 + false + + false + false + false + + + + + + + + + + + + + + + + + + + diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/ExcludeTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/ExcludeTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/ExcludeTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/ExcludeTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/Kafka/KafkaFixture.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/Kafka/KafkaFixture.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/Kafka/KafkaFixture.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/Kafka/KafkaFixture.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/Kafka/KafkaTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/Kafka/KafkaTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/Kafka/KafkaTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/Kafka/KafkaTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/ProfiledApplication.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/ProfiledApplication.cs similarity index 93% rename from test/Elastic.Apm.Profiler.Managed.Tests/ProfiledApplication.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/ProfiledApplication.cs index e6c4b682c..8a0cb48bc 100644 --- a/test/Elastic.Apm.Profiler.Managed.Tests/ProfiledApplication.cs +++ b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/ProfiledApplication.cs @@ -28,10 +28,13 @@ public class ProfiledApplication : IDisposable private readonly string _projectName; private readonly string _publishDirectory; - public ProfiledApplication(string projectName) + public ProfiledApplication(string projectName, bool genericSampleApp = false) { _projectName = projectName; - _projectDirectory = Path.Combine(SolutionPaths.Root, "sample", projectName); + var root = genericSampleApp + ? Path.Combine(SolutionPaths.Root, "sample") + : Path.Combine(SolutionPaths.Root, "test", "profiler", "applications"); + _projectDirectory = Path.Combine(root, projectName); if (!Directory.Exists(_projectDirectory)) throw new DirectoryNotFoundException($"project could not be found at {_projectDirectory}"); diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/RabbitMq/RabbitMqFixture.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/RabbitMq/RabbitMqFixture.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/RabbitMq/RabbitMqFixture.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/RabbitMq/RabbitMqFixture.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/RabbitMq/RabbitMqTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/RabbitMq/RabbitMqTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/RabbitMq/RabbitMqTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/RabbitMq/RabbitMqTests.cs diff --git a/test/Elastic.Apm.Profiler.Managed.Tests/SatelliteAssemblyTests.cs b/test/profiler/Elastic.Apm.Profiler.Managed.Tests/SatelliteAssemblyTests.cs similarity index 100% rename from test/Elastic.Apm.Profiler.Managed.Tests/SatelliteAssemblyTests.cs rename to test/profiler/Elastic.Apm.Profiler.Managed.Tests/SatelliteAssemblyTests.cs diff --git a/sample/Elastic.Apm.AdoNet.NetStandard/DbCommandExecutor.cs b/test/profiler/applications/Elastic.Apm.AdoNet.NetStandard/DbCommandExecutor.cs similarity index 100% rename from sample/Elastic.Apm.AdoNet.NetStandard/DbCommandExecutor.cs rename to test/profiler/applications/Elastic.Apm.AdoNet.NetStandard/DbCommandExecutor.cs diff --git a/sample/Elastic.Apm.AdoNet.NetStandard/DbCommandNetStandardClassExecutor.cs b/test/profiler/applications/Elastic.Apm.AdoNet.NetStandard/DbCommandNetStandardClassExecutor.cs similarity index 100% rename from sample/Elastic.Apm.AdoNet.NetStandard/DbCommandNetStandardClassExecutor.cs rename to test/profiler/applications/Elastic.Apm.AdoNet.NetStandard/DbCommandNetStandardClassExecutor.cs diff --git a/sample/Elastic.Apm.AdoNet.NetStandard/DbCommandNetStandardInterfaceExecutor.cs b/test/profiler/applications/Elastic.Apm.AdoNet.NetStandard/DbCommandNetStandardInterfaceExecutor.cs similarity index 100% rename from sample/Elastic.Apm.AdoNet.NetStandard/DbCommandNetStandardInterfaceExecutor.cs rename to test/profiler/applications/Elastic.Apm.AdoNet.NetStandard/DbCommandNetStandardInterfaceExecutor.cs diff --git a/sample/Elastic.Apm.AdoNet.NetStandard/DbCommandNetStandardInterfaceGenericExecutor.cs b/test/profiler/applications/Elastic.Apm.AdoNet.NetStandard/DbCommandNetStandardInterfaceGenericExecutor.cs similarity index 100% rename from sample/Elastic.Apm.AdoNet.NetStandard/DbCommandNetStandardInterfaceGenericExecutor.cs rename to test/profiler/applications/Elastic.Apm.AdoNet.NetStandard/DbCommandNetStandardInterfaceGenericExecutor.cs diff --git a/sample/Elastic.Apm.AdoNet.NetStandard/Elastic.Apm.AdoNet.NetStandard.csproj b/test/profiler/applications/Elastic.Apm.AdoNet.NetStandard/Elastic.Apm.AdoNet.NetStandard.csproj similarity index 100% rename from sample/Elastic.Apm.AdoNet.NetStandard/Elastic.Apm.AdoNet.NetStandard.csproj rename to test/profiler/applications/Elastic.Apm.AdoNet.NetStandard/Elastic.Apm.AdoNet.NetStandard.csproj diff --git a/sample/Elastic.Apm.AdoNet.NetStandard/IDbCommandExecutor.cs b/test/profiler/applications/Elastic.Apm.AdoNet.NetStandard/IDbCommandExecutor.cs similarity index 100% rename from sample/Elastic.Apm.AdoNet.NetStandard/IDbCommandExecutor.cs rename to test/profiler/applications/Elastic.Apm.AdoNet.NetStandard/IDbCommandExecutor.cs diff --git a/sample/Elastic.Apm.AdoNet/DbCommandClassExecutor.cs b/test/profiler/applications/Elastic.Apm.AdoNet/DbCommandClassExecutor.cs similarity index 100% rename from sample/Elastic.Apm.AdoNet/DbCommandClassExecutor.cs rename to test/profiler/applications/Elastic.Apm.AdoNet/DbCommandClassExecutor.cs diff --git a/sample/Elastic.Apm.AdoNet/DbCommandExtensions.cs b/test/profiler/applications/Elastic.Apm.AdoNet/DbCommandExtensions.cs similarity index 100% rename from sample/Elastic.Apm.AdoNet/DbCommandExtensions.cs rename to test/profiler/applications/Elastic.Apm.AdoNet/DbCommandExtensions.cs diff --git a/sample/Elastic.Apm.AdoNet/DbCommandFactory.cs b/test/profiler/applications/Elastic.Apm.AdoNet/DbCommandFactory.cs similarity index 100% rename from sample/Elastic.Apm.AdoNet/DbCommandFactory.cs rename to test/profiler/applications/Elastic.Apm.AdoNet/DbCommandFactory.cs diff --git a/sample/Elastic.Apm.AdoNet/DbCommandInterfaceExecutor.cs b/test/profiler/applications/Elastic.Apm.AdoNet/DbCommandInterfaceExecutor.cs similarity index 100% rename from sample/Elastic.Apm.AdoNet/DbCommandInterfaceExecutor.cs rename to test/profiler/applications/Elastic.Apm.AdoNet/DbCommandInterfaceExecutor.cs diff --git a/sample/Elastic.Apm.AdoNet/DbCommandInterfaceGenericExecutor.cs b/test/profiler/applications/Elastic.Apm.AdoNet/DbCommandInterfaceGenericExecutor.cs similarity index 100% rename from sample/Elastic.Apm.AdoNet/DbCommandInterfaceGenericExecutor.cs rename to test/profiler/applications/Elastic.Apm.AdoNet/DbCommandInterfaceGenericExecutor.cs diff --git a/sample/Elastic.Apm.AdoNet/DbCommandRunner.cs b/test/profiler/applications/Elastic.Apm.AdoNet/DbCommandRunner.cs similarity index 100% rename from sample/Elastic.Apm.AdoNet/DbCommandRunner.cs rename to test/profiler/applications/Elastic.Apm.AdoNet/DbCommandRunner.cs diff --git a/sample/Elastic.Apm.AdoNet/Elastic.Apm.AdoNet.csproj b/test/profiler/applications/Elastic.Apm.AdoNet/Elastic.Apm.AdoNet.csproj similarity index 74% rename from sample/Elastic.Apm.AdoNet/Elastic.Apm.AdoNet.csproj rename to test/profiler/applications/Elastic.Apm.AdoNet/Elastic.Apm.AdoNet.csproj index b1e0faa47..2c03167ca 100644 --- a/sample/Elastic.Apm.AdoNet/Elastic.Apm.AdoNet.csproj +++ b/test/profiler/applications/Elastic.Apm.AdoNet/Elastic.Apm.AdoNet.csproj @@ -5,7 +5,7 @@ - + diff --git a/sample/KafkaSample/Consumer.cs b/test/profiler/applications/KafkaSample/Consumer.cs similarity index 100% rename from sample/KafkaSample/Consumer.cs rename to test/profiler/applications/KafkaSample/Consumer.cs diff --git a/sample/KafkaSample/KafkaSample.csproj b/test/profiler/applications/KafkaSample/KafkaSample.csproj similarity index 81% rename from sample/KafkaSample/KafkaSample.csproj rename to test/profiler/applications/KafkaSample/KafkaSample.csproj index d7974b2d3..47ba29207 100644 --- a/sample/KafkaSample/KafkaSample.csproj +++ b/test/profiler/applications/KafkaSample/KafkaSample.csproj @@ -12,7 +12,7 @@ - + diff --git a/sample/KafkaSample/Producer.cs b/test/profiler/applications/KafkaSample/Producer.cs similarity index 100% rename from sample/KafkaSample/Producer.cs rename to test/profiler/applications/KafkaSample/Producer.cs diff --git a/sample/KafkaSample/Program.cs b/test/profiler/applications/KafkaSample/Program.cs similarity index 100% rename from sample/KafkaSample/Program.cs rename to test/profiler/applications/KafkaSample/Program.cs diff --git a/sample/KafkaSample/SampleMessage.cs b/test/profiler/applications/KafkaSample/SampleMessage.cs similarity index 100% rename from sample/KafkaSample/SampleMessage.cs rename to test/profiler/applications/KafkaSample/SampleMessage.cs diff --git a/sample/MySqlDataSample/MySqlDataCommandExecutor.cs b/test/profiler/applications/MySqlDataSample/MySqlDataCommandExecutor.cs similarity index 100% rename from sample/MySqlDataSample/MySqlDataCommandExecutor.cs rename to test/profiler/applications/MySqlDataSample/MySqlDataCommandExecutor.cs diff --git a/sample/MySqlDataSample/MySqlDataSample.csproj b/test/profiler/applications/MySqlDataSample/MySqlDataSample.csproj similarity index 100% rename from sample/MySqlDataSample/MySqlDataSample.csproj rename to test/profiler/applications/MySqlDataSample/MySqlDataSample.csproj diff --git a/sample/MySqlDataSample/Program.cs b/test/profiler/applications/MySqlDataSample/Program.cs similarity index 100% rename from sample/MySqlDataSample/Program.cs rename to test/profiler/applications/MySqlDataSample/Program.cs diff --git a/sample/NpgsqlSample/NpgsqlCommandExecutor.cs b/test/profiler/applications/NpgsqlSample/NpgsqlCommandExecutor.cs similarity index 100% rename from sample/NpgsqlSample/NpgsqlCommandExecutor.cs rename to test/profiler/applications/NpgsqlSample/NpgsqlCommandExecutor.cs diff --git a/sample/NpgsqlSample/NpgsqlSample.csproj b/test/profiler/applications/NpgsqlSample/NpgsqlSample.csproj similarity index 100% rename from sample/NpgsqlSample/NpgsqlSample.csproj rename to test/profiler/applications/NpgsqlSample/NpgsqlSample.csproj diff --git a/sample/NpgsqlSample/Program.cs b/test/profiler/applications/NpgsqlSample/Program.cs similarity index 100% rename from sample/NpgsqlSample/Program.cs rename to test/profiler/applications/NpgsqlSample/Program.cs diff --git a/sample/OracleManagedDataAccessCoreSample/OracleCommandExecutor.cs b/test/profiler/applications/OracleManagedDataAccessCoreSample/OracleCommandExecutor.cs similarity index 100% rename from sample/OracleManagedDataAccessCoreSample/OracleCommandExecutor.cs rename to test/profiler/applications/OracleManagedDataAccessCoreSample/OracleCommandExecutor.cs diff --git a/sample/OracleManagedDataAccessCoreSample/OracleDbCommandFactory.cs b/test/profiler/applications/OracleManagedDataAccessCoreSample/OracleDbCommandFactory.cs similarity index 100% rename from sample/OracleManagedDataAccessCoreSample/OracleDbCommandFactory.cs rename to test/profiler/applications/OracleManagedDataAccessCoreSample/OracleDbCommandFactory.cs diff --git a/sample/OracleManagedDataAccessCoreSample/OracleManagedDataAccessCoreSample.csproj b/test/profiler/applications/OracleManagedDataAccessCoreSample/OracleManagedDataAccessCoreSample.csproj similarity index 100% rename from sample/OracleManagedDataAccessCoreSample/OracleManagedDataAccessCoreSample.csproj rename to test/profiler/applications/OracleManagedDataAccessCoreSample/OracleManagedDataAccessCoreSample.csproj diff --git a/sample/OracleManagedDataAccessCoreSample/Program.cs b/test/profiler/applications/OracleManagedDataAccessCoreSample/Program.cs similarity index 100% rename from sample/OracleManagedDataAccessCoreSample/Program.cs rename to test/profiler/applications/OracleManagedDataAccessCoreSample/Program.cs diff --git a/sample/OracleManagedDataAccessSample/OracleCommandExecutor.cs b/test/profiler/applications/OracleManagedDataAccessSample/OracleCommandExecutor.cs similarity index 100% rename from sample/OracleManagedDataAccessSample/OracleCommandExecutor.cs rename to test/profiler/applications/OracleManagedDataAccessSample/OracleCommandExecutor.cs diff --git a/sample/OracleManagedDataAccessSample/OracleDbCommandFactory.cs b/test/profiler/applications/OracleManagedDataAccessSample/OracleDbCommandFactory.cs similarity index 100% rename from sample/OracleManagedDataAccessSample/OracleDbCommandFactory.cs rename to test/profiler/applications/OracleManagedDataAccessSample/OracleDbCommandFactory.cs diff --git a/sample/OracleManagedDataAccessSample/OracleManagedDataAccessSample.csproj b/test/profiler/applications/OracleManagedDataAccessSample/OracleManagedDataAccessSample.csproj similarity index 100% rename from sample/OracleManagedDataAccessSample/OracleManagedDataAccessSample.csproj rename to test/profiler/applications/OracleManagedDataAccessSample/OracleManagedDataAccessSample.csproj diff --git a/sample/OracleManagedDataAccessSample/Program.cs b/test/profiler/applications/OracleManagedDataAccessSample/Program.cs similarity index 100% rename from sample/OracleManagedDataAccessSample/Program.cs rename to test/profiler/applications/OracleManagedDataAccessSample/Program.cs diff --git a/sample/RabbitMqSample/Program.cs b/test/profiler/applications/RabbitMqSample/Program.cs similarity index 100% rename from sample/RabbitMqSample/Program.cs rename to test/profiler/applications/RabbitMqSample/Program.cs diff --git a/sample/RabbitMqSample/RabbitMqSample.csproj b/test/profiler/applications/RabbitMqSample/RabbitMqSample.csproj similarity index 82% rename from sample/RabbitMqSample/RabbitMqSample.csproj rename to test/profiler/applications/RabbitMqSample/RabbitMqSample.csproj index 327154e7e..ced64b4cf 100644 --- a/sample/RabbitMqSample/RabbitMqSample.csproj +++ b/test/profiler/applications/RabbitMqSample/RabbitMqSample.csproj @@ -12,7 +12,7 @@ - + \ No newline at end of file diff --git a/sample/SatelliteAssemblySample/Program.cs b/test/profiler/applications/SatelliteAssemblySample/Program.cs similarity index 100% rename from sample/SatelliteAssemblySample/Program.cs rename to test/profiler/applications/SatelliteAssemblySample/Program.cs diff --git a/sample/SatelliteAssemblySample/SatelliteAssemblySample.csproj b/test/profiler/applications/SatelliteAssemblySample/SatelliteAssemblySample.csproj similarity index 100% rename from sample/SatelliteAssemblySample/SatelliteAssemblySample.csproj rename to test/profiler/applications/SatelliteAssemblySample/SatelliteAssemblySample.csproj diff --git a/sample/SqlClientSample/Program.cs b/test/profiler/applications/SqlClientSample/Program.cs similarity index 100% rename from sample/SqlClientSample/Program.cs rename to test/profiler/applications/SqlClientSample/Program.cs diff --git a/sample/SqlClientSample/SqlClientSample.csproj b/test/profiler/applications/SqlClientSample/SqlClientSample.csproj similarity index 100% rename from sample/SqlClientSample/SqlClientSample.csproj rename to test/profiler/applications/SqlClientSample/SqlClientSample.csproj diff --git a/sample/SqlClientSample/SqlCommandExecutor.cs b/test/profiler/applications/SqlClientSample/SqlCommandExecutor.cs similarity index 100% rename from sample/SqlClientSample/SqlCommandExecutor.cs rename to test/profiler/applications/SqlClientSample/SqlCommandExecutor.cs diff --git a/sample/SqliteSample/Program.cs b/test/profiler/applications/SqliteSample/Program.cs similarity index 100% rename from sample/SqliteSample/Program.cs rename to test/profiler/applications/SqliteSample/Program.cs diff --git a/sample/SqliteSample/SqliteCommandExecutor.cs b/test/profiler/applications/SqliteSample/SqliteCommandExecutor.cs similarity index 100% rename from sample/SqliteSample/SqliteCommandExecutor.cs rename to test/profiler/applications/SqliteSample/SqliteCommandExecutor.cs diff --git a/sample/SqliteSample/SqliteSample.csproj b/test/profiler/applications/SqliteSample/SqliteSample.csproj similarity index 100% rename from sample/SqliteSample/SqliteSample.csproj rename to test/profiler/applications/SqliteSample/SqliteSample.csproj