Merge pull request #237 from wellcomecollection/rk/bump-elastic-apm

Exclude transitive dependency on pre 5.7 version of JNA
wellcomecollection · Jan 22, 2024 · f022ab8 · f022ab8
2 parents ba4b0d9 + 0a1cd43
commit f022ab8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/RELEASE.md b/RELEASE.md
@@ -0,0 +1,5 @@
+RELEASE_TYPE: patch
+
+Update elastic APM libraries, needed to avoid JNA issue on M1 macs.
+
+See https://github.com/wellcomecollection/scala-libs/pull/236
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -136,7 +136,11 @@ object Dependencies {
   )
 
   val elasticApmAgentDependencies = Seq(
-    "co.elastic.apm" % "apm-agent-attach" % versions.elasticApm,
+    "co.elastic.apm" % "apm-agent-attach" % versions.elasticApm
+      // This needs to be excluded because it prevents this library functioning on M1 macs
+      // at the current version of apm-agent-attach it pulls in version 5.3.1 of jna,
+      // we need at least 5.7 to fix this issue. See https://github.com/java-native-access/jna/pull/1238
+      exclude("net.java.dev.jna", "jna"),
     "co.elastic.apm" % "apm-agent-api" % versions.elasticApm,
   )