Skip to content

Commit 1f4b183

Browse files
evanchoolyevanchooly
committed
slim down the PR even more
1 parent da2fc9c commit 1f4b183

6 files changed

+27
-28
lines changed

‎dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ExceptionDebuggerIntegrationTest.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ void testNoSubsequentCaptureAfterFirst() throws Exception {
9797

9898
// DeepOops exception stacktrace:
9999
// java.lang.RuntimeException: oops
100-
// ddog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithException(ServerDebuggerTestApplication.java:190)
101-
// ddog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException5(ServerDebuggerTestApplication.java:210)
102-
// ddog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException4(ServerDebuggerTestApplication.java:206)
103-
// ddog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException3(ServerDebuggerTestApplication.java:202)
104-
// ddog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException2(ServerDebuggerTestApplication.java:198)
105-
// ddog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException1(ServerDebuggerTestApplication.java:194)
106-
// ddog.smoketest.debugger.ServerDebuggerTestApplication.runTracedMethod(ServerDebuggerTestApplication.java:140)
100+
// datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithException(ServerDebuggerTestApplication.java:190)
101+
// datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException5(ServerDebuggerTestApplication.java:210)
102+
// datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException4(ServerDebuggerTestApplication.java:206)
103+
// datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException3(ServerDebuggerTestApplication.java:202)
104+
// datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException2(ServerDebuggerTestApplication.java:198)
105+
// datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException1(ServerDebuggerTestApplication.java:194)
106+
// datadog.smoketest.debugger.ServerDebuggerTestApplication.runTracedMethod(ServerDebuggerTestApplication.java:140)
107107
@Test
108108
@DisplayName("test3CapturedFrames")
109109
@DisabledIf(
@@ -135,23 +135,23 @@ void test3CapturedFrames() throws Exception {
135135
assertEquals(
136136
"oops", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
137137
assertEquals(
138-
"ddog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithException",
138+
"datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithException",
139139
snapshot.getStack().get(0).getFunction());
140140
assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
141141
// snapshot 1
142142
snapshot = snapshots.get(snapshotId1);
143143
assertEquals(
144144
"oops", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
145145
assertEquals(
146-
"ddog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException5",
146+
"datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException5",
147147
snapshot.getStack().get(0).getFunction());
148148
assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
149149
// snapshot 2
150150
snapshot = snapshots.get(snapshotId2);
151151
assertEquals(
152152
"oops", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
153153
assertEquals(
154-
"ddog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException4",
154+
"datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException4",
155155
snapshot.getStack().get(0).getFunction());
156156
assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
157157
return true;
@@ -196,39 +196,39 @@ void test5CapturedFrames() throws Exception {
196196
assertEquals(
197197
"oops", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
198198
assertEquals(
199-
"ddog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithException",
199+
"datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithException",
200200
snapshot.getStack().get(0).getFunction());
201201
assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
202202
// snapshot 1
203203
snapshot = snapshots.get(snapshotId1);
204204
assertEquals(
205205
"oops", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
206206
assertEquals(
207-
"ddog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException5",
207+
"datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException5",
208208
snapshot.getStack().get(0).getFunction());
209209
assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
210210
// snapshot 2
211211
snapshot = snapshots.get(snapshotId2);
212212
assertEquals(
213213
"oops", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
214214
assertEquals(
215-
"ddog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException4",
215+
"datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException4",
216216
snapshot.getStack().get(0).getFunction());
217217
assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
218218
// snapshot 3
219219
snapshot = snapshots.get(snapshotId3);
220220
assertEquals(
221221
"oops", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
222222
assertEquals(
223-
"ddog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException3",
223+
"datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException3",
224224
snapshot.getStack().get(0).getFunction());
225225
assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
226226
// snapshot 4
227227
snapshot = snapshots.get(snapshotId4);
228228
assertEquals(
229229
"oops", snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
230230
assertEquals(
231-
"ddog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException2",
231+
"datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithDeepException2",
232232
snapshot.getStack().get(0).getFunction());
233233
assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
234234
return true;
@@ -262,7 +262,7 @@ void testLambdaHiddenFrames() throws Exception {
262262
"lambdaOops",
263263
snapshot.getCaptures().getReturn().getCapturedThrowable().getMessage());
264264
assertEquals(
265-
"ddog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithLambdaException",
265+
"datadog.smoketest.debugger.ServerDebuggerTestApplication.tracedMethodWithLambdaException",
266266
snapshot.getStack().get(0).getFunction());
267267
assertFullMethodCaptureArgs(snapshot.getCaptures().getReturn());
268268
return true;

‎dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ void testUncaughtException() throws Exception {
370370
assertEquals("oops uncaught!", throwable.getMessage());
371371
assertTrue(throwable.getStacktrace().size() > 0);
372372
assertEquals(
373-
"ddog.smoketest.debugger.Main.exceptionMethod",
373+
"datadog.smoketest.debugger.Main.exceptionMethod",
374374
throwable.getStacktrace().get(0).getFunction());
375375
}
376376

@@ -403,7 +403,7 @@ void testCaughtException() throws Exception {
403403
snapshot.getCaptures().getCaughtExceptions().get(0);
404404
assertEquals("oops caught!", throwable.getMessage());
405405
assertEquals(
406-
"ddog.smoketest.debugger.Main.exceptionMethod",
406+
"datadog.smoketest.debugger.Main.exceptionMethod",
407407
throwable.getStacktrace().get(0).getFunction());
408408
}
409409

‎dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeStateIntegrationTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void testDisableEnableProbesUsingDenyList() throws Exception {
8686

8787
datadogAgentServer.enqueue(EMPTY_200_RESPONSE); // expect BLOCKED status
8888
Configuration.FilterList denyList =
89-
new Configuration.FilterList(asList("ddog.smoketest.debugger"), Collections.emptyList());
89+
new Configuration.FilterList(asList("datadog.smoketest.debugger"), Collections.emptyList());
9090
setCurrentConfiguration(createConfig(asList(logProbe), null, denyList));
9191
waitForReTransformation(appUrl);
9292
waitForAProbeStatus(ProbeStatus.Status.BLOCKED);
@@ -153,7 +153,7 @@ public void testProbeStatusError() throws Exception {
153153
}
154154
if (probeStatus.getDiagnostics().getStatus() == ProbeStatus.Status.ERROR) {
155155
assertEquals(
156-
"Cannot find method ddog/smoketest/debugger/ServerDebuggerTestApplication::unknownMethodName",
156+
"Cannot find method datadog/smoketest/debugger/ServerDebuggerTestApplication::unknownMethodName",
157157
probeStatus.getDiagnostics().getException().getMessage());
158158
error.set(true);
159159
}

‎dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ServerAppDebuggerIntegrationTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.datadog.debugger.probe.SpanDecorationProbe;
99
import com.datadog.debugger.sink.Snapshot;
1010
import com.squareup.moshi.JsonAdapter;
11-
import datadog.smoketest.debugger.ServerDebuggerTestApplication;
1211
import datadog.trace.bootstrap.debugger.ProbeId;
1312
import datadog.trace.test.agent.decoder.DecodedSpan;
1413
import datadog.trace.util.TagsHelper;
@@ -29,7 +28,7 @@
2928

3029
public class ServerAppDebuggerIntegrationTest extends BaseIntegrationTest {
3130
protected static final String SERVER_DEBUGGER_TEST_APP_CLASS =
32-
ServerDebuggerTestApplication.class.getName();
31+
"datadog.smoketest.debugger.ServerDebuggerTestApplication";
3332
protected static final String CONTROL_URL = "/control";
3433
protected static final ProbeId PROBE_ID = new ProbeId("123356536", 0);
3534
protected static final ProbeId PROBE_ID2 = new ProbeId("1233565367", 12);

‎dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SimpleAppDebuggerIntegrationTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package datadog.smoketest;
22

3-
import datadog.smoketest.debugger.DebuggerTestApplication;
43
import datadog.trace.bootstrap.debugger.ProbeId;
54
import datadog.trace.util.TagsHelper;
65
import org.slf4j.Logger;
@@ -9,7 +8,8 @@
98
public class SimpleAppDebuggerIntegrationTest extends BaseIntegrationTest {
109
protected static final Logger LOG =
1110
LoggerFactory.getLogger(SimpleAppDebuggerIntegrationTest.class);
12-
protected static final String DEBUGGER_TEST_APP_CLASS = DebuggerTestApplication.class.getName();
11+
protected static final String DEBUGGER_TEST_APP_CLASS =
12+
"datadog.smoketest.debugger.DebuggerTestApplication";
1313
protected static final ProbeId PROBE_ID = new ProbeId("123356536", 0);
1414
protected static final ProbeId PROBE_ID2 = new ProbeId("1233565368", 12);
1515
protected static final String MAIN_CLASS_NAME = "Main";

‎dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
public class TracerDebuggerIntegrationTest extends BaseIntegrationTest {
3232

3333
private static final String DEBUGGER_TEST_APP_CLASS =
34-
"ddog.smoketest.debugger.SpringBootTestApplication";
34+
"datadog.smoketest.debugger.SpringBootTestApplication";
3535
private static final ProbeId PROBE_ID = new ProbeId("123356536", 1);
3636

3737
@Override
@@ -93,7 +93,7 @@ void testTracerSameMethod() throws Exception {
9393
LogProbe logProbe =
9494
LogProbe.builder()
9595
.probeId(PROBE_ID)
96-
.where("ddog.smoketest.debugger.controller.WebController", "processWithArg", null)
96+
.where("datadog.smoketest.debugger.controller.WebController", "processWithArg", null)
9797
.captureSnapshot(true)
9898
.build();
9999
JsonSnapshotSerializer.IntakeRequest request = doTestTracer(logProbe);
@@ -152,7 +152,7 @@ private JsonSnapshotSerializer.IntakeRequest doTestTracer(LogProbe logProbe) thr
152152
// assert in logs app started
153153
waitForSpecificLogLine(
154154
logFilePath,
155-
"ddog.smoketest.debugger.SpringBootTestApplication - Started SpringBootTestApplication",
155+
"datadog.smoketest.debugger.SpringBootTestApplication - Started SpringBootTestApplication",
156156
Duration.ofMillis(100),
157157
Duration.ofSeconds(30));
158158
sendRequest("http://localhost:" + httpPort + "/greeting");
@@ -182,7 +182,7 @@ private JsonSnapshotSerializer.IntakeRequest doTestTracer(LogProbe logProbe) thr
182182
protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params) {
183183
List<String> commandParams = getDebuggerCommandParams();
184184
commandParams.add(
185-
"-Ddd.trace.methods=ddog.smoketest.debugger.controller.WebController[processWithArg]");
185+
"-Ddd.trace.methods=datadog.smoketest.debugger.controller.WebController[processWithArg]");
186186
return ProcessBuilderHelper.createProcessBuilder(
187187
commandParams, logFilePath, getAppClass(), params);
188188
}

0 commit comments

Comments
 (0)