Merge upstream

.dockerignore

@@ -8,9 +8,9 @@ src/*/Dockerfile
 src/*/*/Dockerfile
 
 ###################################
-# currencyservice
-./src/currencyservice/client.js
-./src/currencyservice/node_modules/
+# currency
+./src/currency/client.js
+./src/currency/node_modules/
 ###################################
 
 ###################################
@@ -28,7 +28,7 @@ src/*/*/Dockerfile
 
 ###################################
 # shippingservice
-./src/shippingservice/target
+./src/shipping/target
 ###################################
 
 # Mix artifacts

.env

@@ -7,18 +7,18 @@ DEMO_VERSION=latest
 
 # Build Args
 TRACETEST_IMAGE_VERSION=v1.7.1
-OTEL_JAVA_AGENT_VERSION=2.9.0
-OPENTELEMETRY_CPP_VERSION=1.17.0
+OTEL_JAVA_AGENT_VERSION=2.10.0
+OPENTELEMETRY_CPP_VERSION=1.18.0
 
 # Dependent images
-COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.113.0
-FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.11.4
-GRAFANA_IMAGE=grafana/grafana:11.3.0
-JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.62.0
+COLLECTOR_CONTRIB_IMAGE=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.116.1
+FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.11.5
+GRAFANA_IMAGE=grafana/grafana:11.4.0
+JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.64.0
 # must also update version field in src/grafana/provisioning/datasources/opensearch.yaml
 OPENSEARCH_IMAGE=opensearchproject/opensearch:2.18.0
-POSTGRES_IMAGE=postgres:17.0
-PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.55.1
+POSTGRES_IMAGE=postgres:17.2
+PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v3.0.1
 VALKEY_IMAGE=valkey/valkey:8.0-alpine
 TRACETEST_IMAGE=kubeshop/tracetest:${TRACETEST_IMAGE_VERSION}
 
@@ -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
 
@@ -49,32 +49,32 @@ OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE=cumulative
 ACCOUNTING_DOCKERFILE=./src/accounting/Dockerfile
 
 # Ad Service
-AD_SERVICE_PORT=9555
-AD_SERVICE_ADDR=adservice:${AD_SERVICE_PORT}
-AD_SERVICE_DOCKERFILE=./src/adservice/Dockerfile
+AD_PORT=9555
+AD_ADDR=ad:${AD_PORT}
+AD_DOCKERFILE=./src/ad/Dockerfile
 
 # Cart Service
-CART_SERVICE_PORT=7070
-CART_SERVICE_ADDR=cartservice:${CART_SERVICE_PORT}
-CART_SERVICE_DOCKERFILE=./src/cartservice/src/Dockerfile
+CART_PORT=7070
+CART_ADDR=cart:${CART_PORT}
+CART_DOCKERFILE=./src/cart/src/Dockerfile
 
 # Checkout Service
 CHECKOUT_SERVICE_PORT=5050
 CHECKOUT_SERVICE_ADDR=checkoutservice:${CHECKOUT_SERVICE_PORT}
 CHECKOUT_SERVICE_DOCKERFILE=./src/checkoutservice/Dockerfile
 
 # Currency Service
-CURRENCY_SERVICE_PORT=7001
-CURRENCY_SERVICE_ADDR=currencyservice:${CURRENCY_SERVICE_PORT}
-CURRENCY_SERVICE_DOCKERFILE=./src/currencyservice/Dockerfile
+CURRENCY_PORT=7001
+CURRENCY_ADDR=currency:${CURRENCY_PORT}
+CURRENCY_DOCKERFILE=./src/currency/Dockerfile
 
 # Email Service
-EMAIL_SERVICE_PORT=6060
-EMAIL_SERVICE_ADDR=http://emailservice:${EMAIL_SERVICE_PORT}
-EMAIL_SERVICE_DOCKERFILE=./src/emailservice/Dockerfile
+EMAIL_PORT=6060
+EMAIL_ADDR=http://email:${EMAIL_PORT}
+EMAIL_DOCKERFILE=./src/email/Dockerfile
 
 # Fraud Service
