updated the docker-k8s-otel workshop

Author: dmitchsplunk

content/en/unsupported-field-workshops/11-docker-k8s-otel/1-connect-to-instance.md renamed to content/en/ninja-workshops/8-docker-k8s-otel/1-connect-to-instance.md

@@ -34,7 +34,13 @@ sudo sh /tmp/splunk-otel-collector.sh \
 {{% tab title="Example Output" %}}
 
 ``` bash
-TBD
+Splunk OpenTelemetry Collector Version: latest
+Memory Size in MIB: 512
+Realm: us1
+Ingest Endpoint: https://ingest.us1.signalfx.com
+API Endpoint: https://api.us1.signalfx.com
+HEC Endpoint: https://ingest.us1.signalfx.com/v1/log
+etc. 
 ```
 
 {{% /tab %}}
@@ -58,7 +64,18 @@ sudo systemctl status splunk-otel-collector
 {{% tab title="Example Output" %}}
 
 ``` bash
-TBD
+● splunk-otel-collector.service - Splunk OpenTelemetry Collector
+     Loaded: loaded (/lib/systemd/system/splunk-otel-collector.service; enabled; vendor preset: enabled)
+    Drop-In: /etc/systemd/system/splunk-otel-collector.service.d
+             └─service-owner.conf
+     Active: active (running) since Fri 2024-12-20 00:13:14 UTC; 45s ago
+   Main PID: 14465 (otelcol)
+      Tasks: 9 (limit: 19170)
+     Memory: 117.4M
+        CPU: 681ms
+     CGroup: /system.slice/splunk-otel-collector.service
+             └─14465 /usr/bin/otelcol
+
 ```
 
 {{% /tab %}}
@@ -79,7 +96,13 @@ sudo journalctl -u splunk-otel-collector
 {{% tab title="Example Output" %}}
 
 ``` bash
-TBD
+Dec 20 00:13:14 derek-1 systemd[1]: Started Splunk OpenTelemetry Collector.
+Dec 20 00:13:14 derek-1 otelcol[14465]: 2024/12/20 00:13:14 settings.go:483: Set config to /etc/otel/collector/agent_config.yaml
+Dec 20 00:13:14 derek-1 otelcol[14465]: 2024/12/20 00:13:14 settings.go:539: Set memory limit to 460 MiB
+Dec 20 00:13:14 derek-1 otelcol[14465]: 2024/12/20 00:13:14 settings.go:524: Set soft memory limit set to 460 MiB
+Dec 20 00:13:14 derek-1 otelcol[14465]: 2024/12/20 00:13:14 settings.go:373: Set garbage collection target percentage (GOGC) to 400
+Dec 20 00:13:14 derek-1 otelcol[14465]: 2024/12/20 00:13:14 settings.go:414: set "SPLUNK_LISTEN_INTERFACE" to "127.0.0.1"
+etc. 
 ```
 
 {{% /tab %}}

content/en/unsupported-field-workshops/11-docker-k8s-otel/10-troubleshoot-collector.md renamed to content/en/ninja-workshops/8-docker-k8s-otel/10-troubleshoot-collector.md

