updating tyk example

kubeshop · Aug 14, 2024 · 2ab19e5 · 2ab19e5
1 parent 7f55ed1
commit 2ab19e5
Show file tree

Hide file tree

Showing 15 changed files with 198 additions and 701 deletions.
diff --git a/examples/quick-start-tyk/.env.template b/examples/quick-start-tyk/.env.template
@@ -1,4 +1,7 @@
-TRACETEST_API_TOKEN=
-TRACETEST_AGENT_API_KEY=
+# Get the required information here: https://app.tracetest.io/retrieve-token
+
+TRACETEST_TOKEN="<YOUR_TRACETEST_TOKEN>"
+TRACETEST_ENVIRONMENT_ID="<YOUR_ENV_ID>"
+
 POKESHOP_DEMO_URL=http://tyk-gateway:8080
 TYK_AUTH_KEY=28d220fd77974a4facfb07dc1e49c2aa
diff --git a/examples/quick-start-tyk/Dockerfile.tracetest b/examples/quick-start-tyk/Dockerfile.tracetest
@@ -0,0 +1,11 @@
+FROM alpine
+
+WORKDIR /app
+ARG TRACETEST_IMAGE_VERSION=v1.4.0
+
+RUN apk --update add bash jq curl
+RUN curl -L https://raw.githubusercontent.com/kubeshop/tracetest/main/install-cli.sh | bash -s -- $TRACETEST_IMAGE_VERSION
+
+WORKDIR /resources
+
+ENTRYPOINT ["echo", "Tracetest CLI installed"]
diff --git a/examples/quick-start-tyk/docker-compose.yml → examples/quick-start-tyk/docker-compose.yaml b/examples/quick-start-tyk/docker-compose.yml → examples/quick-start-tyk/docker-compose.yaml
@@ -18,12 +18,49 @@ services:
  tyk-gateway:
  condition: service_started
 
+ # Cloud-based Managed Tracetest
  tracetest-agent:
- environment:
- TRACETEST_DEV: ${TRACETEST_DEV}
- TRACETEST_API_KEY: ${TRACETEST_AGENT_API_KEY}
- TRACETEST_SERVER_URL: ${TRACETEST_SERVER_URL}
  image: kubeshop/tracetest-agent:latest
+ environment:
+ # Get the required information here: https://app.tracetest.io/retrieve-token
+ - TRACETEST_API_KEY=${TRACETEST_TOKEN}
+ - TRACETEST_ENVIRONMENT_ID=${TRACETEST_ENVIRONMENT_ID}
+
+ tracetest-apply:
+ build:
+ dockerfile: Dockerfile.tracetest
+ volumes:
+ - ./resources:/resources
+ environment:
+ TRACETEST_TOKEN: ${TRACETEST_TOKEN}
+ TRACETEST_ENVIRONMENT_ID: ${TRACETEST_ENVIRONMENT_ID}
+ entrypoint:
+ - bash
+ - /resources/apply.sh
+ networks:
+ default: null
+ depends_on:
+ api:
+ condition: service_started
+ tracetest-agent:
+ condition: service_started
+
+ tracetest-run:
+ build:
+ dockerfile: Dockerfile.tracetest
+ volumes:
+ - ./resources:/resources
+ environment:
+ TRACETEST_TOKEN: ${TRACETEST_TOKEN}
+ TRACETEST_ENVIRONMENT_ID: ${TRACETEST_ENVIRONMENT_ID}
+ entrypoint:
+ - bash
+ - /resources/run.sh
+ networks:
+ default: null
+ depends_on:
+ tracetest-apply:
+ condition: service_completed_successfully
 
  # Tyk Gateway
  tyk-gateway:
@@ -96,6 +133,10 @@ services:
  ports:
  - 8081:8081
  depends_on:
+ tyk-gateway:
+ condition: service_started
+ worker:
+ condition: service_started
  postgres:
  condition: service_healthy
  cache:
@@ -126,9 +167,9 @@ services:
 
  # Collector
  otel-collector:
- image: otel/opentelemetry-collector-contrib:0.59.0
+ image: otel/opentelemetry-collector-contrib:0.100.0
  volumes:
- - ./deployments/otel-collector/otel-collector.yml:/etc/otel-collector.yml
+ - ./otel-collector.yml:/etc/otel-collector.yml
  command: ['--config=/etc/otel-collector.yml']
  ports:
  - 4318:4318

diff --git a/...oyments/otel-collector/otel-collector.yml → examples/quick-start-tyk/otel-collector.yml b/...oyments/otel-collector/otel-collector.yml → examples/quick-start-tyk/otel-collector.yml
@@ -12,8 +12,8 @@ processors:
  batch:
 
 exporters:
- jaeger:
- endpoint: jaeger:14250
+ otlp/jaeger:
+ endpoint: jaeger:4317
  tls:
  insecure: true
  otlp:
@@ -26,7 +26,7 @@ service:
  traces:
  receivers: [otlp]
  processors: []
- exporters: [jaeger]
+ exporters: [otlp/jaeger]
  traces/1:
  receivers: [otlp]
  processors: [batch]