-FRAUD_SERVICE_DOCKERFILE=./src/frauddetectionservice/Dockerfile
+FRAUD_DOCKERFILE=./src/fraud-detection/Dockerfile
 
 # Frontend
 FRONTEND_PORT=8080
@@ -88,43 +88,43 @@ FRONTEND_PROXY_ADDR=frontend-proxy:${ENVOY_PORT}
 FRONTEND_PROXY_DOCKERFILE=./src/frontendproxy/Dockerfile
 
 # Image Provider
-IMAGE_PROVIDER_HOST=imageprovider
+IMAGE_PROVIDER_HOST=image-provider
 IMAGE_PROVIDER_PORT=8081
-IMAGE_PROVIDER_DOCKERFILE=./src/imageprovider/Dockerfile
+IMAGE_PROVIDER_DOCKERFILE=./src/image-provider/Dockerfile
 
 # Load Generator
 LOCUST_WEB_PORT=8089
-LOCUST_USERS=10
+LOCUST_USERS=5
 LOCUST_HOST=http://${FRONTEND_PROXY_ADDR}
-LOCUST_WEB_HOST=loadgenerator
+LOCUST_WEB_HOST=load-generator
 LOCUST_AUTOSTART=true
 LOCUST_HEADLESS=false
-LOAD_GENERATOR_DOCKERFILE=./src/loadgenerator/Dockerfile
+LOAD_GENERATOR_DOCKERFILE=./src/load-generator/Dockerfile
 
 # Payment Service
-PAYMENT_SERVICE_PORT=50051
-PAYMENT_SERVICE_ADDR=paymentservice:${PAYMENT_SERVICE_PORT}
-PAYMENT_SERVICE_DOCKERFILE=./src/paymentservice/Dockerfile
+PAYMENT_PORT=50051
+PAYMENT_ADDR=payment:${PAYMENT_PORT}
+PAYMENT_DOCKERFILE=./src/payment/Dockerfile
 
 # Product Catalog Service
 PRODUCT_CATALOG_SERVICE_PORT=3550
 PRODUCT_CATALOG_SERVICE_ADDR=productcatalogservice:${PRODUCT_CATALOG_SERVICE_PORT}
 PRODUCT_CATALOG_DOCKERFILE=./src/productcatalogservice/Dockerfile
 
 # Quote Service
-QUOTE_SERVICE_PORT=8090
-QUOTE_SERVICE_ADDR=http://quoteservice:${QUOTE_SERVICE_PORT}
-QUOTE_SERVICE_DOCKERFILE=./src/quoteservice/Dockerfile
+QUOTE_PORT=8090
+QUOTE_ADDR=http://quote:${QUOTE_PORT}
+QUOTE_DOCKERFILE=./src/quote/Dockerfile
 
 # Recommendation Service
-RECOMMENDATION_SERVICE_PORT=9001
-RECOMMENDATION_SERVICE_ADDR=recommendationservice:${RECOMMENDATION_SERVICE_PORT}
-RECOMMENDATION_SERVICE_DOCKERFILE=./src/recommendationservice/Dockerfile
+RECOMMENDATION_PORT=9001
+RECOMMENDATION_ADDR=recommendation:${RECOMMENDATION_PORT}
+RECOMMENDATION_DOCKERFILE=./src/recommendation/Dockerfile
 
 # Shipping Service
-SHIPPING_SERVICE_PORT=50050
-SHIPPING_SERVICE_ADDR=shippingservice:${SHIPPING_SERVICE_PORT}
-SHIPPING_SERVICE_DOCKERFILE=./src/shippingservice/Dockerfile
+SHIPPING_PORT=50050
+SHIPPING_ADDR=shipping:${SHIPPING_PORT}
+SHIPPING_DOCKERFILE=./src/shipping/Dockerfile
 
 # ******************
 # Dependent Services
@@ -134,7 +134,7 @@ FLAGD_HOST=flagd
 FLAGD_PORT=8013
 
 # Flagd UI
-FLAGD_UI_HOST=flagdui
+FLAGD_UI_HOST=flagd-ui
 FLAGD_UI_PORT=4000
 FLAGD_UI_DOCKERFILE=./src/flagd-ui/Dockerfile
 

.env.override

