Skip to content

chore: Add logs #227

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

Merged
merged 6 commits into from
Jul 20, 2021
Merged

chore: Add logs #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a9a48ee
Add logs
Jul 20, 2021
f2767bd
spotless
Jul 20, 2021
3e6adcc
Review comment
Jul 20, 2021
a3dbff4
spotless
Jul 20, 2021
4cb9a64
fix test
Jul 20, 2021
21adf29
fix test
Jul 20, 2021
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
43 changes: 43 additions & 0 deletions ...pi/src/main/java/org/hypertrace/traceenricher/trace/util/StructuredTraceGraphBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public static StructuredTraceGraph buildGraph(StructuredTrace trace) {
trace.getCustomerId());
cachedTraceThreadLocal.set(StructuredTrace.newBuilder(trace).build());
cachedGraphThreadLocal.set(graph);
debugGraph("Case: Rebuilding the graph.", graph, trace);
return graph;
}

Expand All @@ -46,8 +47,50 @@ public static StructuredTraceGraph buildGraph(StructuredTrace trace) {
trace.getCustomerId());
cachedTraceThreadLocal.set(StructuredTrace.newBuilder(trace).build());
cachedGraphThreadLocal.set(graph);
debugGraph("Case: Partially building the graph.", graph, trace);
return graph;
}

debugGraph("Case: Not building the graph.", cachedGraphThreadLocal.get(), trace);
return cachedGraphThreadLocal.get();
}

private static void debugGraph(
Copy link
Contributor

@kotharironak kotharironak Jul 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: we will remove this after debugging.

String logPrefix, StructuredTraceGraph graph, StructuredTrace trace) {
if (null != graph
&& (null == graph.getTraceEntitiesGraph() || null == graph.getTraceEventsGraph())) {
LOG.info(
logPrefix
+ "StructuredTraceGraph is not built correctly, trace {}, Is events graph non-null: {}."
+ " Is entities graph non-null: {}",
trace,
(null != graph.getTraceEventsGraph()),
(null != graph.getTraceEntitiesGraph()));

// build the graph again and check
StructuredTraceGraph tempGraph = StructuredTraceGraph.createGraph(trace);
LOG.info(
logPrefix
+ "Recreating StructuredTraceGraph. Is events graph non-null: {}."
+ " Is entities graph non-null: {}",
(null != tempGraph.getTraceEventsGraph()),
(null != tempGraph.getTraceEntitiesGraph()));

tempGraph = StructuredTraceGraph.reCreateTraceEventsGraph(trace);
LOG.info(
logPrefix
+ "Recreating events graph. Is events graph non-null: {}."
+ " Is entities graph non-null: {}",
(null != tempGraph.getTraceEventsGraph()),
(null != tempGraph.getTraceEntitiesGraph()));

tempGraph = StructuredTraceGraph.reCreateTraceEntitiesGraph(trace);
LOG.info(
logPrefix
+ "Recreating entities graph. Is events graph non-null: {}."
+ " Is entities graph non-null: {}",
(null != tempGraph.getTraceEventsGraph()),
(null != tempGraph.getTraceEntitiesGraph()));
}
}
}
15 changes: 12 additions & 3 deletions ...rc/test/java/org/hypertrace/traceenricher/trace/util/StructuredTraceGraphBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,26 @@ void testBuildGraph() {
structuredTraceGraphMockedStatic
.when(() -> StructuredTraceGraph.createGraph(underTestTrace))
.thenReturn(mockedStructuredTraceGraph);

structuredTraceGraphMockedStatic
.when(() -> StructuredTraceGraph.reCreateTraceEntitiesGraph(underTestTrace))
.thenReturn(mockedStructuredTraceGraph);
structuredTraceGraphMockedStatic
.when(() -> StructuredTraceGraph.reCreateTraceEventsGraph(underTestTrace))
.thenReturn(mockedStructuredTraceGraph);
// calls first time
StructuredTraceGraph actual = StructuredTraceGraphBuilder.buildGraph(underTestTrace);
Assertions.assertEquals(mockedStructuredTraceGraph, actual);
structuredTraceGraphMockedStatic.verify(
() -> StructuredTraceGraph.createGraph(underTestTrace), times(1));
// todo change times to 1 when logging is changed to debug level in
// StructuredTraceGraphBuilder#buildGraph
() -> StructuredTraceGraph.createGraph(underTestTrace), times(2));

// calls second time, this time it returns from cache
StructuredTraceGraphBuilder.buildGraph(underTestTrace);
structuredTraceGraphMockedStatic.verify(
() -> StructuredTraceGraph.createGraph(underTestTrace), times(1));
// todo change times to 1 when logging is changed to debug level in
// StructuredTraceGraphBuilder#buildGraph
() -> StructuredTraceGraph.createGraph(underTestTrace), times(3));
}
}
}
Expand Down