logs injection working

Author: hagen-p

content/en/other/3-auto-instrumentation/3-java-microservices-pet-clinic/30-auto-instrumentation.md

@@ -10,17 +10,16 @@ In the previous chapter, we enabled the OpenTelemetry Collector for Kubernetes o
 It is important to understand that Zero Config Auto instrumentation is designed to get Trace/Span & Profiling data out of your existing application, without requiring  you to change your code or requiring to rebuild.
 {{% /notice %}}
 
-
 For this workshop we will be using the Zero config option of the Opentelemetry Collector in Kubernetes.
 This means that the Collector monitors you pods running in Kubernetes, and if they match certain criteria, they will en able auto instrumentation on the pod.
 
-For Java this is the Kubernetes TAG `instrumentation.opentelemetry.io/inject-java\` set to `true`
+For Java it is looking for the Kubernetes TAG `instrumentation.opentelemetry.io/inject-java\` set to `true`
 
 ## 1. Setting up Java auto instrumentation on the first pod
 
 If you enable Zero configuration for a pod, the Collector will attach an initContainer to your existing pod, and restart the pod to activate it.
 
-To show what happens when you enable Auto instrumentation let first do a for & after of the content of a pod, the `api-gateway` in this case:
+To show what happens when you enable Auto instrumentation, lets do a For & After of the content of a pod, the `api-gateway` in this case:
 
 ```bash
 kubectl describe pods api-gateway |grep Image:
@@ -32,6 +31,8 @@ The resulting output should say:
 Image:         quay.io/phagen/spring-petclinic-api-gateway:0.0.2
 ```
 
+This container is pulled from a remote repository `quay.io` and as you will see 
+
 Lets add the Java auto instrumentation TAG to the api-gateway service first with the `kubectl patch deployment` command.
 {{< tabs >}}
 {{% tab title="Patch api-gateway service" %}}

content/en/other/3-auto-instrumentation/3-java-microservices-pet-clinic/60-log-observer-connect.md

@@ -101,7 +101,7 @@ The Services are now ready to be build, so run the script that will use the `mav
 {{% tab title="Running maven" %}}
 
 ```bash
-./mvnw clean install -DskipTests -P buildDocker
+./mvnw clean install -D skipTests -P buildDocker
 ```
 
 {{% /tab %}}
@@ -195,7 +195,7 @@ The result should be :
 
 ## 5. Deploy new services to kubernetes
 
-To see the changes in effect, we need to redeploy the services,  First let change the location of the images from the exterenal repo  to the local one by running the following script:
+To see the changes in effect, we need to redeploy the services,  First let change the location of the images from the external repo  to the local one by running the following script:
 
 ```bash
 . ~/workshop/petclinic/scripts/set_local.sh

workshop/petclinic/scripts/add_otel.sh

@@ -15,9 +15,15 @@ new_dependencies="
         </dependency> 
         <dependency>
             <groupId>io.opentelemetry.instrumentation</groupId>
-            <artifactId>opentelemetry-logback-mdc-1.0</artifactId>
+            <artifactId>opentelemetry-logback-appender-1.0</artifactId>
             <version>2.0.0-alpha</version>
-        </dependency>"
+        </dependency>
+        <dependency>
+            <groupId>io.opentelemetry.instrumentation</groupId>
+            <artifactId>opentelemetry-logback-mdc-1.0</artifactId>
+             <version>2.0.0-alpha</version>
+        </dependency>
+"
 
 # Loop through the specified directories
 for dir in "${directories[@]}"; do

workshop/petclinic/scripts/tail_logs.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Specify the constant prefix
+pod_prefix="petclinic-loadgen-deployment-"
+
+# Get the current pod name with the specified prefix
+pod_name=$(kubectl get pods -o=name | grep "$pod_prefix" | cut -d'/' -f 2)
+
+# Check if a pod with the specified prefix is found
+if [ -n "$pod_name" ]; then
+    # Continuously tail the logs from the specified pod
+    kubectl logs -f "$pod_name"
+else
+    echo "Error: No pod found with the specified prefix."
+fi

workshop/petclinic/scripts/update_logback.sh

@@ -1,27 +1,47 @@
 #!/bin/bash
 
+# '<?xml version="1.0" encoding="UTF-8"?>
+# <configuration>
+#     <include resource="org/springframework/boot/logging/logback/base.xml"/>
+#     <!-- Required for Loglevel managment into the Spring Petclinic Admin Server-->
+#     <jmxConfigurator/>
+#     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+#         <encoder>
+#           <pattern>
+#             %d{yyyy-MM-dd HH:mm:ss} - %logger{36} - %msg trace_id=%X{trace_id} span_id=%X{span_id} trace_flags=%X{trace_flags} %n service.name=%property{otel.resource.service.name}, deployment.environment=%property{otel.resource.deployment.environment}: %m%n
+#           </pattern>
+#         </encoder> 
+#     </appender>
+
+#     <!-- Just wrap your logging appender, for example ConsoleAppender, with OpenTelemetryAppender -->
+#     <appender name="OTEL" class="io.opentelemetry.instrumentation.logback.mdc.v1_0.OpenTelemetryAppender">
+#       <appender-ref ref="CONSOLE"/>
+#     </appender>
+
+#      <!-- Use the wrapped "OTEL" appender instead of the original "CONSOLE" one -->
+#      <root level="INFO">
+#        <appender-ref ref="OTEL"/>
+#      </root>
+# </configuration>'
+
+
 xml_content='<?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
-    <!-- Required for Loglevel managment into the Spring Petclinic Admin Server-->
-    <jmxConfigurator/>
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-          <pattern>
-            %d{yyyy-MM-dd HH:mm:ss} - %logger{36} - %msg trace_id=%X{trace_id} span_id=%X{span_id} trace_flags=%X{trace_flags} %n service.name=%property{otel.resource.service.name}, deployment.environment=%property{otel.resource.deployment.environment}: %m%n
-          </pattern>
-        </encoder> 
+            <pattern>
+                logback: %d{HH:mm:ss.SSS} [%thread] %level %logger{36} - trace_id=%X{trace_id} span_id=%X{span_id} service.name=%property{otel.resource.service.name} trace_flags=%X{trace_flags} - %msg %kvp{DOUBLE}%n
+        </encoder>
     </appender>
-
-    <!-- Just wrap your logging appender, for example ConsoleAppender, with OpenTelemetryAppender -->
-    <appender name="OTEL" class="io.opentelemetry.instrumentation.logback.mdc.v1_0.OpenTelemetryAppender">
-      <appender-ref ref="CONSOLE"/>
+    <appender name="OpenTelemetry"
+              class="io.opentelemetry.instrumentation.logback.appender.v1_0.OpenTelemetryAppender">
+        <captureExperimentalAttributes>true</captureExperimentalAttributes>
+        <captureKeyValuePairAttributes>true</captureKeyValuePairAttributes>
     </appender>
-
-     <!-- Use the wrapped "OTEL" appender instead of the original "CONSOLE" one -->
-     <root level="INFO">
-       <appender-ref ref="OTEL"/>
-     </root>
+    <root level="INFO">
+        <appender-ref ref="console"/>
+        <appender-ref ref="OpenTelemetry"/>
+    </root>
 </configuration>'
 
 directory_paths=("admin-server" "api-gateway" "config-server" "customers-service" "discovery-server" "vets-service" "visits-service")