Add Dapr on in the Cart Service

.licenserc.json

@@ -28,10 +28,12 @@
       "# Copyright The OpenTelemetry Authors",
       "# SPDX-License-Identifier: Apache-2.0"
     ],
+
     "**/*.sql": [
       "-- Copyright The OpenTelemetry Authors",
       "-- SPDX-License-Identifier: Apache-2.0"
     ],
+
     "**/{Dockerfile,Makefile}": [
       "# Copyright The OpenTelemetry Authors",
       "# SPDX-License-Identifier: Apache-2.0"

CHANGELOG.md

@@ -7,6 +7,14 @@ the release.
 
 ## Unreleased
 
+
+* [product catalog] use it with a Dapr client
+  ([#2143](https://github.com/open-telemetry/opentelemetry-demo/pull/2143))
+* [cartservice] Using Dapr to connect to valkey
+  ([#2143](https://github.com/open-telemetry/opentelemetry-demo/pull/2143))
+* [postgresl] added postgresql for product
+  ([#2143](https://github.com/open-telemetry/opentelemetry-demo/pull/2143))
+
 * [chore] add GOMEMLIMIT to all Go services
   ([#2148](https://github.com/open-telemetry/opentelemetry-demo/pull/2148))
 * [product-catalog] Simplify span event name
@@ -44,6 +52,7 @@ the release.
 * [flagd-ui] change image from alpine to distroless to reduce size
   ([#2224](https://github.com/open-telemetry/opentelemetry-demo/pull/2224))
 * [load-generator] Update locustfile for logging with TraceContext
+
   ([#2265](https://github.com/open-telemetry/opentelemetry-demo/pull/2265))
 * [product-catalog] Add OTel grpc Logs to Product Catalog
   ([#2285](https://github.com/open-telemetry/opentelemetry-demo/pull/2285))
@@ -85,12 +94,10 @@ the release.
   fix for `IS_REMOTE` flag feature
   ([#2112](https://github.com/open-telemetry/opentelemetry-demo/pull/2112))
 * [load-generator] Change OpenFeature Evaluation to Remote Evaluation Protocol,
-  based on [this issue in OpenFeature/python-sdk-contrib](https://github.com/open-feature/python-sdk-contrib/issues/198)
+  ([this issue in OpenFeature/python-sdk-contrib](https://github.com/open-feature/python-sdk-contrib/issues/198))
   ([#2114](https://github.com/open-telemetry/opentelemetry-demo/pull/2114))
 * [flagd-ui] increase memory to 100MB
   ([#2120](https://github.com/open-telemetry/opentelemetry-demo/pull/2120))
-* [cartservice] change custom metrics to use seconds
-  ([#2135](https://github.com/open-telemetry/opentelemetry-demo/pull/2135))
 
 ## 2.0.1
 

docker-compose.minimal.yml

@@ -76,12 +76,35 @@ services:
       - OTEL_SERVICE_NAME=cart
       - ASPNETCORE_URLS=http://*:${CART_PORT}
     depends_on:
-      valkey-cart:
-        condition: service_started
+
       otel-collector:
         condition: service_started
     logging: *logging
 
+  cart-dapr:
+    image: "daprio/daprd:edge"
+    container_name: cart-dapr
+    command: [
+      "./daprd",
+      "-app-id",
+      "cart",
+      "-app-port",
+      "${CART_PORT}",
+      "-placement-host-address",
+      "dapr-placement:50006",
+      "-components-path",
+      "/components",
+      "-config",
+      "/configuration/config.yaml"
+    ]
+    volumes:
+      - "./src/dapr/components/:/components"
+      - "./src/dapr/:/configuration"
+    depends_on:
+      - cart
+      - valkey-cart
+      - dapr-placement
+    network_mode: "service:cart"
   # Checkout service
   checkout:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-checkout
@@ -382,6 +405,17 @@ services:
         condition: service_started
     logging: *logging
 
+  product_db:
+    image: postgres:15.3-alpine3.18
+    restart: always
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres123
+    volumes:
+      - ./src/postgresql/product/init.sql:/docker-entrypoint-initdb.d/init.sql
+      - ./src/postgresql/data:/var/lib/postgresql/data
+    ports:
+      - 5436:5432
   # Product Catalog service
   product-catalog:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-product-catalog
@@ -414,6 +448,33 @@ services:
         condition: service_started
     logging: *logging
 
+  product-dapr:
+    image: "daprio/daprd:edge"
+    container_name: product-dapr
+    command: [
+      "./daprd",
+      "-app-id",
+      "product-catalog",
+      "-app-port",
+      "${PRODUCT_CATALOG_PORT}",
+      "-placement-host-address",
+      "dapr-placement:50006",
+      "-resources-path",
+      "/configuration/config.yaml",
+      "-config",
+      "/dapr/config.yaml"
+    ]
+    volumes:
+      - "./src/dapr/components/:/components"
+      - "./src/dapr/:/configuration"
+    depends_on:
+      product_db:
+        condition: service_started
+      dapr-placement:
+        condition: service_started
+    logging: *logging
+    network_mode: "service:product-catalog"
+
   # Quote service
   quote:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-quote
@@ -552,7 +613,15 @@ services:
       - "${VALKEY_PORT}"
     logging: *logging
 
-
+  # ********************
+  # Dapr Components
+  # ********************
+  dapr-placement:
+    image: "daprio/dapr"
+    container_name: dapr-placement
+    command: [ "./placement", "-port", "50006" ]
+    ports:
+      - "50006:50006"
   # ********************
   # Telemetry Components
   # ********************

docker-compose.yml

@@ -82,6 +82,7 @@ services:
         condition: service_started
     logging: *logging
 
+
   # Cart service
   cart:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-cart
@@ -102,20 +103,43 @@ services:
       - CART_PORT
       - FLAGD_HOST
       - FLAGD_PORT
-      - VALKEY_ADDR
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=cart
       - ASPNETCORE_URLS=http://*:${CART_PORT}
     depends_on:
-      valkey-cart:
-        condition: service_started
+
       otel-collector:
         condition: service_started
       flagd:
         condition: service_started
     logging: *logging
 
+  cart-dapr:
+    image: "daprio/daprd:edge"
+    container_name: cart-dapr
+    command: [
+      "./daprd",
+      "-app-id",
+      "product-catalog",
+      "-app-port",
+      "${PRODUCT_CATALOG_PORT}",
+      "-placement-host-address",
+      "dapr-placement:50006",
+      "-resources-path",
+      "/configuration/config.yaml",
+      "-config",
+      "/dapr/config.yaml"
+    ]
+    volumes:
+      - "./src/dapr/components/:/components"
+      - "./src/dapr/:/configuration"
+    depends_on:
+      - cart
+      - valkey-cart
+      - dapr-placement
+    network_mode: "service:cart"
+
   # Checkout service
   checkout:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-checkout
@@ -463,6 +487,19 @@ services:
         condition: service_started
     logging: *logging
 
+  product_db:
+    image: postgres:15.3-alpine3.18
+    restart: always
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres123
+    volumes:
+      - ./src/postgresql/product/init.sql:/docker-entrypoint-initdb.d/init.sql
+      - ./src/postgresql/data:/var/lib/postgresql/data
+    ports:
+      - 5436:5432
+
+
   # Product Catalog service
   product-catalog:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-product-catalog
@@ -496,8 +533,36 @@ services:
         condition: service_started
       flagd:
         condition: service_started
+
     logging: *logging
 
+  product-dapr:
+    image: "daprio/daprd:edge"
+    container_name: product-dapr
+    command: [
+      "./daprd",
+      "-app-id",
+      "product-catalog",
+      "-app-port",
+      "${PRODUCT_CATALOG_PORT}",
+      "-placement-host-address",
+      "dapr-placement:50006",
+      "-resources-path",
+      "/configuration/config.yaml",
+      "-config",
+      "/dapr/config.yaml"
+    ]
+    volumes:
+      - "./src/dapr/components/:/components"
+      - "./src/dapr/:/configuration"
+    depends_on:
+      product_db:
+        condition: service_started
+      dapr-placement:
+        condition: service_started
+    logging: *logging
+    network_mode: "service:product-catalog"
+
   # Quote service
   quote:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-quote
@@ -717,7 +782,15 @@ services:
       - "${VALKEY_PORT}"
     logging: *logging
 
-
+  # ********************
+  # Dapr Components
+  # ********************
+  dapr-placement:
+    image: "daprio/dapr"
+    container_name: dapr-placement
+    command: [ "./placement", "-port", "50006" ]
+    ports:
+      - "50006:50006"
   # ********************
   # Telemetry Components
   # ********************

src/accounting/Accounting.csproj

@@ -19,7 +19,11 @@
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.7" />
 		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
 		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
-		<PackageReference Include="OpenTelemetry.AutoInstrumentation" Version="1.12.0" />
+
+		<PackageReference Include="OpenTelemetry.AutoInstrumentation" Version="1.11.0" />
+        <PackageReference Include="Dapr.Client" Version="1.13.1" />
+        <PackageReference Include="Dapr.AspNetCore" Version="1.13.*-*" />
+
 	</ItemGroup>
 
 	<ItemGroup>

src/accounting/Program.cs

@@ -4,6 +4,8 @@
 using Accounting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Dapr;
+using Dapr.Client;
 
 Console.WriteLine("Accounting service started");
 

src/cart/src/Program.cs

@@ -20,20 +20,16 @@
 using OpenFeature.Hooks;
 
 var builder = WebApplication.CreateBuilder(args);
-string valkeyAddress = builder.Configuration["VALKEY_ADDR"];
-if (string.IsNullOrEmpty(valkeyAddress))
-{
-    Console.WriteLine("VALKEY_ADDR environment variable is required.");
-    Environment.Exit(1);
-}
+
 
 builder.Logging
     .AddOpenTelemetry(options => options.AddOtlpExporter())
     .AddConsole();
 
 builder.Services.AddSingleton<ICartStore>(x =>
 {
-    var store = new ValkeyCartStore(x.GetRequiredService<ILogger<ValkeyCartStore>>(), valkeyAddress);
+    var store = new DaprStateManagementCartStore(x.GetRequiredService<ILogger<DaprStateManagementCartStore>>(), "cart-state-store");
+
     store.Initialize();
     return store;
 });
@@ -50,7 +46,7 @@
 builder.Services.AddSingleton(x =>
     new CartService(
         x.GetRequiredService<ICartStore>(),
-        new ValkeyCartStore(x.GetRequiredService<ILogger<ValkeyCartStore>>(), "badhost:1234"),
+        new DaprStateManagementCartStore(x.GetRequiredService<ILogger<DaprStateManagementCartStore>>(), "bad-state-store"),
         x.GetRequiredService<IFeatureClient>()
 ));
 
@@ -84,8 +80,7 @@
 
 var app = builder.Build();
 
-var ValkeyCartStore = (ValkeyCartStore)app.Services.GetRequiredService<ICartStore>();
-app.Services.GetRequiredService<StackExchangeRedisInstrumentation>().AddConnection(ValkeyCartStore.GetConnection());
+
 
 app.MapGrpcService<CartService>();
 app.MapGrpcHealthChecksService();

src/cart/src/cart.csproj

@@ -30,9 +30,17 @@
     <PackageReference Include="OpenTelemetry.Resources.Host" Version="1.11.0-beta.2" />
     <PackageReference Include="StackExchange.Redis" Version="2.8.31" />
     <PackageReference Include="OpenFeature.Contrib.Providers.Flagd" Version="0.3.2" />
+
+
+    <PackageReference Include="Dapr.AspNetCore" Version="1.15.2" />
+
+
+
+
     <PackageReference Include="OpenFeature" Version="2.7.0" />
     <PackageReference Include="OpenFeature.DependencyInjection" Version="2.7.0" />
     <PackageReference Include="OpenFeature.Hosting" Version="2.7.0" />
+
   </ItemGroup>
 
   <ItemGroup>