Skip to content

Use plugin logger for VmServiceWrapper #8517

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 2 commits into from
Sep 10, 2025
Merged

Use plugin logger for VmServiceWrapper #8517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4588b5
Use plugin logger for VmServiceWrapper
helin24 Sep 8, 2025
c97cc13
Use plugin logger for debug process
helin24 Sep 8, 2025
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
3 changes: 2 additions & 1 deletion src/io/flutter/vmService/DartVmServiceDebugProcess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import io.flutter.FlutterBundle;
import io.flutter.FlutterUtils;
import io.flutter.ObservatoryConnector;
import io.flutter.logging.PluginLogger;
import io.flutter.run.FlutterLaunchMode;
import io.flutter.utils.OpenApiUtils;
import io.flutter.vmService.frame.DartVmServiceEvaluator;
Expand All @@ -59,7 +60,7 @@
import java.util.concurrent.CompletableFuture;

public abstract class DartVmServiceDebugProcess extends XDebugProcess {
private static final @NotNull Logger LOG = Logger.getInstance(DartVmServiceDebugProcess.class.getName());
private static final @NotNull Logger LOG = PluginLogger.createLogger(DartVmServiceDebugProcess.class);

@NotNull private final ExecutionResult myExecutionResult;
@NotNull private final DartUrlResolver myDartUrlResolver;
Expand Down
8 changes: 5 additions & 3 deletions src/io/flutter/vmService/VmServiceWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@
import com.intellij.xdebugger.impl.XDebugSessionImpl;
import com.jetbrains.lang.dart.DartFileType;
import io.flutter.bazel.WorkspaceCache;
import io.flutter.logging.PluginLogger;
import io.flutter.sdk.FlutterSdk;
import io.flutter.sdk.FlutterSdkVersion;
import io.flutter.settings.FlutterSettings;
import io.flutter.utils.OpenApiUtils;
import io.flutter.vmService.frame.DartAsyncMarkerFrame;
import io.flutter.vmService.frame.DartVmServiceEvaluator;
Expand Down Expand Up @@ -88,7 +90,7 @@
import java.util.regex.Pattern;

public class VmServiceWrapper implements Disposable {
@NotNull private static final Logger LOG = Logger.getInstance(VmServiceWrapper.class.getName());
@NotNull private static final Logger LOG = PluginLogger.createLogger(VmServiceWrapper.class);

private static final long RESPONSE_WAIT_TIMEOUT = 3000; // millis

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

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

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

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