Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions java-instrumentation/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ services:
condition: service_healthy
validation-service:
condition: service_started
otel-collector:
condition: service_started
environment:
- SPRING_PROFILES_ACTIVE=docker
- SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/todo
Expand Down
4 changes: 2 additions & 2 deletions java-instrumentation/kubernetes/collector/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ extraEnvs:
value: admin
- name: OPENSEARCH_PASSWORD
value: SecureP@ssw0rd123
- name: DASH0_AUTHORIZATION_TOKEN
- name: DASH0_AUTH_TOKEN
valueFrom:
secretKeyRef:
name: dash0-secrets
Expand Down Expand Up @@ -85,7 +85,7 @@ config:

bearertokenauth/dash0:
scheme: Bearer
token: ${env:DASH0_AUTHORIZATION_TOKEN}
token: ${env:DASH0_AUTH_TOKEN}

service:
extensions:
Expand Down
6 changes: 4 additions & 2 deletions java-instrumentation/otel-collector-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ receivers:
otlp:
protocols:
grpc:
http:
endpoint: 0.0.0.0:4317
http:
endpoint: 0.0.0.0:4318

processors:
batch:
Expand All @@ -15,7 +17,7 @@ extensions:

bearertokenauth/dash0:
scheme: Bearer
token: ${env:DASH0_AUTHORIZATION_TOKEN}
token: ${env:DASH0_AUTH_TOKEN}

exporters:
prometheus:
Expand Down
4 changes: 3 additions & 1 deletion java-instrumentation/todo-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# Use an official OpenJDK image
FROM eclipse-temurin:17-jdk
FROM azul/zulu-openjdk:17-latest

# Set the working directory inside the container
WORKDIR /app

RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*

# Download OpenTelemetry Java agent
RUN curl -L -o opentelemetry-javaagent.jar https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar

Expand Down
2 changes: 1 addition & 1 deletion java-instrumentation/validation-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:17-jdk-slim
FROM azul/zulu-openjdk:17-latest

WORKDIR /app

Expand Down
Loading