@@ -0,0 +1,190 @@
+---
+title: Deploy a .NET Application
+linkTitle: 3. Deploy a .NET Application
+weight: 3
+time: 10 minutes
+---
+
+## Prerequisites 
+
+Before deploying the application, we'll need to install the .NET 8 SDK on our instance.
+
+{{< tabs >}}
+{{% tab title="Script" %}}
+
+``` bash
+sudo apt-get update && \
+  sudo apt-get install -y dotnet-sdk-8.0
+```
+
+{{% /tab %}}
+{{% tab title="Example Output" %}}
+
+``` bash
+Hit:1 http://us-west-1.ec2.archive.ubuntu.com/ubuntu jammy InRelease
+Hit:2 http://us-west-1.ec2.archive.ubuntu.com/ubuntu jammy-updates InRelease                                               
+Hit:3 http://us-west-1.ec2.archive.ubuntu.com/ubuntu jammy-backports InRelease                                             
+Hit:4 http://security.ubuntu.com/ubuntu jammy-security InRelease                                                           
+Ign:5 https://splunk.jfrog.io/splunk/otel-collector-deb release InRelease
+Hit:6 https://splunk.jfrog.io/splunk/otel-collector-deb release Release
+Reading package lists... Done
+Reading package lists... Done
+Building dependency tree... Done
+Reading state information... Done
+The following additional packages will be installed:
+  aspnetcore-runtime-8.0 aspnetcore-targeting-pack-8.0 dotnet-apphost-pack-8.0 dotnet-host-8.0 dotnet-hostfxr-8.0 dotnet-runtime-8.0 dotnet-targeting-pack-8.0 dotnet-templates-8.0 liblttng-ust-common1
+  liblttng-ust-ctl5 liblttng-ust1 netstandard-targeting-pack-2.1-8.0
+The following NEW packages will be installed:
+  aspnetcore-runtime-8.0 aspnetcore-targeting-pack-8.0 dotnet-apphost-pack-8.0 dotnet-host-8.0 dotnet-hostfxr-8.0 dotnet-runtime-8.0 dotnet-sdk-8.0 dotnet-targeting-pack-8.0 dotnet-templates-8.0
+  liblttng-ust-common1 liblttng-ust-ctl5 liblttng-ust1 netstandard-targeting-pack-2.1-8.0
+0 upgraded, 13 newly installed, 0 to remove and 0 not upgraded.
+Need to get 138 MB of archives.
+After this operation, 495 MB of additional disk space will be used.
+etc. 
+```
+
+{{% /tab %}}
+{{< /tabs >}}
+
+Refer to [Install .NET SDK or .NET Runtime on Ubuntu](https://learn.microsoft.com/en-us/dotnet/core/install/linux-ubuntu-install?tabs=dotnet8&pivots=os-linux-ubuntu-2404)
+for further details.
+
+## Review the .NET Application
+
+In the terminal, navigate to the application directory: 
+
+``` bash
+cd ~/workshop/docker-k8s-otel/helloworld
+```
+
+We'll use a simple "Hello World" .NET application for this workshop.  The main logic is found 
+in the Program.cs file: 
+
+``` cs 
+using System.Globalization;
+
+using Microsoft.AspNetCore.Mvc;
+
+var builder = WebApplication.CreateBuilder(args);
+var app = builder.Build();
+
+string Hello([FromServices]ILogger<Program> logger, string? name)
+{
+    if (string.IsNullOrEmpty(name))
+    {
+        logger.LogInformation("Hello, World!);
+    }
+    else
+    {
+        logger.LogInformation("Hello, {result}!", name);
+    }
+
+    return result.ToString(CultureInfo.InvariantCulture);
+}
+
+app.MapGet("/hello/{name?}", Hello);
+
+app.Run();
+```
+
+## Build and Run the .NET Application
+
+We can build the application using the following command:
+
+{{< tabs >}}
+{{% tab title="Script" %}}
+
+``` bash
+dotnet build
+```
+
+{{% /tab %}}
+{{% tab title="Example Output" %}}
+
+``` bash
+MSBuild version 17.8.5+b5265ef37 for .NET
+  Determining projects to restore...
+  All projects are up-to-date for restore.
+  helloworld -> /home/splunk/workshop/docker-k8s-otel/helloworld/bin/Debug/net8.0/helloworld.dll
+
+Build succeeded.
+    0 Warning(s)
+    0 Error(s)
+
+Time Elapsed 00:00:02.04
+```
+
+{{% /tab %}}
+{{< /tabs >}}
+
+If that's successful, we can run it as follows: 
+
+{{< tabs >}}
+{{% tab title="Script" %}}
+
+``` bash
+dotnet run
+```
+
+{{% /tab %}}
+{{% tab title="Example Output" %}}
+
+``` bash
+Building...
+info: Microsoft.Hosting.Lifetime[14]
+      Now listening on: http://localhost:8080
+info: Microsoft.Hosting.Lifetime[0]
+      Application started. Press Ctrl+C to shut down.
+info: Microsoft.Hosting.Lifetime[0]
+      Hosting environment: Development
+info: Microsoft.Hosting.Lifetime[0]
+      Content root path: /home/splunk/workshop/docker-k8s-otel/helloworld
+```
+
+{{% /tab %}}
+{{< /tabs >}}
+
+Once it's running, open a second SSH terminal and access the application using curl: 
+
+{{< tabs >}}
+{{% tab title="Script" %}}
+
+``` bash
+curl http://localhost:8080/hello
+```
+
+{{% /tab %}}
+{{% tab title="Example Output" %}}
+
+``` bash
+Hello, World! 
+```
+
+{{% /tab %}}
+{{< /tabs >}}
+
+You can also pass in your name: 
+
+{{< tabs >}}
+{{% tab title="Script" %}}
+
+``` bash
+curl http://localhost:8080/hello/Tom
+```
+
+{{% /tab %}}
+{{% tab title="Example Output" %}}
+
+``` bash
+Hello, Tom! 
+```
+
+{{% /tab %}}
+{{< /tabs >}}
+
+## Next Steps
+
+What are the two methods that we can use to instrument our application with OpenTelemetry?  
+
+Hint:  see [Instrument your .NET application for Splunk Observability Cloud](https://docs.splunk.com/observability/en/gdi/get-data-in/application/otel-dotnet/instrumentation/instrument-dotnet-application.html) 
+for a discussion of the options. 

content/en/unsupported-field-workshops/11-docker-k8s-otel/11-summary.md renamed to content/en/ninja-workshops/8-docker-k8s-otel/11-summary.md

@@ -17,6 +17,8 @@ which we'll use to instrument our .NET application:
 {{% tab title="Script" %}}
 
 ``` bash
+cd ~/workshop/docker-k8s-otel/helloworld
+
 curl -sSfL https://github.com/signalfx/splunk-otel-dotnet/releases/latest/download/splunk-otel-dotnet-install.sh -O
 ```
 
@@ -50,17 +52,30 @@ sh ./splunk-otel-dotnet-install.sh
 
 Next, we can activate the OpenTelemetry instrumentation: 
 
+{{< tabs >}}
+{{% tab title="Script" %}}
+
 ``` bash
 . $HOME/.splunk-otel-dotnet/instrument.sh
 ```
 
+{{% /tab %}}
+{{% tab title="Example Output" %}}
+
+``` bash
+Downloading v1.8.0 for linux-glibc (/tmp/tmp.m3tSdtbmge/splunk-opentelemetry-dotnet-linux-glibc-x64.zip)...
+```
+
+{{% /tab %}}
+{{< /tabs >}}
+
 ## Set the Deployment Environment
 
 Let's set the deployment environment, to ensure our data flows into its own 
 environment within Splunk Observability Cloud: 
 
 ``` bash 
-export OTEL_RESOURCE_ATTRIBUTES='deployment.environment='otel-$INSTANCE'
+export OTEL_RESOURCE_ATTRIBUTES=deployment.environment=otel-$INSTANCE
 ```
 
 ## A Challenge For You 
@@ -117,23 +132,68 @@ As before, it should return `Hello, World!`.
 If you enabled trace logging, you should see a trace written the console or collector logs such as the following: 
 
 ````
-TODO
+info: Program[0]
+      /hello endpoint invoked anonymously
+Activity.TraceId:            c7bbf57314e4856447508cd8addd49b0
+Activity.SpanId:             1c92ac653c3ece27
+Activity.TraceFlags:         Recorded
+Activity.ActivitySourceName: Microsoft.AspNetCore
+Activity.DisplayName:        GET /hello/{name?}
+Activity.Kind:               Server
+Activity.StartTime:          2024-12-20T00:45:25.6551267Z
+Activity.Duration:           00:00:00.0006464
+Activity.Tags:
+    server.address: localhost
+    server.port: 8080
+    http.request.method: GET
+    url.scheme: http
+    url.path: /hello
+    network.protocol.version: 1.1
+    user_agent.original: curl/7.81.0
+    http.route: /hello/{name?}
+    http.response.status_code: 200
+Resource associated with Activity:
+    splunk.distro.version: 1.8.0
+    telemetry.distro.name: splunk-otel-dotnet
+    telemetry.distro.version: 1.8.0
+    service.name: helloworld
+    os.type: linux
+    os.description: Ubuntu 22.04.5 LTS
+    os.build_id: 6.8.0-1021-aws
+    os.name: Ubuntu
+    os.version: 22.04
+    host.name: derek-1
+    host.id: 20cf15fcc7054b468647b73b8f87c556
+    process.owner: splunk
+    process.pid: 16997
+    process.runtime.description: .NET 8.0.11
+    process.runtime.name: .NET
+    process.runtime.version: 8.0.11
+    container.id: 2
+    telemetry.sdk.name: opentelemetry
+    telemetry.sdk.language: dotnet
+    telemetry.sdk.version: 1.9.0
+    deployment.environment: otel-derek-1
 ````
 
 ## View your application in Splunk Observability Cloud
 
-Now that the setup is complete, let's confirm that it's sending data to **Splunk Observability Cloud**.  Note that when the application is deployed for the first time, it may take a few minutes for the data to appear.
+Now that the setup is complete, let's confirm that traces are sent to **Splunk Observability Cloud**.  Note that when the application is deployed for the first time, it may take a few minutes for the data to appear.
 
 Navigate to APM, then use the Environment dropdown to select your environment (i.e. `otel-instancename`).
 
 If everything was deployed correctly, you should see `helloworld` displayed in the list of services:
 
 ![APM Overview](../images/apm_overview.png)
 
-Click on **Explore** on the right-hand side to view the service map.  
+Click on **Service Map** on the right-hand side to view the service map.  
 
 ![Service Map](../images/service_map.png)
 
 Next, click on **Traces** on the right-hand side to see the traces captured for this application. 
 
 ![Traces](../images/traces.png)
+
+An individual trace should look like the following: 
+
+![Traces](../images/trace.png)