chore: add OTEL support to demos

Makefile

@@ -71,22 +71,18 @@ dc-stack-build:
 	docker compose --file docker-compose.cosmo.yml up --build --remove-orphans --detach
 
 full-demo-up:
-	cd demo && find . -type d -depth 1 -not -iname otel -exec cp -fr otel {} \;
 	docker compose -f docker-compose.full.yml --profile default up --build --remove-orphans --detach
 
 full-demo-down:
-	cd demo && find . -type d -depth 1 -not -iname otel -exec rm -fr {}/otel \;
 	docker compose -f docker-compose.full.yml --profile default --profile router --profile subgraphs down --remove-orphans -v
 
 dc-federation-demo:
 	docker compose -f docker-compose.full.yml --profile default --profile router --profile subgraphs up --remove-orphans --detach
 
 dc-subgraphs-demo:
-	cd demo && find . -type d -depth 1 -not -iname otel -exec cp -fr otel {} \;
 	docker compose -f docker-compose.full.yml --profile subgraphs up --remove-orphans --detach
 
 dc-subgraphs-demo-down:
-	cd demo && find . -type d -depth 1 -not -iname otel -exec rm -fr {}/otel \;
 	docker compose -f docker-compose.full.yml --profile subgraphs down --remove-orphans
 
 docker-build-local:

demo/employees/Dockerfile → demo/Dockerfile.employees

@@ -1,15 +1,15 @@
-FROM golang:1.20
+FROM golang:1.20 as builder
 
 WORKDIR /app
 
-COPY go.mod go.sum ./
+COPY employees/go.mod employees/go.sum ./
 
 RUN mkdir ../otel
 COPY otel ../otel/
 
 RUN go mod download && go mod verify
 
-COPY . .
+COPY employees .
 
 RUN go build -o server
 

demo/family/Dockerfile → demo/Dockerfile.family

@@ -2,14 +2,14 @@ FROM golang:1.20 as builder
 
 WORKDIR /app
 
-COPY go.mod go.sum ./
+COPY family/go.mod family/go.sum ./
 
 RUN mkdir ../otel
 COPY otel ../otel/
 
 RUN go mod download && go mod verify
 
-COPY . .
+COPY family .
 
 RUN go build -o server
 

demo/hobbies/Dockerfile → demo/Dockerfile.hobbies

@@ -2,14 +2,14 @@ FROM golang:1.20 as builder
 
 WORKDIR /app
 
-COPY go.mod go.sum ./
+COPY hobbies/go.mod hobbies/go.sum ./
 
 RUN mkdir ../otel
 COPY otel ../otel/
 
 RUN go mod download && go mod verify
 
-COPY . .
+COPY hobbies .
 
 RUN go build -o server
 

demo/products/Dockerfile → demo/Dockerfile.products

@@ -2,15 +2,14 @@ FROM golang:1.20 as builder
 
 WORKDIR /app
 
-COPY go.mod go.sum ./
+COPY products/go.mod products/go.sum ./
 
 RUN mkdir ../otel
 COPY otel ../otel/
 
 RUN go mod download && go mod verify
 
-COPY . .
-COPY otel ..
+COPY products .
 
 RUN go build -o server
 

demo/employees/.gitignore

@@ -1,2 +1 @@
 /employees
-/otel

demo/family/.gitignore

@@ -1,2 +1 @@
 /family
-/otel

demo/otel/go.mod

@@ -1,4 +1,4 @@
-module github.com/wundergraph/comso/demo/otel
+module github.com/wundergraph/cosmo/demo/otel
 
 go 1.20
 

demo/products/.gitignore

@@ -1,2 +1 @@
 /products
-/otel

docker-compose.full.yml

@@ -5,28 +5,36 @@ services:
   # Services for the demo
   employees:
     container_name: employees
-    build: ./demo/employees
+    build:
+      context: ./demo
+      dockerfile: Dockerfile.employees
     profiles:
       - subgraphs
     ports:
       - '4001:4001'
   family:
     container_name: family
-    build: ./demo/family
+    build:
+      context: ./demo
+      dockerfile: Dockerfile.family
     profiles:
       - subgraphs
     ports:
       - '4002:4002'
   hobbies:
     container_name: hobbies
-    build: ./demo/hobbies
+    build:
+      context: ./demo
+      dockerfile: Dockerfile.hobbies
     profiles:
       - subgraphs
     ports:
       - '4003:4003'
   products:
     container_name: products
-    build: ./demo/products
+    build:
+      context: ./demo
+      dockerfile: Dockerfile.products
     profiles:
       - subgraphs
     ports:

scripts/create-docker-demo.sh

@@ -14,6 +14,6 @@ pnpm wgc subgraph create family --label team=A env=production --routing-url http
 pnpm wgc subgraph create hobbies --label team=B env=production --routing-url http://hobbies:4003/graphql
 pnpm wgc subgraph create products --label team=B env=production --routing-url http://products:4004/graphql
 
-./update-docker-demo.sh
+sh ../scripts/update-docker-demo.sh
 
-pnpm wgc federated-graph create-token production --name mytoken
+pnpm wgc federated-graph create-token production --name mytoken

scripts/create-local-demo.sh

@@ -14,6 +14,6 @@ pnpm wgc subgraph create family --label team=A env=production --routing-url http
 pnpm wgc subgraph create hobbies --label team=B env=production --routing-url http://localhost:4003/graphql
 pnpm wgc subgraph create products --label team=B env=production --routing-url http://localhost:4004/graphql
 
-./update-local-demo.sh
+sh ../scripts/update-local-demo.sh
 
-pnpm wgc federated-graph create-token production --name mytoken
+pnpm wgc federated-graph create-token production --name mytoken