Skip to content

Add ability to pass options to javaagents (#50) - #379

Draft
ryandens wants to merge 3 commits into
mainfrom
worktree-javaagent-options-issue-50
Draft

Add ability to pass options to javaagents (#50)#379
ryandens wants to merge 3 commits into
mainfrom
worktree-javaagent-options-issue-50

Conversation

@ryandens

@ryandens ryandens commented Jul 7, 2026

Copy link
Copy Markdown
Owner

Closes #50.

What

Adds support for the -javaagent:<jar>=<options> form of the flag so agents like the Prometheus JMX Exporter (=12345:config.yaml) can be configured.

API

A new javaagent { } extension exposes an agentOptions map. Options are keyed by dependency coordinategroup:name for module dependencies, project path for project dependencies — so they are independent of the resolved jar file name and survive version bumps.

dependencies {
    javaagent("io.prometheus.jmx:jmx_prometheus_javaagent:0.20.0")
}

javaagent {
    agentOptions.put("io.prometheus.jmx:jmx_prometheus_javaagent", "12345:config.yaml")
}

How

  • JavaagentExtension — new agentOptions MapProperty, created once by JavaagentBasePlugin.
  • AgentOptionsResolver — resolves the coordinate-keyed options against the configuration's resolved artifacts (via ResolvedArtifactResult component identifiers) into a fileName -> options map. Lazy and configuration-cache safe; written in Java for the same task-input serialization reason as JavaForkOptionsConfigurer.
  • The map is threaded into all four -javaagent: sites: application run task, test task, application distribution start scripts, and jib container entrypoints. Agents without a matching entry get no suffix (existing behavior preserved).

Design decisions

Both settled up front (see the issue discussion):

  • Key by coordinate rather than a single global value or by resolved jar name — robust for multiple agents, not brittle to version bumps.
  • Single shared value across contexts for this first version; per-context overrides (tasks.run { javaagent { ... } }, etc.) are a deliberate follow-up.

Known limitation

Options containing spaces work for the run/test tasks (list-based JvmArgumentProvider) but may hit quoting issues in the single-token distribution start-script opt.

Tests

  • New functional tests for run-task options, multi-agent (options applied only to the keyed agent), and distribution start-script rendering (Unix + Windows).
  • New jib functional test asserting the container entrypoint carries =<options>.
  • simple-agent now echoes its agentArgs so options are observable end-to-end.
  • Existing no-options tests unchanged and green; plugin + jib functional/unit suites and spotlessCheck pass.

🤖 Generated with Claude Code

https://claude.ai/code/session_01FBTxQkVXBjJoBSfKPWyY3K

Note

Add options support to javaagent configuration via coordinate-keyed agentOptions map

  • Adds a new JavaagentExtension DSL with an agentOptions map property, where keys are dependency coordinates (e.g. group:name) and values are option strings appended as =<options> to -javaagent flags.
  • A new AgentOptionsResolver utility resolves coordinate keys to file-name-keyed maps in a configuration-cache-safe way.
  • Options are propagated to all plugin surfaces: JavaExec/Test tasks via JavaForkOptionsConfigurer, application run task via JavaagentApplicationRunPlugin, distribution start scripts via JavaagentAwareStartScriptGenerator, and Jib container entrypoints via JavaagentJibPlugin.
  • Agents without configured options are unaffected.
📊 Macroscope summarized de8ee7d. 8 files reviewed, 0 issues evaluated, 0 issues filtered, 0 comments posted

🗂️ Filtered Issues

No issues evaluated.

>

Support the `-javaagent:<jar>=<options>` form of the flag by introducing a
`javaagent { }` extension with an `agentOptions` map keyed by dependency
coordinate (`group:name` for module dependencies, project path for project
dependencies). Keying by coordinate keeps options independent of the resolved
jar file name so they survive version bumps.

A shared `AgentOptionsResolver` resolves the coordinate-keyed options against
the configuration's resolved artifacts into a `fileName -> options` map, which
is threaded into all four contexts that build a `-javaagent:` argument: the
application `run` task, the `test` task, application distribution start
scripts, and jib container entrypoints. Agents without a matching entry are
attached with no suffix, preserving existing behavior.

Per the design discussion on the issue, options are a single project-level
value shared across contexts; per-context overrides are left as a follow-up.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FBTxQkVXBjJoBSfKPWyY3K
Comment thread jib-common/src/main/kotlin/com/ryandens/javaagent/jib/JavaagentJibExtension.kt Outdated
Comment thread plugin/src/main/java/com/ryandens/javaagent/AgentOptionsResolver.java Outdated
…llegalStateExceptio (#391)

## Summary

Fixes an `IllegalStateException` that occurs when `agentOptions` is not
explicitly configured in the Jib extension.

## Changes

- Updated `JavaagentJibExtension.kt` to use `getOrElse(emptyMap())`
instead of `get()` when accessing `agentOptions`
- When `agentOptions` is not configured, the code now gracefully
defaults to an empty map rather than throwing an exception

## Problem

Previously, calling `extraConfig.get().agentOptions.get()` would throw
an `IllegalStateException` if the user had not set any agent options in
their configuration. This made `agentOptions` effectively required even
though it should be optional.

## Solution

Using `getOrElse(emptyMap())` provides a safe default value, making
`agentOptions` truly optional as intended.

<!-- Macroscope (Fix It For Me) template starts here -->
> [!NOTE]
> ### Macroscope: _Fix It For Me_
> - This PR originated from [this
comment](https://github.com/ryandens/javaagent-gradle-plugin/pull/379/files#r3641209014)
in #379.
> - Since auto-merge is on, Macroscope will merge this PR after waiting
for checks to pass.
> - If you'd rather not wait, you can always merge this yourself but
**no further action from you is currently needed**.
> - You can also @mention Macroscope in this PR to request further
changes.
>
> #### Activity
> Currently: <!-- Macroscope (Fix It For Me) current status starts here
-->_Waiting on checks_<!-- Macroscope (Fix It For Me) current status
ends here -->
>
> <details>
> <summary>Previously</summary>
>
> <!-- Macroscope (Fix It For Me) previous status starts here -->
> - Pushed ce934b7
> - Action failed: Validate
> - Waiting on checks
> - Pushed c882d5a
> - Working on next commit...
> - Waiting on checks
> - Pushed 089c78f
> <!-- Macroscope (Fix It For Me) previous status ends here -->
>
> </details>

----
<!-- Macroscope (Fix It For Me) template ends here -->
<!-- Macroscope's pull request summary starts here -->
<!-- Macroscope will only edit the content between these invisible
markers, and the markers themselves will not be visible in the GitHub
rendered markdown. -->
<!-- If you delete either of the start / end markers from your PR's
description, Macroscope will append its summary at the bottom of the
description. -->
> [!NOTE]
> ### Fix `IllegalStateException` by keying agent options on canonical
file path
> - Fixes a runtime `IllegalStateException` in `JavaagentJibExtension`
by replacing `Provider.get()` with `Provider.getOrElse(emptyMap())` when
no `agentOptions` are configured.
> - Changes `AgentOptionsResolver.optionsByFileName` to
`optionsByFilePath`, keying the options map by each artifact's canonical
file path instead of its file name. All consumers
(`JavaForkOptionsConfigurer`, `JavaagentAwareStartScriptGenerator`, Jib
plugin, run/test/distribution plugins) are updated to match.
> - Behavioral Change: agent option lookups in JVM fork args and
generated start scripts now use canonical paths; configs that relied on
file-name keying will need to be re-evaluated if duplicate file names
exist across different directories.
>
> <!-- Macroscope's review summary starts here -->
>
> <sup><a href="https://app.macroscope.com">Macroscope</a> summarized
ce934b7.</sup>
> <!-- Macroscope's review summary ends here -->
>
<!-- macroscope-ui-refresh -->
<!-- Macroscope's pull request summary ends here -->

---------

Co-authored-by: macroscopeapp[bot] <170038800+macroscopeapp[bot]@users.noreply.github.com>
…artScriptGenerator (#392)

## Summary

Fixes a shell injection vulnerability in
`JavaagentAwareStartScriptGenerator.Fake.write()` by adding
platform-aware shell escaping for javaagent option strings.

## Changes

Added proper escaping for agent option values to prevent malicious input
from being interpreted as shell commands:

- **Unix scripts**: Option values are wrapped in single quotes with
internal single quotes escaped as `'\''`
- **Windows scripts**: `%` characters are doubled to `%%` to prevent
environment variable expansion

## Security Impact

Previously, unescaped option strings passed to the javaagent could
potentially be exploited to execute arbitrary shell commands. This fix
ensures that special characters in option values are properly escaped
for the target platform's shell interpreter.

<!-- Macroscope (Fix It For Me) template starts here -->
> [!NOTE]
> ### Macroscope: _Fix It For Me_
> - This PR originated from [this
comment](https://github.com/ryandens/javaagent-gradle-plugin/pull/379/files#r3641346092)
in #379.
> - Since auto-merge is on, Macroscope will merge this PR after waiting
for checks to pass.
> - If you'd rather not wait, you can always merge this yourself but
**no further action from you is currently needed**.
> - You can also @mention Macroscope in this PR to request further
changes.
>
> #### Activity
> Currently: <!-- Macroscope (Fix It For Me) current status starts here
-->_Waiting on checks_<!-- Macroscope (Fix It For Me) current status
ends here -->
>
> <details>
> <summary>Previously</summary>
>
> <!-- Macroscope (Fix It For Me) previous status starts here -->
> - Pushed 51d4603
> - Action failed: Validate
> - Waiting on checks
> - Pushed a62e381
> <!-- Macroscope (Fix It For Me) previous status ends here -->
>
> </details>

----
<!-- Macroscope (Fix It For Me) template ends here -->
<!-- Macroscope's pull request summary starts here -->
<!-- Macroscope will only edit the content between these invisible
markers, and the markers themselves will not be visible in the GitHub
rendered markdown. -->
<!-- If you delete either of the start / end markers from your PR's
description, Macroscope will append its summary at the bottom of the
description. -->
> [!NOTE]
> ### Fix shell injection vulnerability in
`JavaagentAwareStartScriptGenerator` by escaping option values
> - On Unix, javaagent option values are wrapped in single quotes with
internal single quotes escaped to prevent shell injection.
> - On Windows, percent signs in option values are doubled to prevent
variable expansion.
> - The
[`Writer`](https://github.com/ryandens/javaagent-gradle-plugin/pull/392/files#diff-b35a17536e95a01f0d06c07c9255cbcd47cfceeb6231638cda0393b65d70967b)
now accepts a `platform` argument to apply the correct escaping strategy
per OS.
> - Behavioral Change: generated start scripts now quote javaagent
option values, which changes the output format of `DEFAULT_JVM_OPTS` on
Unix.
>
> <!-- Macroscope's review summary starts here -->
>
> <sup><a href="https://app.macroscope.com">Macroscope</a> summarized
51d4603.</sup>
> <!-- Macroscope's review summary ends here -->
>
<!-- macroscope-ui-refresh -->
<!-- Macroscope's pull request summary ends here -->

---------

Co-authored-by: macroscopeapp[bot] <170038800+macroscopeapp[bot]@users.noreply.github.com>
@testlens-app

testlens-app Bot commented Jul 23, 2026

Copy link
Copy Markdown

✅ All tests passed ✅

🏷️ Commit: 2ae86eb
▶️ Tests: 2 executed
⚪️ Checks: 3/3 completed


Learn more about TestLens at testlens.app.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add ability to pass arguments to a Java agent

1 participant