Add docker-compose.yml and tester.sh to generate traffic

Author: dsellarsnr

Diff for: .gitignore

@@ -36,4 +36,5 @@ publish/
 newrelic/
 !newrelic/placeholder.txt
 # Visual Studio 2015
-.vs/
+.vs/
+logs/

Diff for: AspNetCoreMvc/Dockerfile

@@ -1,6 +1,7 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
 FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+RUN apt-get update; apt-get install -y curl
 WORKDIR /app
 EXPOSE 80
 
@@ -19,13 +20,15 @@ FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
 COPY ["newrelic/", "/usr/local/newrelic-netcore20-agent/"]
+
+COPY --chmod=0755 entrypoint.sh /
+COPY --chmod=0755 tester.sh /app
+
 ENV CORECLR_ENABLE_PROFILING=1 \
 CORECLR_PROFILER={36032161-FFC0-4B61-B559-F6C5D41BAE5A} \
 CORECLR_NEWRELIC_HOME=/usr/local/newrelic-netcore20-agent \
 CORECLR_PROFILER_PATH=/usr/local/newrelic-netcore20-agent/libNewRelicProfiler.so \
 NEW_RELIC_CODE_LEVEL_METRICS_ENABLED=true \
-NEW_RELIC_LICENSE_KEY=YOUR_LICENSE_KEY \
-NEW_RELIC_APP_NAME=YOUR_APP_NAME
-
+NEW_RELIC_APP_NAME="CSharp Agent CLM Demo"
 
-ENTRYPOINT ["dotnet", "AspNetCoreMvc.dll"]
+ENTRYPOINT ["/entrypoint.sh"]

Diff for: README.md

@@ -7,7 +7,7 @@ There is a .NET Core 3.1 ASP.NET Core MVC based web application contained in the
 directory. This application is designed to create web transactions with custom instrumented segments.
 
 By running the demo, the application will be launched and
-daemonized and a `tester` shell script will perform [curl](https://curl.se/)
+daemonized and a `tester.sh` shell script will perform [curl](https://curl.se/)
 commands that generate web traffic to exercise all traced Ruby methods.
 
 ## Important Source Files
@@ -74,18 +74,18 @@ This demo can be run in a few different ways:
 ### Software Prerequisites
 
 - [Docker](https://www.docker.com/get-started/)
-- [.NET Core 3.1 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/3.1)
+- [.NET Core 6.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
 - Visual Studio 
 -
 
 ### Instructions for Docker (should work on Linux or Windows)
 
 1. Clone this repository
 2. Place an extracted copy of the `.NET Core Linux version` of Agent's files in the `newrelic` directory.
-3. From `CodeLevelMetricsDemo` directory the Run `docker build -f AspNetCoreMvc\Dockerfile -t clm-aspnetcoremvc:latest .\`
-4a. If running in PROD: After the build run `docker run -d --env NEW_RELIC_LICENSE_KEY=<YOUR_LICENSE_KEY> --env NEW_RELIC_APP_NAME=<YOUR_APP_NAME> -p <PORT_YOU_WANT>:80 clm-aspnetcoremvc:latest`
-4b. If running in STAGING: After the build run `docker run -d --env NEW_RELIC_LICENSE_KEY=<YOUR_LICENSE_KEY> --env NEW_RELIC_APP_NAME=<YOUR_APP_NAME> --env NEW_RELIC_HOST=staging-collector.newrelic.com -p <PORT_YOU_WANT>:80 clm-aspnetcoremvc:latest`
-5. You can exercise the app by going to `https:/localhost:<PORT_YOU_WANT>` and browsing around the UI.
+3a. If running in PROD: `export NEW_RELIC_LICENSE_KEY=<YOUR_LICENSE_KEY>; export NEW_RELIC_HOST=collector.newrelic.com`
+3b. If running in STAGING: After the build run `export NEW_RELIC_LICENSE_KEY=<YOUR_LICENSE_KEY>; export NEW_RELIC_HOST=staging-collector.newrelic.com`
+4. From `CodeLevelMetricsDemo` directory the Run `docker-compose up -d --build`
+5. You can exercise the app by going to `https:/localhost:8888` and browsing around the UI.
 
 ### Instructions for Visual Studio (Windows)
 

Diff for: docker-compose.yml

@@ -0,0 +1,19 @@
+version: '3.9'
+
+services: 
+  app:
+    image: clm-aspnetcoremvc:latest
+    build:
+      context: .
+      dockerfile: AspNetCoreMvc/Dockerfile
+    environment:
+      # required
+      NEW_RELIC_LICENSE_KEY: $NEW_RELIC_LICENSE_KEY
+      # optional
+      NEW_RELIC_HOST: ${NEW_RELIC_HOST:-}
+    ports:
+      - 127.0.0.1:8888:80
+    stdin_open: true
+    tty: true
+    volumes:
+      - "./logs:/usr/local/newrelic-netcore20-agent/logs"

Diff for: entrypoint.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+cd app
+
+# start app
+nohup dotnet AspNetCoreMvc.dll > /usr/local/newrelic-netcore20-agent/logs/app.log 2>&1 &
+
+# generate load
+./tester.sh

Diff for: tester.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+logfile="/usr/local/newrelic-netcore20-agent/logs/tester.log"
+
+sleep 5
+
+echo "Running automated tests..." >> $logfile
+
+while true; do
+    # agents/show
+    curl -s -o /dev/null http://localhost:80/
+
+    # agents/create
+    curl -s -o /dev/null ttp://localhost:80/Agents/Create
+
+    # agents/destroy
+    curl -s -o /dev/null ttp://localhost:80/Agents/Destroy
+    echo "Completed a full set of operations." >> $logfile
+
+    # go too fast and the agent starts sampling
+    sleep 3
+done