add example for Java stdout logs

README.md

@@ -57,8 +57,8 @@ There's no need to configure anything: The Docker image works with OpenTelemetry
 
 ```sh
 # Not needed as these are the defaults in OpenTelemetry:
-export OTEL_EXPORTER_OTLP_PROTOCOL=grpc
-export OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4317
+export OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf
+export OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4318
 ```
 
 ## View Grafana

examples/java/json-logging-ecs/Dockerfile

@@ -15,7 +15,7 @@ WORKDIR /usr/src/app/
 
 COPY --from=builder /usr/src/app/target/rolldice.jar ./app.jar
 # we ignore the version (which is from upstream) and use the latest version of the grafana distribution
-ADD --chmod=644 https://github.com/grafana/grafana-opentelemetry-java/releases/latest/download/grafana-opentelemetry-java.jar /usr/src/app/opentelemetry-javaagent.jar
+ADD --chmod=644 https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar /usr/src/app/opentelemetry-javaagent.jar
 ENV JAVA_TOOL_OPTIONS=-javaagent:/usr/src/app/opentelemetry-javaagent.jar
 
 EXPOSE 8080

examples/java/json-logging-logback/Dockerfile

@@ -14,7 +14,7 @@ WORKDIR /usr/src/app/
 
 COPY --from=builder /usr/src/app/target/rolldice.jar ./app.jar
 # we ignore the version (which is from upstream) and use the latest version of the grafana distribution
-ADD --chmod=644 https://github.com/grafana/grafana-opentelemetry-java/releases/latest/download/grafana-opentelemetry-java.jar /usr/src/app/opentelemetry-javaagent.jar
+ADD --chmod=644 https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar /usr/src/app/opentelemetry-javaagent.jar
 ENV JAVA_TOOL_OPTIONS=-javaagent:/usr/src/app/opentelemetry-javaagent.jar
 
 EXPOSE 8080

examples/java/json-logging-otlp/Dockerfile

@@ -0,0 +1,22 @@
+FROM eclipse-temurin:21-jdk AS builder
+
+WORKDIR /usr/src/app/
+
+COPY ./mvnw pom.xml ./
+COPY ./.mvn ./.mvn
+COPY ./src ./src
+# uncomment the following line when 2.10.0 is released
+# COPY json-logging-otlp/logback-spring.xml ./src/main/resources/logback-spring.xml
+RUN --mount=type=cache,target=/root/.m2 ./mvnw install -DskipTests
+
+FROM eclipse-temurin:21-jre
+
+WORKDIR /usr/src/app/
+
+COPY --from=builder /usr/src/app/target/rolldice.jar ./app.jar
+# we ignore the version (which is from upstream) and use the latest version of the grafana distribution
+ADD --chmod=644 https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar /usr/src/app/opentelemetry-javaagent.jar
+ENV JAVA_TOOL_OPTIONS=-javaagent:/usr/src/app/opentelemetry-javaagent.jar
+
+EXPOSE 8080
+ENTRYPOINT [ "java", "-jar", "./app.jar" ]

examples/java/json-logging-otlp/README.md

@@ -0,0 +1,10 @@
+# Exporting Application logs using JSON logging in Kubernetes
+
+## Running the example
+
+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)
+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

examples/java/json-logging-otlp/build.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -euo pipefail
+
+docker build -f Dockerfile -t "dice:1.1-SNAPSHOT" ..

examples/java/json-logging-otlp/k3d.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -euo pipefail
+
+./build.sh
+k3d cluster create jsonlogging || k3d cluster start jsonlogging
+k3d image import -c jsonlogging dice:1.1-SNAPSHOT
+
+kubectl apply -f k8s/
+
+kubectl wait --for=condition=ready pod -l app=dice
+kubectl wait --for=condition=ready --timeout=5m pod -l app=lgtm
+
+kubectl port-forward service/dice 8080:8080 &
+kubectl port-forward service/lgtm 3000:3000 &

examples/java/json-logging-otlp/k8s/collector-configmap.yaml

