Skip to content

Commit

Permalink
Merge pull request #18 from Yleisradio/feature/tweaks
Browse files Browse the repository at this point in the history
Tweaks
  • Loading branch information
AriPaaWun authored Nov 26, 2024
2 parents a949205 + e652ab7 commit eafd09e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ So, add these to your project.clj dependencies:

```clojure
[co.elastic.apm/apm-agent-api "AGENT_VERSION"]
[clojure-elastic-apm "0.8.0"]
[clojure-elastic-apm "0.13.0"]
```

Note, in the agent configuration, the `elastic.apm.application_packages` option should be the top level namespace in your
Expand Down Expand Up @@ -343,7 +343,7 @@ There are some tests for the functionality. To run them, you need to have Elasti
as containers:

```bash
$ docker-compose up -d
$ docker compose up -d
```

Then, to run tests:
Expand Down
5 changes: 5 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ services:
ports:
- "9200:9200"
- "9300:9300"
# Might be needed when running locally, but seemed to fail CI build
# deploy:
# resources:
# limits:
# memory: 1000M
kibana:
image: "docker.elastic.co/kibana/kibana:8.16.0"
ports:
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[org.clojure/clojure "1.11.1"]]
:profiles {:dev {:jvm-opts ["-javaagent:lib/elastic-apm-agent-1.38.0.jar"
:profiles {:dev {:jvm-opts ["-javaagent:lib/elastic-apm-agent-1.52.1.jar"
"-Delastic.apm.service_name=test-service"
"-Delastic.apm.application_packages=clojure-elastic-apm"
"-Delastic.apm.server_urls=http://localhost:8200"
Expand Down

0 comments on commit eafd09e

Please sign in to comment.