Merge branch 'main' into sozhan/rename.shippingservice

open-telemetry · Dec 16, 2024 · e62b1df · e62b1df
2 parents 07f5dbb + fa7847e
commit e62b1df
Show file tree

Hide file tree

Showing 16 changed files with 491 additions and 54 deletions.
diff --git a/.env b/.env
@@ -28,11 +28,11 @@ ENV_PLATFORM=local
 # OpenTelemetry Collector
 HOST_FILESYSTEM=/
 DOCKER_SOCK=/var/run/docker.sock
-OTEL_COLLECTOR_HOST=otelcol
+OTEL_COLLECTOR_HOST=otel-collector
 OTEL_COLLECTOR_PORT_GRPC=4317
 OTEL_COLLECTOR_PORT_HTTP=4318
-OTEL_COLLECTOR_CONFIG=./src/otelcollector/otelcol-config.yml
-OTEL_COLLECTOR_CONFIG_EXTRAS=./src/otelcollector/otelcol-config-extras.yml
+OTEL_COLLECTOR_CONFIG=./src/otel-collector/otelcol-config.yml
+OTEL_COLLECTOR_CONFIG_EXTRAS=./src/otel-collector/otelcol-config-extras.yml
 OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
 PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:8080/otlp-http/v1/traces
 
@@ -94,7 +94,7 @@ IMAGE_PROVIDER_DOCKERFILE=./src/imageprovider/Dockerfile
 
 # Load Generator
 LOCUST_WEB_PORT=8089
-LOCUST_USERS=10
+LOCUST_USERS=5
 LOCUST_HOST=http://${FRONTEND_PROXY_ADDR}
 LOCUST_WEB_HOST=loadgenerator
 LOCUST_AUTOSTART=true

diff --git a/.github/workflows/label-pr.yml b/.github/workflows/label-pr.yml
@@ -30,7 +30,7 @@ jobs:
               - 'docker-compose*.yml'
               - 'src/flagd/**'
               - 'src/grafana/**'
