Updating example with OTel community feedback

kubeshop · May 24, 2023 · f836786 · f836786
1 parent c7dfad9
commit f836786
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/examples/tracetesting-kubernetes/README.md b/examples/tracetesting-kubernetes/README.md
@@ -0,0 +1,6 @@
+# Tracetesting Kubernetes
+
+On this example, you can see two experiments that Tracetest team developed about enabling OpenTelemetry Tracing on Kubernetes and to start doing trace-based tests using `kubectl`.
+
+- [OpenTelemetry Tracing on Kubernetes using `k3d`](./setup-k8s-with-k3d.md)
+- [Running trace-based tests with kubectl](./setup-k3s.md)
diff --git a/examples/tracetesting-kubernetes/kubetracing/config.toml.tmpl b/examples/tracetesting-kubernetes/kubetracing/config.toml.tmpl
@@ -1,4 +1,3 @@
-# File generated by {{ .Program }}. DO NOT EDIT. Use config.toml.tmpl instead.
 version = 2
 
 [plugins."io.containerd.internal.v1.opt"]

diff --git a/examples/tracetesting-kubernetes/kubetracing/docker-compose.yaml b/examples/tracetesting-kubernetes/kubetracing/docker-compose.yaml
@@ -11,6 +11,8 @@ services:
       retries: 60
     image: jaegertracing/all-in-one:latest
     restart: unless-stopped
+    environment:
+      - COLLECTOR_OTLP_ENABLED=true
     ports:
       - 16686:16686
   otel-collector:

diff --git a/examples/tracetesting-kubernetes/kubetracing/otel-collector.yaml b/examples/tracetesting-kubernetes/kubetracing/otel-collector.yaml
@@ -4,7 +4,6 @@ receivers:
       grpc:
       http:
 processors:
-  # Data sources: traces
   probabilistic_sampler:
     hash_seed: 22
     sampling_percentage: 100
@@ -13,13 +12,13 @@ processors:
 exporters:
   logging:
     logLevel: debug
-  jaeger:
-    endpoint: jaeger:14250
+  otlp/jaeger:
+    endpoint: jaeger:4317
     tls:
       insecure: true
 service:
   pipelines:
     traces:
       receivers: [otlp]
       processors: [probabilistic_sampler, batch]
-      exporters: [jaeger,logging]
+      exporters: [otlp/jaeger,logging]
diff --git a/examples/tracetesting-kubernetes/setup-k8s-with-k3d.md b/examples/tracetesting-kubernetes/setup-k8s-with-k3d.md
@@ -31,7 +31,7 @@ k3d cluster create tracingcluster \
 5. A single test that you can do is to run: 
 
 ```sh
-kubectl run -it --rm --image=alpine echo-command -- echo Hi
+kubectl run -it --rm --restart=Never --image=alpine echo-command -- echo hi
 ```
 
 6. Going to Jaeger again on `http://localhost:16686`, choosing the `kubelet` service, operation `syncPod` and adding the tag `k8s.pod=default/echo-command`, we should be able to see spans related to this pod.