Skip to content

Exclude process.argv by default #118

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

Merged
merged 2 commits into from
Jul 5, 2018
Merged

Exclude process.argv by default #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d893bfe
Exclude process.argv by default
felixbarny Jul 5, 2018
f05a7dd
Add docs for include_process_args config
felixbarny Jul 5, 2018
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
3 changes: 3 additions & 0 deletions apm-agent-core/src/main/java/co/elastic/apm/report/ApmServerReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ public Thread newThread(Runnable r) {
}, ProducerType.MULTI, PhasedBackoffWaitStrategy.withLock(1, 10, TimeUnit.MILLISECONDS));
this.coreConfiguration = coreConfiguration;
reportingEventHandler = new ReportingEventHandler(service, process, system, payloadSender, reporterConfiguration, processorEventHandler);
if (!reporterConfiguration.isIncludeProcessArguments()) {
process.getArgv().clear();
}
disruptor.handleEventsWith(reportingEventHandler);
disruptor.start();
if (reporterConfiguration.getFlushInterval() > 0) {
Expand Down
11 changes: 11 additions & 0 deletions apm-agent-core/src/main/java/co/elastic/apm/report/ReporterConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,13 @@ public class ReporterConfiguration extends ConfigurationOptionProvider {
"Blocks the requests until the transaction has been reported to the APM server.")
.buildWithDefault(false);

private final ConfigurationOption<Boolean> includeProcessArguments = ConfigurationOption.booleanOption()
.key("include_process_args")
.configurationCategory(REPORTER_CATEGORY)
.description("Whether each transaction should have the process arguments attached.\n" +
"Disabled by default to save disk space.")
.buildWithDefault(false);

@Nullable
public String getSecretToken() {
return secretToken.get();
Expand Down Expand Up @@ -119,4 +126,8 @@ public int getMaxQueueSize() {
public boolean isReportSynchronously() {
return reportSynchronously.get();
}

public boolean isIncludeProcessArguments() {
return includeProcessArguments.get();
}
}
21 changes: 21 additions & 0 deletions docs/configuration.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,27 @@ This setting is useful to limit memory consumption if you experience a sudden sp
| `elastic.apm.max_queue_size` | `ELASTIC_APM_MAX_QUEUE_SIZE`
|============

[float]
[[config-include-process-args]]
==== `include_process_args`

Whether each transaction should have the process arguments attached.
Disabled by default to save disk space.


[options="header"]
|============
| Default | Type | Dynamic
| `false` | Boolean | false
|============


[options="header"]
|============
| Java System Properties | Environment
| `elastic.apm.include_process_args` | `ELASTIC_APM_INCLUDE_PROCESS_ARGS`
|============

[[config-stacktrace]]
=== Stacktrace configuration options
[float]
Expand Down