rename the DebuggerProbe to TriggerProbe #7737
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,14 +6,14 @@ | |
| import com.datadog.debugger.instrumentation.DiagnosticMessage; | ||
| import com.datadog.debugger.instrumentation.InstrumentationResult; | ||
| import com.datadog.debugger.instrumentation.MethodInfo; | ||
| import com.datadog.debugger.probe.ExceptionProbe; | ||
| import com.datadog.debugger.probe.ForceMethodInstrumentation; | ||
| import com.datadog.debugger.probe.LogProbe; | ||
| import com.datadog.debugger.probe.MetricProbe; | ||
| import com.datadog.debugger.probe.ProbeDefinition; | ||
| import com.datadog.debugger.probe.SpanDecorationProbe; | ||
| import com.datadog.debugger.probe.SpanProbe; | ||
| import com.datadog.debugger.probe.TriggerProbe; | ||
| import com.datadog.debugger.probe.Where; | ||
| import com.datadog.debugger.sink.DebuggerSink; | ||
| import com.datadog.debugger.sink.ProbeStatusSink; | ||
|
|
@@ -79,7 +79,7 @@ public class DebuggerTransformer implements ClassFileTransformer { | |
| private static final Pattern COMMA_PATTERN = Pattern.compile(","); | ||
| private static final List<Class<?>> PROBE_ORDER = | ||
| Arrays.asList( | ||
| TriggerProbe.class, | ||
| MetricProbe.class, | ||
| LogProbe.class, | ||
| SpanDecorationProbe.class, | ||
|
|
@@ -571,7 +571,7 @@ private List<ToInstrumentInfo> filterAndSortDefinitions( | |
| // note: exception probes are log probes and are handled the same way | ||
| if (definition instanceof LogProbe | ||
| || definition instanceof SpanDecorationProbe | ||
| || definition instanceof TriggerProbe) { | ||
| if (definition instanceof ExceptionProbe) { | ||
| if (addedExceptionProbe) { | ||
| continue; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,16 +17,16 @@ | |
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class TriggerProbe extends ProbeDefinition { | ||
| private static final Logger LOGGER = LoggerFactory.getLogger(TriggerProbe.class); | ||
|
|
||
| // no-arg constructor is required by Moshi to avoid creating instance with unsafe and by-passing | ||
| // constructors, including field initializers. | ||
| public TriggerProbe() { | ||
| this(LANGUAGE, null, null); | ||
| } | ||
|
|
||
| public TriggerProbe(String language, ProbeId probeId, Where where) { | ||
| super(language, probeId, (Tag[]) null, where, MethodLocation.ENTRY); | ||
| } | ||
|
|
||
|
|
@@ -63,7 +63,7 @@ public CapturedContext.Status createStatus() { | |
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
| TriggerProbe that = (TriggerProbe) o; | ||
| return Objects.equals(language, that.language) | ||
| && Objects.equals(id, that.id) | ||
| && version == that.version | ||
|
|
@@ -106,8 +106,8 @@ public static Builder builder() { | |
| } | ||
|
|
||
| public static class Builder extends ProbeDefinition.Builder<Builder> { | ||
| public TriggerProbe build() { | ||
| return new TriggerProbe(language, probeId, where); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,12 +31,12 @@ | |
| import com.datadog.debugger.el.ProbeCondition; | ||
| import com.datadog.debugger.el.values.StringValue; | ||
| import com.datadog.debugger.instrumentation.InstrumentationResult; | ||
| import com.datadog.debugger.probe.LogProbe; | ||
| import com.datadog.debugger.probe.MetricProbe; | ||
| import com.datadog.debugger.probe.ProbeDefinition; | ||
| import com.datadog.debugger.probe.SpanDecorationProbe; | ||
| import com.datadog.debugger.probe.SpanProbe; | ||
| import com.datadog.debugger.probe.TriggerProbe; | ||
| import com.datadog.debugger.probe.Where; | ||
| import com.datadog.debugger.sink.DebuggerSink; | ||
| import com.datadog.debugger.sink.ProbeStatusSink; | ||
|
|
@@ -2385,7 +2385,7 @@ public void allProbesSameMethod() throws IOException, URISyntaxException { | |
| .where(where) | ||
| .build()) | ||
| .add(LogProbe.builder().probeId(PROBE_ID3).where(where).build()) | ||
| .add(TriggerProbe.builder().probeId(PROBE_ID4).where(where).build()) | ||
| .build(); | ||
|
|
||
| CoreTracer tracer = CoreTracer.builder().build(); | ||
|
|
@@ -2532,7 +2532,7 @@ private TestSnapshotListener installProbes( | |
| encodedId, | ||
| logProbes, | ||
| configuration.getSpanDecorationProbes(), | ||
| configuration.getTriggerProbes())); | ||
| DebuggerContext.initClassFilter(new DenyListHelper(null)); | ||
| DebuggerContext.initValueSerializer(new JsonSnapshotSerializer()); | ||
| if (logProbes != null) { | ||
|
|
@@ -2555,7 +2555,7 @@ private ProbeImplementation resolver( | |
| String encodedId, | ||
| Collection<LogProbe> logProbes, | ||
| Collection<SpanDecorationProbe> spanDecorationProbes, | ||
| Collection<TriggerProbe> triggerProbes) { | ||
| for (LogProbe probe : logProbes) { | ||
| if (probe.getProbeId().getEncodedId().equals(encodedId)) { | ||
| return probe; | ||
|
|
@@ -2566,7 +2566,7 @@ private ProbeImplementation resolver( | |
| return probe; | ||
| } | ||
| } | ||
| for (TriggerProbe probe : triggerProbes) { | ||
| if (probe.getProbeId().getEncodedId().equals(encodedId)) { | ||
| return probe; | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
⚪ Code Quality Violation
single if statement should be wrapped in a brace (...read more)
Omitting braces
{}is valid in multiple statements, such as, for loops, if statements, and while loops. However, enforcing the use of control braces throughout your codebase will make the code more consistent and can make it easier to add statements in the future.