-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open Telemetry and Docker #315
Open
mdemare
wants to merge
6
commits into
main
Choose a base branch
from
opentelemetry
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
662d45e
Open telemetry
mdemare bc3ce22
Some docker-compose fixups
joodie 0db5692
Ignore some generated files from the local project dir
joodie 3b12fb7
test: specify amd64 platform (try to fix issues on Arm mac)
joodie ae15ee9
Vendored the open telemetry agent; cleaned up prometheus cfg
mdemare 1b81bd9
Apps need test-clients.json
mdemare File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
/*.jar | ||
/target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
.PHONY: lint test check clean | ||
|
||
lint: | ||
clojure -M:lint | ||
|
||
test: | ||
clojure -M:test | ||
|
||
check: lint test | ||
|
||
clean: | ||
rm -rf classes target | ||
|
||
.PHONY: test lint check |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
global: | ||
scrape_interval: 15s | ||
evaluation_interval: 30s | ||
|
||
external_labels: | ||
monitor: codelab | ||
foo: bar | ||
|
||
scrape_configs: | ||
- job_name: scrape-static | ||
|
||
honor_labels: true | ||
# scrape_interval is defined by the configured global (15s). | ||
# scrape_timeout is defined by the global default (10s). | ||
|
||
# metrics_path defaults to '/metrics' | ||
# scheme defaults to 'http'. | ||
scheme: http | ||
|
||
static_configs: | ||
- targets: ["localhost:9090"] | ||
labels: | ||
service: prometheus | ||
- targets: ["worker:9464"] | ||
labels: | ||
service: worker | ||
- targets: ["api:3000"] | ||
labels: | ||
service: api | ||
- targets: ["api:9464"] | ||
labels: | ||
service: api |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
services: | ||
redis: | ||
image: redis:7-alpine | ||
restart: always | ||
ports: | ||
- '6380:6379' | ||
command: redis-server --save 20 1 --loglevel warning | ||
volumes: | ||
- redis:/data | ||
prometheus: | ||
image: prom/prometheus | ||
ports: | ||
- "9090:9090" | ||
volumes: | ||
- ./dev-infra/prometheus.yml:/etc/prometheus/prometheus.yml | ||
worker: | ||
platform: "linux/amd64" | ||
build: . | ||
env_file: | ||
- .envrc # read environment from local direnv settings | ||
environment: | ||
CLIENTS_INFO_PATH: /test-clients.json | ||
REDIS_URI: redis://redis | ||
OTEL_METRICS_EXPORTER: prometheus | ||
OTEL_EXPORTER_PROMETHEUS_ENDPOINT: http://localhost:9464/metrics | ||
OTEL_SERVICE_NAME: edumapper-worker | ||
OTEL_LOGS_EXPORTER: none | ||
OTEL_TRACES_EXPORTER: none | ||
JAVA_TOOL_OPTIONS: -javaagent:./opentelemetry-javaagent.jar | ||
volumes: | ||
- ./truststore.jks:/truststore.jks | ||
- ./keystore.jks:/keystore.jks | ||
- ./test/test-clients.json:/test/test-clients.json | ||
command: worker | ||
ports: | ||
- "9465:9464" | ||
api: | ||
platform: "linux/amd64" | ||
build: . | ||
env_file: | ||
- .envrc # read environment from local direnv settings | ||
environment: | ||
CLIENTS_INFO_PATH: /test-clients.json | ||
REDIS_URI: redis://redis | ||
OTEL_METRICS_EXPORTER: prometheus | ||
OTEL_EXPORTER_PROMETHEUS_ENDPOINT: http://localhost:9464/metrics | ||
OTEL_SERVICE_NAME: edumapper-api | ||
OTEL_LOGS_EXPORTER: none | ||
OTEL_TRACES_EXPORTER: none | ||
JAVA_TOOL_OPTIONS: -javaagent:./opentelemetry-javaagent.jar | ||
API_HOSTNAME: 0.0.0.0 | ||
API_PORT: 3000 | ||
volumes: | ||
- ./truststore.jks:/truststore.jks | ||
- ./keystore.jks:/keystore.jks | ||
- ./test/test-clients.json:/test/test-clients.json | ||
ports: | ||
- "3000:3000" | ||
- "9464:9464" | ||
command: serve-api | ||
volumes: | ||
redis: | ||
driver: local |
Binary file not shown.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Liever geen binaries in de repo en volgens mij wordt deze al gedownload in de makefile (latest weliswaar maar daar heb ik al overgeklaagd)