Skip to content

Commit e90f79b

Browse files
committed
chore(tests): add more tests for data collection
1 parent 190bca6 commit e90f79b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1324
-99
lines changed

.idea/kubernetes-settings.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

agent/src/main/java/com/intergral/deep/agent/DeepAgent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public String id() {
151151

152152
@Override
153153
public boolean isEnabled() {
154-
return this.settings.getSettingAs(ISettings.KEY_ENABLED, Boolean.class);
154+
return this.settings.isActive();
155155
}
156156

157157
@Override

agent/src/main/java/com/intergral/deep/agent/push/PushUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,12 @@ private static Iterable<? extends StackFrame> convertFrames(
135135
}).collect(Collectors.toList());
136136
}
137137

138-
private static Iterable<? extends com.intergral.deep.proto.tracepoint.v1.VariableID> covertVariables(
138+
public static Collection<com.intergral.deep.proto.tracepoint.v1.VariableID> covertVariables(
139139
final Collection<VariableID> frameVariables) {
140140
return frameVariables.stream().map(PushUtils::convertVariableID).collect(Collectors.toList());
141141
}
142142

143-
private static Map<String, Variable> convertVarLookup(
143+
public static Map<String, Variable> convertVarLookup(
144144
final Map<String, com.intergral.deep.agent.types.snapshot.Variable> varLookup) {
145145
return varLookup.entrySet()
146146
.stream()

agent/src/main/java/com/intergral/deep/agent/tracepoint/handler/FrameCollector.java

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package com.intergral.deep.agent.tracepoint.handler;
1919

20+
import com.intergral.deep.agent.Utils;
2021
import com.intergral.deep.agent.api.plugin.IEvaluator;
2122
import com.intergral.deep.agent.api.resource.Resource;
2223
import com.intergral.deep.agent.settings.Settings;
@@ -47,7 +48,6 @@ public class FrameCollector extends VariableProcessor {
4748
protected final Map<String, Object> variables;
4849
private final StackTraceElement[] stack;
4950

50-
private final Map<String, String> varCache = new HashMap<>();
5151
private final String jspSuffix;
5252
private final List<String> jspPackages;
5353

@@ -214,23 +214,6 @@ protected boolean processNode(final Node node) {
214214
return true;
215215
}
216216

217-
private boolean checkVarCount() {
218-
return varCache.size() <= this.frameConfig.maxVariables();
219-
}
220-
221-
@Override
222-
protected String checkId(final String identity) {
223-
return this.varCache.get(identity);
224-
}
225-
226-
@Override
227-
protected String newVarId(final String identity) {
228-
final int size = this.varCache.size();
229-
final String newId = String.valueOf(size + 1);
230-
this.varCache.put(identity, newId);
231-
return newId;
232-
}
233-
234217
protected boolean isAppFrame(final StackTraceElement stackTraceElement) {
235218
final List<String> inAppInclude = settings.getAsList("in.app.include");
236219
final List<String> inAppExclude = settings.getAsList("in.app.exclude");
@@ -255,7 +238,7 @@ private String getFileName(final StackTraceElement stackTraceElement) {
255238
if (stackTraceElement.getFileName() == null) {
256239
return InstUtils.shortClassName(stackTraceElement.getClassName());
257240
}
258-
return stackTraceElement.getFileName();
241+
return Utils.trimPrefix(stackTraceElement.getFileName(), "/");
259242
}
260243

261244
protected String getMethodName(final StackTraceElement stackTraceElement,

agent/src/main/java/com/intergral/deep/agent/tracepoint/handler/FrameProcessor.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,7 @@ private boolean conditionPasses(final TracePointConfig tracePointConfig) {
6666
}
6767

6868
public void configureSelf() {
69-
for (TracePointConfig tracePointConfig : this.filteredTracepoints) {
70-
this.frameConfig.process(tracePointConfig);
71-
}
72-
this.frameConfig.close();
69+
configureSelf(this.filteredTracepoints);
7370
}
7471

7572
public Collection<EventSnapshot> collect() {

0 commit comments

Comments
 (0)