Merge branch 'main' into imageprovider

.env

@@ -65,6 +65,7 @@ FEATURE_FLAG_GRPC_SERVICE_ADDR=featureflagservice:${FEATURE_FLAG_GRPC_SERVICE_PO
 
 # flagd
 FLAGD_HOST=flagd
+FLAGD_PORT=8013
 
 # Frontend
 FRONTEND_PORT=8080

Makefile

@@ -131,7 +131,6 @@ start:
 	@echo "Go to http://localhost:8080/jaeger/ui for the Jaeger UI."
 	@echo "Go to http://localhost:8080/grafana/ for the Grafana UI."
 	@echo "Go to http://localhost:8080/loadgen/ for the Load Generator UI."
-	@echo "Go to http://localhost:8080/feature/ for the Feature Flag UI."
 
 .PHONY: start-minimal
 start-minimal:
@@ -153,7 +152,6 @@ start-odd:
 	@echo "Go to http://localhost:8080/jaeger/ui for the Jaeger UI."
 	@echo "Go to http://localhost:8080/grafana/ for the Grafana UI."
 	@echo "Go to http://localhost:8080/loadgen/ for the Load Generator UI."
-	@echo "Go to http://localhost:8080/feature/ for the Feature Flag UI."
 	@echo "Go to http://localhost:11633/ for the Tracetest Web UI."
 
 .PHONY: stop

docker-compose.yml

@@ -63,6 +63,7 @@ services:
     environment:
       - AD_SERVICE_PORT
       - FLAGD_HOST
+      - FLAGD_PORT
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
@@ -71,6 +72,8 @@ services:
     depends_on:
       otelcol:
         condition: service_started
+      flagd:
+        condition: service_started
     logging: *logging
 
   # Cart service
@@ -92,6 +95,7 @@ services:
     environment:
       - CART_SERVICE_PORT
       - FLAGD_HOST
+      - FLAGD_PORT
       - REDIS_ADDR
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_RESOURCE_ATTRIBUTES
@@ -102,6 +106,8 @@ services:
         condition: service_started
       otelcol:
         condition: service_started
+      flagd:
+        condition: service_started
     logging: *logging
 
   # Checkout service
@@ -122,6 +128,7 @@ services:
       - "${CHECKOUT_SERVICE_PORT}"
     environment:
       - FLAGD_HOST
+      - FLAGD_PORT
       - CHECKOUT_SERVICE_PORT
       - CART_SERVICE_ADDR
       - CURRENCY_SERVICE_ADDR
@@ -151,6 +158,8 @@ services:
         condition: service_started
       kafka:
         condition: service_healthy
+      flagd:
+        condition: service_started
     logging: *logging
 
   # Currency service
@@ -206,7 +215,7 @@ services:
     logging: *logging
 
   flagd:
-    image: ghcr.io/open-feature/flagd:latest
+    image: ghcr.io/open-feature/flagd:v0.9.0
     container_name: flagd
     command: [
       "start",
@@ -423,13 +432,16 @@ services:
     environment:
       - PAYMENT_SERVICE_PORT
       - FLAGD_HOST
+      - FLAGD_PORT
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=paymentservice
     depends_on:
       otelcol:
         condition: service_started
+      flagd:
+        condition: service_started
     logging: *logging
 
   # Product Catalog service
@@ -451,13 +463,16 @@ services:
     environment:
       - PRODUCT_CATALOG_SERVICE_PORT
       - FLAGD_HOST
+      - FLAGD_PORT
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=productcatalogservice
     depends_on:
       otelcol:
         condition: service_started
+      flagd:
+        condition: service_started
     logging: *logging
 
   # Quote service
@@ -508,6 +523,7 @@ services:
       - RECOMMENDATION_SERVICE_PORT
       - PRODUCT_CATALOG_SERVICE_ADDR
       - FLAGD_HOST
+      - FLAGD_PORT
       - OTEL_PYTHON_LOG_CORRELATION=true
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
@@ -519,6 +535,8 @@ services:
         condition: service_started
       otelcol:
         condition: service_started
+      flagd:
+        condition: service_started
     logging: *logging
 
   # Shipping service
@@ -793,6 +811,8 @@ services:
         condition: service_started
       frauddetectionservice:
         condition: service_started
+      flagd:
+        condition: service_started
 
   tracetest-server:
     image: ${TRACETEST_IMAGE}