Merge remote-tracking branch 'upstream/main' into daocloud

openinsight-proj · Sep 5, 2023 · e1daec5 · e1daec5
2 parents 4d58aee + 315b3ea
commit e1daec5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -85,6 +85,8 @@ release.
   ([#1085](https://github.com/open-telemetry/opentelemetry-demo/pull/1085))
 * [cartservice] Support for logs
   ([#1086](https://github.com/open-telemetry/opentelemetry-demo/pull/1086))
+* [TraceTests] Update span attributes to align with new IBM/sarama instrumentation
+  ([#1096](https://github.com/open-telemetry/opentelemetry-demo/pull/1096))
 
 ## 1.4.0
 

diff --git a/test/tracetesting/checkout-service/place-order.yaml b/test/tracetesting/checkout-service/place-order.yaml
@@ -45,6 +45,6 @@ spec:
     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"]
+    selector: span[tracetest.span.type="messaging" name="orders publish" messaging.system="kafka" messaging.destination.name="orders" messaging.destination.kind="topic" messaging.operation="publish"]
     assertions:
-    - attr:messaging.destination = "orders"
+    - attr:messaging.destination.name = "orders"
diff --git a/test/tracetesting/frontend-service/06-checking-out-cart.yaml b/test/tracetesting/frontend-service/06-checking-out-cart.yaml
@@ -59,12 +59,12 @@ spec:
     - 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"]
+    selector: span[tracetest.span.type="messaging" name="orders publish" messaging.system="kafka" messaging.destination.name="orders" messaging.destination.kind="topic" messaging.operation="publish"]
     assertions:
-    - attr:messaging.destination = "orders"
+    - attr:messaging.destination.name = "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"]
+    selector: span[tracetest.span.type="messaging" name="orders receive" messaging.system="kafka" messaging.destination.name="orders" messaging.destination.kind="topic" messaging.operation="receive"]
     assertions:
     - attr:name = "orders receive"
   - name: The order was sent to fraud detection team