Skip to content
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.

Sign up for GitHub

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

Tweaks #18

Merged
merged 4 commits into from
Nov 26, 2024
Merged

Tweaks #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9e8fc8
Update elastic-apm-agent from 1.38.0 to 1.52.1
AriPaaWun Nov 26, 2024
049eb63
Update README to match current versions and tooling
AriPaaWun Nov 26, 2024
8de51b6
Set memory for elasticsearch container so it doesn't crash
AriPaaWun Nov 26, 2024
e652ab7
Comment out elasticsearch memory setting so that it will run in CI
AriPaaWun Nov 26, 2024
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
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
View file
Open in desktop
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 renamed lib/elastic-apm-agent-1.38.0.jar → lib/elastic-apm-agent-1.52.1.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion project.clj
View file
Open in desktop
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