chore: Cleanup and fixes

kubeshop · Sep 13, 2024 · b2fb5fc · b2fb5fc
1 parent 391b31f
commit b2fb5fc
Show file tree

Hide file tree

Showing 16 changed files with 11,590 additions and 7,869 deletions.
diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/package.json b/api/package.json
@@ -41,15 +41,15 @@
     "@grpc/grpc-js": "^1.8.15",
     "@koa/cors": "^3.3.0",
     "@koa/router": "^10.1.1",
-    "@opentelemetry/api": "^1.8.0",
-    "@opentelemetry/auto-instrumentations-node": "^0.44.0",
-    "@opentelemetry/exporter-jaeger": "^1.24.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.51.0",
-    "@opentelemetry/instrumentation": "^0.51.0",
-    "@opentelemetry/resources": "^1.24.0",
-    "@opentelemetry/sdk-node": "^0.51.0",
-    "@opentelemetry/sdk-trace-base": "^1.24.0",
-    "@opentelemetry/semantic-conventions": "^1.24.0",
+    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/auto-instrumentations-node": "^0.50.0",
+    "@opentelemetry/exporter-jaeger": "^1.26.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.53.0",
+    "@opentelemetry/instrumentation": "^0.53.0",
+    "@opentelemetry/resources": "^1.26.0",
+    "@opentelemetry/sdk-node": "^0.53.0",
+    "@opentelemetry/sdk-trace-base": "^1.26.0",
+    "@opentelemetry/semantic-conventions": "^1.27.0",
     "@types/node-fetch": "^2.6.4",
     "amqplib": "^0.8.0",
     "class-transformer": "^0.5.1",

diff --git a/collector.config.yaml b/collector.config.yaml
@@ -11,11 +11,24 @@ receivers:
 processors:
   batch:
 
+  tail_sampling:
+    decision_wait: 2s
+    num_traces: 100
+    expected_new_traces_per_sec: 10
+    policies:
+      [
+        {
+          name: Accept traces that started from tracetest,
+          type: trace_state,
+          trace_state: { key: "tracetest", values: ["true"] },
+        },
+      ]
+
 exporters:
   logging:
     loglevel: debug
-  jaeger:
-    endpoint: ${JAEGER_ENDPOINT}
+  otlp:
+    endpoint: jaeger:4317
     tls:
       insecure: true
   otlp/trace:
@@ -27,9 +40,9 @@ service:
   pipelines:
     traces:
       receivers: [otlp]
-      processors: []
-      exporters: [logging, jaeger]
-    traces/1:
+      processors: [tail_sampling, batch]
+      exporters: [otlp]
+    traces/agent:
       receivers: [otlp]
-      processors: [batch]
+      processors: [tail_sampling, batch]
       exporters: [otlp/trace]
diff --git a/cypress/e2e/1-getting-started/home.cy.ts b/cypress/e2e/1-getting-started/home.cy.ts
@@ -42,9 +42,8 @@ describe('Home', { defaultCommandTimeout: 80000 }, () => {
   });
 
   beforeEach(() => {
-    cy.visit('/', {
-      onBeforeLoad: win => tracetest.capture(win.document),
-    });
+    tracetest.capture();
+    cy.visit('/');
   });
 
   // uncomment to wait for trace tests to be done

diff --git a/docker-compose.stream.yml b/docker-compose.stream.yml
@@ -42,6 +42,7 @@ services:
       KAFKA_TOPIC: 'pokemon'
       KAFKA_CLIENT_ID: 'streaming-worker'
       REDIS_URL: cache
+      SERVICE_NAME: pokeshop-streaming-worker
     restart: on-failure
     depends_on:
       db:
@@ -53,4 +54,4 @@ services:
       cache:
         condition: service_healthy
       otel-collector:
-        condition: service_started
+        condition: service_started
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -44,32 +44,25 @@ services:
       - 14250:14250
       - 16685:16685
       - 16686:16686
-    environment:
-      - COLLECTOR_ZIPKIN_HOST_PORT=:9411
-      - COLLECTOR_OTLP_ENABLED=true
     healthcheck:
       test: ['CMD', 'wget', '--spider', 'localhost:16686']
       interval: 1s
       timeout: 3s
       retries: 60
 
   otel-collector:
-    image: otel/opentelemetry-collector-contrib:0.59.0
+    image: otel/opentelemetry-collector-contrib:0.100.0
     restart: unless-stopped
     extra_hosts:
       - 'host.docker.internal:host-gateway'
-    # ports:
-    #   - 55679:55679
-    #   - 8888:8888
-    #   - 4317:4317
-    #   - 4318:4318
+    ports:
+      - 4317:4317
+      - 4318:4318
     command:
       - '--config'
       - '/otel-local-config.yaml'
     volumes:
       - ./collector.config.yaml:/otel-local-config.yaml
-    environment:
-      - JAEGER_ENDPOINT=jaeger:14250
     depends_on:
       jaeger:
         condition: service_healthy