Skip to content

Commit 3c65153

Browse files
KevinRansomcolombod
KevinRansom
authored and
colombod
committed
Remove logging
1 parent 9f3889c commit 3c65153

File tree

3 files changed

+35
-125
lines changed

3 files changed

+35
-125
lines changed

‎src/Microsoft.DotNet.Interactive.PackageManagement/KernelSupportsNugetExtensions.cs

Lines changed: 35 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using Microsoft.DotNet.Interactive.Commands;
1414
using Microsoft.DotNet.Interactive.Events;
1515
using Microsoft.DotNet.Interactive.Formatting;
16-
using Pocket;
1716
using static Microsoft.DotNet.Interactive.Formatting.PocketViewTags;
1817

1918
namespace Microsoft.DotNet.Interactive
@@ -208,60 +207,50 @@ internal static KernelCommandInvocation DoNugetRestore()
208207
Enumerable.Empty<string>().ToList(),
209208
0);
210209

211-
using (var operation = Logger.Log.OnEnterAndExit())
212-
{
213-
CreateOrUpdateDisplayValue(context, installPackagesPropertyName, installMessage);
210+
CreateOrUpdateDisplayValue(context, installPackagesPropertyName, installMessage);
214211

215-
var currentPackageReferences = kernel.ResolvedPackageReferences?.ToHashSet() ?? new HashSet<ResolvedPackageReference>();
216-
var restorePackagesTask = kernel.RestoreAsync();
217-
var delay = 500;
218-
while (await Task.WhenAny(Task.Delay(delay), restorePackagesTask) != restorePackagesTask)
212+
var currentPackageReferences = kernel.ResolvedPackageReferences?.ToHashSet() ?? new HashSet<ResolvedPackageReference>();
213+
var restorePackagesTask = kernel.RestoreAsync();
214+
var delay = 500;
215+
while (await Task.WhenAny(Task.Delay(delay), restorePackagesTask) != restorePackagesTask)
216+
{
217+
if (context.CancellationToken.IsCancellationRequested)
219218
{
220-
if (context.CancellationToken.IsCancellationRequested)
221-
{
222-
break;
223-
}
224-
installMessage.Progress = 1 + installMessage.Progress;
225-
CreateOrUpdateDisplayValue(context, installPackagesPropertyName, installMessage);
219+
break;
226220
}
221+
installMessage.Progress = 1 + installMessage.Progress;
222+
CreateOrUpdateDisplayValue(context, installPackagesPropertyName, installMessage);
223+
}
227224

228-
var result = await restorePackagesTask;
229-
230-
var resultMessage = new InstallPackagesMessage(
231-
requestedSources,
232-
Enumerable.Empty<string>().ToList(),
233-
kernel.ResolvedPackageReferences.Where(r => requestedPackages.Contains(r.PackageName, StringComparer.OrdinalIgnoreCase)).Where(currentPackageReferences.Add).Select(s => $"{s.PackageName}, {s.PackageVersion}").OrderBy(s => s).ToList(),
234-
0);
225+
var result = await restorePackagesTask;
235226

236-
var logMessage = new InstallPackagesMessage(
237-
kernel.RestoreSources.OrderBy(s => s).ToList(),
238-
requestedPackages,
239-
kernel.ResolvedPackageReferences.Select(s => $"{s.PackageName}, {s.PackageVersion}").OrderBy(s => s).ToList(),
240-
0);
227+
var resultMessage = new InstallPackagesMessage(
228+
requestedSources,
229+
Enumerable.Empty<string>().ToList(),
230+
kernel.ResolvedPackageReferences.Where(r => requestedPackages.Contains(r.PackageName, StringComparer.OrdinalIgnoreCase)).Where(currentPackageReferences.Add).Select(s => $"{s.PackageName}, {s.PackageVersion}").OrderBy(s => s).ToList(),
231+
0);
241232

242-
if (result.Succeeded)
243-
{
244-
foreach (var line in logMessage.FormatAsPlainTextLines())
245-
{
246-
operation.Info(line);
247-
}
233+
var logMessage = new InstallPackagesMessage(
234+
kernel.RestoreSources.OrderBy(s => s).ToList(),
235+
requestedPackages,
236+
kernel.ResolvedPackageReferences.Select(s => $"{s.PackageName}, {s.PackageVersion}").OrderBy(s => s).ToList(),
237+
0);
248238

249-
kernel?.RegisterResolvedPackageReferences(result.ResolvedReferences);
250-
foreach (var resolvedReference in result.ResolvedReferences)
251-
{
252-
context.Publish(new PackageAdded(resolvedReference, context.Command));
253-
}
254-
CreateOrUpdateDisplayValue(context, installPackagesPropertyName, resultMessage);
255-
}
256-
else
239+
if (result.Succeeded)
240+
{
241+
kernel?.RegisterResolvedPackageReferences(result.ResolvedReferences);
242+
foreach (var resolvedReference in result.ResolvedReferences)
257243
{
258-
operation.Info($"failed: {operation.Info(installMessage.FormatAsPlainText())}");
259-
260-
var errors = $"{string.Join(Environment.NewLine, result.Errors)}";
261-
CreateOrUpdateDisplayValue(context, installPackagesPropertyName, resultMessage);
262-
context.Fail(message: errors);
244+
context.Publish(new PackageAdded(resolvedReference, context.Command));
263245
}
264-
};
246+
CreateOrUpdateDisplayValue(context, installPackagesPropertyName, resultMessage);
247+
}
248+
else
249+
{
250+
var errors = $"{string.Join(Environment.NewLine, result.Errors)}";
251+
CreateOrUpdateDisplayValue(context, installPackagesPropertyName, resultMessage);
252+
context.Fail(message: errors);
253+
}
265254
};
266255
await invocationContext.HandlingKernel.SendAsync(new AnonymousKernelCommand(restore));
267256
};

