Skip to content

Commit 690b872

Browse files
authored
Use plugin logger for VmServiceWrapper (#8517)
Part of #8369
1 parent e9b498d commit 690b872

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/io/flutter/vmService/DartVmServiceDebugProcess.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import io.flutter.FlutterBundle;
3636
import io.flutter.FlutterUtils;
3737
import io.flutter.ObservatoryConnector;
38+
import io.flutter.logging.PluginLogger;
3839
import io.flutter.run.FlutterLaunchMode;
3940
import io.flutter.utils.OpenApiUtils;
4041
import io.flutter.vmService.frame.DartVmServiceEvaluator;
@@ -59,7 +60,7 @@
5960
import java.util.concurrent.CompletableFuture;
6061

6162
public abstract class DartVmServiceDebugProcess extends XDebugProcess {
62-
private static final @NotNull Logger LOG = Logger.getInstance(DartVmServiceDebugProcess.class.getName());
63+
private static final @NotNull Logger LOG = PluginLogger.createLogger(DartVmServiceDebugProcess.class);
6364

6465
@NotNull private final ExecutionResult myExecutionResult;
6566
@NotNull private final DartUrlResolver myDartUrlResolver;

src/io/flutter/vmService/VmServiceWrapper.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
import com.intellij.xdebugger.impl.XDebugSessionImpl;
2525
import com.jetbrains.lang.dart.DartFileType;
2626
import io.flutter.bazel.WorkspaceCache;
27+
import io.flutter.logging.PluginLogger;
2728
import io.flutter.sdk.FlutterSdk;
2829
import io.flutter.sdk.FlutterSdkVersion;
30+
import io.flutter.settings.FlutterSettings;
2931
import io.flutter.utils.OpenApiUtils;
3032
import io.flutter.vmService.frame.DartAsyncMarkerFrame;
3133
import io.flutter.vmService.frame.DartVmServiceEvaluator;
@@ -88,7 +90,7 @@
8890
import java.util.regex.Pattern;
8991

9092
public class VmServiceWrapper implements Disposable {
91-
@NotNull private static final Logger LOG = Logger.getInstance(VmServiceWrapper.class.getName());
93+
@NotNull private static final Logger LOG = PluginLogger.createLogger(VmServiceWrapper.class);
9294

9395
private static final long RESPONSE_WAIT_TIMEOUT = 3000; // millis
9496

@@ -560,7 +562,7 @@ public void addBreakpointWithVmService(@NotNull String isolateId,
560562
int line = position.getLine() + 1;
561563

562564
String resolvedUri = getResolvedUri(position);
563-
LOG.info("Computed resolvedUri: " + resolvedUri);
565+
if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) LOG.info("Computed resolvedUri: " + resolvedUri);
564566
List<String> resolvedUriList = List.of(percentEscapeUri(resolvedUri));
565567

566568
CanonicalBreakpoint canonicalBreakpoint =
@@ -636,7 +638,7 @@ private String getResolvedUri(@NotNull XSourcePosition position) {
636638
WorkspaceCache.getInstance(session.getProject()).isBazel() ? position.getFile() : position.getFile().getCanonicalFile();
637639
assert file != null;
638640
String url = file.getUrl();
639-
LOG.info("in getResolvedUri. url: " + url);
641+
if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) LOG.info("in getResolvedUri. url: " + url);
640642

641643
if (WorkspaceCache.getInstance(myDebugProcess.getSession().getProject()).isBazel()) {
642644
String root = WorkspaceCache.getInstance(myDebugProcess.getSession().getProject()).get().getRoot().getPath();

0 commit comments

Comments
 (0)