Skip to content

Commit 1365f7b

Browse files
committed
Remove limits of 100 max probes
to be able to create more with MCP
1 parent 7a4d8d0 commit 1365f7b

File tree

2 files changed

+0
-97
lines changed

2 files changed

+0
-97
lines changed

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

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@
2929
import org.slf4j.LoggerFactory;
3030

3131
public class DebuggerProductChangesListener implements ProductListener {
32-
public static final int MAX_ALLOWED_TRIGGER_PROBES = 100;
33-
public static final int MAX_ALLOWED_METRIC_PROBES = 100;
34-
public static final int MAX_ALLOWED_LOG_PROBES = 100;
35-
public static final int MAX_ALLOWED_SPAN_PROBES = 100;
36-
public static final int MAX_ALLOWED_SPAN_DECORATION_PROBES = 100;
3732
public static final String LOG_PROBE_PREFIX = "logProbe_";
3833
public static final String METRIC_PROBE_PREFIX = "metricProbe_";
3934
public static final String SPAN_PROBE_PREFIX = "spanProbe_";
@@ -168,46 +163,26 @@ static class DefinitionBuilder {
168163
private int spanDecorationProbeCount = 0;
169164

170165
void add(MetricProbe probe) {
171-
if (metricProbeCount >= MAX_ALLOWED_METRIC_PROBES) {
172-
LOGGER.debug("Max allowed metric probes reached, ignoring new probe: {}", probe);
173-
return;
174-
}
175166
definitions.add(probe);
176167
metricProbeCount++;
177168
}
178169

179170
void add(LogProbe probe) {
180-
if (logProbeCount >= MAX_ALLOWED_LOG_PROBES) {
181-
LOGGER.debug("Max allowed log probes reached, ignoring new probe: {}", probe);
182-
return;
183-
}
184171
definitions.add(probe);
185172
logProbeCount++;
186173
}
187174

188175
void add(SpanProbe probe) {
189-
if (spanProbeCount >= MAX_ALLOWED_SPAN_PROBES) {
190-
LOGGER.debug("Max allowed span probes reached, ignoring new probe: {}", probe);
191-
return;
192-
}
193176
definitions.add(probe);
194177
spanProbeCount++;
195178
}
196179

197180
void add(TriggerProbe probe) {
198-
if (triggerProbeCount >= MAX_ALLOWED_TRIGGER_PROBES) {
199-
LOGGER.debug("Max allowed trigger probes reached, ignoring new probe: {}", probe);
200-
return;
201-
}
202181
definitions.add(probe);
203182
triggerProbeCount++;
204183
}
205184

206185
void add(SpanDecorationProbe probe) {
207-
if (spanDecorationProbeCount >= MAX_ALLOWED_SPAN_DECORATION_PROBES) {
208-
LOGGER.debug("Max allowed span decoration probes reached, ignoring new probe: {}", probe);
209-
return;
210-
}
211186
definitions.add(probe);
212187
spanDecorationProbeCount++;
213188
}

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerProductChangesListenerTest.java

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

3-
import static com.datadog.debugger.agent.DebuggerProductChangesListener.MAX_ALLOWED_LOG_PROBES;
4-
import static com.datadog.debugger.agent.DebuggerProductChangesListener.MAX_ALLOWED_METRIC_PROBES;
5-
import static com.datadog.debugger.agent.DebuggerProductChangesListener.MAX_ALLOWED_SPAN_DECORATION_PROBES;
6-
import static com.datadog.debugger.agent.DebuggerProductChangesListener.MAX_ALLOWED_SPAN_PROBES;
73
import static com.datadog.debugger.util.LogProbeTestHelper.parseTemplate;
84
import static datadog.remoteconfig.PollingHinterNoop.NOOP;
95
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
@@ -197,74 +193,6 @@ public void badConfigIDFailsToAccept() throws IOException {
197193
assertNull(acceptor.definitions);
198194
}
199195

200-
@Test
201-
public void maxLogProbes() {
202-
SimpleAcceptor acceptor = new SimpleAcceptor();
203-
DebuggerProductChangesListener listener =
204-
new DebuggerProductChangesListener(tracerConfig, acceptor);
205-
for (int i = 0; i < 200; i++) {
206-
LogProbe probe =
207-
LogProbe.builder()
208-
.probeId(String.valueOf(i), 0)
209-
.where("java.lang.String", "concat" + i)
210-
.build();
211-
acceptLogProbe(listener, probe);
212-
}
213-
listener.commit(NOOP);
214-
assertEquals(MAX_ALLOWED_LOG_PROBES, acceptor.getDefinitions().size());
215-
}
216-
217-
@Test
218-
public void maxMetricProbes() {
219-
SimpleAcceptor acceptor = new SimpleAcceptor();
220-
DebuggerProductChangesListener listener =
221-
new DebuggerProductChangesListener(tracerConfig, acceptor);
222-
for (int i = 0; i < 200; i++) {
223-
MetricProbe probe =
224-
MetricProbe.builder()
225-
.probeId(String.valueOf(i), 0)
226-
.where("java.lang.String", "concat" + i)
227-
.build();
228-
acceptMetricProbe(listener, probe);
229-
}
230-
listener.commit(NOOP);
231-
assertEquals(MAX_ALLOWED_METRIC_PROBES, acceptor.getDefinitions().size());
232-
}
233-
234-
@Test
235-
public void maxSpanProbes() {
236-
SimpleAcceptor acceptor = new SimpleAcceptor();
237-
DebuggerProductChangesListener listener =
238-
new DebuggerProductChangesListener(tracerConfig, acceptor);
239-
for (int i = 0; i < 200; i++) {
240-
SpanProbe probe =
241-
SpanProbe.builder()
242-
.probeId(String.valueOf(i), 0)
243-
.where("java.lang.String", "concat" + i)
244-
.build();
245-
acceptSpanProbe(listener, probe);
246-
}
247-
listener.commit(NOOP);
248-
assertEquals(MAX_ALLOWED_SPAN_PROBES, acceptor.getDefinitions().size());
249-
}
250-
251-
@Test
252-
public void maxSpanDecorationProbes() {
253-
SimpleAcceptor acceptor = new SimpleAcceptor();
254-
DebuggerProductChangesListener listener =
255-
new DebuggerProductChangesListener(tracerConfig, acceptor);
256-
for (int i = 0; i < 200; i++) {
257-
SpanDecorationProbe probe =
258-
SpanDecorationProbe.builder()
259-
.probeId(String.valueOf(i), 0)
260-
.where("java.lang.String", "concat" + i)
261-
.build();
262-
acceptSpanDecorationProbe(listener, probe);
263-
}
264-
listener.commit(NOOP);
265-
assertEquals(MAX_ALLOWED_SPAN_DECORATION_PROBES, acceptor.getDefinitions().size());
266-
}
267-
268196
@Test
269197
public void parsingException() throws IOException {
270198
SimpleAcceptor acceptor = new SimpleAcceptor();

0 commit comments

Comments
 (0)