Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Vendored the open telemetry agent; cleaned up prometheus cfg
Browse files Browse the repository at this point in the history
mdemare committed Jul 8, 2024
1 parent b162365 commit 088e140
Showing 4 changed files with 3 additions and 12 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@ profiles.clj
.DS_Store
pom.xml
pom.xml.asc
*.jar
*.class
/.lein-*
/.nrepl-port
@@ -20,4 +19,3 @@ pom.xml.asc
/keystore.jks
/.envrc
/.envrc-docker
/opentelemetry-javaagent.jar
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -9,7 +9,9 @@ RUN make opentelemetry-javaagent.jar
FROM gcr.io/distroless/java:11

COPY --from=builder /app/target/eduhub-rio-mapper.jar /eduhub-rio-mapper.jar
COPY --from=builder /app/opentelemetry-javaagent.jar /opentelemetry-javaagent.jar
# Make sure there is an opentelemetry agent in the workdir in case docker-compose
# starts up a process with -javaagent in the JAVA_TOOL_OPTIONS
COPY --from=builder /app/vendor/opentelemetry-javaagent-2.2.0.jar /opentelemetry-javaagent.jar

WORKDIR /
ENTRYPOINT ["java", "-jar", "/eduhub-rio-mapper.jar"]
9 changes: 0 additions & 9 deletions dev-infra/prometheus.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
# my global config
global:
scrape_interval: 15s
evaluation_interval: 30s
# scrape_timeout is set to the global default (10s).

external_labels:
monitor: codelab
foo: bar

#rule_files:
# - "first.rules"
# - "my/*.rules"

scrape_configs:
- job_name: scrape-static

@@ -27,9 +21,6 @@ scrape_configs:
- targets: ["localhost:9090"]
labels:
service: prometheus
# - targets: ["host.docker.internal:8080"]
# labels:
# service: eduhub-gateway
- targets: ["worker:9464"]
labels:
service: worker
Binary file added vendor/opentelemetry-javaagent-2.2.0.jar
Binary file not shown.

0 comments on commit 088e140

Please sign in to comment.