Support :bootclasspath in :java-agents.

gardnervickers · May 16, 2013 · c5767cd · c5767cd
1 parent 0d817f5
commit c5767cd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/leiningen-core/src/leiningen/core/eval.clj b/leiningen-core/src/leiningen/core/eval.clj
@@ -183,8 +183,9 @@ leiningen.core.utils/platform-nullsink instead."
     (pr-str form)))
 
 (defn- agent-arg [coords file]
-  (format "-javaagent:%s%s" file (if-let [o (:options (apply hash-map coords))]
-                                   (str "=" o) "")))
+  (let [{:keys [options bootclasspath]} (apply hash-map coords)]
+    (concat [(str "-javaagent:" file (and options (str "=" options)))]
+            (if bootclasspath [(str "-Xbootclasspath/a:" file)]))))
 
 (defn ^:internal classpath-arg [project]
   (let [classpath-string (string/join java.io.File/pathSeparatorChar
@@ -194,7 +195,7 @@ leiningen.core.utils/platform-nullsink instead."
         ;; here, but it doesn't, which is what we want. but maybe a bug?
         agent-jars (aether/dependency-files (aether/dependency-hierarchy
                                              (:java-agents project) agent-tree))]
-    `(~@(map agent-arg (:java-agents project) agent-jars)
+    `(~@(mapcat agent-arg (:java-agents project) agent-jars)
       ~@(if (:bootclasspath project)
           [(str "-Xbootclasspath/a:" classpath-string)]
           ["-classpath" classpath-string]))))

diff --git a/leiningen-core/test/leiningen/core/test/eval.clj b/leiningen-core/test/leiningen/core/test/eval.clj
@@ -48,12 +48,14 @@
                (contains? args "-Dhttps.proxyPort=443"))))))
 
 (deftest test-java-agent
-  (let [p {:java-agents '[[com.newrelic.agent.java/newrelic-agent "2.18.0"]
+  (let [p {:java-agents '[[com.newrelic.agent.java/newrelic-agent "2.18.0"
+                           :bootclasspath true]
                           [nodisassemble "0.1.1" :options "hello"]]
            :dependencies '[[slamhound "1.3.0"]]
            :repositories project/default-repositories}
-        [newrelic nodisassemble] (classpath-arg p)]
-    (is (.endsWith newrelic (lthelper/fix-path-delimiters 
+        [newrelic newrelic-bootcp nodisassemble] (classpath-arg p)]
+    (is (.endsWith newrelic (lthelper/fix-path-delimiters
                               (str "/com/newrelic/agent/java/newrelic-agent"
                                    "/2.18.0/newrelic-agent-2.18.0.jar"))))
+    (is (re-find #"bootclasspath.*newrelic.*jar" newrelic-bootcp))
     (is (re-find #"-javaagent:.*nodisassemble-0.1.1.jar=hello" nodisassemble))))
diff --git a/sample.project.clj b/sample.project.clj
@@ -234,7 +234,8 @@
             #"clojars" {:name "Internal nexus"
                         :url "http://mvn.local/nexus/releases"
                         :repo-manager true}}
-  ;; Java agents can instrument and intercept certain VM features.
+  ;; Java agents can instrument and intercept certain VM features. Include
+  ;; :bootclasspath true to place the agent jar on the bootstrap classpath.
   :java-agents [[nodisassemble "0.1.1" :options "extra"]]
   ;; Defaults for signing options. Defers to per-repository settings.
   :signing {:gpg-key "[email protected]"}