diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9a098f3895..13efacff6d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -110,43 +110,7 @@ updates: open-pull-requests-limit: 20 - package-ecosystem: nuget - directory: /test/integration-tests/aspnet/IntegrationTests.AspNet - schedule: - interval: "daily" - open-pull-requests-limit: 20 - - - package-ecosystem: nuget - directory: /test/integration-tests/IntegrationTests.GraphQL - schedule: - interval: "daily" - open-pull-requests-limit: 20 - - - package-ecosystem: nuget - directory: /test/integration-tests/IntegrationTests.Helpers - schedule: - interval: "daily" - open-pull-requests-limit: 20 - - - package-ecosystem: nuget - directory: /test/integration-tests/IntegrationTests.Http - schedule: - interval: "daily" - open-pull-requests-limit: 20 - - - package-ecosystem: nuget - directory: /test/integration-tests/IntegrationTests.StartupHook - schedule: - interval: "daily" - open-pull-requests-limit: 20 - - - package-ecosystem: nuget - directory: /test/integration-tests/IntegrationTests.MongoDB - schedule: - interval: "daily" - open-pull-requests-limit: 20 - - - package-ecosystem: nuget - directory: /test/integration-tests/IntegrationTests.SqlClient + directory: /test/IntegrationTests schedule: interval: "daily" open-pull-requests-limit: 20 diff --git a/OpenTelemetry.AutoInstrumentation.proj b/OpenTelemetry.AutoInstrumentation.proj index 55795d4680..b10d822a0b 100644 --- a/OpenTelemetry.AutoInstrumentation.proj +++ b/OpenTelemetry.AutoInstrumentation.proj @@ -14,16 +14,15 @@ - - + - + - + @@ -59,16 +58,6 @@ - - - - - - - - - - diff --git a/OpenTelemetry.AutoInstrumentation.sln b/OpenTelemetry.AutoInstrumentation.sln index da3121e373..130a8b9ade 100644 --- a/OpenTelemetry.AutoInstrumentation.sln +++ b/OpenTelemetry.AutoInstrumentation.sln @@ -84,11 +84,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5C915382-C test\Directory.Build.props = test\Directory.Build.props EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "integration-tests", "integration-tests", "{357C3F25-98CA-41C6-BA2C-20968695D026}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.GraphQL", "test\integration-tests\IntegrationTests.GraphQL\IntegrationTests.GraphQL.csproj", "{56BA76DB-56E0-465E-84B6-71C64F12017F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.Helpers", "test\integration-tests\IntegrationTests.Helpers\IntegrationTests.Helpers.csproj", "{20B74D4B-B777-4E33-AE1F-7D536DFA6BE6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests", "test\IntegrationTests\IntegrationTests.csproj", "{20B74D4B-B777-4E33-AE1F-7D536DFA6BE6}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test-applications", "test-applications", "{91A299AD-6C09-4B7F-BD8B-A705D9BFC672}" EndProject @@ -109,16 +105,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aspnet", "aspnet", "{2E1F47 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication.AspNet", "test\test-applications\integrations\aspnet\TestApplication.AspNet\TestApplication.AspNet.csproj", "{5FDB5603-21D3-446A-8B50-36DACCF7C2FF}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aspnet", "aspnet", "{A0B40A84-EF97-47DB-8455-796A9BCA1097}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.AspNet", "test\integration-tests\aspnet\IntegrationTests.AspNet\IntegrationTests.AspNet.csproj", "{EE65928D-15C8-45E5-A94C-7094381E7ACF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.AutoInstrumentation.Bootstrapping.Tests", "test\OpenTelemetry.AutoInstrumentation.Bootstrapping.Tests\OpenTelemetry.AutoInstrumentation.Bootstrapping.Tests.csproj", "{35AB65D8-D76E-40C6-B10C-501A6D44C9E0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.AutoInstrumentation.StartupHook", "src\OpenTelemetry.AutoInstrumentation.StartupHook\OpenTelemetry.AutoInstrumentation.StartupHook.csproj", "{E04DA938-E153-4A0D-9CB0-EAC38210FAF2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.StartupHook", "test\integration-tests\IntegrationTests.StartupHook\IntegrationTests.StartupHook.csproj", "{0584ADC1-956E-49B0-A46F-8405AA2AD207}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApplication.StartupHook", "test\test-applications\integrations\TestApplication.StartupHook\TestApplication.StartupHook.csproj", "{FF665CC4-6643-4614-A1A0-FA182E3AF37C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.AutoInstrumentation.AdditionalDeps", "src\OpenTelemetry.AutoInstrumentation.AdditionalDeps\OpenTelemetry.AutoInstrumentation.AdditionalDeps.csproj", "{E026D9FA-FBD5-4066-AF6A-FB63DE28521F}" @@ -131,16 +121,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.ManualInstrumentat EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApplication.Http", "test\test-applications\integrations\TestApplication.Http\TestApplication.Http.csproj", "{4E17BE29-B227-41D8-97FE-26F674951E26}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.Http", "test\integration-tests\IntegrationTests.Http\IntegrationTests.Http.csproj", "{413326C3-4B8F-4C44-93C8-0E20EFB97DB4}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.CoreAppOldReference", "examples\CoreAppOldReference\Examples.CoreAppOldReference.csproj", "{6ACF2A48-427F-4EF2-81B5-EE9CDB0476C6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.MongoDB", "test\integration-tests\IntegrationTests.MongoDB\IntegrationTests.MongoDB.csproj", "{75EB97DD-E191-4BDF-83DE-E26785567710}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApplication.MongoDB", "test\test-applications\integrations\TestApplication.MongoDB\TestApplication.MongoDB.csproj", "{3B77F975-BF66-4218-9982-F48D3271DDFE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.SqlClient", "test\integration-tests\IntegrationTests.SqlClient\IntegrationTests.SqlClient.csproj", "{474834F1-2769-4FBB-BD0A-941DE276DFB6}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApplication.SqlClient", "test\test-applications\integrations\TestApplication.SqlClient\TestApplication.SqlClient.csproj", "{2120CFA2-9D16-45F0-A333-B0385C371509}" EndProject Global @@ -303,8 +287,8 @@ Global {EFAE6960-9425-462E-BFFB-4C9A038DD8C0}.Debug|x64.Build.0 = Debug|x64 {EFAE6960-9425-462E-BFFB-4C9A038DD8C0}.Debug|x86.ActiveCfg = Debug|x86 {EFAE6960-9425-462E-BFFB-4C9A038DD8C0}.Debug|x86.Build.0 = Debug|x86 - {EFAE6960-9425-462E-BFFB-4C9A038DD8C0}.Release|Any CPU.ActiveCfg = Release|x86 - {EFAE6960-9425-462E-BFFB-4C9A038DD8C0}.Release|Any CPU.Build.0 = Release|x86 + {EFAE6960-9425-462E-BFFB-4C9A038DD8C0}.Release|Any CPU.ActiveCfg = Release|x64 + {EFAE6960-9425-462E-BFFB-4C9A038DD8C0}.Release|Any CPU.Build.0 = Release|x64 {EFAE6960-9425-462E-BFFB-4C9A038DD8C0}.Release|x64.ActiveCfg = Release|x64 {EFAE6960-9425-462E-BFFB-4C9A038DD8C0}.Release|x64.Build.0 = Release|x64 {EFAE6960-9425-462E-BFFB-4C9A038DD8C0}.Release|x86.ActiveCfg = Release|x86 @@ -315,8 +299,8 @@ Global {6615B3D8-87C7-40D4-A7EA-19A7BFC7FD24}.Debug|x64.Build.0 = Debug|x64 {6615B3D8-87C7-40D4-A7EA-19A7BFC7FD24}.Debug|x86.ActiveCfg = Debug|x86 {6615B3D8-87C7-40D4-A7EA-19A7BFC7FD24}.Debug|x86.Build.0 = Debug|x86 - {6615B3D8-87C7-40D4-A7EA-19A7BFC7FD24}.Release|Any CPU.ActiveCfg = Release|x86 - {6615B3D8-87C7-40D4-A7EA-19A7BFC7FD24}.Release|Any CPU.Build.0 = Release|x86 + {6615B3D8-87C7-40D4-A7EA-19A7BFC7FD24}.Release|Any CPU.ActiveCfg = Release|x64 + {6615B3D8-87C7-40D4-A7EA-19A7BFC7FD24}.Release|Any CPU.Build.0 = Release|x64 {6615B3D8-87C7-40D4-A7EA-19A7BFC7FD24}.Release|x64.ActiveCfg = Release|x64 {6615B3D8-87C7-40D4-A7EA-19A7BFC7FD24}.Release|x64.Build.0 = Release|x64 {6615B3D8-87C7-40D4-A7EA-19A7BFC7FD24}.Release|x86.ActiveCfg = Release|x86 @@ -327,18 +311,7 @@ Global {4DDEEB10-A6B5-4A46-96C1-1B7276B61E08}.Release|Any CPU.ActiveCfg = Release|Any CPU {4DDEEB10-A6B5-4A46-96C1-1B7276B61E08}.Release|x64.ActiveCfg = Release|Any CPU {4DDEEB10-A6B5-4A46-96C1-1B7276B61E08}.Release|x86.ActiveCfg = Release|Any CPU - {56BA76DB-56E0-465E-84B6-71C64F12017F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {56BA76DB-56E0-465E-84B6-71C64F12017F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {56BA76DB-56E0-465E-84B6-71C64F12017F}.Debug|x64.ActiveCfg = Debug|Any CPU - {56BA76DB-56E0-465E-84B6-71C64F12017F}.Debug|x64.Build.0 = Debug|Any CPU - {56BA76DB-56E0-465E-84B6-71C64F12017F}.Debug|x86.ActiveCfg = Debug|Any CPU - {56BA76DB-56E0-465E-84B6-71C64F12017F}.Debug|x86.Build.0 = Debug|Any CPU - {56BA76DB-56E0-465E-84B6-71C64F12017F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {56BA76DB-56E0-465E-84B6-71C64F12017F}.Release|Any CPU.Build.0 = Release|Any CPU - {56BA76DB-56E0-465E-84B6-71C64F12017F}.Release|x64.ActiveCfg = Release|Any CPU - {56BA76DB-56E0-465E-84B6-71C64F12017F}.Release|x64.Build.0 = Release|Any CPU - {56BA76DB-56E0-465E-84B6-71C64F12017F}.Release|x86.ActiveCfg = Release|Any CPU - {56BA76DB-56E0-465E-84B6-71C64F12017F}.Release|x86.Build.0 = Release|Any CPU + {4DDEEB10-A6B5-4A46-96C1-1B7276B61E08}.Release|x86.Build.0 = Release|Any CPU {20B74D4B-B777-4E33-AE1F-7D536DFA6BE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {20B74D4B-B777-4E33-AE1F-7D536DFA6BE6}.Debug|Any CPU.Build.0 = Debug|Any CPU {20B74D4B-B777-4E33-AE1F-7D536DFA6BE6}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -357,8 +330,8 @@ Global {63FD1231-345F-461E-A9C2-237ED305ED11}.Debug|x64.Build.0 = Debug|x64 {63FD1231-345F-461E-A9C2-237ED305ED11}.Debug|x86.ActiveCfg = Debug|x86 {63FD1231-345F-461E-A9C2-237ED305ED11}.Debug|x86.Build.0 = Debug|x86 - {63FD1231-345F-461E-A9C2-237ED305ED11}.Release|Any CPU.ActiveCfg = Release|x86 - {63FD1231-345F-461E-A9C2-237ED305ED11}.Release|Any CPU.Build.0 = Release|x86 + {63FD1231-345F-461E-A9C2-237ED305ED11}.Release|Any CPU.ActiveCfg = Release|x64 + {63FD1231-345F-461E-A9C2-237ED305ED11}.Release|Any CPU.Build.0 = Release|x64 {63FD1231-345F-461E-A9C2-237ED305ED11}.Release|x64.ActiveCfg = Release|x64 {63FD1231-345F-461E-A9C2-237ED305ED11}.Release|x64.Build.0 = Release|x64 {63FD1231-345F-461E-A9C2-237ED305ED11}.Release|x86.ActiveCfg = Release|x86 @@ -393,24 +366,12 @@ Global {5FDB5603-21D3-446A-8B50-36DACCF7C2FF}.Debug|x64.Build.0 = Debug|x64 {5FDB5603-21D3-446A-8B50-36DACCF7C2FF}.Debug|x86.ActiveCfg = Debug|x86 {5FDB5603-21D3-446A-8B50-36DACCF7C2FF}.Debug|x86.Build.0 = Debug|x86 - {5FDB5603-21D3-446A-8B50-36DACCF7C2FF}.Release|Any CPU.ActiveCfg = Release|x86 - {5FDB5603-21D3-446A-8B50-36DACCF7C2FF}.Release|Any CPU.Build.0 = Release|x86 + {5FDB5603-21D3-446A-8B50-36DACCF7C2FF}.Release|Any CPU.ActiveCfg = Release|x64 + {5FDB5603-21D3-446A-8B50-36DACCF7C2FF}.Release|Any CPU.Build.0 = Release|x64 {5FDB5603-21D3-446A-8B50-36DACCF7C2FF}.Release|x64.ActiveCfg = Release|x64 {5FDB5603-21D3-446A-8B50-36DACCF7C2FF}.Release|x64.Build.0 = Release|x64 {5FDB5603-21D3-446A-8B50-36DACCF7C2FF}.Release|x86.ActiveCfg = Release|x86 {5FDB5603-21D3-446A-8B50-36DACCF7C2FF}.Release|x86.Build.0 = Release|x86 - {EE65928D-15C8-45E5-A94C-7094381E7ACF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE65928D-15C8-45E5-A94C-7094381E7ACF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE65928D-15C8-45E5-A94C-7094381E7ACF}.Debug|x64.ActiveCfg = Debug|Any CPU - {EE65928D-15C8-45E5-A94C-7094381E7ACF}.Debug|x64.Build.0 = Debug|Any CPU - {EE65928D-15C8-45E5-A94C-7094381E7ACF}.Debug|x86.ActiveCfg = Debug|Any CPU - {EE65928D-15C8-45E5-A94C-7094381E7ACF}.Debug|x86.Build.0 = Debug|Any CPU - {EE65928D-15C8-45E5-A94C-7094381E7ACF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE65928D-15C8-45E5-A94C-7094381E7ACF}.Release|Any CPU.Build.0 = Release|Any CPU - {EE65928D-15C8-45E5-A94C-7094381E7ACF}.Release|x64.ActiveCfg = Release|Any CPU - {EE65928D-15C8-45E5-A94C-7094381E7ACF}.Release|x64.Build.0 = Release|Any CPU - {EE65928D-15C8-45E5-A94C-7094381E7ACF}.Release|x86.ActiveCfg = Release|Any CPU - {EE65928D-15C8-45E5-A94C-7094381E7ACF}.Release|x86.Build.0 = Release|Any CPU {35AB65D8-D76E-40C6-B10C-501A6D44C9E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {35AB65D8-D76E-40C6-B10C-501A6D44C9E0}.Debug|Any CPU.Build.0 = Debug|Any CPU {35AB65D8-D76E-40C6-B10C-501A6D44C9E0}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -435,25 +396,14 @@ Global {E04DA938-E153-4A0D-9CB0-EAC38210FAF2}.Release|x64.Build.0 = Release|Any CPU {E04DA938-E153-4A0D-9CB0-EAC38210FAF2}.Release|x86.ActiveCfg = Release|Any CPU {E04DA938-E153-4A0D-9CB0-EAC38210FAF2}.Release|x86.Build.0 = Release|Any CPU - {0584ADC1-956E-49B0-A46F-8405AA2AD207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0584ADC1-956E-49B0-A46F-8405AA2AD207}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0584ADC1-956E-49B0-A46F-8405AA2AD207}.Debug|x64.ActiveCfg = Debug|Any CPU - {0584ADC1-956E-49B0-A46F-8405AA2AD207}.Debug|x64.Build.0 = Debug|Any CPU - {0584ADC1-956E-49B0-A46F-8405AA2AD207}.Debug|x86.ActiveCfg = Debug|Any CPU - {0584ADC1-956E-49B0-A46F-8405AA2AD207}.Debug|x86.Build.0 = Debug|Any CPU - {0584ADC1-956E-49B0-A46F-8405AA2AD207}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0584ADC1-956E-49B0-A46F-8405AA2AD207}.Release|Any CPU.Build.0 = Release|Any CPU - {0584ADC1-956E-49B0-A46F-8405AA2AD207}.Release|x64.ActiveCfg = Release|Any CPU - {0584ADC1-956E-49B0-A46F-8405AA2AD207}.Release|x64.Build.0 = Release|Any CPU - {0584ADC1-956E-49B0-A46F-8405AA2AD207}.Release|x86.ActiveCfg = Release|Any CPU - {0584ADC1-956E-49B0-A46F-8405AA2AD207}.Release|x86.Build.0 = Release|Any CPU {FF665CC4-6643-4614-A1A0-FA182E3AF37C}.Debug|Any CPU.ActiveCfg = Debug|x64 {FF665CC4-6643-4614-A1A0-FA182E3AF37C}.Debug|Any CPU.Build.0 = Debug|x64 {FF665CC4-6643-4614-A1A0-FA182E3AF37C}.Debug|x64.ActiveCfg = Debug|x64 {FF665CC4-6643-4614-A1A0-FA182E3AF37C}.Debug|x64.Build.0 = Debug|x64 {FF665CC4-6643-4614-A1A0-FA182E3AF37C}.Debug|x86.ActiveCfg = Debug|x86 {FF665CC4-6643-4614-A1A0-FA182E3AF37C}.Debug|x86.Build.0 = Debug|x86 - {FF665CC4-6643-4614-A1A0-FA182E3AF37C}.Release|Any CPU.ActiveCfg = Release|x86 + {FF665CC4-6643-4614-A1A0-FA182E3AF37C}.Release|Any CPU.ActiveCfg = Release|x64 + {FF665CC4-6643-4614-A1A0-FA182E3AF37C}.Release|Any CPU.Build.0 = Release|x64 {FF665CC4-6643-4614-A1A0-FA182E3AF37C}.Release|x64.ActiveCfg = Release|x64 {FF665CC4-6643-4614-A1A0-FA182E3AF37C}.Release|x64.Build.0 = Release|x64 {FF665CC4-6643-4614-A1A0-FA182E3AF37C}.Release|x86.ActiveCfg = Release|x86 @@ -518,18 +468,6 @@ Global {4E17BE29-B227-41D8-97FE-26F674951E26}.Release|x64.Build.0 = Release|x64 {4E17BE29-B227-41D8-97FE-26F674951E26}.Release|x86.ActiveCfg = Release|x86 {4E17BE29-B227-41D8-97FE-26F674951E26}.Release|x86.Build.0 = Release|x86 - {413326C3-4B8F-4C44-93C8-0E20EFB97DB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {413326C3-4B8F-4C44-93C8-0E20EFB97DB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {413326C3-4B8F-4C44-93C8-0E20EFB97DB4}.Debug|x64.ActiveCfg = Debug|Any CPU - {413326C3-4B8F-4C44-93C8-0E20EFB97DB4}.Debug|x64.Build.0 = Debug|Any CPU - {413326C3-4B8F-4C44-93C8-0E20EFB97DB4}.Debug|x86.ActiveCfg = Debug|Any CPU - {413326C3-4B8F-4C44-93C8-0E20EFB97DB4}.Debug|x86.Build.0 = Debug|Any CPU - {413326C3-4B8F-4C44-93C8-0E20EFB97DB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {413326C3-4B8F-4C44-93C8-0E20EFB97DB4}.Release|Any CPU.Build.0 = Release|Any CPU - {413326C3-4B8F-4C44-93C8-0E20EFB97DB4}.Release|x64.ActiveCfg = Release|Any CPU - {413326C3-4B8F-4C44-93C8-0E20EFB97DB4}.Release|x64.Build.0 = Release|Any CPU - {413326C3-4B8F-4C44-93C8-0E20EFB97DB4}.Release|x86.ActiveCfg = Release|Any CPU - {413326C3-4B8F-4C44-93C8-0E20EFB97DB4}.Release|x86.Build.0 = Release|Any CPU {6ACF2A48-427F-4EF2-81B5-EE9CDB0476C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6ACF2A48-427F-4EF2-81B5-EE9CDB0476C6}.Debug|Any CPU.Build.0 = Debug|Any CPU {6ACF2A48-427F-4EF2-81B5-EE9CDB0476C6}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -542,18 +480,6 @@ Global {6ACF2A48-427F-4EF2-81B5-EE9CDB0476C6}.Release|x64.Build.0 = Release|Any CPU {6ACF2A48-427F-4EF2-81B5-EE9CDB0476C6}.Release|x86.ActiveCfg = Release|Any CPU {6ACF2A48-427F-4EF2-81B5-EE9CDB0476C6}.Release|x86.Build.0 = Release|Any CPU - {75EB97DD-E191-4BDF-83DE-E26785567710}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {75EB97DD-E191-4BDF-83DE-E26785567710}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75EB97DD-E191-4BDF-83DE-E26785567710}.Debug|x64.ActiveCfg = Debug|Any CPU - {75EB97DD-E191-4BDF-83DE-E26785567710}.Debug|x64.Build.0 = Debug|Any CPU - {75EB97DD-E191-4BDF-83DE-E26785567710}.Debug|x86.ActiveCfg = Debug|Any CPU - {75EB97DD-E191-4BDF-83DE-E26785567710}.Debug|x86.Build.0 = Debug|Any CPU - {75EB97DD-E191-4BDF-83DE-E26785567710}.Release|Any CPU.ActiveCfg = Release|Any CPU - {75EB97DD-E191-4BDF-83DE-E26785567710}.Release|Any CPU.Build.0 = Release|Any CPU - {75EB97DD-E191-4BDF-83DE-E26785567710}.Release|x64.ActiveCfg = Release|Any CPU - {75EB97DD-E191-4BDF-83DE-E26785567710}.Release|x64.Build.0 = Release|Any CPU - {75EB97DD-E191-4BDF-83DE-E26785567710}.Release|x86.ActiveCfg = Release|Any CPU - {75EB97DD-E191-4BDF-83DE-E26785567710}.Release|x86.Build.0 = Release|Any CPU {3B77F975-BF66-4218-9982-F48D3271DDFE}.Debug|Any CPU.ActiveCfg = Debug|x64 {3B77F975-BF66-4218-9982-F48D3271DDFE}.Debug|Any CPU.Build.0 = Debug|x64 {3B77F975-BF66-4218-9982-F48D3271DDFE}.Debug|x64.ActiveCfg = Debug|x64 @@ -566,18 +492,6 @@ Global {3B77F975-BF66-4218-9982-F48D3271DDFE}.Release|x64.Build.0 = Release|x64 {3B77F975-BF66-4218-9982-F48D3271DDFE}.Release|x86.ActiveCfg = Release|x86 {3B77F975-BF66-4218-9982-F48D3271DDFE}.Release|x86.Build.0 = Release|x86 - {474834F1-2769-4FBB-BD0A-941DE276DFB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {474834F1-2769-4FBB-BD0A-941DE276DFB6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {474834F1-2769-4FBB-BD0A-941DE276DFB6}.Debug|x64.ActiveCfg = Debug|Any CPU - {474834F1-2769-4FBB-BD0A-941DE276DFB6}.Debug|x64.Build.0 = Debug|Any CPU - {474834F1-2769-4FBB-BD0A-941DE276DFB6}.Debug|x86.ActiveCfg = Debug|Any CPU - {474834F1-2769-4FBB-BD0A-941DE276DFB6}.Debug|x86.Build.0 = Debug|Any CPU - {474834F1-2769-4FBB-BD0A-941DE276DFB6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {474834F1-2769-4FBB-BD0A-941DE276DFB6}.Release|Any CPU.Build.0 = Release|Any CPU - {474834F1-2769-4FBB-BD0A-941DE276DFB6}.Release|x64.ActiveCfg = Release|Any CPU - {474834F1-2769-4FBB-BD0A-941DE276DFB6}.Release|x64.Build.0 = Release|Any CPU - {474834F1-2769-4FBB-BD0A-941DE276DFB6}.Release|x86.ActiveCfg = Release|Any CPU - {474834F1-2769-4FBB-BD0A-941DE276DFB6}.Release|x86.Build.0 = Release|Any CPU {2120CFA2-9D16-45F0-A333-B0385C371509}.Debug|Any CPU.ActiveCfg = Debug|x64 {2120CFA2-9D16-45F0-A333-B0385C371509}.Debug|Any CPU.Build.0 = Debug|x64 {2120CFA2-9D16-45F0-A333-B0385C371509}.Debug|x64.ActiveCfg = Debug|x64 @@ -612,9 +526,7 @@ Global {6615B3D8-87C7-40D4-A7EA-19A7BFC7FD24} = {82A3CE96-0935-45E5-A9AA-A93A5B63500B} {4DDEEB10-A6B5-4A46-96C1-1B7276B61E08} = {36004B32-55EB-4591-B6D2-B99DE373D0B8} {7A95C636-A6E9-4156-B18E-28C1BE065A1A} = {36004B32-55EB-4591-B6D2-B99DE373D0B8} - {357C3F25-98CA-41C6-BA2C-20968695D026} = {5C915382-C886-457D-8641-9E766D8E5A17} - {56BA76DB-56E0-465E-84B6-71C64F12017F} = {357C3F25-98CA-41C6-BA2C-20968695D026} - {20B74D4B-B777-4E33-AE1F-7D536DFA6BE6} = {357C3F25-98CA-41C6-BA2C-20968695D026} + {20B74D4B-B777-4E33-AE1F-7D536DFA6BE6} = {5C915382-C886-457D-8641-9E766D8E5A17} {91A299AD-6C09-4B7F-BD8B-A705D9BFC672} = {5C915382-C886-457D-8641-9E766D8E5A17} {E409ADD3-9574-465C-AB09-4324D205CC7C} = {91A299AD-6C09-4B7F-BD8B-A705D9BFC672} {63FD1231-345F-461E-A9C2-237ED305ED11} = {E409ADD3-9574-465C-AB09-4324D205CC7C} @@ -623,22 +535,16 @@ Global {CF5EFBA1-A852-4D11-968D-CE6A9A46B299} = {E3ABDF7D-4592-4923-907C-D351DDF1CBE9} {2E1F47D9-BEC1-4DCE-A84D-847FE5BBBE9E} = {E409ADD3-9574-465C-AB09-4324D205CC7C} {5FDB5603-21D3-446A-8B50-36DACCF7C2FF} = {2E1F47D9-BEC1-4DCE-A84D-847FE5BBBE9E} - {A0B40A84-EF97-47DB-8455-796A9BCA1097} = {357C3F25-98CA-41C6-BA2C-20968695D026} - {EE65928D-15C8-45E5-A94C-7094381E7ACF} = {A0B40A84-EF97-47DB-8455-796A9BCA1097} {35AB65D8-D76E-40C6-B10C-501A6D44C9E0} = {5C915382-C886-457D-8641-9E766D8E5A17} {E04DA938-E153-4A0D-9CB0-EAC38210FAF2} = {9E5F0022-0A50-40BF-AC6A-C3078585ECAB} - {0584ADC1-956E-49B0-A46F-8405AA2AD207} = {357C3F25-98CA-41C6-BA2C-20968695D026} {FF665CC4-6643-4614-A1A0-FA182E3AF37C} = {E409ADD3-9574-465C-AB09-4324D205CC7C} {E026D9FA-FBD5-4066-AF6A-FB63DE28521F} = {9E5F0022-0A50-40BF-AC6A-C3078585ECAB} {065FEB4E-A99E-4A59-8112-1CB30CF794F9} = {5C915382-C886-457D-8641-9E766D8E5A17} {56938BD4-37F4-4E3F-BFBF-80F0309DFDBF} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A} {346746C5-A0EA-40D8-A1C7-FE324BDF3772} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A} {4E17BE29-B227-41D8-97FE-26F674951E26} = {E409ADD3-9574-465C-AB09-4324D205CC7C} - {413326C3-4B8F-4C44-93C8-0E20EFB97DB4} = {357C3F25-98CA-41C6-BA2C-20968695D026} {6ACF2A48-427F-4EF2-81B5-EE9CDB0476C6} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A} - {75EB97DD-E191-4BDF-83DE-E26785567710} = {357C3F25-98CA-41C6-BA2C-20968695D026} {3B77F975-BF66-4218-9982-F48D3271DDFE} = {E409ADD3-9574-465C-AB09-4324D205CC7C} - {474834F1-2769-4FBB-BD0A-941DE276DFB6} = {357C3F25-98CA-41C6-BA2C-20968695D026} {2120CFA2-9D16-45F0-A333-B0385C371509} = {E409ADD3-9574-465C-AB09-4324D205CC7C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/build/nuke/Build.Steps.Linux.cs b/build/nuke/Build.Steps.Linux.cs index bf9799949b..d58496286c 100644 --- a/build/nuke/Build.Steps.Linux.cs +++ b/build/nuke/Build.Steps.Linux.cs @@ -54,6 +54,7 @@ partial class Build .Unlisted() .After(CompileNativeSrcLinux) .After(CompileNativeTestsLinux) + .After(PublishManagedProfiler) .OnlyWhenStatic(() => IsLinux) .Executes(() => { diff --git a/build/nuke/Build.Steps.Windows.cs b/build/nuke/Build.Steps.Windows.cs index 81a06fc8dd..cbc0b2b50e 100644 --- a/build/nuke/Build.Steps.Windows.cs +++ b/build/nuke/Build.Steps.Windows.cs @@ -1,5 +1,4 @@ using System.IO; -using Extensions; using Nuke.Common; using Nuke.Common.IO; using Nuke.Common.ProjectModel; @@ -8,11 +7,9 @@ using Nuke.Common.Tools.DotNet; using Nuke.Common.Tools.MSBuild; using Serilog; -using static DotNetMSBuildTasks; using static Nuke.Common.EnvironmentInfo; using static Nuke.Common.IO.FileSystemTasks; using static Nuke.Common.Tools.Docker.DockerTasks; -using static Nuke.Common.Tools.DotNet.DotNetTasks; using static Nuke.Common.Tools.MSBuild.MSBuildTasks; partial class Build @@ -85,6 +82,7 @@ partial class Build .Unlisted() .After(CompileNativeSrcWindows) .After(CompileNativeTestsWindows) + .After(PublishManagedProfiler) .OnlyWhenStatic(() => IsWin) .Executes(() => { @@ -96,27 +94,9 @@ partial class Build testExe("--gtest_output=xml", workingDirectory: workingDirectory); }); - Target CompileManagedTestsWindows => _ => _ - .Unlisted() - .After(CompileManagedTests) - .OnlyWhenStatic(() => IsWin) - .Triggers(PublishIisTestApplications) - .Executes(() => - { - // Compile .NET Framework projects - - DotNetMSBuild(x => x - .SetTargetPath(MsBuildProject) - .SetTargetPlatform(Platform) - .SetConfiguration(BuildConfiguration) - .DisableRestore() - .SetTargets("BuildCsharpFXTest") - ); - }); - Target PublishIisTestApplications => _ => _ .Unlisted() - .After(CompileManagedTestsWindows) + .After(CompileManagedTests) .OnlyWhenStatic(() => IsWin) .OnlyWhenStatic(() => Containers == ContainersWindows) .Executes(() => @@ -144,26 +124,4 @@ partial class Build ); } }); - - Target RunManagedTestsWindows => _ => _ - .Unlisted() - .After(RunManagedTests) - .DependsOn(CompileManagedTestsWindows) - .DependsOn(PublishIisTestApplications) - .OnlyWhenStatic(() => IsWin) - .Executes(() => - { - Project[] aspNetTests = Solution.GetWindowsOnlyIntegrationTests(); - - DotNetTest(config => config - .SetConfiguration(BuildConfiguration) - .SetTargetPlatform(Platform) - .SetFramework(TargetFramework.NET462) - .SetFilter(ContainersTestFilter()) - .EnableNoRestore() - .EnableNoBuild() - .CombineWith(aspNetTests, (s, project) => s - .EnableTrxLogOutput(GetResultsDirectory(project)) - .SetProjectFile(project)), degreeOfParallelism: 4); - }); } diff --git a/build/nuke/Build.Steps.cs b/build/nuke/Build.Steps.cs index 2ab77e0b70..361413907c 100644 --- a/build/nuke/Build.Steps.cs +++ b/build/nuke/Build.Steps.cs @@ -113,7 +113,6 @@ partial class Build .Unlisted() .Description("Compiles the managed code in the test directory") .After(CompileManagedSrc) - .Triggers(CompileManagedTestsWindows) .Executes(() => { // Always AnyCPU @@ -240,7 +239,6 @@ partial class Build .After(PublishMocks) .Triggers(RunManagedUnitTests) .Triggers(RunManagedIntegrationTests) - .Triggers(RunManagedTestsWindows) .Executes(() => { }); Target PublishMocks => _ => _ @@ -302,7 +300,7 @@ partial class Build .Unlisted() .Executes(() => { - Project[] integrationTests = Solution.GetCrossPlatformIntegrationTests(); + var project = Solution.GetProject("IntegrationTests"); IEnumerable frameworks = IsWin ? TestFrameworks : TestFrameworks.ExceptNetFramework(); @@ -310,14 +308,13 @@ partial class Build .SetConfiguration(BuildConfiguration) .SetTargetPlatform(Platform) .SetFilter(ContainersTestFilter()) + .EnableTrxLogOutput(GetResultsDirectory(project)) + .SetProjectFile(project) .EnableNoRestore() .EnableNoBuild() .CombineWith(frameworks, (s, fx) => s .SetFramework(fx) - ) - .CombineWith(integrationTests, (s, project) => s - .EnableTrxLogOutput(GetResultsDirectory(project)) - .SetProjectFile(project)), degreeOfParallelism: 4); + )); }); Target CopyAdditionalDeps => _ => _ diff --git a/build/nuke/Build.cs b/build/nuke/Build.cs index 7ae4e12b13..237d1f218e 100644 --- a/build/nuke/Build.cs +++ b/build/nuke/Build.cs @@ -99,6 +99,7 @@ void DeleteReparsePoints(string path) .DependsOn(CompileManagedTests) .DependsOn(CompileMocks) .DependsOn(PublishMocks) + .DependsOn(PublishIisTestApplications) .DependsOn(RunManagedTests); Target BuildExamples => _ => _ diff --git a/build/nuke/Extensions/SolutionExtensions.cs b/build/nuke/Extensions/SolutionExtensions.cs deleted file mode 100644 index 5310fe61af..0000000000 --- a/build/nuke/Extensions/SolutionExtensions.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Nuke.Common.ProjectModel; - -namespace Extensions -{ - public static class SolutionExtensions - { - public static Project[] GetCrossPlatformIntegrationTests(this Solution solution) - { - return GetIntegrationTests(solution) - // Exclude Windows only tests - .Where(x => !(x.GetProperty("WindowsOnly") ?? false)) - .ToArray(); - } - - public static Project[] GetWindowsOnlyIntegrationTests(this Solution solution) - { - return GetIntegrationTests(solution) - // Take Windows only tests - .Where(x => x.GetProperty("WindowsOnly") ?? false) - .ToArray(); - } - - public static IEnumerable GetIntegrationTests(this Solution solution) - { - return solution - .GetProjects("IntegrationTests.*") - // Skip helpers project - .Where(x => !x.Name.Equals(Projects.Tests.IntegrationTestsHelpers, StringComparison.OrdinalIgnoreCase)); - } - } -} diff --git a/build/nuke/Projects.cs b/build/nuke/Projects.cs index b73f3050cd..bdb09c8edb 100644 --- a/build/nuke/Projects.cs +++ b/build/nuke/Projects.cs @@ -13,8 +13,6 @@ public static class Tests public const string AutoInstrumentationLoaderTests = "OpenTelemetry.AutoInstrumentation.Loader.Tests"; public const string AutoInstrumentationBootstrappingTests = "OpenTelemetry.AutoInstrumentation.Bootstrapping.Tests"; public const string AutoInstrumentationTests = "OpenTelemetry.AutoInstrumentation.Tests"; - - public const string IntegrationTestsHelpers = "IntegrationTests.Helpers"; } public static class Mocks diff --git a/test/integration-tests/aspnet/IntegrationTests.AspNet/AspNetTests.cs b/test/IntegrationTests/AspNetTests.cs similarity index 67% rename from test/integration-tests/aspnet/IntegrationTests.AspNet/AspNetTests.cs rename to test/IntegrationTests/AspNetTests.cs index cd89536b8d..ed80c7f0c3 100644 --- a/test/integration-tests/aspnet/IntegrationTests.AspNet/AspNetTests.cs +++ b/test/IntegrationTests/AspNetTests.cs @@ -1,3 +1,20 @@ +// +// Copyright The OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +#if NETFRAMEWORK using System.IO; using System.Net.Http; using System.Threading.Tasks; @@ -44,3 +61,4 @@ public async Task SubmitsTraces() } } } +#endif diff --git a/test/integration-tests/IntegrationTests.GraphQL/GraphQLSpanExpectation.cs b/test/IntegrationTests/GraphQLSpanExpectation.cs similarity index 100% rename from test/integration-tests/IntegrationTests.GraphQL/GraphQLSpanExpectation.cs rename to test/IntegrationTests/GraphQLSpanExpectation.cs diff --git a/test/integration-tests/IntegrationTests.GraphQL/GraphQLTests.cs b/test/IntegrationTests/GraphQLTests.cs similarity index 100% rename from test/integration-tests/IntegrationTests.GraphQL/GraphQLTests.cs rename to test/IntegrationTests/GraphQLTests.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/Compatibility/DictionaryExtensions.cs b/test/IntegrationTests/Helpers/Compatibility/DictionaryExtensions.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/Compatibility/DictionaryExtensions.cs rename to test/IntegrationTests/Helpers/Compatibility/DictionaryExtensions.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/Constants/TimeConstants.cs b/test/IntegrationTests/Helpers/Constants/TimeConstants.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/Constants/TimeConstants.cs rename to test/IntegrationTests/Helpers/Constants/TimeConstants.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/DockerNetworkHelper.cs b/test/IntegrationTests/Helpers/DockerNetworkHelper.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/DockerNetworkHelper.cs rename to test/IntegrationTests/Helpers/DockerNetworkHelper.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/EnvironmentHelper.cs b/test/IntegrationTests/Helpers/EnvironmentHelper.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/EnvironmentHelper.cs rename to test/IntegrationTests/Helpers/EnvironmentHelper.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/EnvironmentTools.cs b/test/IntegrationTests/Helpers/EnvironmentTools.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/EnvironmentTools.cs rename to test/IntegrationTests/Helpers/EnvironmentTools.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/FirewallHelper.cs b/test/IntegrationTests/Helpers/FirewallHelper.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/FirewallHelper.cs rename to test/IntegrationTests/Helpers/FirewallHelper.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/GlobalSuppressions.cs b/test/IntegrationTests/Helpers/GlobalSuppressions.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/GlobalSuppressions.cs rename to test/IntegrationTests/Helpers/GlobalSuppressions.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/HealthzHelper.cs b/test/IntegrationTests/Helpers/HealthzHelper.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/HealthzHelper.cs rename to test/IntegrationTests/Helpers/HealthzHelper.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/InstrumentedProcessHelper.cs b/test/IntegrationTests/Helpers/InstrumentedProcessHelper.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/InstrumentedProcessHelper.cs rename to test/IntegrationTests/Helpers/InstrumentedProcessHelper.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/MetricsSettings.cs b/test/IntegrationTests/Helpers/MetricsSettings.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/MetricsSettings.cs rename to test/IntegrationTests/Helpers/MetricsSettings.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/MockCollector.cs b/test/IntegrationTests/Helpers/MockCollector.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/MockCollector.cs rename to test/IntegrationTests/Helpers/MockCollector.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/MockZipkinCollector.cs b/test/IntegrationTests/Helpers/MockZipkinCollector.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/MockZipkinCollector.cs rename to test/IntegrationTests/Helpers/MockZipkinCollector.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/Mocks/IMockSpan.cs b/test/IntegrationTests/Helpers/Mocks/IMockSpan.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/Mocks/IMockSpan.cs rename to test/IntegrationTests/Helpers/Mocks/IMockSpan.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/Mocks/ZSpanMock.cs b/test/IntegrationTests/Helpers/Mocks/ZSpanMock.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/Mocks/ZSpanMock.cs rename to test/IntegrationTests/Helpers/Mocks/ZSpanMock.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/Models/Container.cs b/test/IntegrationTests/Helpers/Models/Container.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/Models/Container.cs rename to test/IntegrationTests/Helpers/Models/Container.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/Models/EventArgs.cs b/test/IntegrationTests/Helpers/Models/EventArgs.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/Models/EventArgs.cs rename to test/IntegrationTests/Helpers/Models/EventArgs.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/Models/FirewallPort.cs b/test/IntegrationTests/Helpers/Models/FirewallPort.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/Models/FirewallPort.cs rename to test/IntegrationTests/Helpers/Models/FirewallPort.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/Models/ProcessResult.cs b/test/IntegrationTests/Helpers/Models/ProcessResult.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/Models/ProcessResult.cs rename to test/IntegrationTests/Helpers/Models/ProcessResult.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/Models/SpanExpectation.cs b/test/IntegrationTests/Helpers/Models/SpanExpectation.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/Models/SpanExpectation.cs rename to test/IntegrationTests/Helpers/Models/SpanExpectation.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/Models/WebServerSpanExpectation.cs b/test/IntegrationTests/Helpers/Models/WebServerSpanExpectation.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/Models/WebServerSpanExpectation.cs rename to test/IntegrationTests/Helpers/Models/WebServerSpanExpectation.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/OutputHelper.cs b/test/IntegrationTests/Helpers/OutputHelper.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/OutputHelper.cs rename to test/IntegrationTests/Helpers/OutputHelper.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/PowershellHelper.cs b/test/IntegrationTests/Helpers/PowershellHelper.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/PowershellHelper.cs rename to test/IntegrationTests/Helpers/PowershellHelper.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/ProcessHelper.cs b/test/IntegrationTests/Helpers/ProcessHelper.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/ProcessHelper.cs rename to test/IntegrationTests/Helpers/ProcessHelper.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/SpanTestHelpers.cs b/test/IntegrationTests/Helpers/SpanTestHelpers.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/SpanTestHelpers.cs rename to test/IntegrationTests/Helpers/SpanTestHelpers.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/TcpPortProvider.cs b/test/IntegrationTests/Helpers/TcpPortProvider.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/TcpPortProvider.cs rename to test/IntegrationTests/Helpers/TcpPortProvider.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/TestHelper.cs b/test/IntegrationTests/Helpers/TestHelper.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/TestHelper.cs rename to test/IntegrationTests/Helpers/TestHelper.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/TestSettings.cs b/test/IntegrationTests/Helpers/TestSettings.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/TestSettings.cs rename to test/IntegrationTests/Helpers/TestSettings.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/TimeExtensions.cs b/test/IntegrationTests/Helpers/TimeExtensions.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/TimeExtensions.cs rename to test/IntegrationTests/Helpers/TimeExtensions.cs diff --git a/test/integration-tests/IntegrationTests.Helpers/TracesSettings.cs b/test/IntegrationTests/Helpers/TracesSettings.cs similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/TracesSettings.cs rename to test/IntegrationTests/Helpers/TracesSettings.cs diff --git a/test/integration-tests/IntegrationTests.Http/HttpTests.cs b/test/IntegrationTests/HttpTests.cs similarity index 99% rename from test/integration-tests/IntegrationTests.Http/HttpTests.cs rename to test/IntegrationTests/HttpTests.cs index 9e63d8b6fa..72ddcb50f7 100644 --- a/test/integration-tests/IntegrationTests.Http/HttpTests.cs +++ b/test/IntegrationTests/HttpTests.cs @@ -14,6 +14,7 @@ // limitations under the License. // +#if !NETFRAMEWORK using System; using System.Linq; using FluentAssertions; @@ -145,3 +146,4 @@ public void SubmitMetrics() } } } +#endif diff --git a/test/integration-tests/IntegrationTests.Helpers/IntegrationTests.Helpers.csproj b/test/IntegrationTests/IntegrationTests.csproj similarity index 88% rename from test/integration-tests/IntegrationTests.Helpers/IntegrationTests.Helpers.csproj rename to test/IntegrationTests/IntegrationTests.csproj index fb7989956c..b6cfd8d443 100644 --- a/test/integration-tests/IntegrationTests.Helpers/IntegrationTests.Helpers.csproj +++ b/test/IntegrationTests/IntegrationTests.csproj @@ -13,7 +13,7 @@ - + diff --git a/test/integration-tests/IntegrationTests.MongoDB/MongoDbCollection.cs b/test/IntegrationTests/MongoDbCollection.cs similarity index 100% rename from test/integration-tests/IntegrationTests.MongoDB/MongoDbCollection.cs rename to test/IntegrationTests/MongoDbCollection.cs diff --git a/test/integration-tests/IntegrationTests.MongoDB/MongoDbTests.cs b/test/IntegrationTests/MongoDbTests.cs similarity index 88% rename from test/integration-tests/IntegrationTests.MongoDB/MongoDbTests.cs rename to test/IntegrationTests/MongoDbTests.cs index c63a070312..204f3fdba8 100644 --- a/test/integration-tests/IntegrationTests.MongoDB/MongoDbTests.cs +++ b/test/IntegrationTests/MongoDbTests.cs @@ -69,9 +69,9 @@ public void SubmitsTraces() if (Regex.IsMatch(span.Name, "employees\\.*")) { - Assert.Equal("mongodb", span.Tags?.GetValueOrDefault("db.system")); - Assert.Equal("test-db", span.Tags?.GetValueOrDefault("db.name")); - Assert.True("1.0.0.0" == span.Tags?.GetValueOrDefault("otel.library.version"), span.ToString()); + Assert.Equal("mongodb", span.Tags["db.system"]); + Assert.Equal("test-db", span.Tags["db.name"]); + Assert.True("1.0.0.0" == span.Tags["otel.library.version"], span.ToString()); if (span.Tags?.ContainsKey("db.statement") ?? false) { @@ -82,7 +82,7 @@ public void SubmitsTraces() else { // These are manual (DiagnosticSource) traces - Assert.True("1.0.0" == span.Tags?.GetValueOrDefault("otel.library.version"), span.ToString()); + Assert.True("1.0.0" == span.Tags["otel.library.version"], span.ToString()); } } diff --git a/test/integration-tests/IntegrationTests.Helpers/README.md b/test/IntegrationTests/README.md similarity index 74% rename from test/integration-tests/IntegrationTests.Helpers/README.md rename to test/IntegrationTests/README.md index 61a80b0244..c0b40118a0 100644 --- a/test/integration-tests/IntegrationTests.Helpers/README.md +++ b/test/IntegrationTests/README.md @@ -1,7 +1,4 @@ -# IntegrationTests.Helpers - -This project contains code that can be used other integration test -projects to support writing integration tests. +# Integration Tests ## OTLP protos diff --git a/test/integration-tests/IntegrationTests.SqlClient/SqlClientCollection.cs b/test/IntegrationTests/SqlClientCollection.cs similarity index 100% rename from test/integration-tests/IntegrationTests.SqlClient/SqlClientCollection.cs rename to test/IntegrationTests/SqlClientCollection.cs diff --git a/test/integration-tests/IntegrationTests.SqlClient/SqlTests.cs b/test/IntegrationTests/SqlTests.cs similarity index 100% rename from test/integration-tests/IntegrationTests.SqlClient/SqlTests.cs rename to test/IntegrationTests/SqlTests.cs diff --git a/test/integration-tests/IntegrationTests.StartupHook/StartupHookTests.cs b/test/IntegrationTests/StartupHookTests.cs similarity index 99% rename from test/integration-tests/IntegrationTests.StartupHook/StartupHookTests.cs rename to test/IntegrationTests/StartupHookTests.cs index dcfb2d2b13..ea780d870c 100644 --- a/test/integration-tests/IntegrationTests.StartupHook/StartupHookTests.cs +++ b/test/IntegrationTests/StartupHookTests.cs @@ -14,6 +14,7 @@ // limitations under the License. // +#if !NETFRAMEWORK using System; using System.Collections.Generic; using System.Collections.Immutable; @@ -131,3 +132,4 @@ private void AssertExpectationsMet(List expectations, Assert.True(!failures.Any(), finalMessage); } } +#endif diff --git a/test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/collector/README.md b/test/IntegrationTests/opentelemetry/proto/collector/README.md similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/collector/README.md rename to test/IntegrationTests/opentelemetry/proto/collector/README.md diff --git a/test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/collector/logs/v1/logs_service.proto b/test/IntegrationTests/opentelemetry/proto/collector/logs/v1/logs_service.proto similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/collector/logs/v1/logs_service.proto rename to test/IntegrationTests/opentelemetry/proto/collector/logs/v1/logs_service.proto diff --git a/test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/collector/logs/v1/logs_service_http.yaml b/test/IntegrationTests/opentelemetry/proto/collector/logs/v1/logs_service_http.yaml similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/collector/logs/v1/logs_service_http.yaml rename to test/IntegrationTests/opentelemetry/proto/collector/logs/v1/logs_service_http.yaml diff --git a/test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/collector/metrics/v1/metrics_service.proto b/test/IntegrationTests/opentelemetry/proto/collector/metrics/v1/metrics_service.proto similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/collector/metrics/v1/metrics_service.proto rename to test/IntegrationTests/opentelemetry/proto/collector/metrics/v1/metrics_service.proto diff --git a/test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/collector/metrics/v1/metrics_service_http.yaml b/test/IntegrationTests/opentelemetry/proto/collector/metrics/v1/metrics_service_http.yaml similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/collector/metrics/v1/metrics_service_http.yaml rename to test/IntegrationTests/opentelemetry/proto/collector/metrics/v1/metrics_service_http.yaml diff --git a/test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/collector/trace/v1/trace_service.proto b/test/IntegrationTests/opentelemetry/proto/collector/trace/v1/trace_service.proto similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/collector/trace/v1/trace_service.proto rename to test/IntegrationTests/opentelemetry/proto/collector/trace/v1/trace_service.proto diff --git a/test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/collector/trace/v1/trace_service_http.yaml b/test/IntegrationTests/opentelemetry/proto/collector/trace/v1/trace_service_http.yaml similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/collector/trace/v1/trace_service_http.yaml rename to test/IntegrationTests/opentelemetry/proto/collector/trace/v1/trace_service_http.yaml diff --git a/test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/common/v1/common.proto b/test/IntegrationTests/opentelemetry/proto/common/v1/common.proto similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/common/v1/common.proto rename to test/IntegrationTests/opentelemetry/proto/common/v1/common.proto diff --git a/test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/logs/v1/logs.proto b/test/IntegrationTests/opentelemetry/proto/logs/v1/logs.proto similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/logs/v1/logs.proto rename to test/IntegrationTests/opentelemetry/proto/logs/v1/logs.proto diff --git a/test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/metrics/v1/metrics.proto b/test/IntegrationTests/opentelemetry/proto/metrics/v1/metrics.proto similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/metrics/v1/metrics.proto rename to test/IntegrationTests/opentelemetry/proto/metrics/v1/metrics.proto diff --git a/test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/resource/v1/resource.proto b/test/IntegrationTests/opentelemetry/proto/resource/v1/resource.proto similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/resource/v1/resource.proto rename to test/IntegrationTests/opentelemetry/proto/resource/v1/resource.proto diff --git a/test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/trace/v1/trace.proto b/test/IntegrationTests/opentelemetry/proto/trace/v1/trace.proto similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/trace/v1/trace.proto rename to test/IntegrationTests/opentelemetry/proto/trace/v1/trace.proto diff --git a/test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/trace/v1/trace_config.proto b/test/IntegrationTests/opentelemetry/proto/trace/v1/trace_config.proto similarity index 100% rename from test/integration-tests/IntegrationTests.Helpers/opentelemetry/proto/trace/v1/trace_config.proto rename to test/IntegrationTests/opentelemetry/proto/trace/v1/trace_config.proto diff --git a/test/integration-tests/IntegrationTests.GraphQL/IntegrationTests.GraphQL.csproj b/test/integration-tests/IntegrationTests.GraphQL/IntegrationTests.GraphQL.csproj deleted file mode 100644 index 9c81dc287d..0000000000 --- a/test/integration-tests/IntegrationTests.GraphQL/IntegrationTests.GraphQL.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/test/integration-tests/IntegrationTests.Http/IntegrationTests.Http.csproj b/test/integration-tests/IntegrationTests.Http/IntegrationTests.Http.csproj deleted file mode 100644 index a0fbbe1cdd..0000000000 --- a/test/integration-tests/IntegrationTests.Http/IntegrationTests.Http.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netcoreapp3.1;net6.0 - - - - - - - diff --git a/test/integration-tests/IntegrationTests.MongoDB/IntegrationTests.MongoDB.csproj b/test/integration-tests/IntegrationTests.MongoDB/IntegrationTests.MongoDB.csproj deleted file mode 100644 index 90f1d0a684..0000000000 --- a/test/integration-tests/IntegrationTests.MongoDB/IntegrationTests.MongoDB.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - netcoreapp3.1;net6.0 - - - - - - - - - - \ No newline at end of file diff --git a/test/integration-tests/IntegrationTests.SqlClient/IntegrationTests.SqlClient.csproj b/test/integration-tests/IntegrationTests.SqlClient/IntegrationTests.SqlClient.csproj deleted file mode 100644 index a0fbbe1cdd..0000000000 --- a/test/integration-tests/IntegrationTests.SqlClient/IntegrationTests.SqlClient.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netcoreapp3.1;net6.0 - - - - - - - diff --git a/test/integration-tests/IntegrationTests.StartupHook/IntegrationTests.StartupHook.csproj b/test/integration-tests/IntegrationTests.StartupHook/IntegrationTests.StartupHook.csproj deleted file mode 100644 index edc0b394c6..0000000000 --- a/test/integration-tests/IntegrationTests.StartupHook/IntegrationTests.StartupHook.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - netcoreapp3.1;net6.0 - - - - - - - - - - \ No newline at end of file diff --git a/test/integration-tests/aspnet/Directory.Build.props b/test/integration-tests/aspnet/Directory.Build.props deleted file mode 100644 index 07c2efb498..0000000000 --- a/test/integration-tests/aspnet/Directory.Build.props +++ /dev/null @@ -1,6 +0,0 @@ - - - true - 10.0 - - diff --git a/test/integration-tests/aspnet/IntegrationTests.AspNet/IntegrationTests.AspNet.csproj b/test/integration-tests/aspnet/IntegrationTests.AspNet/IntegrationTests.AspNet.csproj deleted file mode 100644 index b915393cc0..0000000000 --- a/test/integration-tests/aspnet/IntegrationTests.AspNet/IntegrationTests.AspNet.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - net462 - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - diff --git a/test/test-applications/integrations/TestApplication.Http/TestApplication.Http.csproj b/test/test-applications/integrations/TestApplication.Http/TestApplication.Http.csproj index 8229b49e2c..b2703097c2 100644 --- a/test/test-applications/integrations/TestApplication.Http/TestApplication.Http.csproj +++ b/test/test-applications/integrations/TestApplication.Http/TestApplication.Http.csproj @@ -9,7 +9,7 @@ - +