diff --git a/.dockerignore b/.dockerignore
index adf5c33c55..29055b8518 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -10,5 +10,5 @@ packages/
**/bin/
**/obj/
-!test/test-applications/aspnet/Samples.AspNet472.LoaderOptimizationRegKey/bin/
+!test/test-applications/aspnet/TestApplication.AspNet472.LoaderOptimizationRegKey/bin/
!src/WindowsInstaller/bin/
\ No newline at end of file
diff --git a/OpenTelemetry.AutoInstrumentation.proj b/OpenTelemetry.AutoInstrumentation.proj
index d853f2bd80..55795d4680 100644
--- a/OpenTelemetry.AutoInstrumentation.proj
+++ b/OpenTelemetry.AutoInstrumentation.proj
@@ -10,20 +10,20 @@
-
-
-
+
+
+
-
+
-
+
@@ -50,21 +50,21 @@
-
+
-
+
-
+
-
+
diff --git a/OpenTelemetry.AutoInstrumentation.sln b/OpenTelemetry.AutoInstrumentation.sln
index 135da3ce4e..2f679e17b5 100644
--- a/OpenTelemetry.AutoInstrumentation.sln
+++ b/OpenTelemetry.AutoInstrumentation.sln
@@ -66,9 +66,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenTelemetry.AutoInstrumen
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependency-libs", "dependency-libs", "{82A3CE96-0935-45E5-A9AA-A93A5B63500B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.ExampleLibrary", "test\test-applications\integrations\dependency-libs\Samples.ExampleLibrary\Samples.ExampleLibrary.csproj", "{EFAE6960-9425-462E-BFFB-4C9A038DD8C0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApplication.ExampleLibrary", "test\test-applications\integrations\dependency-libs\TestApplication.ExampleLibrary\TestApplication.ExampleLibrary.csproj", "{EFAE6960-9425-462E-BFFB-4C9A038DD8C0}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.ExampleLibraryTracer", "test\test-applications\integrations\dependency-libs\Samples.ExampleLibraryTracer\Samples.ExampleLibraryTracer.csproj", "{6615B3D8-87C7-40D4-A7EA-19A7BFC7FD24}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApplication.ExampleLibraryTracer", "test\test-applications\integrations\dependency-libs\TestApplication.ExampleLibraryTracer\TestApplication.ExampleLibraryTracer.csproj", "{6615B3D8-87C7-40D4-A7EA-19A7BFC7FD24}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{36004B32-55EB-4591-B6D2-B99DE373D0B8}"
EndProject
@@ -97,7 +97,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "integrations", "integration
test\test-applications\integrations\Directory.Build.props = test\test-applications\integrations\Directory.Build.props
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.GraphQL", "test\test-applications\integrations\Samples.GraphQL\Samples.GraphQL.csproj", "{63FD1231-345F-461E-A9C2-237ED305ED11}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApplication.GraphQL", "test\test-applications\integrations\TestApplication.GraphQL\TestApplication.GraphQL.csproj", "{63FD1231-345F-461E-A9C2-237ED305ED11}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.AutoInstrumentation.Loader.Tests", "test\OpenTelemetry.AutoInstrumentation.Loader.Tests\OpenTelemetry.AutoInstrumentation.Loader.Tests.csproj", "{735434B9-6555-4DEE-97FC-786C763CA1F1}"
EndProject
@@ -107,11 +107,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.AutoInstrumen
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.MongoDB", "test\integration-tests\IntegrationTests.MongoDB\IntegrationTests.MongoDB.csproj", "{446D0E14-2788-43DD-A465-8F16DA7014F8}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.MongoDB", "test\test-applications\integrations\Samples.MongoDB\Samples.MongoDB.csproj", "{02D6A472-A602-4BF4-A539-8AD165097898}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApplication.MongoDB", "test\test-applications\integrations\TestApplication.MongoDB\TestApplication.MongoDB.csproj", "{02D6A472-A602-4BF4-A539-8AD165097898}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aspnet", "aspnet", "{2E1F47D9-BEC1-4DCE-A84D-847FE5BBBE9E}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.AspNet", "test\test-applications\integrations\aspnet\Samples.AspNet\Samples.AspNet.csproj", "{5FDB5603-21D3-446A-8B50-36DACCF7C2FF}"
+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
@@ -123,7 +123,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.AutoInstrumen
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}") = "Samples.StartupHook", "test\test-applications\integrations\Samples.StartupHook\Samples.StartupHook.csproj", "{FF665CC4-6643-4614-A1A0-FA182E3AF37C}"
+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}"
EndProject
@@ -131,9 +131,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.AutoInstrumen
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.Vendor.Distro", "examples\Vendor.Distro\Examples.Vendor.Distro.csproj", "{56938BD4-37F4-4E3F-BFBF-80F0309DFDBF}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Examples.ManualInstrumentations", "examples\ManualInstrumentations\Examples.ManualInstrumentations.csproj", "{346746C5-A0EA-40D8-A1C7-FE324BDF3772}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.ManualInstrumentations", "examples\ManualInstrumentations\Examples.ManualInstrumentations.csproj", "{346746C5-A0EA-40D8-A1C7-FE324BDF3772}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Http", "test\test-applications\integrations\Samples.Http\Samples.Http.csproj", "{4E17BE29-B227-41D8-97FE-26F674951E26}"
+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
diff --git a/build/nuke/Build.Steps.Windows.cs b/build/nuke/Build.Steps.Windows.cs
index c3ca47d4da..1ead5e9840 100644
--- a/build/nuke/Build.Steps.Windows.cs
+++ b/build/nuke/Build.Steps.Windows.cs
@@ -100,7 +100,7 @@ partial class Build
.Unlisted()
.After(CompileManagedTests)
.OnlyWhenStatic(() => IsWin)
- .Triggers(PublishIisSamples)
+ .Triggers(PublishIisTestApplications)
.Executes(() =>
{
// Compile .NET Framework projects
@@ -114,7 +114,7 @@ partial class Build
);
});
- Target PublishIisSamples => _ => _
+ Target PublishIisTestApplications => _ => _
.Unlisted()
.After(CompileManagedTestsWindows)
.OnlyWhenStatic(() => IsWin)
@@ -148,7 +148,7 @@ partial class Build
.Unlisted()
.After(RunManagedTests)
.DependsOn(CompileManagedTestsWindows)
- .DependsOn(PublishIisSamples)
+ .DependsOn(PublishIisTestApplications)
.OnlyWhenStatic(() => IsWin)
.Executes(() =>
{
diff --git a/examples/AspNetCoreMvc/Views/Shared/_Layout.cshtml b/examples/AspNetCoreMvc/Views/Shared/_Layout.cshtml
index b4481d2a16..5e254194fc 100644
--- a/examples/AspNetCoreMvc/Views/Shared/_Layout.cshtml
+++ b/examples/AspNetCoreMvc/Views/Shared/_Layout.cshtml
@@ -3,7 +3,7 @@
- @ViewData["Title"] - Samples.AspNetCoreMvc
+ @ViewData["Title"] - TestApplication.AspNetCoreMvc
diff --git a/examples/Directory.Build.props b/examples/Directory.Build.props
index 0b6fc598c9..ea75f7101f 100644
--- a/examples/Directory.Build.props
+++ b/examples/Directory.Build.props
@@ -7,6 +7,6 @@
-
+
\ No newline at end of file
diff --git a/test/OpenTelemetry.AutoInstrumentation.Native.Tests/OpenTelemetry.AutoInstrumentation.Native.Tests.vcxproj b/test/OpenTelemetry.AutoInstrumentation.Native.Tests/OpenTelemetry.AutoInstrumentation.Native.Tests.vcxproj
index 4a17e15d6b..0b02990bb0 100644
--- a/test/OpenTelemetry.AutoInstrumentation.Native.Tests/OpenTelemetry.AutoInstrumentation.Native.Tests.vcxproj
+++ b/test/OpenTelemetry.AutoInstrumentation.Native.Tests/OpenTelemetry.AutoInstrumentation.Native.Tests.vcxproj
@@ -87,11 +87,11 @@
-
+
{4b243cf1-4269-45c6-a238-1a9bfa58b8cc}
TargetFramework=net462
-
+
{fdb5c8d0-018d-4ff9-9680-c6a5078f819b}
TargetFramework=net462
diff --git a/test/OpenTelemetry.AutoInstrumentation.Native.Tests/clr_helper_test.cpp b/test/OpenTelemetry.AutoInstrumentation.Native.Tests/clr_helper_test.cpp
index 2bf7583bc9..96782cbd3e 100644
--- a/test/OpenTelemetry.AutoInstrumentation.Native.Tests/clr_helper_test.cpp
+++ b/test/OpenTelemetry.AutoInstrumentation.Native.Tests/clr_helper_test.cpp
@@ -12,17 +12,17 @@ TEST_F(CLRHelperTest, EnumeratesTypeDefs) {
std::vector expected_types = {
L"Microsoft.CodeAnalysis.EmbeddedAttribute",
L"System.Runtime.CompilerServices.IsReadOnlyAttribute",
- L"Samples.ExampleLibrary.Class1",
- L"Samples.ExampleLibrary.GenericTests.ComprehensiveCaller`2",
- L"Samples.ExampleLibrary.GenericTests.GenericTarget`2",
- L"Samples.ExampleLibrary.GenericTests.PointStruct",
- L"Samples.ExampleLibrary.GenericTests.StructContainer`1",
- L"Samples.ExampleLibrary.FakeClient.Biscuit`1",
- L"Samples.ExampleLibrary.FakeClient.Biscuit",
- L"Samples.ExampleLibrary.FakeClient.StructBiscuit",
- L"Samples.ExampleLibrary.FakeClient.DogClient`2",
- L"Samples.ExampleLibrary.FakeClient.DogTrick`1",
- L"Samples.ExampleLibrary.FakeClient.DogTrick",
+ L"TestApplication.ExampleLibrary.Class1",
+ L"TestApplication.ExampleLibrary.GenericTests.ComprehensiveCaller`2",
+ L"TestApplication.ExampleLibrary.GenericTests.GenericTarget`2",
+ L"TestApplication.ExampleLibrary.GenericTests.PointStruct",
+ L"TestApplication.ExampleLibrary.GenericTests.StructContainer`1",
+ L"TestApplication.ExampleLibrary.FakeClient.Biscuit`1",
+ L"TestApplication.ExampleLibrary.FakeClient.Biscuit",
+ L"TestApplication.ExampleLibrary.FakeClient.StructBiscuit",
+ L"TestApplication.ExampleLibrary.FakeClient.DogClient`2",
+ L"TestApplication.ExampleLibrary.FakeClient.DogTrick`1",
+ L"TestApplication.ExampleLibrary.FakeClient.DogTrick",
L"<>c",
L"Cookie",
L"Cookie",
@@ -68,17 +68,17 @@ TEST_F(CLRHelperTest, GetsTypeInfoFromTypeDefs) {
L"Cookie",
L"Microsoft.CodeAnalysis.EmbeddedAttribute",
L"Raisin",
- L"Samples.ExampleLibrary.Class1",
- L"Samples.ExampleLibrary.FakeClient.Biscuit",
- L"Samples.ExampleLibrary.FakeClient.Biscuit`1",
- L"Samples.ExampleLibrary.FakeClient.DogClient`2",
- L"Samples.ExampleLibrary.FakeClient.DogTrick",
- L"Samples.ExampleLibrary.FakeClient.DogTrick`1",
- L"Samples.ExampleLibrary.FakeClient.StructBiscuit",
- L"Samples.ExampleLibrary.GenericTests.ComprehensiveCaller`2",
- L"Samples.ExampleLibrary.GenericTests.GenericTarget`2",
- L"Samples.ExampleLibrary.GenericTests.PointStruct",
- L"Samples.ExampleLibrary.GenericTests.StructContainer`1",
+ L"TestApplication.ExampleLibrary.Class1",
+ L"TestApplication.ExampleLibrary.FakeClient.Biscuit",
+ L"TestApplication.ExampleLibrary.FakeClient.Biscuit`1",
+ L"TestApplication.ExampleLibrary.FakeClient.DogClient`2",
+ L"TestApplication.ExampleLibrary.FakeClient.DogTrick",
+ L"TestApplication.ExampleLibrary.FakeClient.DogTrick`1",
+ L"TestApplication.ExampleLibrary.FakeClient.StructBiscuit",
+ L"TestApplication.ExampleLibrary.GenericTests.ComprehensiveCaller`2",
+ L"TestApplication.ExampleLibrary.GenericTests.GenericTarget`2",
+ L"TestApplication.ExampleLibrary.GenericTests.PointStruct",
+ L"TestApplication.ExampleLibrary.GenericTests.StructContainer`1",
L"System.Runtime.CompilerServices.IsReadOnlyAttribute"};
std::set actual;
for (auto& type_def : EnumTypeDefs(metadata_import_)) {
@@ -166,17 +166,17 @@ TEST_F(CLRHelperTest, GetsTypeInfoFromMethods) {
L"d__4`2",
L"Cookie",
L"Raisin",
- L"Samples.ExampleLibrary.Class1",
- L"Samples.ExampleLibrary.FakeClient.Biscuit",
- L"Samples.ExampleLibrary.FakeClient.Biscuit`1",
- L"Samples.ExampleLibrary.FakeClient.DogClient`2",
- L"Samples.ExampleLibrary.FakeClient.DogTrick",
- L"Samples.ExampleLibrary.FakeClient.DogTrick`1",
- L"Samples.ExampleLibrary.FakeClient.StructBiscuit",
- L"Samples.ExampleLibrary.GenericTests.ComprehensiveCaller`2",
- L"Samples.ExampleLibrary.GenericTests.GenericTarget`2",
- L"Samples.ExampleLibrary.GenericTests.PointStruct",
- L"Samples.ExampleLibrary.GenericTests.StructContainer`1"};
+ L"TestApplication.ExampleLibrary.Class1",
+ L"TestApplication.ExampleLibrary.FakeClient.Biscuit",
+ L"TestApplication.ExampleLibrary.FakeClient.Biscuit`1",
+ L"TestApplication.ExampleLibrary.FakeClient.DogClient`2",
+ L"TestApplication.ExampleLibrary.FakeClient.DogTrick",
+ L"TestApplication.ExampleLibrary.FakeClient.DogTrick`1",
+ L"TestApplication.ExampleLibrary.FakeClient.StructBiscuit",
+ L"TestApplication.ExampleLibrary.GenericTests.ComprehensiveCaller`2",
+ L"TestApplication.ExampleLibrary.GenericTests.GenericTarget`2",
+ L"TestApplication.ExampleLibrary.GenericTests.PointStruct",
+ L"TestApplication.ExampleLibrary.GenericTests.StructContainer`1"};
std::set actual;
for (auto& type_def : EnumTypeDefs(metadata_import_)) {
for (auto& method_def : EnumMethods(metadata_import_, type_def)) {
@@ -191,20 +191,20 @@ TEST_F(CLRHelperTest, GetsTypeInfoFromMethods) {
TEST_F(CLRHelperTest, FindTypeDefsByName) {
std::vector expected_types = {
- L"Samples.ExampleLibrary.Class1",
- L"Samples.ExampleLibrary.GenericTests.ComprehensiveCaller`2",
- L"Samples.ExampleLibrary.GenericTests.GenericTarget`2",
- L"Samples.ExampleLibrary.GenericTests.PointStruct",
- L"Samples.ExampleLibrary.GenericTests.StructContainer`1",
- L"Samples.ExampleLibrary.FakeClient.Biscuit`1",
- L"Samples.ExampleLibrary.FakeClient.Biscuit",
- L"Samples.ExampleLibrary.FakeClient.DogClient`2",
- L"Samples.ExampleLibrary.FakeClient.DogTrick`1",
- L"Samples.ExampleLibrary.FakeClient.DogTrick"};
+ L"TestApplication.ExampleLibrary.Class1",
+ L"TestApplication.ExampleLibrary.GenericTests.ComprehensiveCaller`2",
+ L"TestApplication.ExampleLibrary.GenericTests.GenericTarget`2",
+ L"TestApplication.ExampleLibrary.GenericTests.PointStruct",
+ L"TestApplication.ExampleLibrary.GenericTests.StructContainer`1",
+ L"TestApplication.ExampleLibrary.FakeClient.Biscuit`1",
+ L"TestApplication.ExampleLibrary.FakeClient.Biscuit",
+ L"TestApplication.ExampleLibrary.FakeClient.DogClient`2",
+ L"TestApplication.ExampleLibrary.FakeClient.DogTrick`1",
+ L"TestApplication.ExampleLibrary.FakeClient.DogTrick"};
for (auto& def : expected_types) {
mdTypeDef typeDef = mdTypeDefNil;
- auto found = FindTypeDefByName(def, L"Samples.ExampleLibrary",
+ auto found = FindTypeDefByName(def, L"TestApplication.ExampleLibrary",
metadata_import_, typeDef);
EXPECT_TRUE(found) << "Failed type is : " << def << std::endl;
EXPECT_NE(typeDef, mdTypeDefNil) << "Failed type is : " << def << std::endl;
@@ -213,12 +213,12 @@ TEST_F(CLRHelperTest, FindTypeDefsByName) {
TEST_F(CLRHelperTest, FindNestedTypeDefsByName) {
std::vector expected_types = {
- L"Samples.ExampleLibrary.FakeClient.Biscuit+Cookie",
- L"Samples.ExampleLibrary.FakeClient.StructBiscuit+Cookie"};
+ L"TestApplication.ExampleLibrary.FakeClient.Biscuit+Cookie",
+ L"TestApplication.ExampleLibrary.FakeClient.StructBiscuit+Cookie"};
for (auto& def : expected_types) {
mdTypeDef typeDef = mdTypeDefNil;
- auto found = FindTypeDefByName(def, L"Samples.ExampleLibrary",
+ auto found = FindTypeDefByName(def, L"TestApplication.ExampleLibrary",
metadata_import_, typeDef);
EXPECT_TRUE(found) << "Failed type is : " << def << std::endl;
EXPECT_NE(typeDef, mdTypeDefNil) << "Failed type is : " << def << std::endl;
@@ -227,12 +227,12 @@ TEST_F(CLRHelperTest, FindNestedTypeDefsByName) {
TEST_F(CLRHelperTest, DoesNotFindDoubleNestedTypeDefsByName) {
std::vector expected_types = {
- L"Samples.ExampleLibrary.NotARealClass",
- L"Samples.ExampleLibrary.FakeClient.Biscuit+Cookie+Raisin"};
+ L"TestApplication.ExampleLibrary.NotARealClass",
+ L"TestApplication.ExampleLibrary.FakeClient.Biscuit+Cookie+Raisin"};
for (auto& def : expected_types) {
mdTypeDef typeDef = mdTypeDefNil;
- auto found = FindTypeDefByName(def, L"Samples.ExampleLibrary",
+ auto found = FindTypeDefByName(def, L"TestApplication.ExampleLibrary",
metadata_import_, typeDef);
EXPECT_FALSE(found) << "Failed type is : " << def << std::endl;
EXPECT_EQ(typeDef, mdTypeDefNil) << "Failed type is : " << def << std::endl;
diff --git a/test/OpenTelemetry.AutoInstrumentation.Native.Tests/metadata_builder_test.cpp b/test/OpenTelemetry.AutoInstrumentation.Native.Tests/metadata_builder_test.cpp
index a8c7ee3386..e9a1fe8e2e 100644
--- a/test/OpenTelemetry.AutoInstrumentation.Native.Tests/metadata_builder_test.cpp
+++ b/test/OpenTelemetry.AutoInstrumentation.Native.Tests/metadata_builder_test.cpp
@@ -36,10 +36,10 @@ class MetadataBuilderTest : public ::testing::Test {
ASSERT_TRUE(SUCCEEDED(hr));
ComPtr metadataInterfaces;
- hr = metadata_dispenser_->OpenScope(L"Samples.ExampleLibrary.dll",
+ hr = metadata_dispenser_->OpenScope(L"TestApplication.ExampleLibrary.dll",
ofReadWriteMask, IID_IMetaDataImport2,
metadataInterfaces.GetAddressOf());
- ASSERT_TRUE(SUCCEEDED(hr)) << "File not found: Samples.ExampleLibrary.dll";
+ ASSERT_TRUE(SUCCEEDED(hr)) << "File not found: TestApplication.ExampleLibrary.dll";
const auto metadataImport =
metadataInterfaces.As(IID_IMetaDataImport2);
@@ -50,7 +50,7 @@ class MetadataBuilderTest : public ::testing::Test {
const auto assemblyEmit =
metadataInterfaces.As(IID_IMetaDataAssemblyEmit);
- const std::wstring assemblyName = L"Samples.ExampleLibrary";
+ const std::wstring assemblyName = L"TestApplication.ExampleLibrary";
const AppDomainID app_domain_id{};
@@ -71,7 +71,7 @@ class MetadataBuilderTest : public ::testing::Test {
metadataEmit, assemblyImport, assemblyEmit);
hr = metadata_builder_->EmitAssemblyRef(trace::AssemblyReference(
- L"Samples.ExampleLibraryTracer, Version=1.0.0.0"));
+ L"TestApplication.ExampleLibraryTracer, Version=1.0.0.0"));
ASSERT_TRUE(SUCCEEDED(hr));
}
@@ -86,21 +86,21 @@ TEST_F(MetadataBuilderTest, StoresWrapperMemberRef) {
const auto min_ver = Version(0, 0, 0, 0);
const auto max_ver = Version(USHRT_MAX, USHRT_MAX, USHRT_MAX, USHRT_MAX);
const MethodReference ref1(L"", L"", L"", L"", min_ver, max_ver, {}, empty_sig_type_);
- const MethodReference ref2(L"Samples.ExampleLibrary", L"Class1", L"Add", L"", min_ver, max_ver, {}, empty_sig_type_);
- const MethodReference ref3(L"Samples.ExampleLibrary", L"Class1", L"Add", L"ReplaceTargetMethod", min_ver, max_ver, {}, empty_sig_type_);
+ const MethodReference ref2(L"TestApplication.ExampleLibrary", L"Class1", L"Add", L"", min_ver, max_ver, {}, empty_sig_type_);
+ const MethodReference ref3(L"TestApplication.ExampleLibrary", L"Class1", L"Add", L"ReplaceTargetMethod", min_ver, max_ver, {}, empty_sig_type_);
const MethodReplacement mr1(ref1, ref2, ref3);
auto hr = metadata_builder_->StoreWrapperMethodRef(mr1);
ASSERT_EQ(S_OK, hr);
mdMemberRef tmp;
auto ok = module_metadata_->TryGetWrapperMemberRef(
- L"[Samples.ExampleLibrary]Class1.Add_vMin_0.0.0.0_vMax_65535.65535.65535.65535", tmp);
+ L"[TestApplication.ExampleLibrary]Class1.Add_vMin_0.0.0.0_vMax_65535.65535.65535.65535", tmp);
EXPECT_TRUE(ok);
EXPECT_NE(tmp, 0);
tmp = 0;
ok = module_metadata_->TryGetWrapperMemberRef(
- L"[Samples.ExampleLibrary]Class2.Add_vMin_0.0.0.0_vMax_65535.65535.65535.65535", tmp);
+ L"[TestApplication.ExampleLibrary]Class2.Add_vMin_0.0.0.0_vMax_65535.65535.65535.65535", tmp);
EXPECT_FALSE(ok);
EXPECT_EQ(tmp, 0);
}
@@ -110,8 +110,8 @@ TEST_F(MetadataBuilderTest, StoresWrapperMemberRefForSeparateAssembly) {
const auto max_ver = Version(USHRT_MAX, USHRT_MAX, USHRT_MAX, USHRT_MAX);
const MethodReference ref1(L"", L"", L"", L"", min_ver, max_ver, {},
empty_sig_type_);
- const MethodReference ref2(L"Samples.ExampleLibrary", L"Class1", L"Add", L"", min_ver, max_ver, {}, empty_sig_type_);
- const MethodReference ref3(L"Samples.ExampleLibraryTracer", L"Class1", L"Add", L"ReplaceTargetMethod",
+ const MethodReference ref2(L"TestApplication.ExampleLibrary", L"Class1", L"Add", L"", min_ver, max_ver, {}, empty_sig_type_);
+ const MethodReference ref3(L"TestApplication.ExampleLibraryTracer", L"Class1", L"Add", L"ReplaceTargetMethod",
min_ver, max_ver, {}, empty_sig_type_);
const MethodReplacement mr1(ref1, ref2, ref3);
auto hr = metadata_builder_->StoreWrapperMethodRef(mr1);
@@ -119,7 +119,7 @@ TEST_F(MetadataBuilderTest, StoresWrapperMemberRefForSeparateAssembly) {
mdMemberRef tmp;
auto ok = module_metadata_->TryGetWrapperMemberRef(
- L"[Samples.ExampleLibraryTracer]Class1.Add_vMin_0.0.0.0_vMax_65535.65535.65535.65535", tmp);
+ L"[TestApplication.ExampleLibraryTracer]Class1.Add_vMin_0.0.0.0_vMax_65535.65535.65535.65535", tmp);
EXPECT_TRUE(ok);
EXPECT_NE(tmp, 0);
}
@@ -129,8 +129,8 @@ TEST_F(MetadataBuilderTest, StoresWrapperMemberRefRecordsFailure) {
const auto max_ver = Version(USHRT_MAX, USHRT_MAX, USHRT_MAX, USHRT_MAX);
const MethodReference ref1(L"", L"", L"", L"", min_ver, max_ver, {},
empty_sig_type_);
- const MethodReference ref2(L"Samples.ExampleLibrary", L"Class1", L"Add", L"", min_ver, max_ver, {}, empty_sig_type_);
- const MethodReference ref3(L"Samples.ExampleLibraryTracer.AssemblyDoesNotExist", L"Class1", L"Add", L"ReplaceTargetMethod",
+ const MethodReference ref2(L"TestApplication.ExampleLibrary", L"Class1", L"Add", L"", min_ver, max_ver, {}, empty_sig_type_);
+ const MethodReference ref3(L"TestApplication.ExampleLibraryTracer.AssemblyDoesNotExist", L"Class1", L"Add", L"ReplaceTargetMethod",
min_ver, max_ver, {}, empty_sig_type_);
const MethodReplacement mr1(ref1, ref2, ref3);
auto hr = metadata_builder_->StoreWrapperMethodRef(mr1);
diff --git a/test/OpenTelemetry.AutoInstrumentation.Native.Tests/test_helpers.h b/test/OpenTelemetry.AutoInstrumentation.Native.Tests/test_helpers.h
index 5b1436c321..4bd6de7dca 100644
--- a/test/OpenTelemetry.AutoInstrumentation.Native.Tests/test_helpers.h
+++ b/test/OpenTelemetry.AutoInstrumentation.Native.Tests/test_helpers.h
@@ -40,10 +40,10 @@ class CLRHelperTestBase : public ::testing::Test {
ASSERT_TRUE(SUCCEEDED(hr));
ComPtr metadataInterfaces;
- hr = metadata_dispenser_->OpenScope(L"Samples.ExampleLibrary.dll",
+ hr = metadata_dispenser_->OpenScope(L"TestApplication.ExampleLibrary.dll",
ofReadWriteMask, IID_IMetaDataImport2,
metadataInterfaces.GetAddressOf());
- ASSERT_TRUE(SUCCEEDED(hr)) << "Samples.ExampleLibrary.dll was not found.";
+ ASSERT_TRUE(SUCCEEDED(hr)) << "TestApplication.ExampleLibrary.dll was not found.";
metadata_import_ =
metadataInterfaces.As(IID_IMetaDataImport2);
diff --git a/test/integration-tests/IntegrationTests.GraphQL/GraphQLTests.cs b/test/integration-tests/IntegrationTests.GraphQL/GraphQLTests.cs
index 80e5feeef0..2c0e1bbd36 100644
--- a/test/integration-tests/IntegrationTests.GraphQL/GraphQLTests.cs
+++ b/test/integration-tests/IntegrationTests.GraphQL/GraphQLTests.cs
@@ -20,7 +20,6 @@
using System.IO;
using System.Linq;
using System.Net;
-using System.Net.Http;
using System.Threading;
using IntegrationTests.Helpers;
using IntegrationTests.Helpers.Models;
@@ -31,7 +30,7 @@ namespace IntegrationTests.GraphQL;
public class GraphQLTests : TestHelper
{
- private const string ServiceName = "Samples.GraphQL";
+ private const string ServiceName = "TestApplication.GraphQL";
private static readonly string _graphQLValidateOperationName = "graphql.validate";
private static readonly string _graphQLExecuteOperationName = "graphql.execute";
@@ -87,11 +86,11 @@ public void SubmitsTraces()
int aspNetCorePort = TcpPortProvider.GetOpenPort();
using (var agent = new MockZipkinCollector(Output, agentPort))
- using (Process process = StartSample(agent.Port, arguments: null, packageVersion: string.Empty, aspNetCorePort: aspNetCorePort))
+ using (Process process = StartTestApplication(agent.Port, arguments: null, packageVersion: string.Empty, aspNetCorePort: aspNetCorePort))
{
if (process.HasExited)
{
- throw new InvalidOperationException($"Sample has exited with code: {process.ExitCode}");
+ throw new InvalidOperationException($"Test application has exited with code: {process.ExitCode}");
}
var wh = new EventWaitHandle(false, EventResetMode.AutoReset);
diff --git a/test/integration-tests/IntegrationTests.Helpers/EnvironmentHelper.cs b/test/integration-tests/IntegrationTests.Helpers/EnvironmentHelper.cs
index f69f4ab4c6..71ee340aa0 100644
--- a/test/integration-tests/IntegrationTests.Helpers/EnvironmentHelper.cs
+++ b/test/integration-tests/IntegrationTests.Helpers/EnvironmentHelper.cs
@@ -39,7 +39,7 @@ public class EnvironmentHelper
private readonly string _appNamePrepend;
private readonly string _runtime;
private readonly bool _isCoreClr;
- private readonly string _samplesDirectory;
+ private readonly string _testApplicationDirectory;
private readonly TargetFrameworkAttribute _targetFramework;
private bool _requiresProfiling;
@@ -47,15 +47,15 @@ public class EnvironmentHelper
private string _profilerFileLocation;
public EnvironmentHelper(
- string sampleName,
+ string testApplicationName,
Type anchorType,
ITestOutputHelper output,
- string samplesDirectory = null,
- bool prependSamplesToAppName = true,
+ string testApplicationDirectory = null,
+ bool prependTestApplicationToAppName = true,
bool requiresProfiling = true)
{
- SampleName = sampleName;
- _samplesDirectory = samplesDirectory ?? Path.Combine("test", "test-applications", "integrations");
+ TestApplicationName = testApplicationName;
+ _testApplicationDirectory = testApplicationDirectory ?? Path.Combine("test", "test-applications", "integrations");
_targetFramework = Assembly.GetAssembly(anchorType).GetCustomAttribute();
_output = output;
_requiresProfiling = requiresProfiling;
@@ -73,8 +73,8 @@ public EnvironmentHelper(
_patch = versionParts[2];
}
- _appNamePrepend = prependSamplesToAppName
- ? "Samples."
+ _appNamePrepend = prependTestApplicationToAppName
+ ? "TestApplication."
: string.Empty;
}
@@ -82,9 +82,9 @@ public EnvironmentHelper(
public Dictionary CustomEnvironmentVariables { get; set; } = new Dictionary();
- public string SampleName { get; }
+ public string TestApplicationName { get; }
- public string FullSampleName => $"{_appNamePrepend}{SampleName}";
+ public string FullTestApplicationName => $"{_appNamePrepend}{TestApplicationName}";
public static bool IsNet5()
{
@@ -202,10 +202,10 @@ public void SetEnvironmentVariables(
environmentVariables["OTEL_TRACES_EXPORTER"] = "zipkin";
environmentVariables["OTEL_EXPORTER_ZIPKIN_ENDPOINT"] = $"http://127.0.0.1:{agentPort}";
- // for ASP.NET Core sample apps, set the server's port
+ // for ASP.NET Core test applications, set the server's port
environmentVariables["ASPNETCORE_URLS"] = $"http://127.0.0.1:{aspNetCorePort}/";
- environmentVariables["OTEL_DOTNET_AUTO_ADDITIONAL_SOURCES"] = "Samples.*";
+ environmentVariables["OTEL_DOTNET_AUTO_ADDITIONAL_SOURCES"] = "TestApplication.*";
foreach (var key in CustomEnvironmentVariables.Keys)
{
@@ -264,32 +264,25 @@ public string GetIntegrationsPath()
throw new Exception($"Unable to find integrations at: {integrationsPath}");
}
- public string GetSampleApplicationPath(string packageVersion = "", string framework = "")
+ public string GetTestApplicationPath(string packageVersion = "", string framework = "")
{
string extension = "exe";
- if (IsCoreClr() || _samplesDirectory.Contains("aspnet"))
+ if (IsCoreClr() || _testApplicationDirectory.Contains("aspnet"))
{
extension = "dll";
}
- var appFileName = $"{FullSampleName}.{extension}";
- var sampleAppPath = Path.Combine(GetSampleApplicationOutputDirectory(packageVersion: packageVersion, framework: framework), appFileName);
- return sampleAppPath;
+ var appFileName = $"{FullTestApplicationName}.{extension}";
+ var testApplicationPath = Path.Combine(GetTestApplicationApplicationOutputDirectory(packageVersion: packageVersion, framework: framework), appFileName);
+ return testApplicationPath;
}
- public string GetTestCommandForSampleApplicationPath(string packageVersion = "", string framework = "")
- {
- var appFileName = $"{FullSampleName}.dll";
- var sampleAppPath = Path.Combine(GetSampleApplicationOutputDirectory(packageVersion: packageVersion, framework: framework), appFileName);
- return sampleAppPath;
- }
-
- public string GetSampleExecutionSource()
+ public string GetTestApplicationExecutionSource()
{
string executor;
- if (_samplesDirectory.Contains("aspnet"))
+ if (_testApplicationDirectory.Contains("aspnet"))
{
executor = $"C:\\Program Files{(Environment.Is64BitProcess ? string.Empty : " (x86)")}\\IIS Express\\iisexpress.exe";
}
@@ -299,8 +292,8 @@ public string GetSampleExecutionSource()
}
else
{
- var appFileName = $"{FullSampleName}.exe";
- executor = Path.Combine(GetSampleApplicationOutputDirectory(), appFileName);
+ var appFileName = $"{FullTestApplicationName}.exe";
+ executor = Path.Combine(GetTestApplicationApplicationOutputDirectory(), appFileName);
if (!File.Exists(executor))
{
@@ -311,24 +304,24 @@ public string GetSampleExecutionSource()
return executor;
}
- public string GetSampleProjectDirectory()
+ public string GetTestApplicationProjectDirectory()
{
var solutionDirectory = EnvironmentTools.GetSolutionDirectory();
var projectDir = Path.Combine(
solutionDirectory,
- _samplesDirectory,
- $"{FullSampleName}");
+ _testApplicationDirectory,
+ $"{FullTestApplicationName}");
return projectDir;
}
- public string GetSampleApplicationOutputDirectory(string packageVersion = "", string framework = "")
+ public string GetTestApplicationApplicationOutputDirectory(string packageVersion = "", string framework = "")
{
var targetFramework = string.IsNullOrEmpty(framework) ? GetTargetFramework() : framework;
var binDir = Path.Combine(
- GetSampleProjectDirectory(),
+ GetTestApplicationProjectDirectory(),
"bin");
- if (_samplesDirectory.Contains("aspnet"))
+ if (_testApplicationDirectory.Contains("aspnet"))
{
return Path.Combine(
binDir,
diff --git a/test/integration-tests/IntegrationTests.Helpers/TestHelper.cs b/test/integration-tests/IntegrationTests.Helpers/TestHelper.cs
index dbfe1f17a1..b9db6f51e2 100644
--- a/test/integration-tests/IntegrationTests.Helpers/TestHelper.cs
+++ b/test/integration-tests/IntegrationTests.Helpers/TestHelper.cs
@@ -32,8 +32,8 @@ public abstract class TestHelper
// Warning: Long timeouts can cause integer overflow!
private static readonly TimeSpan DefaultProcessTimeout = TimeSpan.FromMinutes(5);
- protected TestHelper(string sampleAppName, ITestOutputHelper output)
- : this(new EnvironmentHelper(sampleAppName, typeof(TestHelper), output), output)
+ protected TestHelper(string testApplicationName, ITestOutputHelper output)
+ : this(new EnvironmentHelper(testApplicationName, typeof(TestHelper), output), output)
{
}
@@ -55,8 +55,8 @@ protected TestHelper(EnvironmentHelper environmentHelper, ITestOutputHelper outp
public async Task StartContainerAsync(int traceAgentPort, int webPort)
{
- // get path to sample app that the profiler will attach to
- string sampleName = $"samples-{EnvironmentHelper.SampleName.ToLowerInvariant()}";
+ // get path to test application that the profiler will attach to
+ string testApplicationName = $"testapplication-{EnvironmentHelper.TestApplicationName.ToLowerInvariant()}";
string agentBaseUrl = $"http://{DockerNetworkHelper.IntegrationTestsGateway}:{traceAgentPort}";
string agentHealthzUrl = $"{agentBaseUrl}/healthz";
@@ -75,10 +75,10 @@ public async Task StartContainerAsync(int traceAgentPort, int webPort
Output.WriteLine("Collecting docker logs to: " + logPath);
var builder = new TestcontainersBuilder()
- .WithImage(sampleName)
+ .WithImage(testApplicationName)
.WithCleanUp(cleanUp: true)
.WithOutputConsumer(Consume.RedirectStdoutAndStderrToConsole())
- .WithName($"{sampleName}-{traceAgentPort}-{webPort}")
+ .WithName($"{testApplicationName}-{traceAgentPort}-{webPort}")
.WithNetwork(networkId, networkName)
.WithPortBinding(webPort, 80)
.WithEnvironment("OTEL_EXPORTER_ZIPKIN_ENDPOINT", zipkinEndpoint)
@@ -88,7 +88,7 @@ public async Task StartContainerAsync(int traceAgentPort, int webPort
var container = builder.Build();
var wasStarted = container.StartAsync().Wait(TimeSpan.FromMinutes(5));
- wasStarted.Should().BeTrue($"Container based on {sampleName} has to be operational for the test.");
+ wasStarted.Should().BeTrue($"Container based on {testApplicationName} has to be operational for the test.");
Output.WriteLine($"Container was started successfully.");
@@ -104,18 +104,18 @@ public async Task StartContainerAsync(int traceAgentPort, int webPort
return new Container(container);
}
- public Process StartSample(int traceAgentPort, string arguments, string packageVersion, int aspNetCorePort, string framework = "", bool enableStartupHook = true)
+ public Process StartTestApplication(int traceAgentPort, string arguments, string packageVersion, int aspNetCorePort, string framework = "", bool enableStartupHook = true)
{
- // get path to sample app that the profiler will attach to
- string sampleAppPath = EnvironmentHelper.GetSampleApplicationPath(packageVersion, framework);
- if (!File.Exists(sampleAppPath))
+ // get path to test application that the profiler will attach to
+ string testApplicationPath = EnvironmentHelper.GetTestApplicationPath(packageVersion, framework);
+ if (!File.Exists(testApplicationPath))
{
- throw new Exception($"application not found: {sampleAppPath}");
+ throw new Exception($"application not found: {testApplicationPath}");
}
- Output.WriteLine($"Starting Application: {sampleAppPath}");
- var executable = EnvironmentHelper.IsCoreClr() ? EnvironmentHelper.GetSampleExecutionSource() : sampleAppPath;
- var args = EnvironmentHelper.IsCoreClr() ? $"{sampleAppPath} {arguments ?? string.Empty}" : arguments;
+ Output.WriteLine($"Starting Application: {testApplicationPath}");
+ var executable = EnvironmentHelper.IsCoreClr() ? EnvironmentHelper.GetTestApplicationExecutionSource() : testApplicationPath;
+ var args = EnvironmentHelper.IsCoreClr() ? $"{testApplicationPath} {arguments ?? string.Empty}" : arguments;
return InstrumentedProcessHelper.StartInstrumentedProcess(
executable,
@@ -127,9 +127,9 @@ public Process StartSample(int traceAgentPort, string arguments, string packageV
enableStartupHook: enableStartupHook);
}
- public ProcessResult RunSampleAndWaitForExit(int traceAgentPort, string arguments = null, string packageVersion = "", string framework = "", int aspNetCorePort = 5000, bool enableStartupHook = true)
+ public ProcessResult RunTestApplicationAndWaitForExit(int traceAgentPort, string arguments = null, string packageVersion = "", string framework = "", int aspNetCorePort = 5000, bool enableStartupHook = true)
{
- var process = StartSample(traceAgentPort, arguments, packageVersion, aspNetCorePort: aspNetCorePort, framework: framework, enableStartupHook: enableStartupHook);
+ var process = StartTestApplication(traceAgentPort, arguments, packageVersion, aspNetCorePort: aspNetCorePort, framework: framework, enableStartupHook: enableStartupHook);
var name = process.ProcessName;
using var helper = new ProcessHelper(process);
diff --git a/test/integration-tests/IntegrationTests.Http/HttpTests.cs b/test/integration-tests/IntegrationTests.Http/HttpTests.cs
index 82daa314de..4096541cb5 100644
--- a/test/integration-tests/IntegrationTests.Http/HttpTests.cs
+++ b/test/integration-tests/IntegrationTests.Http/HttpTests.cs
@@ -25,7 +25,7 @@ namespace IntegrationTests.Http
{
public class HttpTests : TestHelper
{
- private const string ServiceName = "Samples.Http";
+ private const string ServiceName = "TestApplication.Http";
public HttpTests(ITestOutputHelper output)
: base("Http", output)
@@ -43,7 +43,7 @@ public void SubmitTraces()
const int expectedSpanCount = 3;
- using var processResult = RunSampleAndWaitForExit(agent.Port, enableStartupHook: true);
+ using var processResult = RunTestApplicationAndWaitForExit(agent.Port, enableStartupHook: true);
Assert.True(processResult.ExitCode >= 0, $"Process exited with code {processResult.ExitCode} and exception: {processResult.StandardError}");
var spans = agent.WaitForSpans(expectedSpanCount, 3000);
diff --git a/test/integration-tests/IntegrationTests.MongoDB/MongoDbTests.cs b/test/integration-tests/IntegrationTests.MongoDB/MongoDbTests.cs
index 987d6ef0d3..1ccce4266e 100644
--- a/test/integration-tests/IntegrationTests.MongoDB/MongoDbTests.cs
+++ b/test/integration-tests/IntegrationTests.MongoDB/MongoDbTests.cs
@@ -45,13 +45,13 @@ public MongoDbTests(ITestOutputHelper output, MongoDbFixture mongoDb)
[Trait("Category", "EndToEnd")]
public void SubmitsTraces()
{
- const string ServiceName = "Samples.MongoDB";
+ const string ServiceName = "TestApplication.MongoDB";
SetEnvironmentVariable("OTEL_SERVICE_NAME", ServiceName);
int agentPort = TcpPortProvider.GetOpenPort();
using (var agent = new MockZipkinCollector(Output, agentPort))
- using (var processResult = RunSampleAndWaitForExit(agent.Port, arguments: $"--mongo-db {_mongoDb.Port}"))
+ using (var processResult = RunTestApplicationAndWaitForExit(agent.Port, arguments: $"--mongo-db {_mongoDb.Port}"))
{
Assert.True(processResult.ExitCode >= 0, $"Process exited with code {processResult.ExitCode} and exception: {processResult.StandardError}");
diff --git a/test/integration-tests/IntegrationTests.StartupHook/StartupHookTests.cs b/test/integration-tests/IntegrationTests.StartupHook/StartupHookTests.cs
index 4a7e61e303..4b36e8eb31 100644
--- a/test/integration-tests/IntegrationTests.StartupHook/StartupHookTests.cs
+++ b/test/integration-tests/IntegrationTests.StartupHook/StartupHookTests.cs
@@ -28,7 +28,7 @@ namespace IntegrationTests.StartupHook;
public class StartupHookTests : TestHelper
{
- private const string ServiceName = "Samples.MongoDB";
+ private const string ServiceName = "TestApplication.MongoDB";
private List _expectations = new List();
@@ -73,7 +73,7 @@ public void ApplicationIsExcluded(bool excludeApplication)
int expectedSpanCount = 2;
if (excludeApplication)
{
- applicationNameToExclude = EnvironmentHelper.FullSampleName;
+ applicationNameToExclude = EnvironmentHelper.FullTestApplicationName;
expectedSpanCount = 0;
}
@@ -89,7 +89,7 @@ private IImmutableList RunTestApplication(bool enableStartupHook)
int agentPort = TcpPortProvider.GetOpenPort();
using (var agent = new MockZipkinCollector(Output, agentPort))
- using (var processResult = RunSampleAndWaitForExit(agent.Port, enableStartupHook: enableStartupHook))
+ using (var processResult = RunTestApplicationAndWaitForExit(agent.Port, enableStartupHook: enableStartupHook))
{
Assert.True(processResult.ExitCode >= 0, $"Process exited with code {processResult.ExitCode} and exception: {processResult.StandardError}");
return agent.WaitForSpans(2, 500);
diff --git a/test/integration-tests/aspnet/IntegrationTests.AspNet/AspNetTests.cs b/test/integration-tests/aspnet/IntegrationTests.AspNet/AspNetTests.cs
index c01961e7c5..df70856aef 100644
--- a/test/integration-tests/aspnet/IntegrationTests.AspNet/AspNetTests.cs
+++ b/test/integration-tests/aspnet/IntegrationTests.AspNet/AspNetTests.cs
@@ -9,10 +9,10 @@ namespace IntegrationTests.AspNet;
public class AspNetTests : TestHelper
{
- private static readonly string SampleDir = Path.Combine("test", "test-applications", "integrations", "aspnet");
+ private static readonly string TestApplicationDir = Path.Combine("test", "test-applications", "integrations", "aspnet");
public AspNetTests(ITestOutputHelper output)
- : base(new EnvironmentHelper("AspNet", typeof(TestHelper), output, SampleDir), output)
+ : base(new EnvironmentHelper("AspNet", typeof(TestHelper), output, TestApplicationDir), output)
{
}
diff --git a/test/test-applications/integrations/Integrations.props b/test/test-applications/integrations/Integrations.props
index 76fad120f9..5a133c99e0 100644
--- a/test/test-applications/integrations/Integrations.props
+++ b/test/test-applications/integrations/Integrations.props
@@ -15,8 +15,8 @@
false
false
-
- $(DefineConstants);DEFAULT_SAMPLES
+
+ $(DefineConstants);DEFAULT_TEST_APPLICATIONS
$(DefineConstants);COMPREHENSIVE_TESTS
diff --git a/test/test-applications/integrations/Samples.GraphQL/GraphQLUserContext.cs b/test/test-applications/integrations/TestApplication.GraphQL/GraphQLUserContext.cs
similarity index 95%
rename from test/test-applications/integrations/Samples.GraphQL/GraphQLUserContext.cs
rename to test/test-applications/integrations/TestApplication.GraphQL/GraphQLUserContext.cs
index 5a62407c10..b6ab18486e 100644
--- a/test/test-applications/integrations/Samples.GraphQL/GraphQLUserContext.cs
+++ b/test/test-applications/integrations/TestApplication.GraphQL/GraphQLUserContext.cs
@@ -16,7 +16,7 @@
using System.Security.Claims;
-namespace Samples.GraphQL;
+namespace TestApplication.GraphQL;
public class GraphQLUserContext
{
diff --git a/test/test-applications/integrations/Samples.GraphQL/Program.cs b/test/test-applications/integrations/TestApplication.GraphQL/Program.cs
similarity index 98%
rename from test/test-applications/integrations/Samples.GraphQL/Program.cs
rename to test/test-applications/integrations/TestApplication.GraphQL/Program.cs
index 54af55152f..51b3faabda 100644
--- a/test/test-applications/integrations/Samples.GraphQL/Program.cs
+++ b/test/test-applications/integrations/TestApplication.GraphQL/Program.cs
@@ -23,7 +23,7 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Samples.GraphQL;
+namespace TestApplication.GraphQL;
public class Program
{
diff --git a/test/test-applications/integrations/Samples.GraphQL/Properties/launchSettings.json b/test/test-applications/integrations/TestApplication.GraphQL/Properties/launchSettings.json
similarity index 97%
rename from test/test-applications/integrations/Samples.GraphQL/Properties/launchSettings.json
rename to test/test-applications/integrations/TestApplication.GraphQL/Properties/launchSettings.json
index b6aef9ab51..244045caf2 100644
--- a/test/test-applications/integrations/Samples.GraphQL/Properties/launchSettings.json
+++ b/test/test-applications/integrations/TestApplication.GraphQL/Properties/launchSettings.json
@@ -8,7 +8,7 @@
}
},
"profiles": {
- "Samples.GraphQL": {
+ "TestApplication.GraphQL": {
"commandName": "Project",
"launchBrowser": false,
"environmentVariables": {
diff --git a/test/test-applications/integrations/Samples.GraphQL/StarWarsExtensions/StarWarsSubscription.cs b/test/test-applications/integrations/TestApplication.GraphQL/StarWarsExtensions/StarWarsSubscription.cs
similarity index 98%
rename from test/test-applications/integrations/Samples.GraphQL/StarWarsExtensions/StarWarsSubscription.cs
rename to test/test-applications/integrations/TestApplication.GraphQL/StarWarsExtensions/StarWarsSubscription.cs
index c807b3ba01..204b2b065b 100644
--- a/test/test-applications/integrations/Samples.GraphQL/StarWarsExtensions/StarWarsSubscription.cs
+++ b/test/test-applications/integrations/TestApplication.GraphQL/StarWarsExtensions/StarWarsSubscription.cs
@@ -24,7 +24,7 @@
using GraphQL.Subscription;
using GraphQL.Types;
-namespace Samples.GraphQL.StarWarsExtensions;
+namespace TestApplication.GraphQL.StarWarsExtensions;
///
/// This is an example JSON request for a subscription
diff --git a/test/test-applications/integrations/Samples.GraphQL/Startup.cs b/test/test-applications/integrations/TestApplication.GraphQL/Startup.cs
similarity index 98%
rename from test/test-applications/integrations/Samples.GraphQL/Startup.cs
rename to test/test-applications/integrations/TestApplication.GraphQL/Startup.cs
index e378b998cc..f1e0f6406f 100644
--- a/test/test-applications/integrations/Samples.GraphQL/Startup.cs
+++ b/test/test-applications/integrations/TestApplication.GraphQL/Startup.cs
@@ -27,7 +27,7 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Samples.GraphQL;
+namespace TestApplication.GraphQL;
public class Startup
{
diff --git a/test/test-applications/integrations/Samples.GraphQL/Samples.GraphQL.csproj b/test/test-applications/integrations/TestApplication.GraphQL/TestApplication.GraphQL.csproj
similarity index 100%
rename from test/test-applications/integrations/Samples.GraphQL/Samples.GraphQL.csproj
rename to test/test-applications/integrations/TestApplication.GraphQL/TestApplication.GraphQL.csproj
diff --git a/test/test-applications/integrations/Samples.Http/Program.cs b/test/test-applications/integrations/TestApplication.Http/Program.cs
similarity index 98%
rename from test/test-applications/integrations/Samples.Http/Program.cs
rename to test/test-applications/integrations/TestApplication.Http/Program.cs
index 2fcaad45d2..d41b388484 100644
--- a/test/test-applications/integrations/Samples.Http/Program.cs
+++ b/test/test-applications/integrations/TestApplication.Http/Program.cs
@@ -18,7 +18,7 @@
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Hosting;
-namespace Samples.Http
+namespace TestApplication.Http
{
public class Program
{
diff --git a/test/test-applications/integrations/TestApplication.Http/Properties/launchSettings.json b/test/test-applications/integrations/TestApplication.Http/Properties/launchSettings.json
new file mode 100644
index 0000000000..4f83755e7d
--- /dev/null
+++ b/test/test-applications/integrations/TestApplication.Http/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+ "profiles": {
+ "TestApplication.Http": {
+ "commandName": "Project",
+ "launchBrowser": true,
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ },
+ "applicationUrl": "https://localhost:51356;http://localhost:51357"
+ }
+ }
+}
\ No newline at end of file
diff --git a/test/test-applications/integrations/Samples.Http/Startup.cs b/test/test-applications/integrations/TestApplication.Http/Startup.cs
similarity index 95%
rename from test/test-applications/integrations/Samples.Http/Startup.cs
rename to test/test-applications/integrations/TestApplication.Http/Startup.cs
index f5cf125c6b..835620a596 100644
--- a/test/test-applications/integrations/Samples.Http/Startup.cs
+++ b/test/test-applications/integrations/TestApplication.Http/Startup.cs
@@ -21,11 +21,11 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
-namespace Samples.Http
+namespace TestApplication.Http
{
public class Startup
{
- private static readonly ActivitySource MyActivitySource = new ActivitySource("Samples.Http", "1.0.0");
+ private static readonly ActivitySource MyActivitySource = new ActivitySource("TestApplication.Http", "1.0.0");
public Startup(IConfiguration configuration)
{
diff --git a/test/test-applications/integrations/Samples.Http/Samples.Http.csproj b/test/test-applications/integrations/TestApplication.Http/TestApplication.Http.csproj
similarity index 100%
rename from test/test-applications/integrations/Samples.Http/Samples.Http.csproj
rename to test/test-applications/integrations/TestApplication.Http/TestApplication.Http.csproj
diff --git a/test/test-applications/integrations/Samples.MongoDB/Program.cs b/test/test-applications/integrations/TestApplication.MongoDB/Program.cs
similarity index 98%
rename from test/test-applications/integrations/Samples.MongoDB/Program.cs
rename to test/test-applications/integrations/TestApplication.MongoDB/Program.cs
index 27067f2691..79c0b15452 100644
--- a/test/test-applications/integrations/Samples.MongoDB/Program.cs
+++ b/test/test-applications/integrations/TestApplication.MongoDB/Program.cs
@@ -25,12 +25,12 @@
using MongoDB.Driver.Core.Clusters;
using MongoDB.Driver.Core.Servers;
-namespace Samples.MongoDB;
+namespace TestApplication.MongoDB;
public static class Program
{
internal static readonly ActivitySource ActivitySource = new ActivitySource(
- "Samples.MongoDB", "1.0.0");
+ "TestApplication.MongoDB", "1.0.0");
public static void Main(string[] args)
{
diff --git a/test/test-applications/integrations/Samples.MongoDB/Properties/launchSettings.json b/test/test-applications/integrations/TestApplication.MongoDB/Properties/launchSettings.json
similarity index 96%
rename from test/test-applications/integrations/Samples.MongoDB/Properties/launchSettings.json
rename to test/test-applications/integrations/TestApplication.MongoDB/Properties/launchSettings.json
index fdd3867a03..5b924d0233 100644
--- a/test/test-applications/integrations/Samples.MongoDB/Properties/launchSettings.json
+++ b/test/test-applications/integrations/TestApplication.MongoDB/Properties/launchSettings.json
@@ -1,6 +1,6 @@
{
"profiles": {
- "Samples.MongoDB": {
+ "TestApplication.MongoDB": {
"commandName": "Project",
"environmentVariables": {
"CORECLR_ENABLE_PROFILING": "1",
diff --git a/test/test-applications/integrations/Samples.MongoDB/Samples.MongoDB.csproj b/test/test-applications/integrations/TestApplication.MongoDB/TestApplication.MongoDB.csproj
similarity index 100%
rename from test/test-applications/integrations/Samples.MongoDB/Samples.MongoDB.csproj
rename to test/test-applications/integrations/TestApplication.MongoDB/TestApplication.MongoDB.csproj
diff --git a/test/test-applications/integrations/Samples.StartupHook/Directory.Build.props b/test/test-applications/integrations/TestApplication.StartupHook/Directory.Build.props
similarity index 100%
rename from test/test-applications/integrations/Samples.StartupHook/Directory.Build.props
rename to test/test-applications/integrations/TestApplication.StartupHook/Directory.Build.props
diff --git a/test/test-applications/integrations/Samples.StartupHook/Program.cs b/test/test-applications/integrations/TestApplication.StartupHook/Program.cs
similarity index 85%
rename from test/test-applications/integrations/Samples.StartupHook/Program.cs
rename to test/test-applications/integrations/TestApplication.StartupHook/Program.cs
index 1b7961748b..63f544a3b9 100644
--- a/test/test-applications/integrations/Samples.StartupHook/Program.cs
+++ b/test/test-applications/integrations/TestApplication.StartupHook/Program.cs
@@ -1,11 +1,11 @@
using System.Diagnostics;
using System.Net.Http;
-namespace Samples.StartupHook
+namespace TestApplication.StartupHook
{
class Program
{
- private static readonly ActivitySource MyActivitySource = new ActivitySource("Samples.StartupHook", "1.0.0");
+ private static readonly ActivitySource MyActivitySource = new ActivitySource("TestApplication.StartupHook", "1.0.0");
static void Main(string[] args)
{
diff --git a/test/test-applications/integrations/Samples.StartupHook/Samples.StartupHook.csproj b/test/test-applications/integrations/TestApplication.StartupHook/TestApplication.StartupHook.csproj
similarity index 100%
rename from test/test-applications/integrations/Samples.StartupHook/Samples.StartupHook.csproj
rename to test/test-applications/integrations/TestApplication.StartupHook/TestApplication.StartupHook.csproj
diff --git a/test/test-applications/integrations/aspnet/Samples.AspNet/Global.asax b/test/test-applications/integrations/aspnet/Samples.AspNet/Global.asax
deleted file mode 100644
index eaa548728b..0000000000
--- a/test/test-applications/integrations/aspnet/Samples.AspNet/Global.asax
+++ /dev/null
@@ -1 +0,0 @@
-<%@ Application Codebehind="Global.asax.cs" Inherits="Samples.AspNet.MvcApplication" Language="C#" %>
diff --git a/test/test-applications/integrations/aspnet/Samples.AspNet/.dockerignore b/test/test-applications/integrations/aspnet/TestApplication.AspNet/.dockerignore
similarity index 100%
rename from test/test-applications/integrations/aspnet/Samples.AspNet/.dockerignore
rename to test/test-applications/integrations/aspnet/TestApplication.AspNet/.dockerignore
diff --git a/test/test-applications/integrations/aspnet/Samples.AspNet/App_Start/RouteConfig.cs b/test/test-applications/integrations/aspnet/TestApplication.AspNet/App_Start/RouteConfig.cs
similarity index 97%
rename from test/test-applications/integrations/aspnet/Samples.AspNet/App_Start/RouteConfig.cs
rename to test/test-applications/integrations/aspnet/TestApplication.AspNet/App_Start/RouteConfig.cs
index 424314be57..3985d04de6 100644
--- a/test/test-applications/integrations/aspnet/Samples.AspNet/App_Start/RouteConfig.cs
+++ b/test/test-applications/integrations/aspnet/TestApplication.AspNet/App_Start/RouteConfig.cs
@@ -17,7 +17,7 @@
using System.Web.Mvc;
using System.Web.Routing;
-namespace Samples.AspNet;
+namespace TestApplication.AspNet;
public class RouteConfig
{
diff --git a/test/test-applications/integrations/aspnet/Samples.AspNet/Controllers/HealthCheckController.cs b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Controllers/HealthCheckController.cs
similarity index 94%
rename from test/test-applications/integrations/aspnet/Samples.AspNet/Controllers/HealthCheckController.cs
rename to test/test-applications/integrations/aspnet/TestApplication.AspNet/Controllers/HealthCheckController.cs
index 5d3f068126..96808cf061 100644
--- a/test/test-applications/integrations/aspnet/Samples.AspNet/Controllers/HealthCheckController.cs
+++ b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Controllers/HealthCheckController.cs
@@ -16,7 +16,7 @@
using System.Web.Mvc;
-namespace Samples.AspNet.Controllers;
+namespace TestApplication.AspNet.Controllers;
public class HealthCheckController : Controller
{
diff --git a/test/test-applications/integrations/aspnet/Samples.AspNet/Controllers/HomeController.cs b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Controllers/HomeController.cs
similarity index 96%
rename from test/test-applications/integrations/aspnet/Samples.AspNet/Controllers/HomeController.cs
rename to test/test-applications/integrations/aspnet/TestApplication.AspNet/Controllers/HomeController.cs
index 9d4d62bd02..122d6b8fb8 100644
--- a/test/test-applications/integrations/aspnet/Samples.AspNet/Controllers/HomeController.cs
+++ b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Controllers/HomeController.cs
@@ -20,9 +20,9 @@
using System.Linq;
using System.Reflection;
using System.Web.Mvc;
-using Samples.AspNet.Helpers;
+using TestApplication.AspNet.Helpers;
-namespace Samples.AspNet.Controllers;
+namespace TestApplication.AspNet.Controllers;
public class HomeController : Controller
{
diff --git a/test/test-applications/integrations/aspnet/Samples.AspNet/Dockerfile b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Dockerfile
similarity index 88%
rename from test/test-applications/integrations/aspnet/Samples.AspNet/Dockerfile
rename to test/test-applications/integrations/aspnet/TestApplication.AspNet/Dockerfile
index 4e9bb3a764..aa02152696 100644
--- a/test/test-applications/integrations/aspnet/Samples.AspNet/Dockerfile
+++ b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Dockerfile
@@ -10,9 +10,9 @@ ENV COR_ENABLE_PROFILING=1 `
OTEL_DOTNET_AUTO_HOME=C:\opentelemetry\ `
OTEL_DOTNET_AUTO_INTEGRATIONS_FILE=C:\opentelemetry\integrations.json `
OTEL_TRACES_EXPORTER=zipkin `
- OTEL_DOTNET_AUTO_ADDITIONAL_SOURCES=Samples.* `
+ OTEL_DOTNET_AUTO_ADDITIONAL_SOURCES=TestApplication.* `
OTEL_DOTNET_AUTO_ENABLED_INSTRUMENTATIONS=HttpClient,AspNet `
- OTEL_SERVICE_NAME=Samples.AspNet `
+ OTEL_SERVICE_NAME=TestApplication.AspNet `
OTEL_DOTNET_AUTO_DOMAIN_NEUTRAL_INSTRUMENTATION=1 `
OTEL_DOTNET_AUTO_DEBUG=1 `
OTEL_DOTNET_AUTO_LOG_DIRECTORY=C:\inetpub\wwwroot\logs `
diff --git a/test/test-applications/integrations/aspnet/TestApplication.AspNet/Global.asax b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Global.asax
new file mode 100644
index 0000000000..22a8dac5af
--- /dev/null
+++ b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Global.asax
@@ -0,0 +1 @@
+<%@ Application Codebehind="Global.asax.cs" Inherits="TestApplication.AspNet.MvcApplication" Language="C#" %>
diff --git a/test/test-applications/integrations/aspnet/Samples.AspNet/Global.asax.cs b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Global.asax.cs
similarity index 96%
rename from test/test-applications/integrations/aspnet/Samples.AspNet/Global.asax.cs
rename to test/test-applications/integrations/aspnet/TestApplication.AspNet/Global.asax.cs
index 69f0d3f576..8826c382d5 100644
--- a/test/test-applications/integrations/aspnet/Samples.AspNet/Global.asax.cs
+++ b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Global.asax.cs
@@ -16,7 +16,7 @@
using System.Web.Routing;
-namespace Samples.AspNet;
+namespace TestApplication.AspNet;
public class MvcApplication : System.Web.HttpApplication
{
diff --git a/test/test-applications/integrations/aspnet/Samples.AspNet/Helpers/AssembliesHelper.cs b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Helpers/AssembliesHelper.cs
similarity index 96%
rename from test/test-applications/integrations/aspnet/Samples.AspNet/Helpers/AssembliesHelper.cs
rename to test/test-applications/integrations/aspnet/TestApplication.AspNet/Helpers/AssembliesHelper.cs
index 8e1ed62cd6..9c2ede171b 100644
--- a/test/test-applications/integrations/aspnet/Samples.AspNet/Helpers/AssembliesHelper.cs
+++ b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Helpers/AssembliesHelper.cs
@@ -18,7 +18,7 @@
using System.Collections.Generic;
using System.Linq;
-namespace Samples.AspNet.Helpers;
+namespace TestApplication.AspNet.Helpers;
public static class AssembliesHelper
{
diff --git a/test/test-applications/integrations/aspnet/Samples.AspNet/Properties/AssemblyInfo.cs b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Properties/AssemblyInfo.cs
similarity index 91%
rename from test/test-applications/integrations/aspnet/Samples.AspNet/Properties/AssemblyInfo.cs
rename to test/test-applications/integrations/aspnet/TestApplication.AspNet/Properties/AssemblyInfo.cs
index 1dbd460940..16ba0975e2 100644
--- a/test/test-applications/integrations/aspnet/Samples.AspNet/Properties/AssemblyInfo.cs
+++ b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-//
+//
// Copyright The OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,11 +21,11 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("Samples.AspNet")]
+[assembly: AssemblyTitle("TestApplication.AspNet")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Samples.AspNet")]
+[assembly: AssemblyProduct("TestApplication.AspNet")]
[assembly: AssemblyCopyright("Copyright © 2021")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/test/test-applications/integrations/aspnet/Samples.AspNet/Properties/PublishProfiles/FolderProfile.Debug.pubxml b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Properties/PublishProfiles/FolderProfile.Debug.pubxml
similarity index 100%
rename from test/test-applications/integrations/aspnet/Samples.AspNet/Properties/PublishProfiles/FolderProfile.Debug.pubxml
rename to test/test-applications/integrations/aspnet/TestApplication.AspNet/Properties/PublishProfiles/FolderProfile.Debug.pubxml
diff --git a/test/test-applications/integrations/aspnet/Samples.AspNet/Properties/PublishProfiles/FolderProfile.Release.pubxml b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Properties/PublishProfiles/FolderProfile.Release.pubxml
similarity index 100%
rename from test/test-applications/integrations/aspnet/Samples.AspNet/Properties/PublishProfiles/FolderProfile.Release.pubxml
rename to test/test-applications/integrations/aspnet/TestApplication.AspNet/Properties/PublishProfiles/FolderProfile.Release.pubxml
diff --git a/test/test-applications/integrations/aspnet/Samples.AspNet/Samples.AspNet.csproj b/test/test-applications/integrations/aspnet/TestApplication.AspNet/TestApplication.AspNet.csproj
similarity index 99%
rename from test/test-applications/integrations/aspnet/Samples.AspNet/Samples.AspNet.csproj
rename to test/test-applications/integrations/aspnet/TestApplication.AspNet/TestApplication.AspNet.csproj
index d81f2c65c3..015dbccbd8 100644
--- a/test/test-applications/integrations/aspnet/Samples.AspNet/Samples.AspNet.csproj
+++ b/test/test-applications/integrations/aspnet/TestApplication.AspNet/TestApplication.AspNet.csproj
@@ -13,8 +13,8 @@
{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}
Library
Properties
- Samples.AspNet
- Samples.AspNet
+ TestApplication.AspNet
+ TestApplication.AspNet
v4.6.2
false
true
diff --git a/test/test-applications/integrations/aspnet/Samples.AspNet/Views/Home/Index.cshtml b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Views/Home/Index.cshtml
similarity index 96%
rename from test/test-applications/integrations/aspnet/Samples.AspNet/Views/Home/Index.cshtml
rename to test/test-applications/integrations/aspnet/TestApplication.AspNet/Views/Home/Index.cshtml
index 62c89e11b6..146047efa4 100644
--- a/test/test-applications/integrations/aspnet/Samples.AspNet/Views/Home/Index.cshtml
+++ b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Views/Home/Index.cshtml
@@ -1,6 +1,6 @@
ASP.NET
-
This is a sample ASP.NET (.NET Framework) application for integration tests
+
This is an ASP.NET (.NET Framework) application for integration tests
diff --git a/test/test-applications/integrations/aspnet/Samples.AspNet/Views/Shared/_Layout.cshtml b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Views/Shared/_Layout.cshtml
similarity index 61%
rename from test/test-applications/integrations/aspnet/Samples.AspNet/Views/Shared/_Layout.cshtml
rename to test/test-applications/integrations/aspnet/TestApplication.AspNet/Views/Shared/_Layout.cshtml
index 1ddc75a95c..0f6d68c4b6 100644
--- a/test/test-applications/integrations/aspnet/Samples.AspNet/Views/Shared/_Layout.cshtml
+++ b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Views/Shared/_Layout.cshtml
@@ -1,14 +1,14 @@
- Samples.AspNet
+ TestApplication.AspNet
diff --git a/test/test-applications/integrations/aspnet/Samples.AspNet/Views/Web.config b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Views/Web.config
similarity index 97%
rename from test/test-applications/integrations/aspnet/Samples.AspNet/Views/Web.config
rename to test/test-applications/integrations/aspnet/TestApplication.AspNet/Views/Web.config
index 785ade760d..98ebaa5906 100644
--- a/test/test-applications/integrations/aspnet/Samples.AspNet/Views/Web.config
+++ b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Views/Web.config
@@ -16,7 +16,7 @@
-
+
diff --git a/test/test-applications/integrations/aspnet/Samples.AspNet/Views/_ViewStart.cshtml b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Views/_ViewStart.cshtml
similarity index 100%
rename from test/test-applications/integrations/aspnet/Samples.AspNet/Views/_ViewStart.cshtml
rename to test/test-applications/integrations/aspnet/TestApplication.AspNet/Views/_ViewStart.cshtml
diff --git a/test/test-applications/integrations/aspnet/Samples.AspNet/Web.config b/test/test-applications/integrations/aspnet/TestApplication.AspNet/Web.config
similarity index 100%
rename from test/test-applications/integrations/aspnet/Samples.AspNet/Web.config
rename to test/test-applications/integrations/aspnet/TestApplication.AspNet/Web.config
diff --git a/test/test-applications/integrations/aspnet/Samples.AspNet/packages.config b/test/test-applications/integrations/aspnet/TestApplication.AspNet/packages.config
similarity index 100%
rename from test/test-applications/integrations/aspnet/Samples.AspNet/packages.config
rename to test/test-applications/integrations/aspnet/TestApplication.AspNet/packages.config
diff --git a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/Class1.cs b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/Class1.cs
similarity index 98%
rename from test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/Class1.cs
rename to test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/Class1.cs
index 9e91e7bf40..02ef28c3c4 100644
--- a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/Class1.cs
+++ b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/Class1.cs
@@ -18,7 +18,7 @@
using System.Collections;
using System.Collections.Generic;
-namespace Samples.ExampleLibrary
+namespace TestApplication.ExampleLibrary
{
public class Class1
{
diff --git a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/FakeClient/Biscuit.cs b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/FakeClient/Biscuit.cs
similarity index 96%
rename from test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/FakeClient/Biscuit.cs
rename to test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/FakeClient/Biscuit.cs
index e6edd67057..2821c661de 100644
--- a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/FakeClient/Biscuit.cs
+++ b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/FakeClient/Biscuit.cs
@@ -17,7 +17,7 @@
using System;
using System.Collections.Generic;
-namespace Samples.ExampleLibrary.FakeClient
+namespace TestApplication.ExampleLibrary.FakeClient
{
public class Biscuit : Biscuit
{
diff --git a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/FakeClient/DogClient.cs b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/FakeClient/DogClient.cs
similarity index 98%
rename from test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/FakeClient/DogClient.cs
rename to test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/FakeClient/DogClient.cs
index 887596d1e6..7ee66cf4a9 100644
--- a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/FakeClient/DogClient.cs
+++ b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/FakeClient/DogClient.cs
@@ -18,7 +18,7 @@
using System.Collections.Generic;
using System.Threading.Tasks;
-namespace Samples.ExampleLibrary.FakeClient
+namespace TestApplication.ExampleLibrary.FakeClient
{
public class DogClient
{
diff --git a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/FakeClient/DogTrick.cs b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/FakeClient/DogTrick.cs
similarity index 94%
rename from test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/FakeClient/DogTrick.cs
rename to test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/FakeClient/DogTrick.cs
index 1f8af470fc..f4dd480adf 100644
--- a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/FakeClient/DogTrick.cs
+++ b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/FakeClient/DogTrick.cs
@@ -14,7 +14,7 @@
// limitations under the License.
//
-namespace Samples.ExampleLibrary.FakeClient
+namespace TestApplication.ExampleLibrary.FakeClient
{
public class DogTrick
{
diff --git a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/GenericTests/ComprehensiveCaller.cs b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/GenericTests/ComprehensiveCaller.cs
similarity index 99%
rename from test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/GenericTests/ComprehensiveCaller.cs
rename to test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/GenericTests/ComprehensiveCaller.cs
index e2a6272d99..17dce86e50 100644
--- a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/GenericTests/ComprehensiveCaller.cs
+++ b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/GenericTests/ComprehensiveCaller.cs
@@ -17,7 +17,7 @@
using System;
using System.Threading.Tasks;
-namespace Samples.ExampleLibrary.GenericTests
+namespace TestApplication.ExampleLibrary.GenericTests
{
public class ComprehensiveCaller
{
diff --git a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/GenericTests/GenericTarget.cs b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/GenericTests/GenericTarget.cs
similarity index 95%
rename from test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/GenericTests/GenericTarget.cs
rename to test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/GenericTests/GenericTarget.cs
index b93d554774..e053b2686a 100644
--- a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/GenericTests/GenericTarget.cs
+++ b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/GenericTests/GenericTarget.cs
@@ -14,7 +14,7 @@
// limitations under the License.
//
-namespace Samples.ExampleLibrary.GenericTests
+namespace TestApplication.ExampleLibrary.GenericTests
{
public class GenericTarget
{
diff --git a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/GenericTests/PointStruct.cs b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/GenericTests/PointStruct.cs
similarity index 94%
rename from test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/GenericTests/PointStruct.cs
rename to test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/GenericTests/PointStruct.cs
index df587e0b94..90479d5817 100644
--- a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/GenericTests/PointStruct.cs
+++ b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/GenericTests/PointStruct.cs
@@ -14,7 +14,7 @@
// limitations under the License.
//
-namespace Samples.ExampleLibrary.GenericTests
+namespace TestApplication.ExampleLibrary.GenericTests
{
public struct PointStruct
{
diff --git a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/GenericTests/StructContainer.cs b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/GenericTests/StructContainer.cs
similarity index 94%
rename from test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/GenericTests/StructContainer.cs
rename to test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/GenericTests/StructContainer.cs
index 1a60715fde..b8a9b20719 100644
--- a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/GenericTests/StructContainer.cs
+++ b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/GenericTests/StructContainer.cs
@@ -16,7 +16,7 @@
using System.Collections.Generic;
-namespace Samples.ExampleLibrary.GenericTests
+namespace TestApplication.ExampleLibrary.GenericTests
{
public struct StructContainer
{
diff --git a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/GlobalSuppressions.cs b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/GlobalSuppressions.cs
similarity index 100%
rename from test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/GlobalSuppressions.cs
rename to test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/GlobalSuppressions.cs
diff --git a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/Samples.ExampleLibrary.csproj b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/TestApplication.ExampleLibrary.csproj
similarity index 100%
rename from test/test-applications/integrations/dependency-libs/Samples.ExampleLibrary/Samples.ExampleLibrary.csproj
rename to test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibrary/TestApplication.ExampleLibrary.csproj
diff --git a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibraryTracer/Class1.cs b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibraryTracer/Class1.cs
similarity index 95%
rename from test/test-applications/integrations/dependency-libs/Samples.ExampleLibraryTracer/Class1.cs
rename to test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibraryTracer/Class1.cs
index 3c4f99387b..21f3fb866e 100644
--- a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibraryTracer/Class1.cs
+++ b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibraryTracer/Class1.cs
@@ -14,7 +14,7 @@
// limitations under the License.
//
-namespace Samples.ExampleLibraryTracer
+namespace TestApplication.ExampleLibraryTracer
{
public class Class1
{
diff --git a/test/test-applications/integrations/dependency-libs/Samples.ExampleLibraryTracer/Samples.ExampleLibraryTracer.csproj b/test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibraryTracer/TestApplication.ExampleLibraryTracer.csproj
similarity index 100%
rename from test/test-applications/integrations/dependency-libs/Samples.ExampleLibraryTracer/Samples.ExampleLibraryTracer.csproj
rename to test/test-applications/integrations/dependency-libs/TestApplication.ExampleLibraryTracer/TestApplication.ExampleLibraryTracer.csproj