added docker compose files

.devcontainer/Dockerfile

@@ -12,13 +12,12 @@ RUN apt-get update \
     gradle \
     maven \
     python3 \
+    python-is-python3 \
     python3-dev \
     python3-pip \
     python3-setuptools \
     python3-wheel \
-    python3-psutil && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+    python3-psutil
 
 RUN pip install \
     flask \

.devcontainer/devcontainer.json

@@ -1,7 +1,10 @@
 {
 	"name": "otel-getting-started",
 	"workspaceFolder": "/workspaces/opentelemetry-training/labs",
-	"image": "ghcr.io/novatecconsulting/opentelemetry-training-application:latest",
+	"build": {
+		"dockerfile": "./Dockerfile",
+		"context": "../."
+	},
 	"runArgs": [
 		"--privileged"
 	],

labs/automatic-instrumentation/library-instrumentation/initial/src/app.py

@@ -21,7 +21,7 @@ def get_user():
 
 def do_stuff():
     time.sleep(0.1)
-    url = "http://echo:6000/"
+    url = "http://localhost:6000/"
     response = requests.get(url)
     return response
 

labs/automatic-instrumentation/library-instrumentation/solution/src/app.py

@@ -37,7 +37,7 @@ def get_user():
 
 def do_stuff():
     time.sleep(0.1)
-    url = "http://echo:6000/"
+    url = "http://localhost:6000/"
     response = requests.get(url)
     return response
 

labs/collector/initial/docker-compose.yml

@@ -7,4 +7,9 @@ services:
       - ./otel-collector-config.yml:/etc/otel-collector-config.yml
     ports:
       - 4317:4317
-      - 4318:4318
+      - 4318:4318
+
+  echo:
+    image: ealen/echo-server:0.9.2
+    ports:
+      - 6000:80

labs/collector/initial/src/app.py

@@ -79,7 +79,7 @@ def do_stuff():
     time.sleep(0.1)
     headers = {}
     inject(headers)
-    url = "http://echo:6000/"
+    url = "http://localhost:6000/"
     response = requests.get(url)
     print(response.json())
     logging.info(str(response.json()))

labs/collector/solution/docker-compose.yml

@@ -7,4 +7,9 @@ services:
       - ./otel-collector-config.yml:/etc/otel-collector-config.yml
     ports:
       - 4317:4317
-      - 4318:4318
+      - 4318:4318
+
+  echo:
+    image: ealen/echo-server:0.9.2
+    ports:
+      - 6000:80

labs/collector/solution/src/app.py

@@ -79,7 +79,7 @@ def do_stuff():
     time.sleep(0.1)
     headers = {}
     inject(headers)
-    url = "http://echo:6000/"
+    url = "http://localhost:6000/"
     response = requests.get(url)
     print(response.json())
     logging.info(str(response.json()))

labs/manual-instrumentation-logs/initial/docker-compose.yml

@@ -0,0 +1,5 @@
+services:
+  echo:
+    image: ealen/echo-server:0.9.2
+    ports:
+      - 6000:80

labs/manual-instrumentation-logs/initial/src/app.py

@@ -21,7 +21,7 @@ def get_user():
 
 def do_stuff():
     time.sleep(0.1)
-    url = "http://echo:6000/"
+    url = "http://localhost:6000/"
     response = requests.get(url)
     return response
 

labs/manual-instrumentation-logs/solution/docker-compose.yml

@@ -0,0 +1,5 @@
+services:
+  echo:
+    image: ealen/echo-server:0.9.2
+    ports:
+      - 6000:80

labs/manual-instrumentation-logs/solution/src/app.py

@@ -31,7 +31,7 @@ def get_user():
 
 def do_stuff():
     time.sleep(0.1)
-    url = "http://echo:6000/"
+    url = "http://localhost:6000/"
     response = requests.get(url)
     logging.info(response.json())
     return response

labs/manual-instrumentation-metrics/initial/docker-compose.yml

@@ -0,0 +1,5 @@
+services:
+  echo:
+    image: ealen/echo-server:0.9.2
+    ports:
+      - 6000:80

labs/manual-instrumentation-metrics/initial/src/app.py

@@ -21,7 +21,7 @@ def get_user():
 
 def do_stuff():
     time.sleep(0.1)
-    url = "http://echo:6000/"
+    url = "http://localhost:6000/"
     response = requests.get(url)
     return response
 

labs/manual-instrumentation-metrics/solution/docker-compose.yml

@@ -0,0 +1,5 @@
+services:
+  echo:
+    image: ealen/echo-server:0.9.2
+    ports:
+      - 6000:80

labs/manual-instrumentation-metrics/solution/src/app.py

@@ -46,7 +46,7 @@ def get_user():
 
 def do_stuff():
     time.sleep(0.1)
-    url = "http://echo:6000/"
+    url = "http://localhost:6000/"
     response = requests.get(url)
     return response
 

labs/manual-instrumentation-traces/initial/docker-compose.yml

@@ -0,0 +1,5 @@
+services:
+  echo:
+    image: ealen/echo-server:0.9.2
+    ports:
+      - 6000:80

labs/manual-instrumentation-traces/initial/src/app.py

@@ -21,7 +21,7 @@ def get_user():
 
 def do_stuff():
     time.sleep(0.1)
-    url = "http://echo:6000/"
+    url = "http://localhost:6000/"
     response = requests.get(url)
     return response
 

labs/manual-instrumentation-traces/solution/docker-compose.yml

@@ -0,0 +1,5 @@
+services:
+  echo:
+    image: ealen/echo-server:0.9.2
+    ports:
+      - 6000:80

labs/manual-instrumentation-traces/solution/src/app.py

@@ -1,7 +1,7 @@
 # pyright: reportMissingTypeStubs=false, reportUnknownParameterType=false, reportMissingParameterType=false, reportUnknownArgumentType=false
 
-import time
 import json
+import time
 
 import requests
 from client import ChaosClient, FakerClient
@@ -47,15 +47,15 @@ def do_stuff():
     inject(headers)
 
     time.sleep(.1)
-    url = "http://echo:6000/"
+    url = "http://localhost:6000/"
     response = requests.get(url, headers=headers)
-    
+
     # debug
     print("Headers included in outbound request:")
     print(json.dumps(response.json()["request"]["headers"], indent=2))
-    
+
     return response
-    
+
 @app.route('/')
 @tracer.start_as_current_span("index")
 def index():

labs/manual-instrumentation-traces/solution/src/trace_utils.py

@@ -1,5 +1,3 @@
-# pyright: reportMissingTypeStubs=false, reportUnknownParameterType=false, reportMissingParameterType=false, reportUnknownArgumentType=false, reportUnknownMemberType=false, reportAttributeAccessIssue=false, reportArgumentType=false
-
 from opentelemetry import trace
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor, ConsoleSpanExporter

tutorial/content/labs/instrumentation/automatic/instrumentation_libraries/index.md

@@ -106,7 +106,7 @@ def get_user():
 
 def do_stuff():
     time.sleep(0.1)
-    url = "http://echo:6000/"
+    url = "http://localhost:6000/"
     response = requests.get(url)
     return response