Merge branch 'main' into main

open-telemetry · Aug 31, 2023 · b80f8fd · b80f8fd
2 parents 6f03f2d + d7b8070
commit b80f8fd
Show file tree

Hide file tree

Showing 40 changed files with 77 additions and 127 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ release.
 
 ## Unreleased
 
+* update trace-based tests to test stream events
+  ([#1072](https://github.com/open-telemetry/opentelemetry-demo/pull/1072))
 * Add cartServiceFailure feature flag triggering Cart Service errors
   ([#824](https://github.com/open-telemetry/opentelemetry-demo/pull/824))
 * [paymentservice] update JS SDKs to 1.12.0/0.38.0

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -762,6 +762,7 @@ services:
       - PRODUCT_CATALOG_SERVICE_ADDR
       - RECOMMENDATION_SERVICE_ADDR
       - SHIPPING_SERVICE_ADDR
+      - KAFKA_SERVICE_ADDR
     extra_hosts:
       - "host.docker.internal:host-gateway"
     depends_on:
@@ -790,6 +791,10 @@ services:
         condition: service_started
       quoteservice:
         condition: service_started
+      accountingservice:
+        condition: service_started
+      frauddetectionservice:
+        condition: service_started
 
   tracetest-server:
     image: kubeshop/tracetest:latest

diff --git a/src/cartservice/src/cartstore/LocalCartStore.cs b/src/cartservice/src/cartstore/LocalCartStore.cs
diff --git a/test/tracetesting/ad-service/all.yaml b/test/tracetesting/ad-service/all.yaml
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-type: Transaction
+type: TestSuite
 spec:
   id: ad-service-all
   name: 'Ad Service'

diff --git a/test/tracetesting/ad-service/get.yaml b/test/tracetesting/ad-service/get.yaml
@@ -10,7 +10,7 @@ spec:
     type: grpc
     grpc:
       protobufFile: ../../../pb/demo.proto
-      address: ${env:AD_SERVICE_ADDR}
+      address: ${var:AD_SERVICE_ADDR}
       method: oteldemo.AdService.GetAds
       request: |-
         {

diff --git a/test/tracetesting/cart-service/add-item-to-cart.yaml b/test/tracetesting/cart-service/add-item-to-cart.yaml
@@ -10,7 +10,7 @@ spec:
     type: grpc
     grpc:
       protobufFile: ../../../pb/demo.proto
-      address: ${env:CART_SERVICE_ADDR}
+      address: ${var:CART_SERVICE_ADDR}
       method: oteldemo.CartService.AddItem
       request: |-
         {

diff --git a/test/tracetesting/cart-service/all.yaml b/test/tracetesting/cart-service/all.yaml
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-type: Transaction
+type: TestSuite
 spec:
   id: cart-all
   name: 'Cart Service'

diff --git a/test/tracetesting/cart-service/check-if-cart-is-empty.yaml b/test/tracetesting/cart-service/check-if-cart-is-empty.yaml
@@ -10,7 +10,7 @@ spec:
     type: grpc
     grpc:
       protobufFile: ../../../pb/demo.proto
-      address: ${env:CART_SERVICE_ADDR}
+      address: ${var:CART_SERVICE_ADDR}
       method: oteldemo.CartService.GetCart
       request: |-
         {

diff --git a/test/tracetesting/cart-service/check-if-cart-is-populated.yaml b/test/tracetesting/cart-service/check-if-cart-is-populated.yaml
@@ -10,7 +10,7 @@ spec:
     type: grpc
     grpc:
       protobufFile: ../../../pb/demo.proto
-      address: ${env:CART_SERVICE_ADDR}
+      address: ${var:CART_SERVICE_ADDR}
       method: oteldemo.CartService.GetCart
       request: |-
         {

diff --git a/test/tracetesting/cart-service/empty-cart.yaml b/test/tracetesting/cart-service/empty-cart.yaml
@@ -10,7 +10,7 @@ spec:
     type: grpc
     grpc:
       protobufFile: ../../../pb/demo.proto
-      address: ${env:CART_SERVICE_ADDR}
+      address: ${var:CART_SERVICE_ADDR}
       method: oteldemo.CartService.EmptyCart
       request: |-
         {

diff --git a/test/tracetesting/checkout-service/all.yaml b/test/tracetesting/checkout-service/all.yaml
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-type: Transaction
+type: TestSuite
 spec:
   id: checkout-service-all
   name: 'Checkout Service'

diff --git a/test/tracetesting/checkout-service/place-order.yaml b/test/tracetesting/checkout-service/place-order.yaml
@@ -10,7 +10,7 @@ spec:
     type: grpc
     grpc:
       protobufFile: ../../../pb/demo.proto
-      address: ${env:CHECKOUT_SERVICE_ADDR}
+      address: ${var:CHECKOUT_SERVICE_ADDR}
       method: oteldemo.CheckoutService.PlaceOrder
       request: |-
         {
@@ -44,3 +44,7 @@ spec:
       rpc.system="grpc" rpc.method="PlaceOrder" rpc.service="oteldemo.CheckoutService"]
     assertions:
     - attr:rpc.grpc.status_code = 0
+  - name: It sends an order to be processed asyncronously
+    selector: span[tracetest.span.type="messaging" name="orders send" messaging.system="kafka" messaging.destination="orders" messaging.destination_kind="topic" messaging.operation="send"]
+    assertions:
+    - attr:messaging.destination = "orders"
diff --git a/test/tracetesting/currency-service/all.yaml b/test/tracetesting/currency-service/all.yaml
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-type: Transaction
+type: TestSuite
 spec:
   id: currency-service-all
   name: 'Currency Service'

diff --git a/test/tracetesting/currency-service/convert.yaml b/test/tracetesting/currency-service/convert.yaml
@@ -10,7 +10,7 @@ spec:
     type: grpc
     grpc:
       protobufFile: ../../../pb/demo.proto
-      address: ${env:CURRENCY_SERVICE_ADDR}
+      address: ${var:CURRENCY_SERVICE_ADDR}
       method: oteldemo.CurrencyService.Convert
       request: |-
         {

diff --git a/test/tracetesting/currency-service/supported.yaml b/test/tracetesting/currency-service/supported.yaml
@@ -10,7 +10,7 @@ spec:
     type: grpc
     grpc:
       protobufFile: ../../../pb/demo.proto
-      address: ${env:CURRENCY_SERVICE_ADDR}
+      address: ${var:CURRENCY_SERVICE_ADDR}
       method: oteldemo.CurrencyService.GetSupportedCurrencies
   specs:
   - name: It has a span called "CurrencyService/GetSupportedCurrencies"

diff --git a/test/tracetesting/email-service/all.yaml b/test/tracetesting/email-service/all.yaml
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-type: Transaction
+type: TestSuite
 spec:
   id: email-service-all
   name: 'Email Service'

diff --git a/test/tracetesting/email-service/confirmation.yaml b/test/tracetesting/email-service/confirmation.yaml
@@ -9,7 +9,7 @@ spec:
   trigger:
     type: http
     httpRequest:
-      url: ${env:EMAIL_SERVICE_ADDR}/send_order_confirmation
+      url: ${var:EMAIL_SERVICE_ADDR}/send_order_confirmation
       method: POST
       headers:
       - key: Content-Type

diff --git a/test/tracetesting/frontend-service/01-see-ads.yaml b/test/tracetesting/frontend-service/01-see-ads.yaml
@@ -9,7 +9,7 @@ spec:
   trigger:
     type: http
     httpRequest:
-      url: http://${env:FRONTEND_ADDR}/api/data
+      url: http://${var:FRONTEND_ADDR}/api/data
       method: GET
       headers:
       - key: Content-Type

diff --git a/test/tracetesting/frontend-service/02-get-product-recommendation.yaml b/test/tracetesting/frontend-service/02-get-product-recommendation.yaml
@@ -9,7 +9,7 @@ spec:
   trigger:
     type: http
     httpRequest:
-      url: http://${env:FRONTEND_ADDR}/api/recommendations
+      url: http://${var:FRONTEND_ADDR}/api/recommendations
       method: GET
       headers:
       - key: Content-Type

diff --git a/test/tracetesting/frontend-service/03-browse-product.yaml b/test/tracetesting/frontend-service/03-browse-product.yaml
@@ -9,7 +9,7 @@ spec:
   trigger:
     type: http
     httpRequest:
-      url: http://${env:FRONTEND_ADDR}/api/products/0PUK6V6EV0
+      url: http://${var:FRONTEND_ADDR}/api/products/0PUK6V6EV0
       method: GET
       headers:
       - key: Content-Type

diff --git a/test/tracetesting/frontend-service/04-add-product-to-cart.yaml b/test/tracetesting/frontend-service/04-add-product-to-cart.yaml
@@ -9,7 +9,7 @@ spec:
   trigger:
     type: http
     httpRequest:
-      url: http://${env:FRONTEND_ADDR}/api/cart
+      url: http://${var:FRONTEND_ADDR}/api/cart
       method: POST
       headers:
       - key: Content-Type

diff --git a/test/tracetesting/frontend-service/05-view-cart.yaml b/test/tracetesting/frontend-service/05-view-cart.yaml
@@ -9,7 +9,7 @@ spec:
   trigger:
     type: http
     httpRequest:
-      url: http://${env:FRONTEND_ADDR}/api/cart?userId=2491f868-88f1-4345-8836-d5d8511a9f83
+      url: http://${var:FRONTEND_ADDR}/api/cart?userId=2491f868-88f1-4345-8836-d5d8511a9f83
       method: GET
       headers:
       - key: Content-Type

diff --git a/test/tracetesting/frontend-service/06-checking-out-cart.yaml b/test/tracetesting/frontend-service/06-checking-out-cart.yaml
@@ -9,7 +9,7 @@ spec:
   trigger:
     type: http
     httpRequest:
-      url: http://${env:FRONTEND_ADDR}/api/checkout
+      url: http://${var:FRONTEND_ADDR}/api/checkout
       method: POST
       headers:
       - key: Content-Type
@@ -38,23 +38,37 @@ spec:
     selector: span[tracetest.span.type="general" name="Tracetest trigger"]
     assertions:
     - attr:tracetest.response.status = 200
-  - selector: span[tracetest.span.type="rpc" name="oteldemo.CheckoutService/PlaceOrder" rpc.system="grpc" rpc.method="PlaceOrder" rpc.service="oteldemo.CheckoutService"]
-    name: "The order was placed"
+  - name: "The order was placed"
+    selector: span[tracetest.span.type="rpc" name="oteldemo.CheckoutService/PlaceOrder" rpc.system="grpc" rpc.method="PlaceOrder" rpc.service="oteldemo.CheckoutService"]
     assertions:
     - attr:app.user.id = "2491f868-88f1-4345-8836-d5d8511a9f83"
     - attr:app.order.items.count = 1
-  - selector: span[tracetest.span.type="rpc" name="oteldemo.PaymentService/Charge" rpc.system="grpc" rpc.method="Charge" rpc.service="oteldemo.PaymentService"]
-    name: "The user was charged"
+  - name: "The user was charged"
+    selector: span[tracetest.span.type="rpc" name="oteldemo.PaymentService/Charge" rpc.system="grpc" rpc.method="Charge" rpc.service="oteldemo.PaymentService"]
     assertions:
     - attr:rpc.grpc.status_code  =  0
     - attr:tracetest.selected_spans.count >= 1
-  - selector: span[tracetest.span.type="rpc" name="oteldemo.ShippingService/ShipOrder" rpc.system="grpc" rpc.method="ShipOrder" rpc.service="oteldemo.ShippingService"]
-    name: "The product was shipped"
+  - name: "The product was shipped"
+    selector: span[tracetest.span.type="rpc" name="oteldemo.ShippingService/ShipOrder" rpc.system="grpc" rpc.method="ShipOrder" rpc.service="oteldemo.ShippingService"]
     assertions:
     - attr:rpc.grpc.status_code = 0
     - attr:tracetest.selected_spans.count >= 1
-  - selector: span[tracetest.span.type="rpc" name="oteldemo.CartService/EmptyCart" rpc.system="grpc" rpc.method="EmptyCart" rpc.service="oteldemo.CartService"]
-    name: "The cart was emptied"
+  - name: "The cart was emptied"
+    selector: span[tracetest.span.type="rpc" name="oteldemo.CartService/EmptyCart" rpc.system="grpc" rpc.method="EmptyCart" rpc.service="oteldemo.CartService"]
     assertions:
     - attr:rpc.grpc.status_code = 0
     - attr:tracetest.selected_spans.count >= 1
+  - name: The order was sent to be processed asyncronously
+    selector: span[tracetest.span.type="messaging" name="orders send" messaging.system="kafka" messaging.destination="orders" messaging.destination_kind="topic" messaging.operation="send"]
+    assertions:
+    - attr:messaging.destination = "orders"
+  - name: The order was sent to accountability
+    # captures the span emitted by Kafka instrumentation for Go
+    selector: span[tracetest.span.type="messaging" name="orders receive" messaging.system="kafka" messaging.destination="orders" messaging.destination_kind="topic" messaging.operation="receive"]
+    assertions:
+    - attr:name = "orders receive"
+  - name: The order was sent to fraud detection team
+    # captures the span emitted by Kafka instrumentation for Kotlin
+    selector: span[tracetest.span.type="messaging" name="orders process" messaging.system="kafka" messaging.operation="process"]
+    assertions:
+    - attr:name = "orders process"
diff --git a/test/tracetesting/frontend-service/all.yaml b/test/tracetesting/frontend-service/all.yaml
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-type: Transaction
+type: TestSuite
 spec:
   id: frontend-all
   name: 'Frontend Service'

diff --git a/test/tracetesting/payment-service/all.yaml b/test/tracetesting/payment-service/all.yaml
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-type: Transaction
+type: TestSuite
 spec:
   id: payment-service-all
   name: 'Payment Service'

diff --git a/test/tracetesting/payment-service/amex-credit-card-not-allowed.yaml b/test/tracetesting/payment-service/amex-credit-card-not-allowed.yaml
@@ -10,7 +10,7 @@ spec:
     type: grpc
     grpc:
       protobufFile: ../../../pb/demo.proto
-      address: ${env:PAYMENT_SERVICE_ADDR}
+      address: ${var:PAYMENT_SERVICE_ADDR}
       method: oteldemo.PaymentService.Charge
       request: |-
         {

diff --git a/test/tracetesting/payment-service/expired-credit-card.yaml b/test/tracetesting/payment-service/expired-credit-card.yaml
@@ -10,7 +10,7 @@ spec:
     type: grpc
     grpc:
       protobufFile: ../../../pb/demo.proto
-      address: ${env:PAYMENT_SERVICE_ADDR}
+      address: ${var:PAYMENT_SERVICE_ADDR}
       method: oteldemo.PaymentService.Charge
       request: |-
         {

diff --git a/test/tracetesting/payment-service/invalid-credit-card.yaml b/test/tracetesting/payment-service/invalid-credit-card.yaml
@@ -10,7 +10,7 @@ spec:
     type: grpc
     grpc:
       protobufFile: ../../../pb/demo.proto
-      address: ${env:PAYMENT_SERVICE_ADDR}
+      address: ${var:PAYMENT_SERVICE_ADDR}
       method: oteldemo.PaymentService.Charge
       request: |-
         {

diff --git a/test/tracetesting/payment-service/valid-credit-card.yaml b/test/tracetesting/payment-service/valid-credit-card.yaml
@@ -10,7 +10,7 @@ spec:
     type: grpc
     grpc:
       protobufFile: ../../../pb/demo.proto
-      address: ${env:PAYMENT_SERVICE_ADDR}
+      address: ${var:PAYMENT_SERVICE_ADDR}
       method: oteldemo.PaymentService.Charge
       request: |-
         {