add example for OTLP logging via stdout and k8s

Author: zeitlinger

.github/renovate.json5

@@ -34,5 +34,18 @@
       "matchPackageNames": ["eclipse-temurin"],
       "enabled": false
     }
+  ],
+  "customManagers": [
+    {
+      "customType": "regex",
+      "description": "Update _VERSION variables in Dockerfiles",
+      "fileMatch": [
+        "(^|/|\\.)Dockerfile$",
+        "(^|/)Dockerfile\\.[^/]*$"
+      ],
+      "matchStrings": [
+        "# renovate: datasource=(?<datasource>[a-z-]+?)(?: depName=(?<depName>.+?))? packageName=(?<packageName>.+?)(?: versioning=(?<versioning>[a-z-]+?))?\\s(?:ENV|ARG) .+?_VERSION=(?<currentValue>.+?)\\s"
+      ]
+    }
   ]
 }

.github/workflows/acceptance-tests.yml

@@ -30,5 +30,5 @@ jobs:
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: docker-compose.log
-          path: oats/yaml/build/**/output.log
+          name: log output
+          path: oats/yaml/build/**/*.log

logging-otlp/Dockerfile

@@ -2,11 +2,12 @@ FROM eclipse-temurin:21-jre
 
 WORKDIR /usr/src/app/
 
-COPY build/libs/*SNAPSHOT.jar ./app.jar
-# we ignore the version (which is from upstream) and use the latest version of the grafana distribution
-# todo:  with renovate update
-ADD --chmod=644 https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.10.0/opentelemetry-javaagent.jar /usr/src/app/opentelemetry-javaagent.jar
-ENV JAVA_TOOL_OPTIONS=-javaagent:/usr/src/app/opentelemetry-javaagent.jar
+# renovate: datasource=github-releases depName=opentelemetry-java-instrumentation packageName=open-telemetry/opentelemetry-java-instrumentation
+ENV OPENTELEMETRY_JAVA_INSTRUMENTATION_VERSION=v2.10.0
+
+ADD build/libs/*SNAPSHOT.jar ./app.jar
+ADD --chmod=644 https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/$OPENTELEMETRY_JAVA_INSTRUMENTATION_VERSION/opentelemetry-javaagent.jar ./opentelemetry-javaagent.jar
+ENV JAVA_TOOL_OPTIONS=-javaagent:./opentelemetry-javaagent.jar
 
 EXPOSE 8080
 ENTRYPOINT [ "java", "-jar", "./app.jar" ]

logging-otlp/README.md

@@ -4,7 +4,7 @@
 
 1. Build the Docker image using using `build.sh`
 2. Deploy the manifest using `kubectl apply -f k8s/` (e.g. using [k3d.sh](k3d.sh))
-3. Generate traffic using [generate-traffic.sh](../../../generate-traffic.sh)
+3. Generate traffic using [generate-traffic.sh](./generate-traffic.sh)
 4. Log in to [http://localhost:3000](http://localhost:3000) with user _admin_ and password _admin_.
 5. Go to "Explore"
 6. Select "Loki" as data source

logging-otlp/generate-traffic.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+watch 'curl -s http://localhost:8080/rolldice'