@@ -8,14 +8,14 @@ IMAGE_NAME=ghcr.io/elastic/opentelemetry-demo
 # *********************
 # Elastic Demo Services
 # *********************
-AD_SERVICE_DOCKERFILE=./src/adservice/Dockerfile.elastic
+AD_DOCKERFILE=./src/adservice/Dockerfile.elastic
 FRAUD_SERVICE_DOCKERFILE=./src/frauddetectionservice/Dockerfile.elastic
 KAFKA_SERVICE_DOCKERFILE=./src/kafka/Dockerfile.elastic
 
 # *********************
 # Elastic Collector
 # *********************
 COLLECTOR_CONTRIB_IMAGE=docker.elastic.co/beats/elastic-agent:8.16.0
-OTEL_COLLECTOR_CONFIG=./src/otelcollector/otelcol-elastic-config.yaml
-OTEL_COLLECTOR_CONFIG_EXTRAS=./src/otelcollector/otelcol-elastic-config-extras.yaml
+OTEL_COLLECTOR_CONFIG=./src/otel-collector/otelcol-elastic-config.yaml
+OTEL_COLLECTOR_CONFIG_EXTRAS=./src/otel-collector/otelcol-elastic-config-extras.yaml
 ELASTIC_AGENT_OTEL=true

.github/component_owners.yml

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # this file is used by .github/workflows/assign-reviewers.yml
 components:
-  src/adservice:
+  src/ad:
     - jack-berg
     - mateuszrzeszutek
     - trask

.github/workflows/component-build-images.yml

@@ -55,28 +55,28 @@ jobs:
             tag_suffix: accounting
             context: ./
             setup-qemu: true
-          - file: ./src/adservice/Dockerfile
-            tag_suffix: adservice
+          - file: ./src/ad/Dockerfile
+            tag_suffix: ad
             context: ./
             setup-qemu: true
-          - file: ./src/cartservice/src/Dockerfile
-            tag_suffix: cartservice
+          - file: ./src/cart/src/Dockerfile
+            tag_suffix: cart
             context: ./
             setup-qemu: false
           - file: ./src/checkoutservice/Dockerfile
             tag_suffix: checkoutservice
             context: ./
             setup-qemu: true
-          - file: ./src/currencyservice/Dockerfile
-            tag_suffix: currencyservice
+          - file: ./src/currency/Dockerfile
+            tag_suffix: currency
             context: ./
             setup-qemu: true
-          - file: ./src/emailservice/Dockerfile
-            tag_suffix: emailservice
+          - file: ./src/email/Dockerfile
+            tag_suffix: email
             context: ./
             setup-qemu: true
-          - file: ./src/frauddetectionservice/Dockerfile
-            tag_suffix: frauddetectionservice
+          - file: ./src/fraud-detection/Dockerfile
+            tag_suffix: fraud-detection
             context: ./
             setup-qemu: true
           - file: ./src/frontend/Dockerfile
@@ -91,40 +91,40 @@ jobs:
             tag_suffix: frontend-tests
             context: ./
             setup-qemu: true
-          - file: ./src/imageprovider/Dockerfile
-            tag_suffix: imageprovider
+          - file: ./src/image-provider/Dockerfile
+            tag_suffix: image-provider
             context: ./
             setup-qemu: true
           - file: ./src/kafka/Dockerfile
             tag_suffix: kafka
             context: ./
             setup-qemu: true
-          - file: ./src/loadgenerator/Dockerfile
-            tag_suffix: loadgenerator
+          - file: ./src/load-generator/Dockerfile
+            tag_suffix: load-generator
             context: ./
             setup-qemu: true
-          - file: ./src/paymentservice/Dockerfile
-            tag_suffix: paymentservice
+          - file: ./src/payment/Dockerfile
+            tag_suffix: payment
             context: ./
             setup-qemu: true
           - file: ./src/productcatalogservice/Dockerfile
             tag_suffix: productcatalogservice
             context: ./
             setup-qemu: true
-          - file: ./src/quoteservice/Dockerfile
-            tag_suffix: quoteservice
+          - file: ./src/quote/Dockerfile
+            tag_suffix: quote
             context: ./
             setup-qemu: true
