Skip to content

Commit 3cf184d

Browse files
committed
Add switch to turn off peer.hostname collection
1 parent 20c6a3d commit 3cf184d

File tree

3 files changed

+13
-3
lines changed
  • dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator
  • dd-trace-api/src/main/java/datadog/trace/api/config
  • internal-api/src/main/java/datadog/trace/api

3 files changed

+13
-3
lines changed

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public AgentSpan onPeerConnection(final AgentSpan span, final InetAddress remote
119119
public AgentSpan onPeerConnection(AgentSpan span, InetAddress remoteAddress, boolean resolved) {
120120
if (remoteAddress != null) {
121121
String ip = remoteAddress.getHostAddress();
122-
if (resolved) {
122+
if (resolved && Config.get().isPeerHostNameEnabled()) {
123123
span.setTag(Tags.PEER_HOSTNAME, hostName(remoteAddress, ip));
124124
}
125125
if (remoteAddress instanceof Inet4Address) {

dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,13 @@ public final class TracerConfig {
131131
"trace.experimental.long-running.initial.flush.interval";
132132
public static final String TRACE_LONG_RUNNING_FLUSH_INTERVAL =
133133
"trace.experimental.long-running.flush.interval";
134+
135+
public static final String TRACE_PEER_HOSTNAME_ENABLED = "trace.peer.hostname.enabled";
136+
134137
public static final String TRACE_PEER_SERVICE_DEFAULTS_ENABLED =
135138
"trace.peer.service.defaults.enabled";
136-
137139
public static final String TRACE_PEER_SERVICE_COMPONENT_OVERRIDES =
138140
"trace.peer.service.component.overrides";
139-
140141
public static final String TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED =
141142
"trace.remove.integration-service-names.enabled";
142143

internal-api/src/main/java/datadog/trace/api/Config.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ public static String getHostName() {
146146
private final String prioritySamplingForce;
147147
private final boolean traceResolverEnabled;
148148
private final int spanAttributeSchemaVersion;
149+
private final boolean peerHostNameEnabled;
149150
private final boolean peerServiceDefaultsEnabled;
150151
private final Map<String, String> peerServiceComponentOverrides;
151152
private final boolean removeIntegrationServiceNamesEnabled;
@@ -827,6 +828,8 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
827828

828829
spanAttributeSchemaVersion = schemaVersionFromConfig();
829830

831+
peerHostNameEnabled = configProvider.getBoolean(TRACE_PEER_HOSTNAME_ENABLED, true);
832+
830833
// following two only used in v0.
831834
// in v1+ defaults are always calculated regardless this feature flag
832835
peerServiceDefaultsEnabled =
@@ -2167,6 +2170,10 @@ public int getSpanAttributeSchemaVersion() {
21672170
return spanAttributeSchemaVersion;
21682171
}
21692172

2173+
public boolean isPeerHostNameEnabled() {
2174+
return peerHostNameEnabled;
2175+
}
2176+
21702177
public boolean isPeerServiceDefaultsEnabled() {
21712178
return peerServiceDefaultsEnabled;
21722179
}
@@ -4820,6 +4827,8 @@ public String toString() {
48204827
+ jaxRsExceptionAsErrorsEnabled
48214828
+ ", axisPromoteResourceName="
48224829
+ axisPromoteResourceName
4830+
+ ", peerHostNameEnabled="
4831+
+ peerHostNameEnabled
48234832
+ ", peerServiceDefaultsEnabled="
48244833
+ peerServiceDefaultsEnabled
48254834
+ ", peerServiceComponentOverrides="

0 commit comments

Comments
 (0)