diff --git a/.env b/.env
index 0b7b7614a3..955519f76e 100644
--- a/.env
+++ b/.env
@@ -56,11 +56,12 @@ FRONTEND_ADDR=frontend:${FRONTEND_PORT}
# Frontend Proxy (Envoy)
FRONTEND_HOST=frontend
ENVOY_PORT=8080
+FRONTEND_PROXY_ADDR=frontend-proxy:${ENVOY_PORT}
# Load Generator
LOCUST_WEB_PORT=8089
LOCUST_USERS=10
-LOCUST_HOST=http://${FRONTEND_ADDR}
+LOCUST_HOST=http://${FRONTEND_PROXY_ADDR}
LOCUST_WEB_HOST=loadgenerator
LOCUST_AUTOSTART=true
LOCUST_HEADLESS=false
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b4ca3f422..aa31c65f16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,8 @@ release.
([#909](https://github.com/open-telemetry/opentelemetry-demo/pull/909))
* [loadgenerator] fix redirect on recommendations load
([#913](https://github.com/open-telemetry/opentelemetry-demo/pull/913))
+* [loadgenerator] run load through frontend proxy (Envoy)
+ ([#914](https://github.com/open-telemetry/opentelemetry-demo/pull/914))
## 1.4.0
diff --git a/src/cartservice/cartservice.sln b/src/cartservice/cartservice.sln
index 9929dc483c..22f83a5b0f 100644
--- a/src/cartservice/cartservice.sln
+++ b/src/cartservice/cartservice.sln
@@ -1,11 +1,11 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33627.172
MinimumVisualStudioVersion = 15.0.26124.0
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cartservice", "src\cartservice.csproj", "{2348C29F-E8D3-4955-916D-D609CBC97FCB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cartservice", "src\cartservice.csproj", "{2348C29F-E8D3-4955-916D-D609CBC97FCB}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cartservice.tests", "tests\cartservice.tests.csproj", "{59825342-CE64-4AFA-8744-781692C0811B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cartservice.tests", "tests\cartservice.tests.csproj", "{59825342-CE64-4AFA-8744-781692C0811B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,9 +16,6 @@ Global
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2348C29F-E8D3-4955-916D-D609CBC97FCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2348C29F-E8D3-4955-916D-D609CBC97FCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -45,4 +42,10 @@ Global
{59825342-CE64-4AFA-8744-781692C0811B}.Release|x86.ActiveCfg = Release|Any CPU
{59825342-CE64-4AFA-8744-781692C0811B}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {52315C59-030C-477D-97BB-B1328630F041}
+ EndGlobalSection
EndGlobal
diff --git a/src/cartservice/src/Properties/launchSettings.json b/src/cartservice/src/Properties/launchSettings.json
new file mode 100644
index 0000000000..cd7dafae66
--- /dev/null
+++ b/src/cartservice/src/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+ "profiles": {
+ "cartservice": {
+ "commandName": "Project",
+ "launchBrowser": true,
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ },
+ "applicationUrl": "https://localhost:59597;http://localhost:59598"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/cartservice/src/cartservice.csproj b/src/cartservice/src/cartservice.csproj
index 62a54da972..172894ac45 100644
--- a/src/cartservice/src/cartservice.csproj
+++ b/src/cartservice/src/cartservice.csproj
@@ -5,16 +5,17 @@
-
-
-
-
-
+
+
+
+
+
+
-
+
diff --git a/src/cartservice/tests/cartservice.tests.csproj b/src/cartservice/tests/cartservice.tests.csproj
index 933aefa5a8..d3ace53272 100644
--- a/src/cartservice/tests/cartservice.tests.csproj
+++ b/src/cartservice/tests/cartservice.tests.csproj
@@ -5,9 +5,9 @@
-
+
-
+
all