Skip to content

Commit

Permalink
Update changelog, small doc and name changes
Browse files Browse the repository at this point in the history
  • Loading branch information
JonasKunz committed Oct 24, 2023
1 parent be13291 commit 77d9d5b
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:
[float]
===== Features
* Context propagation and log correlation now takes place even if recording is disabled - {pull}3358[#3358]
* Added `context_propagation_only` configuration option - {pull}3358[#3358]
[float]
===== Bug fixes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public void onChange(ConfigurationOption<?> configurationOption, Boolean oldValu

this.objectPoolFactory = poolFactory;
transactionPool = poolFactory.createTransactionPool(maxPooledElements, this);
propagationOnlyContextPool = poolFactory.createRemoteParentContextPool(maxPooledElements, this);
propagationOnlyContextPool = poolFactory.createPropagationOnlyContextPool(maxPooledElements, this);
spanPool = poolFactory.createSpanPool(maxPooledElements, this);

// we are assuming that we don't need as many errors as spans or transactions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ public class TracerConfiguration extends ConfigurationOptionProvider {
"\n" +
"A boolean specifying if the agent should be recording or not.\n" +
"When recording, the agent instruments incoming HTTP requests, tracks errors and collects and sends metrics.\n" +
"When not recording, the agent works almost as a noop, not collecting data and not communicating with the APM sever,\n" +
"When not recording, the agent works as a noop, not collecting data and not communicating with the APM sever,\n" +
"except for polling the central configuration endpoint.\n" +
"Note that trace context propagation, baggage and log correlation remain active even when recording is disabled.\n"+
"Note that trace context propagation, baggage and log correlation will also be disabled when recording is disabled.\n"+
"As this is a reversible switch, agent threads are not being killed when inactivated, but they will be \n" +
"mostly idle in this state, so the overhead should be negligible.\n" +
"\n" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@ protected void recycle() {

@Override
public String toString() {
return String.format("RemoteParentContext %s (%s)", remoteTraceParent, Integer.toHexString(System.identityHashCode(this)));
return String.format("PropagationOnlyContext %s (%s)", remoteTraceParent, Integer.toHexString(System.identityHashCode(this)));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public Transaction createInstance() {
});
}

public ObjectPool<PropagationOnlyContext> createRemoteParentContextPool(int maxCapacity, final ElasticApmTracer tracer) {
public ObjectPool<PropagationOnlyContext> createPropagationOnlyContextPool(int maxCapacity, final ElasticApmTracer tracer) {
return createRecyclableObjectPool(maxCapacity, new Allocator<PropagationOnlyContext>() {
@Override
public PropagationOnlyContext createInstance() {
Expand Down

0 comments on commit 77d9d5b

Please sign in to comment.