Skip to content

Commit 4a82413

Browse files
evanchoolyevanchooly
authored
rename the DebuggerProbe to TriggerProbe (#7737)
1 parent 9e65424 commit 4a82413

File tree

8 files changed

+67
-68
lines changed

8 files changed

+67
-68
lines changed

‎dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/Configuration.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.datadog.debugger.agent;
22

3-
import com.datadog.debugger.probe.DebuggerProbe;
43
import com.datadog.debugger.probe.ExceptionProbe;
54
import com.datadog.debugger.probe.LogProbe;
65
import com.datadog.debugger.probe.MetricProbe;
76
import com.datadog.debugger.probe.ProbeDefinition;
87
import com.datadog.debugger.probe.SpanDecorationProbe;
98
import com.datadog.debugger.probe.SpanProbe;
9+
import com.datadog.debugger.probe.TriggerProbe;
1010
import com.squareup.moshi.Json;
1111
import java.util.ArrayList;
1212
import java.util.Collection;
@@ -66,7 +66,7 @@ public int hashCode() {
6666
private final Collection<MetricProbe> metricProbes;
6767
private final Collection<LogProbe> logProbes;
6868
private final Collection<SpanProbe> spanProbes;
69-
private final Collection<DebuggerProbe> debuggerProbes;
69+
private final Collection<TriggerProbe> triggerProbes;
7070
private final Collection<SpanDecorationProbe> spanDecorationProbes;
7171
private final FilterList allowList;
7272
private final FilterList denyList;
@@ -89,7 +89,7 @@ public Configuration(
8989
Collection<MetricProbe> metricProbes,
9090
Collection<LogProbe> logProbes,
9191
Collection<SpanProbe> spanProbes,
92-
Collection<DebuggerProbe> debuggerProbes,
92+
Collection<TriggerProbe> triggerProbes,
9393
Collection<SpanDecorationProbe> spanDecorationProbes,
9494
FilterList allowList,
9595
FilterList denyList,
@@ -98,7 +98,7 @@ public Configuration(
9898
this.metricProbes = metricProbes;
9999
this.logProbes = logProbes;
100100
this.spanProbes = spanProbes;
101-
this.debuggerProbes = debuggerProbes;
101+
this.triggerProbes = triggerProbes;
102102
this.spanDecorationProbes = spanDecorationProbes;
103103
this.allowList = allowList;
104104
this.denyList = denyList;
@@ -121,8 +121,8 @@ public Collection<SpanProbe> getSpanProbes() {
121121
return spanProbes;
122122
}
123123

124-
public Collection<DebuggerProbe> getDebuggerProbes() {
125-
return debuggerProbes;
124+
public Collection<TriggerProbe> getTriggerProbes() {
125+
return triggerProbes;
126126
}
127127

128128
public Collection<SpanDecorationProbe> getSpanDecorationProbes() {
@@ -143,8 +143,8 @@ public LogProbe.Sampling getSampling() {
143143

144144
public Collection<ProbeDefinition> getDefinitions() {
145145
Collection<ProbeDefinition> result = new ArrayList<>();
146-
if (debuggerProbes != null) {
147-
result.addAll(debuggerProbes);
146+
if (triggerProbes != null) {
147+
result.addAll(triggerProbes);
148148
}
149149
if (metricProbes != null) {
150150
result.addAll(metricProbes);
@@ -209,7 +209,7 @@ public static class Builder {
209209
private List<MetricProbe> metricProbes = null;
210210
private List<LogProbe> logProbes = null;
211211
private List<SpanProbe> spanProbes = null;
212-
private List<DebuggerProbe> debuggerProbes = null;
212+
private List<TriggerProbe> triggerProbes = null;
213213
private List<SpanDecorationProbe> spanDecorationProbes = null;
214214
private FilterList allowList = null;
215215
private FilterList denyList = null;
@@ -226,7 +226,7 @@ public Configuration.Builder add(Collection<? extends ProbeDefinition> definitio
226226
}
227227
for (ProbeDefinition definition : definitions) {
228228
if (definition instanceof MetricProbe) add((MetricProbe) definition);
229-
if (definition instanceof DebuggerProbe) add((DebuggerProbe) definition);
229+
if (definition instanceof TriggerProbe) add((TriggerProbe) definition);
230230
if (definition instanceof LogProbe) add((LogProbe) definition);
231231
if (definition instanceof SpanProbe) add((SpanProbe) definition);
232232
if (definition instanceof SpanDecorationProbe) add((SpanDecorationProbe) definition);
@@ -258,11 +258,11 @@ public Configuration.Builder add(SpanProbe probe) {
258258
return this;
259259
}
260260

261-
public Configuration.Builder add(DebuggerProbe probe) {
262-
if (debuggerProbes == null) {
263-
debuggerProbes = new ArrayList<>();
261+
public Configuration.Builder add(TriggerProbe probe) {
262+
if (triggerProbes == null) {
263+
triggerProbes = new ArrayList<>();
264264
}
265-
debuggerProbes.add(probe);
265+
triggerProbes.add(probe);
266266
return this;
267267
}
268268

@@ -321,11 +321,11 @@ public Configuration.Builder addSpanProbes(Collection<SpanProbe> probes) {
321321
return this;
322322
}
323323

324-
public Configuration.Builder addDebuggerProbes(Collection<DebuggerProbe> probes) {
324+
public Configuration.Builder addTriggerProbes(Collection<TriggerProbe> probes) {
325325
if (probes == null) {
326326
return this;
327327
}
328-
for (DebuggerProbe probe : probes) {
328+
for (TriggerProbe probe : probes) {
329329
add(probe);
330330
}
331331
return this;
@@ -377,7 +377,7 @@ public Configuration.Builder add(Configuration other) {
377377
addMetricProbes(other.getMetricProbes());
378378
addLogProbes(other.getLogProbes());
379379
addSpanProbes(other.getSpanProbes());
380-
addDebuggerProbes(other.getDebuggerProbes());
380+
addTriggerProbes(other.getTriggerProbes());
381381
addSpanDecorationProbes(other.getSpanDecorationProbes());
382382
addAllowList(other.getAllowList());
383383
addDenyList(other.getDenyList());
@@ -391,7 +391,7 @@ public Configuration build() {
391391
metricProbes,
392392
logProbes,
393393
spanProbes,
394-
debuggerProbes,
394+
triggerProbes,
395395
spanDecorationProbes,
396396
allowList,
397397
denyList,

‎dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerProductChangesListener.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import static com.datadog.debugger.agent.ConfigurationAcceptor.Source.REMOTE_CONFIG;
44

5-
import com.datadog.debugger.probe.DebuggerProbe;
65
import com.datadog.debugger.probe.LogProbe;
76
import com.datadog.debugger.probe.MetricProbe;
87
import com.datadog.debugger.probe.ProbeDefinition;
98
import com.datadog.debugger.probe.SpanDecorationProbe;
109
import com.datadog.debugger.probe.SpanProbe;
10+
import com.datadog.debugger.probe.TriggerProbe;
1111
import com.datadog.debugger.util.MoshiHelper;
1212
import com.squareup.moshi.JsonAdapter;
1313
import datadog.remoteconfig.PollingRateHinter;
@@ -29,15 +29,15 @@
2929
import org.slf4j.LoggerFactory;
3030

3131
public class DebuggerProductChangesListener implements ProductListener {
32-
public static final int MAX_ALLOWED_DEBUGGER_PROBES = 100;
32+
public static final int MAX_ALLOWED_TRIGGER_PROBES = 100;
3333
public static final int MAX_ALLOWED_METRIC_PROBES = 100;
3434
public static final int MAX_ALLOWED_LOG_PROBES = 100;
3535
public static final int MAX_ALLOWED_SPAN_PROBES = 100;
3636
public static final int MAX_ALLOWED_SPAN_DECORATION_PROBES = 100;
3737
public static final String LOG_PROBE_PREFIX = "logProbe_";
3838
public static final String METRIC_PROBE_PREFIX = "metricProbe_";
3939
public static final String SPAN_PROBE_PREFIX = "spanProbe_";
40-
public static final String DEBUGGER_PROBE_PREFIX = "debuggerProbe_";
40+
public static final String TRIGGER_PROBE_PREFIX = "triggerProbe_";
4141
public static final String SPAN_DECORATION_PROBE_PREFIX = "spanDecorationProbe_";
4242
private static final Logger LOGGER =
4343
LoggerFactory.getLogger(DebuggerProductChangesListener.class);
@@ -55,8 +55,8 @@ static class Adapter {
5555
static final JsonAdapter<SpanProbe> SPAN_PROBE_JSON_ADAPTER =
5656
MoshiHelper.createMoshiConfig().adapter(SpanProbe.class);
5757

58-
static final JsonAdapter<DebuggerProbe> DEBUGGER_PROBE_JSON_ADAPTER =
59-
MoshiHelper.createMoshiConfig().adapter(DebuggerProbe.class);
58+
static final JsonAdapter<TriggerProbe> TRIGGER_PROBE_JSON_ADAPTER =
59+
MoshiHelper.createMoshiConfig().adapter(TriggerProbe.class);
6060

6161
static final JsonAdapter<SpanDecorationProbe> SPAN_DECORATION_PROBE_JSON_ADAPTER =
6262
MoshiHelper.createMoshiConfig().adapter(SpanDecorationProbe.class);
@@ -77,8 +77,8 @@ static SpanProbe deserializeSpanProbe(byte[] content) throws IOException {
7777
return deserialize(SPAN_PROBE_JSON_ADAPTER, content);
7878
}
7979

80-
static DebuggerProbe deserializeDebuggerProbe(byte[] content) throws IOException {
81-
return deserialize(DEBUGGER_PROBE_JSON_ADAPTER, content);
80+
static TriggerProbe deserializeTriggerProbe(byte[] content) throws IOException {
81+
return deserialize(TRIGGER_PROBE_JSON_ADAPTER, content);
8282
}
8383

8484
static SpanDecorationProbe deserializeSpanDecorationProbe(byte[] content) throws IOException {
@@ -118,9 +118,9 @@ public void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollin
118118
} else if (configId.startsWith(SPAN_PROBE_PREFIX)) {
119119
SpanProbe spanProbe = Adapter.deserializeSpanProbe(content);
120120
configChunks.put(configId, definitions -> definitions.add(spanProbe));
121-
} else if (configId.startsWith(DEBUGGER_PROBE_PREFIX)) {
122-
DebuggerProbe debuggerProbe = Adapter.deserializeDebuggerProbe(content);
123-
configChunks.put(configId, definitions -> definitions.add(debuggerProbe));
121+
} else if (configId.startsWith(TRIGGER_PROBE_PREFIX)) {
122+
TriggerProbe triggerProbe = Adapter.deserializeTriggerProbe(content);
123+
configChunks.put(configId, definitions -> definitions.add(triggerProbe));
124124
} else if (configId.startsWith(SPAN_DECORATION_PROBE_PREFIX)) {
125125
SpanDecorationProbe spanDecorationProbe = Adapter.deserializeSpanDecorationProbe(content);
126126
configChunks.put(configId, definitions -> definitions.add(spanDecorationProbe));
@@ -161,7 +161,7 @@ public void commit(PollingRateHinter pollingRateHinter) {
161161

162162
static class DefinitionBuilder {
163163
private final Collection<ProbeDefinition> definitions = new ArrayList<>();
164-
private int debuggerProbeCount = 0;
164+
private int triggerProbeCount = 0;
165165
private int metricProbeCount = 0;
166166
private int logProbeCount = 0;
167167
private int spanProbeCount = 0;
@@ -194,13 +194,13 @@ void add(SpanProbe probe) {
194194
spanProbeCount++;
195195
}
196196

197-
void add(DebuggerProbe probe) {
198-
if (debuggerProbeCount >= MAX_ALLOWED_DEBUGGER_PROBES) {
199-
LOGGER.debug("Max allowed debugger probes reached, ignoring new probe: {}", probe);
197+
void add(TriggerProbe probe) {
198+
if (triggerProbeCount >= MAX_ALLOWED_TRIGGER_PROBES) {
199+
LOGGER.debug("Max allowed trigger probes reached, ignoring new probe: {}", probe);
200200
return;
201201
}
202202
definitions.add(probe);
203-
debuggerProbeCount++;
203+
triggerProbeCount++;
204204
}
205205

206206
void add(SpanDecorationProbe probe) {
@@ -220,8 +220,8 @@ void addAll(Collection<ProbeDefinition> newDefinitions) {
220220
add((LogProbe) definition);
221221
} else if (definition instanceof SpanProbe) {
222222
add((SpanProbe) definition);
223-
} else if (definition instanceof DebuggerProbe) {
224-
add((DebuggerProbe) definition);
223+
} else if (definition instanceof TriggerProbe) {
224+
add((TriggerProbe) definition);
225225
} else if (definition instanceof SpanDecorationProbe) {
226226
add((SpanDecorationProbe) definition);
227227
}

‎dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
import com.datadog.debugger.instrumentation.DiagnosticMessage;
77
import com.datadog.debugger.instrumentation.InstrumentationResult;
88
import com.datadog.debugger.instrumentation.MethodInfo;
9-
import com.datadog.debugger.probe.DebuggerProbe;
109
import com.datadog.debugger.probe.ExceptionProbe;
1110
import com.datadog.debugger.probe.ForceMethodInstrumentation;
1211
import com.datadog.debugger.probe.LogProbe;
1312
import com.datadog.debugger.probe.MetricProbe;
1413
import com.datadog.debugger.probe.ProbeDefinition;
1514
import com.datadog.debugger.probe.SpanDecorationProbe;
1615
import com.datadog.debugger.probe.SpanProbe;
16+
import com.datadog.debugger.probe.TriggerProbe;
1717
import com.datadog.debugger.probe.Where;
1818
import com.datadog.debugger.sink.DebuggerSink;
1919
import com.datadog.debugger.sink.ProbeStatusSink;
@@ -79,7 +79,7 @@ public class DebuggerTransformer implements ClassFileTransformer {
7979
private static final Pattern COMMA_PATTERN = Pattern.compile(",");
8080
private static final List<Class<?>> PROBE_ORDER =
8181
Arrays.asList(
82-
DebuggerProbe.class,
82+
TriggerProbe.class,
8383
MetricProbe.class,
8484
LogProbe.class,
8585
SpanDecorationProbe.class,
@@ -571,7 +571,7 @@ private List<ToInstrumentInfo> filterAndSortDefinitions(
571571
// note: exception probes are log probes and are handled the same way
572572
if (definition instanceof LogProbe
573573
|| definition instanceof SpanDecorationProbe
574-
|| definition instanceof DebuggerProbe) {
574+
|| definition instanceof TriggerProbe) {
575575
if (definition instanceof ExceptionProbe) {
576576
if (addedExceptionProbe) {
577577
continue;

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/DebuggerProbe.java renamed to dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/TriggerProbe.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
import org.slf4j.Logger;
1818
import org.slf4j.LoggerFactory;
1919

20-
public class DebuggerProbe extends ProbeDefinition {
21-
private static final Logger LOGGER = LoggerFactory.getLogger(DebuggerProbe.class);
20+
public class TriggerProbe extends ProbeDefinition {
21+
private static final Logger LOGGER = LoggerFactory.getLogger(TriggerProbe.class);
2222

2323
// no-arg constructor is required by Moshi to avoid creating instance with unsafe and by-passing
2424
// constructors, including field initializers.
25-
public DebuggerProbe() {
25+
public TriggerProbe() {
2626
this(LANGUAGE, null, null);
2727
}
2828

29-
public DebuggerProbe(String language, ProbeId probeId, Where where) {
29+
public TriggerProbe(String language, ProbeId probeId, Where where) {
3030
super(language, probeId, (Tag[]) null, where, MethodLocation.ENTRY);
3131
}
3232

@@ -63,7 +63,7 @@ public CapturedContext.Status createStatus() {
6363
public boolean equals(Object o) {
6464
if (this == o) return true;
6565
if (o == null || getClass() != o.getClass()) return false;
66-
DebuggerProbe that = (DebuggerProbe) o;
66+
TriggerProbe that = (TriggerProbe) o;
6767
return Objects.equals(language, that.language)
6868
&& Objects.equals(id, that.id)
6969
&& version == that.version
@@ -106,8 +106,8 @@ public static Builder builder() {
106106
}
107107

108108
public static class Builder extends ProbeDefinition.Builder<Builder> {
109-
public DebuggerProbe build() {
110-
return new DebuggerProbe(language, probeId, where);
109+
public TriggerProbe build() {
110+
return new TriggerProbe(language, probeId, where);
111111
}
112112
}
113113
}

‎dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
import com.datadog.debugger.el.ProbeCondition;
3232
import com.datadog.debugger.el.values.StringValue;
3333
import com.datadog.debugger.instrumentation.InstrumentationResult;
34-
import com.datadog.debugger.probe.DebuggerProbe;
3534
import com.datadog.debugger.probe.LogProbe;
3635
import com.datadog.debugger.probe.MetricProbe;
3736
import com.datadog.debugger.probe.ProbeDefinition;
3837
import com.datadog.debugger.probe.SpanDecorationProbe;
3938
import com.datadog.debugger.probe.SpanProbe;
39+
import com.datadog.debugger.probe.TriggerProbe;
4040
import com.datadog.debugger.probe.Where;
4141
import com.datadog.debugger.sink.DebuggerSink;
4242
import com.datadog.debugger.sink.ProbeStatusSink;
@@ -2385,7 +2385,7 @@ public void allProbesSameMethod() throws IOException, URISyntaxException {
23852385
.where(where)
23862386
.build())
23872387
.add(LogProbe.builder().probeId(PROBE_ID3).where(where).build())
2388-
.add(DebuggerProbe.builder().probeId(PROBE_ID4).where(where).build())
2388+
.add(TriggerProbe.builder().probeId(PROBE_ID4).where(where).build())
23892389
.build();
23902390

23912391
CoreTracer tracer = CoreTracer.builder().build();
@@ -2532,7 +2532,7 @@ private TestSnapshotListener installProbes(
25322532
encodedId,
25332533
logProbes,
25342534
configuration.getSpanDecorationProbes(),
2535-
configuration.getDebuggerProbes()));
2535+
configuration.getTriggerProbes()));
25362536
DebuggerContext.initClassFilter(new DenyListHelper(null));
25372537
DebuggerContext.initValueSerializer(new JsonSnapshotSerializer());
25382538
if (logProbes != null) {
@@ -2555,7 +2555,7 @@ private ProbeImplementation resolver(
25552555
String encodedId,
25562556
Collection<LogProbe> logProbes,
25572557
Collection<SpanDecorationProbe> spanDecorationProbes,
2558-
Collection<DebuggerProbe> debuggerProbes) {
2558+
Collection<TriggerProbe> triggerProbes) {
25592559
for (LogProbe probe : logProbes) {
25602560
if (probe.getProbeId().getEncodedId().equals(encodedId)) {
25612561
return probe;
@@ -2566,7 +2566,7 @@ private ProbeImplementation resolver(
25662566
return probe;
25672567
}
25682568
}
2569-
for (DebuggerProbe probe : debuggerProbes) {
2569+
for (TriggerProbe probe : triggerProbes) {
25702570
if (probe.getProbeId().getEncodedId().equals(encodedId)) {
25712571
return probe;
25722572
}

0 commit comments

Comments
 (0)