Merge pull request #154 from DataDog/aaron.kalin/traffic_container

Traffic Container Improvements

Author: Aaron Kalin

.github/workflows/traffic-replay.yml

@@ -0,0 +1,35 @@
+name: Traffic Replay Container
+
+on:
+  push:
+    branches: [ main ]
+    paths:
+      - traffic-replay/**
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout Code
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v1
+    - name: Login to Docker Hub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+    - name: Build and Push Docker Image
+      uses: docker/build-push-action@v2
+      with:
+        context: ./traffic-replay
+        platforms: linux/amd64 # TODO: Support linux/arm64?
+        push: true
+        tags: ddtraining/traffic-replay:latest

README.md

@@ -69,6 +69,8 @@ This way, we don't have to manually click around the site to see all the places
 
 ### Containerized replay
 
+#### Building and running manually
+
 Example traffic can be perpetually sent via the `traffic-replay` container. To build and run it via Docker and connect it to your running cluster in docker-compose (by default the docker-compose_default network is created).
 
 ```
@@ -85,15 +87,15 @@ environment:
   - FRONTEND_PORT=80
 ```
 
-### Local replay
+#### Running via Docker Compose
 
-You can reuse the recorded traffic ad-hoc:
+We automatically build new traffic-replay containers on every release and you can spin up the traffic-replay container with your Docker Compose cluster by adding the config as an override via the example below.
 
-```bash
-$ ./gor --input-file-loop --input-file requests_0.gor --output-http "http://localhost:3000"
+```
+POSTGRES_USER=postgres POSTGRES_PASSWORD=postgres docker-compose -f deploy/docker-compose/docker-compose-broken-instrumented.yml -f deploy/docker-compose/docker-compose-traffic-replay.yml up
 ```
 
-This command opens up the traffic recording, and ships all the requests to `localhost`, at port 3000. After running this traffic generator for a while, we'll be able to see the services that make up our application within Datadog.
+Any of the other docker compose configurations can work with this traffic container just by adding another `-f  deploy/docker-compose/docker-compose-traffic-replay.yml` to the compose command.
 
 ## Viewing Our Broken Services in Datadog
 

UPDATING.md

@@ -0,0 +1,27 @@
+# Maintenance and Upgrade Guide
+
+## Rails Apps
+
+To upgrade any new gems in the Gemfile do the following procedure. To install new gems, replace the `bundle upgrade` with `bundle install`
+
+### For the broken and instrumented storefront
+
+```
+cd store-frontend-broken-instrumented
+docker run --interactive --tty --rm --name storefrontdev --mount type=bind,source="$(pwd)",target=/app ddtraining/storefront:latest /bin/bash
+# bundle upgrade
+# exit
+```
+
+Commit the new Gemfile and Gemfile.lock
+
+### For the fixed and instrumented storefront
+
+```
+cd store-frontend-instrumented-fixed
+docker run --interactive --tty --rm --name storefrontdev --mount type=bind,source="$(pwd)",target=/app ddtraining/storefront-fixed:latest /bin/bash
+# bundle upgrade
+# exit
+```
+
+Commit the new Gemfile and Gemfile.lock

deploy/docker-compose/README.md

@@ -12,16 +12,18 @@ They currently exist in three different versions:
 
 `docker-compose-fixed-instrumented`: View a fixed application and compare it to the previously broken deployment.
 
+`docker-compose-traffic-replay`: Simulate traffic to the application.
+
 The application itself runs on `docker-compose`. First, install Docker along with docker-compose. Then sign up with a trial [Datadog account](https://www.datadoghq.com/), and grab your API key from the Integrations->API tab.
 
-To run any of the scenarios:
+To run any of the scenarios, be in the root directory:
 
 ```bash
 $ git clone https://github.com/DataDog/ecommerce-workshop.git
-$ cd ecommerce-workshop/deploy/docker-compose
-$ POSTGRES_USER=postgres POSTGRES_PASSWORD=postgres DD_API_KEY=<YOUR_API_KEY> docker-compose -f <docker_compose_with_your_selected_scenario> up
+$ cd ecommerce-workshop
+$ POSTGRES_USER=postgres POSTGRES_PASSWORD=postgres DD_API_KEY=<YOUR_API_KEY> docker-compose -f deploy/docker-compose/<docker_compose_with_your_selected_scenario> up
 ```
 
 With this, the docker images will be pulled, and you'll be able to visit the app.
 
-When you go to the homepage, you'll notice that, although the site takes a while to load, it mostly looks as if it works. Indeed, there are only a few views that are broken. Try navigating around the site to see if you can't discover the broken pieces.
+When you go to the homepage, you'll notice that, although the site takes a while to load, it mostly looks as if it works. Indeed, there are only a few views that are broken. Try navigating around the site to see if you can't discover the broken pieces.

deploy/docker-compose/docker-compose-traffic-replay.yml

@@ -0,0 +1,5 @@
+version: '3'
+services:
+  traffic-replay:
+    image: "ddtraining/traffic-replay:latest"
+