‎src/dotnet-interactive.IntegrationTests/LoggingTests.cs

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -86,83 +86,5 @@ public async Task kernel_server_honors_log_path()
8686
var logFileContents = File.ReadAllText(logFile.FullName);
8787
logFileContents.Should().Contain("CodeSubmissionReceived: 1+1");
8888
}
89-
90-
[IntegrationFact]
91-
public async Task Pound_r_nuget_should_produce_full_log()
92-
{
93-
var expectedLogging = new[]
94-
{
95-
"Installed Packages,",
96-
" - google.protobuf,",
97-
" - microsoft.ml,",
98-
" - microsoft.ml.cpumath,",
99-
" - microsoft.ml.dataview,",
100-
" - microsoft.ml.onnxruntime,",
101-
" - Microsoft.ML.OnnxTransformer,",
102-
" - newtonsoft.json,",
103-
" - system.codedom,",
104-
" - system.numerics.tensors,"
105-
};
106-
107-
using var logPath = DisposableDirectory.Create();
108-
109-
_output.WriteLine($"Created log file: {logPath.Directory.FullName}");
110-
111-
using var outputReceived = new ManualResetEvent(false);
112-
var outputLock = new object();
113-
var receivedOutput = false;
114-
var errorLines = new List<string>();
115-
var waitTime = TimeSpan.FromSeconds(10);
116-
117-
// start as external process
118-
var kernelServerProcess = ProcessHelper.Start(
119-
command: "dotnet",
120-
args: $@"interactive stdio --log-path ""{logPath.Directory.FullName}"" --verbose",
121-
workingDir: new DirectoryInfo(Directory.GetCurrentDirectory()),
122-
output: _line =>
123-
{
124-
lock (outputLock)
125-
{
126-
if (!receivedOutput)
127-
{
128-
receivedOutput = true;
129-
outputReceived.Set();
130-
}
131-
}
132-
},
133-
error: errorLines.Add);
134-
135-
// wait for log file to be created
136-
var logFile = await logPath.Directory.WaitForFile(
137-
timeout: waitTime,
138-
predicate: _file => true); // any matching file is the one we want
139-
errorLines.Should().BeEmpty("there should not be any errors");
140-
logFile.Should().NotBeNull($"a log file should have been created at {logFile.FullName}");
141-
142-
// submit code
143-
var code = @"#r ""nuget:Microsoft.ML.OnnxTransformer,1.4.0""";
144-
var submissionJson = @"{""token"":""abc"",""commandType"":""SubmitCode"",""command"":{""code"":"""+ code + @""",""submissionType"":0,""targetKernelName"":null}}";
145-
await kernelServerProcess.StandardInput.WriteLineAsync(submissionJson);
146-
await kernelServerProcess.StandardInput.FlushAsync();
147-
148-
// wait for output to proceed
149-
var gotOutput = outputReceived.WaitOne(timeout: TimeSpan.FromSeconds(4));
150-
gotOutput.Should().BeTrue("expected to receive on stdout");
151-
152-
// kill
153-
await Task.Delay(TimeSpan.FromSeconds(4)); // allow logs to be flushed
154-
kernelServerProcess.Kill();
155-
kernelServerProcess.WaitForExit(2000).Should().BeTrue("process should exit quickly");
156-
errorLines.Should().BeEmpty();
157-
158-
// check log file for expected contents
159-
(await logFile.WaitForFileCondition(
160-
timeout: waitTime,
161-
predicate: file => file.Length > 0))
162-
.Should()
163-
.BeTrue($"expected non-empty log file within {waitTime.TotalSeconds}s");
164-
var logFileContents = File.ReadAllText(logFile.FullName);
165-
logFileContents.Should().ContainAll (expectedLogging);
166-
}
16789
}
16890
}

‎src/dotnet-interactive/Program.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public static async Task<int> Main(string[] args)
3838
typeof(Kernel).Assembly, // Microsoft.DotNet.Interactive.dll
3939
typeof(Shell).Assembly, // Microsoft.DotNet.Interactive.Jupyter.dll
4040
typeof(AspNetCoreCSharpKernelExtensions).Assembly, // Microsoft.DotNet.Interactive.AspNetCore.dll
41-
typeof(Microsoft.DotNet.Interactive.ISupportNuget).Assembly, // Microsoft.DotNet.Interactive.PackageManagement.dll
4241
};
4342

4443
internal static IDisposable StartToolLogging(StartupOptions options)

0 commit comments

Comments
 (0)