-          - file: ./src/recommendationservice/Dockerfile
-            tag_suffix: recommendationservice
+          - file: ./src/recommendation/Dockerfile
+            tag_suffix: recommendation
             context: ./
             setup-qemu: true
-          - file: ./src/shippingservice/Dockerfile
-            tag_suffix: shippingservice
+          - file: ./src/shipping/Dockerfile
+            tag_suffix: shipping
             context: ./
             setup-qemu: true
           - file: ./src/flagd-ui/Dockerfile
-            tag_suffix: flagdui
+            tag_suffix: flagd-ui
             context: ./
             setup-qemu: true
           - file: ./test/tracetesting/Dockerfile

.github/workflows/component_build-images-elastic.yml

@@ -28,36 +28,36 @@ jobs:
       fail-fast: false
       matrix:
         file_tag:
-          - file: ./src/accountingservice/Dockerfile
-            tag_suffix: accountingservice
+          - file: ./src/accounting/Dockerfile
+            tag_suffix: accounting
             context: ./
             setup-qemu: true
-          - file: ./src/adservice/Dockerfile.elastic
-            tag_suffix: adservice
+          - file: ./src/ad/Dockerfile.elastic
+            tag_suffix: ad
             context: ./
             setup-qemu: true
-          - file: ./src/cartservice/src/Dockerfile
-            tag_suffix: cartservice
+          - file: ./src/cart/src/Dockerfile
+            tag_suffix: cart
             context: ./
             setup-qemu: false
           - file: ./src/checkoutservice/Dockerfile
             tag_suffix: checkoutservice
             context: ./
             setup-qemu: true
-          - file: ./src/currencyservice/Dockerfile
-            tag_suffix: currencyservice
+          - file: ./src/currency/Dockerfile
+            tag_suffix: currency
             context: ./
             setup-qemu: true
-          - file: ./src/emailservice/Dockerfile
-            tag_suffix: emailservice
+          - file: ./src/email/Dockerfile
+            tag_suffix: email
             context: ./
             setup-qemu: true
           - file: ./src/flagd-ui/Dockerfile
             tag_suffix: flagdui
             context: ./
             setup-qemu: true
-          - file: ./src/frauddetectionservice/Dockerfile.elastic
-            tag_suffix: frauddetectionservice
+          - file: ./src/fraud-detection/Dockerfile.elastic
+            tag_suffix: fraud-detection
             context: ./
             setup-qemu: true
           - file: ./src/frontend/Dockerfile
@@ -72,36 +72,36 @@ jobs:
             tag_suffix: frontend-tests
             context: ./
             setup-qemu: true
-          - file: ./src/imageprovider/Dockerfile
-            tag_suffix: imageprovider
+          - file: ./src/image-provider/Dockerfile
+            tag_suffix: image-provider
             context: ./
             setup-qemu: true
           - file: ./src/kafka/Dockerfile.elastic
             tag_suffix: kafka
             context: ./
             setup-qemu: true
-          - file: ./src/loadgenerator/Dockerfile
-            tag_suffix: loadgenerator
+          - file: ./src/load-generator/Dockerfile
+            tag_suffix: load-generator
             context: ./
             setup-qemu: true
-          - file: ./src/paymentservice/Dockerfile
-            tag_suffix: paymentservice
+          - file: ./src/payment/Dockerfile
+            tag_suffix: payment
             context: ./
             setup-qemu: true
           - file: ./src/productcatalogservice/Dockerfile
             tag_suffix: productcatalogservice
             context: ./
             setup-qemu: true
-          - file: ./src/quoteservice/Dockerfile
-            tag_suffix: quoteservice
+          - file: ./src/quote/Dockerfile
+            tag_suffix: quote
             context: ./
             setup-qemu: true
-          - file: ./src/recommendationservice/Dockerfile
-            tag_suffix: recommendationservice
+          - file: ./src/recommendation/Dockerfile
+            tag_suffix: recommendation
             context: ./
             setup-qemu: true
-          - file: ./src/shippingservice/Dockerfile
-            tag_suffix: shippingservice
+          - file: ./src/shipping/Dockerfile
+            tag_suffix: shipping
             context: ./
             setup-qemu: true
           - file: ./test/tracetesting/Dockerfile