Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated stacktrace format in java trace messages #13847

Merged
merged 3 commits into from
Jun 16, 2022
Merged

updated stacktrace format in java trace messages #13847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8724696
updated stacktrace format in java trace messages
Phlair Jun 16, 2022
185a611
test checks specifically on stacktrace in trace message
Phlair Jun 16, 2022
e4c5dcf
remove unused import
Phlair Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ases/base-java/src/main/java/io/airbyte/integrations/base/AirbyteTraceMessageUtility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import io.airbyte.protocol.models.AirbyteMessage;
import io.airbyte.protocol.models.AirbyteMessage.Type;
import io.airbyte.protocol.models.AirbyteTraceMessage;
import java.util.Arrays;
import java.util.function.Consumer;
import org.apache.commons.lang3.exception.ExceptionUtils;

public final class AirbyteTraceMessageUtility {

Expand Down Expand Up @@ -53,7 +53,7 @@ private static AirbyteMessage makeErrorTraceAirbyteMessage(
.withFailureType(failureType)
.withMessage(displayMessage)
.withInternalMessage(e.toString())
.withStackTrace(Arrays.toString(e.getStackTrace()))));
.withStackTrace(ExceptionUtils.getStackTrace(e))));
}

private static AirbyteMessage makeAirbyteMessageFromTraceMessage(AirbyteTraceMessage airbyteTraceMessage) {
Expand Down
19 changes: 17 additions & 2 deletions .../base-java/src/test/java/io/airbyte/integrations/base/AirbyteTraceMessageUtilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,17 @@ private void assertJsonNodeIsTraceMessage(JsonNode jsonNode) {
@Test
void testEmitSystemErrorTrace() {
AirbyteTraceMessageUtility.emitSystemErrorTrace(Mockito.mock(RuntimeException.class), "this is a system error");
assertJsonNodeIsTraceMessage(Jsons.deserialize(outContent.toString(StandardCharsets.UTF_8)));
JsonNode outJson = Jsons.deserialize(outContent.toString(StandardCharsets.UTF_8));
assertJsonNodeIsTraceMessage(outJson);
Assertions.assertEquals("system_error", outJson.get("trace").get("error").get("failure_type").asText());
}

@Test
void testEmitConfigErrorTrace() {
AirbyteTraceMessageUtility.emitConfigErrorTrace(Mockito.mock(RuntimeException.class), "this is a config error");
assertJsonNodeIsTraceMessage(Jsons.deserialize(outContent.toString(StandardCharsets.UTF_8)));
JsonNode outJson = Jsons.deserialize(outContent.toString(StandardCharsets.UTF_8));
assertJsonNodeIsTraceMessage(outJson);
Assertions.assertEquals("config_error", outJson.get("trace").get("error").get("failure_type").asText());
}

@Test
Expand All @@ -51,6 +55,17 @@ void testEmitErrorTrace() {
assertJsonNodeIsTraceMessage(Jsons.deserialize(outContent.toString(StandardCharsets.UTF_8)));
}

@Test
void testCorrectStacktraceFormat() {
try {
int x = 1 / 0;
} catch (Exception e) {
AirbyteTraceMessageUtility.emitSystemErrorTrace(e, "you exploded the universe");
}
JsonNode outJson = Jsons.deserialize(outContent.toString(StandardCharsets.UTF_8));
Assertions.assertTrue(outJson.get("trace").get("error").get("stack_trace").asText().contains("\n\tat"));
}

@AfterEach
public void revertOut() {
System.setOut(originalOut);
Expand Down