-              - 'src/otelcollector/**'
+              - 'src/otel-collector/**'
               - 'src/prometheus/**'
 
       - name: "Add Label: docs-update-required"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,10 @@ the release.
   ([#1827](https://github.com/open-telemetry/opentelemetry-demo/pull/1827))
 * [cartservice] - Add Exemplars to Cart Service
   ([#1830](https://github.com/open-telemetry/opentelemetry-demo/pull/1830))
+* [grafana] Add Exemplars Dashboard
+  ([#1836](https://github.com/open-telemetry/opentelemetry-demo/pull/1836))
+* [otel-collector] rename otelcol to otel-collector
+  ([#1841](https://github.com/open-telemetry/opentelemetry-demo/pull/1841))
 * [shipping] rename shippingservice to accounting
   ([#1827](https://github.com/open-telemetry/opentelemetry-demo/pull/1842))
 

diff --git a/docker-compose-tests.yml b/docker-compose-tests.yml
@@ -107,7 +107,7 @@ services:
     depends_on:
       tracetest-postgres:
         condition: service_healthy
-      otelcol:
+      otel-collector:
         condition: service_started
     healthcheck:
       test: [ "CMD", "wget", "--spider", "localhost:11633" ]

diff --git a/docker-compose-tests_include-override.yml b/docker-compose-tests_include-override.yml
@@ -3,7 +3,7 @@
 
 services:
 
-  otelcol:
+  otel-collector:
     command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-tracetest.yml" ]
     environment:
       - ENVOY_PORT

diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -45,7 +45,7 @@ services:
       - OTEL_LOGS_EXPORTER=otlp
       - OTEL_SERVICE_NAME=adservice
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -76,7 +76,7 @@ services:
     depends_on:
       valkey-cart:
         condition: service_started
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -122,7 +122,7 @@ services:
         condition: service_started
       shipping:
         condition: service_started
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -150,7 +150,7 @@ services:
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.name=currencyservice   # The C++ SDK does not support OTEL_SERVICE_NAME
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -176,7 +176,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=emailservice
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -233,7 +233,7 @@ services:
         condition: service_started
       shipping:
         condition: service_started
-      otelcol:
+      otel-collector:
         condition: service_started
       imageprovider:
         condition: service_started
@@ -308,7 +308,7 @@ services:
       - OTEL_SERVICE_NAME=imageprovider
       - OTEL_RESOURCE_ATTRIBUTES
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -374,7 +374,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=paymentservice
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -402,7 +402,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=productcatalogservice
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -430,7 +430,7 @@ services:
       - OTEL_SERVICE_NAME=quoteservice
       - OTEL_PHP_INTERNAL_METRICS_ENABLED=true
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -463,7 +463,7 @@ services:
     depends_on:
       productcatalogservice:
         condition: service_started
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -490,7 +490,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=shipping
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -581,9 +581,9 @@ services:
     logging: *logging
 
   # OpenTelemetry Collector
-  otelcol:
+  otel-collector:
     image: ${COLLECTOR_CONTRIB_IMAGE}
-    container_name: otel-col
+    container_name: otel-collector
     deploy:
       resources:
         limits:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=accounting
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
       kafka:
         condition: service_healthy
@@ -72,7 +72,7 @@ services:
       - OTEL_LOGS_EXPORTER=otlp
       - OTEL_SERVICE_NAME=adservice
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
       flagd:
         condition: service_started
@@ -106,7 +106,7 @@ services:
     depends_on:
       valkey-cart:
         condition: service_started
-      otelcol:
+      otel-collector:
         condition: service_started
       flagd:
         condition: service_started
@@ -156,7 +156,7 @@ services:
         condition: service_started
       shipping:
         condition: service_started
-      otelcol:
+      otel-collector:
         condition: service_started
       kafka:
         condition: service_healthy
@@ -188,7 +188,7 @@ services:
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.name=currencyservice   # The C++ SDK does not support OTEL_SERVICE_NAME
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -215,7 +215,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=emailservice
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -246,7 +246,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=frauddetectionservice
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
       kafka:
         condition: service_healthy
@@ -305,7 +305,7 @@ services:
         condition: service_started
       shipping:
         condition: service_started
-      otelcol:
+      otel-collector:
         condition: service_started
       imageprovider:
         condition: service_started
@@ -384,7 +384,7 @@ services:
       - OTEL_SERVICE_NAME=imageprovider
       - OTEL_RESOURCE_ATTRIBUTES
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -451,7 +451,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=paymentservice
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
       flagd:
         condition: service_started
@@ -482,7 +482,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=productcatalogservice
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
       flagd:
         condition: service_started
@@ -512,7 +512,7 @@ services:
       - OTEL_SERVICE_NAME=quoteservice
       - OTEL_PHP_INTERNAL_METRICS_ENABLED=true
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -546,7 +546,7 @@ services:
     depends_on:
       productcatalogservice:
         condition: service_started
-      otelcol:
+      otel-collector:
         condition: service_started
       flagd:
         condition: service_started
@@ -575,7 +575,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=shipping
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
     logging: *logging
 
@@ -628,7 +628,7 @@ services:
     ports:
       - "${FLAGD_UI_PORT}"
     depends_on:
-      otelcol:
+      otel-collector:
         condition: service_started
       flagd:
         condition: service_started
@@ -689,15 +689,15 @@ services:
     image: ${JAEGERTRACING_IMAGE}
     container_name: jaeger
     command:
-      - "--memory.max-traces=5000"
+      - "--memory.max-traces=25000"
       - "--query.base-path=/jaeger/ui"
       - "--prometheus.server-url=http://${PROMETHEUS_ADDR}"
       - "--prometheus.query.normalize-calls=true"
       - "--prometheus.query.normalize-duration=true"
     deploy:
       resources:
         limits:
-          memory: 400M
+          memory: 1200M
     restart: unless-stopped
     ports:
       - "${JAEGER_SERVICE_PORT}"         # Jaeger UI
@@ -725,9 +725,9 @@ services:
     logging: *logging
 
   # OpenTelemetry Collector
-  otelcol:
+  otel-collector:
     image: ${COLLECTOR_CONTRIB_IMAGE}
-    container_name: otel-col
+    container_name: otel-collector
     deploy:
       resources:
         limits:

diff --git a/renovate.json5 b/renovate.json5
@@ -67,8 +67,8 @@
       "groupName": "loadgenerator",
     },
     {
-      "matchFileNames": ["src/otelcollector/**"],
-      "groupName": "otelcollector",
+      "matchFileNames": ["src/otel-collector/**"],
+      "groupName": "otel-collector",
     },
     {
       "matchFileNames": ["src/paymentservice/**"],

diff --git a/src/frontend/pages/_app.tsx b/src/frontend/pages/_app.tsx
@@ -4,7 +4,6 @@
 import '../styles/globals.css';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import App, { AppContext, AppProps } from 'next/app';
-import { getCookie } from 'cookies-next';
 import CurrencyProvider from '../providers/Currency.provider';
 import CartProvider from '../providers/Cart.provider';
 import { ThemeProvider } from 'styled-components';
@@ -26,8 +25,7 @@ declare global {
 }
 
 if (typeof window !== 'undefined') {
-  const collector = getCookie('otelCollectorUrl')?.toString() || '';
-  FrontendTracer(collector);
+  FrontendTracer();
   if (window.location) {
     const session = SessionGateway.getSession();
 

diff --git a/src/frontend/utils/telemetry/FrontendTracer.ts b/src/frontend/utils/telemetry/FrontendTracer.ts
@@ -19,7 +19,7 @@ const {
   IS_SYNTHETIC_REQUEST = '',
 } = typeof window !== 'undefined' ? window.ENV : {};
 
-const FrontendTracer = (collectorString: string) => {
+const FrontendTracer = () => {
   let resource = new Resource({
     [SemanticResourceAttributes.SERVICE_NAME]: NEXT_PUBLIC_OTEL_SERVICE_NAME,
   });
@@ -33,7 +33,7 @@ const FrontendTracer = (collectorString: string) => {
   provider.addSpanProcessor(
     new BatchSpanProcessor(
       new OTLPTraceExporter({
-        url: NEXT_PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT || collectorString || 'http://localhost:4318/v1/traces',
+        url: NEXT_PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT || 'http://localhost:4318/v1/traces',
       }),
       {
         scheduledDelayMillis: 500,