@@ -0,0 +1,72 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: otel-collector-config
+data:
+  otel-collector-config.yaml: |-
+    receivers:
+      otlp:
+        protocols:
+          grpc:
+            endpoint: 0.0.0.0:4317
+          http:
+            endpoint: 0.0.0.0:4318
+      prometheus/collector: # needed if you use the docker-lgtm image
+        config:
+          scrape_configs:
+            - job_name: 'opentelemetry-collector'
+              static_configs:
+                - targets: [ 'localhost:8888' ]
+      filelog/otlp-json-logs:
+        include:
+          - /var/log/pods/*/*/*.log
+        include_file_path: true
+        operators:
+          - id: container-parser
+            type: container
+
+    processors:
+      batch:
+      resourcedetection:
+        detectors: [ "env", "system" ]
+        override: false
+
+    connectors:
+      otlpjson:
+
+    exporters:
+      otlphttp/metrics:
+        endpoint: http://localhost:9090/api/v1/otlp
+      otlphttp/traces:
+        endpoint: http://localhost:4418
+      otlphttp/logs:
+        endpoint: http://localhost:3100/otlp
+      debug/metrics:
+        verbosity: detailed
+      debug/traces:
+        verbosity: detailed
+      debug/logs:
+        verbosity: detailed
+      nop:
+
+    service:
+      pipelines:
+        traces:
+          receivers: [ otlp ]
+          processors: [ batch ]
+          exporters: [ otlphttp/traces ]
+        metrics:
+          receivers: [ otlp, prometheus/collector ]
+          processors: [ batch ]
+          exporters: [ otlphttp/metrics ]
+        logs/raw_otlpjson:
+          receivers: [ filelog/otlp-json-logs ]
+          # (i) no need for processors before the otlpjson connector
+          # Declare processors in the shared "logs" pipeline below
+          processors: [ ]
+          exporters: [ otlpjson ]
+        logs/otlp:
+          receivers: [ otlp, otlpjson ]
+          processors: [ resourcedetection, batch ]
+          exporters: [ otlphttp/logs ]
+          # exporters: [ otlphttp/logs, debug/logs ]  # Uncomment this line to enable debug logging

examples/java/json-logging-otlp/k8s/dice.yaml

@@ -0,0 +1,48 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: dice
+spec:
+  selector:
+    app: dice
+  ports:
+    - protocol: TCP
+      port: 8080
+      targetPort: 8080
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dice
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: dice
+  template:
+    metadata:
+      labels:
+        app: dice
+    spec:
+      containers:
+      - name: dice
+        image: dice:1.1-SNAPSHOT
+        imagePullPolicy: Never
+        ports:
+        - containerPort: 8080
+        env:
+          - name: OTEL_EXPORTER_OTLP_ENDPOINT
+            value: "http://lgtm:4318"
+          - name: OTEL_LOGS_EXPORTER
+            value: "experimental-otlp/stdout"
+          - name: OTEL_RESOURCE_ATTRIBUTES
+            value: service.name=dice,service.namespace=shop,service.version=1.1,deployment.environment=staging
+          - name: OTEL_INSTRUMENTATION_LOGBACK_APPENDER_EXPERIMENTAL_LOG_ATTRIBUTES
+            value: "true"
+          - name: OTEL_INSTRUMENTATION_LOGBACK_APPENDER_EXPERIMENTAL_CAPTURE_KEY_VALUE_PAIR_ATTRIBUTES
+            value: "true"
+          - name: OTEL_INSTRUMENTATION_LOGBACK_APPENDER_EXPERIMENTAL_CAPTURE_MDC_ATTRIBUTES
+            value: "true"
+          - name: SERVICE_NAME
+            value: dice
+

examples/java/json-logging-otlp/k8s/lgtm.yaml

@@ -0,0 +1,86 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: lgtm
+spec:
+  selector:
+    app: lgtm
+  ports:
+    - name: grafana
+      protocol: TCP
+      port: 3000
+      targetPort: 3000
+    - name: otel-grpc
+      protocol: TCP
+      port: 4317
+      targetPort: 4317
+    - name: otel-http
+      protocol: TCP
+      port: 4318
+      targetPort: 4318
+    - name: prometheus # needed for automated tests
+      protocol: TCP
+      port: 9090
+      targetPort: 9090
+    - name: loki # needed for automated tests
+      protocol: TCP
+      port: 3100
+      targetPort: 3100
+    - name: tempo # needed for automated tests
+      protocol: TCP
+      port: 3200
+      targetPort: 3200
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: lgtm
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: lgtm
+  template:
+    metadata:
+      labels:
+        app: lgtm
+    spec:
+      containers:
+        - name: lgtm
+          image: grafana/otel-lgtm:latest
+          ports:
+            - containerPort: 3000
+            - containerPort: 4317
+            - containerPort: 4318
+            - containerPort: 9090 # needed for automated tests
+            - containerPort: 3100 # needed for automated tests
+            - containerPort: 3200 # needed for automated tests
+          readinessProbe:
+            exec:
+              command:
+                - cat
+                - /tmp/ready
+          volumeMounts:
+            - mountPath: /otel-lgtm/otelcol-config.yaml
+              name: otel-collector-config
+              subPath: otel-collector-config.yaml
+              readOnly: true
+            - mountPath: /var/log
+              name: varlog
+              readOnly: true
+            - mountPath: /var/lib/docker/containers
+              name: varlibdockercontainers
+              readOnly: true
+          env:
+            - name: ENABLE_LOGS_OTELCOL
+              value: "true"
+      volumes:
+        - name: otel-collector-config
+          configMap:
+            name: otel-collector-config
+        - name: varlog
+          hostPath:
+            path: /var/log
+        - name: varlibdockercontainers
+          hostPath:
+            path: /var/lib/docker/containers

examples/java/json-logging-otlp/logback-spring.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <root level="INFO">
+    </root>
+</configuration>