Fixed exercises and flow

Author: rcastley

content/en/s4r/6-apm/4-apm-service-breakdown.md

@@ -5,9 +5,8 @@ weight: 4
 
 {{% notice title="Exercise" style="green" icon="running" %}}
 
-* From the service map view, click on **paymentservice** to select it. You can use the Breakdown selector to break the service down by any indexed span tag.
-* In the right-hand pane there is a button {{% button style="grey"  %}}Breakdown{{% /button %}}. Click on this button to view the tags the service can be broken down by.
-* Select `tenant.level`.
+* In the right-hand pane click on the {{% button style="grey"  %}}Breakdown{{% /button %}}.
+* Select `tenant.level` in the list.
 * Click on **gold** to select it.
 * Click on {{% button style="grey"  %}}Breakdown{{% /button %}} and select `version`.
 * Repeat this for **silver** and **bronze**.

content/en/s4r/6-apm/5-apm-trace-analyzer.md

@@ -7,19 +7,18 @@ Splunk Observability Cloud provides several tools for exploring application moni
 
 {{% notice title="Exercise" style="green" icon="running" %}}
 
-* In the right-hand pane, click on **Traces**. To ensure we are using **Trace Analyzer** make sure the button {{% button %}}Switch to Classic View{{% /button %}} is showing. If it is not, click on {{% button style="blue" %}}Switch to Trace Analyzer{{% /button %}}.
+* In the right-hand pane, click on **Traces**.
+* To ensure we are using **Trace Analyzer** make sure the button {{% button %}}Switch to Classic View{{% /button %}} is showing. If it is not, click on {{% button style="blue" %}}Switch to Trace Analyzer{{% /button %}}.
 
 {{% /notice %}}
 
 ![APM Trace Analyzer](../images/apm-trace-analyzer.png)
 
-In **Trace Analyzer** you can filter traces by any indexed/unindexed span tag. In this case, we want to filter the traces by `version` as we know from the previous exercise that `v350.10` is causing problems.
-
 {{% notice title="Exercise" style="green" icon="running" %}}
 
 * In the time picker select **Last 1 hour**.
 * Make sure the **Sample Ratio** is set to `1:1` and **not** `1:10`.
-* Click on **Add filters**, type in **orderId** and select **orderId** from the **Unindexed Tags** list.
+* Click on **Add filters**, type in **orderId** and select **orderId** from the list.
 * Paste in your **Order Confirmation ID** from when you went shopping earlier in the workshop and hit enter.
   ![Traces by Duration](../images/apm-trace-by-duration.png)
 

content/en/s4r/6-apm/6-apm-waterfall.md

@@ -11,19 +11,19 @@ Each span in Splunk APM captures a single operation. Splunk APM considers a span
 
 {{% notice title="Exercise" style="green" icon="running" %}}
 
-* Click on the {{% button style="red"  %}}!{{% /button %}} next to the **paymentservice** span in the waterfall.
+* Click on the {{% button style="red"  %}}!{{% /button %}} next to any of the `paymentservice:grpc.hipstershop.PaymentService/Charge` spans in the waterfall.
+
 {{< tabs >}}
 {{% tab title="Question" %}}
-**What is the error message being reported in the span metadata?**
+**What is the error message and version being reported in the span metadata?**
 {{% /tab %}}
 {{% tab title="Answer" %}}
-**Invalid request**
+**Invalid request and `v350.10`**
 {{% /tab %}}
 {{< /tabs >}}
 
 {{% /notice %}}
-
-At the very bottom of the **Trace Waterfall** click on the word **Logs (1)**. This highlights that there are **Related Logs** for this trace.
+Now that we have identified the version of the **paymentservice** that is causing the issue, let's see if we can find out more information about the error. This is where **Related Logs** come in.
 
 ![Related Logs](../images/apm-related-logs.png)
 
@@ -35,4 +35,9 @@ Related Content relies on specific metadata that allow APM, Infrastructure Monit
 * `trace_id`
 * `span_id`
 
-Click on the **Related Logs** link to view the logs for this trace. This will open the **Log Observer** in a new tab.
+{{% notice title="Exercise" style="green" icon="running" %}}
+
+* At the very bottom of the **Trace Waterfall** click on the word **Logs (1)**. This highlights that there are **Related Logs** for this trace.
+* Click on the **Logs for trace** entry in the pop-up, the will open the **Log Observer** view in a new tab.
+
+{{% /notice %}}