Support bundle upload

edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Core/logs/IRequestsUploader.cs

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft. All rights reserved.
+namespace Microsoft.Azure.Devices.Edge.Agent.Core.Logs
+{
+    using System;
+    using System.IO;
+    using System.Threading.Tasks;
+
+    public interface IRequestsUploader
+    {
+        Task UploadLogs(string uri, string module, byte[] payload, LogsContentEncoding logsContentEncoding, LogsContentType logsContentType);
+
+        Task<Func<ArraySegment<byte>, Task>> GetLogsUploaderCallback(string uri, string module, LogsContentEncoding logsContentEncoding, LogsContentType logsContentType);
+
+        Task UploadSupportBundle(string uri, Stream source);
+    }
+}

edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Core/requests/LogsRequest.cs → edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Core/requests/ModuleLogsRequest.cs

@@ -8,9 +8,9 @@ namespace Microsoft.Azure.Devices.Edge.Agent.Core.Requests
     using Microsoft.Azure.Devices.Edge.Util.Json;
     using Newtonsoft.Json;
 
-    public class LogsRequest
+    public class ModuleLogsRequest
     {
-        public LogsRequest(
+        public ModuleLogsRequest(
             string schemaVersion,
             List<LogRequestItem> items,
             LogsContentEncoding encoding,
@@ -23,7 +23,7 @@ public LogsRequest(
         }
 
         [JsonConstructor]
-        LogsRequest(
+        ModuleLogsRequest(
             string schemaVersion,
             List<LogRequestItem> items,
             LogsContentEncoding? encoding,

edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Core/requests/LogsRequestHandler.cs → edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Core/requests/ModuleLogsRequestHandler.cs

@@ -11,7 +11,7 @@ namespace Microsoft.Azure.Devices.Edge.Agent.Core.Requests
     using Microsoft.Azure.Devices.Edge.Util;
     using Microsoft.Extensions.Logging;
 
-    public class LogsRequestHandler : RequestHandlerBase<LogsRequest, IEnumerable<LogsResponse>>
+    public class ModuleLogsRequestHandler : RequestHandlerBase<ModuleLogsRequest, IEnumerable<ModuleLogsResponse>>
     {
         const int MaxTailValue = 500;
 
@@ -20,17 +20,17 @@ public class LogsRequestHandler : RequestHandlerBase<LogsRequest, IEnumerable<Lo
         readonly ILogsProvider logsProvider;
         readonly IRuntimeInfoProvider runtimeInfoProvider;
 
-        public LogsRequestHandler(ILogsProvider logsProvider, IRuntimeInfoProvider runtimeInfoProvider)
+        public ModuleLogsRequestHandler(ILogsProvider logsProvider, IRuntimeInfoProvider runtimeInfoProvider)
         {
             this.logsProvider = Preconditions.CheckNotNull(logsProvider, nameof(logsProvider));
             this.runtimeInfoProvider = Preconditions.CheckNotNull(runtimeInfoProvider, nameof(runtimeInfoProvider));
         }
 
         public override string RequestName => "GetLogs";
 
-        protected override async Task<Option<IEnumerable<LogsResponse>>> HandleRequestInternal(Option<LogsRequest> payloadOption, CancellationToken cancellationToken)
+        protected override async Task<Option<IEnumerable<ModuleLogsResponse>>> HandleRequestInternal(Option<ModuleLogsRequest> payloadOption, CancellationToken cancellationToken)
         {
-            LogsRequest payload = payloadOption.Expect(() => new ArgumentException("Request payload not found"));
+            ModuleLogsRequest payload = payloadOption.Expect(() => new ArgumentException("Request payload not found"));
             if (ExpectedSchemaVersion.CompareMajorVersion(payload.SchemaVersion, "logs upload request schema") != 0)
             {
                 Events.MismatchedMinorVersions(payload.SchemaVersion, ExpectedSchemaVersion);
@@ -47,7 +47,7 @@ protected override async Task<Option<IEnumerable<LogsResponse>>> HandleRequestIn
                 false);
 
             IList<(string id, ModuleLogOptions logOptions)> logOptionsList = await requestToOptionsMapper.MapToLogOptions(payload.Items, cancellationToken);
-            IEnumerable<Task<LogsResponse>> uploadLogsTasks = logOptionsList.Select(
+            IEnumerable<Task<ModuleLogsResponse>> uploadLogsTasks = logOptionsList.Select(
                 async l =>
                 {
                     Events.ReceivedLogOptions(l);
@@ -65,17 +65,17 @@ protected override async Task<Option<IEnumerable<LogsResponse>>> HandleRequestIn
 
                     Events.ReceivedModuleLogs(moduleLogs, l.id);
                     return logOptions.ContentEncoding == LogsContentEncoding.Gzip
-                        ? new LogsResponse(l.id, moduleLogs)
-                        : new LogsResponse(l.id, moduleLogs.FromBytes());
+                        ? new ModuleLogsResponse(l.id, moduleLogs)
+                        : new ModuleLogsResponse(l.id, moduleLogs.FromBytes());
                 });
-            IEnumerable<LogsResponse> response = await Task.WhenAll(uploadLogsTasks);
+            IEnumerable<ModuleLogsResponse> response = await Task.WhenAll(uploadLogsTasks);
             return Option.Some(response);
         }
 
         static class Events
         {
             const int IdStart = AgentEventIds.LogsRequestHandler;
-            static readonly ILogger Log = Logger.Factory.CreateLogger<LogsRequestHandler>();
+            static readonly ILogger Log = Logger.Factory.CreateLogger<ModuleLogsRequestHandler>();
 
             enum EventIds
             {
@@ -107,7 +107,7 @@ public static void ReceivedLogOptions((string id, ModuleLogOptions logOptions) r
                 }
             }
 
-            public static void ProcessingRequest(LogsRequest payload)
+            public static void ProcessingRequest(ModuleLogsRequest payload)
             {
                 Log.LogInformation((int)EventIds.ProcessingRequest, $"Processing request to get logs for {payload.ToJson()}");
             }

edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Core/requests/LogsResponse.cs → edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Core/requests/ModuleLogsResponse.cs

@@ -5,20 +5,20 @@ namespace Microsoft.Azure.Devices.Edge.Agent.Core.Requests
     using Microsoft.Azure.Devices.Edge.Util.Json;
     using Newtonsoft.Json;
 
-    public class LogsResponse
+    public class ModuleLogsResponse
     {
-        public LogsResponse(string id, byte[] payloadBytes)
+        public ModuleLogsResponse(string id, byte[] payloadBytes)
             : this(id, null, payloadBytes)
         {
         }
 
-        public LogsResponse(string id, string payload)
+        public ModuleLogsResponse(string id, string payload)
             : this(id, payload, null)
         {
         }
 
         [JsonConstructor]
-        LogsResponse(string id, string payload, byte[] payloadBytes)
+        ModuleLogsResponse(string id, string payload, byte[] payloadBytes)
         {
             this.Id = Preconditions.CheckNonWhiteSpace(id, nameof(id));
             this.PayloadBytes = Option.Maybe(payloadBytes);

edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Core/requests/LogsUploadRequest.cs → edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Core/requests/ModuleLogsUploadRequest.cs

@@ -8,9 +8,9 @@ namespace Microsoft.Azure.Devices.Edge.Agent.Core.Requests
     using Microsoft.Azure.Devices.Edge.Util.Json;
     using Newtonsoft.Json;
 
-    public class LogsUploadRequest
+    public class ModuleLogsUploadRequest
     {
-        public LogsUploadRequest(
+        public ModuleLogsUploadRequest(
             string schemaVersion,
             List<LogRequestItem> items,
             LogsContentEncoding encoding,
@@ -25,7 +25,7 @@ public LogsUploadRequest(
         }
 
         [JsonConstructor]
-        LogsUploadRequest(
+        ModuleLogsUploadRequest(
             string schemaVersion,
             List<LogRequestItem> items,
             LogsContentEncoding? encoding,

edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Core/requests/LogsUploadRequestHandler.cs → edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Core/requests/ModuleLogsUploadRequestHandler.cs

@@ -11,26 +11,26 @@ namespace Microsoft.Azure.Devices.Edge.Agent.Core.Requests
     using Microsoft.Azure.Devices.Edge.Util;
     using Microsoft.Extensions.Logging;
 
-    public class LogsUploadRequestHandler : RequestHandlerBase<LogsUploadRequest, TaskStatusResponse>
+    public class ModuleLogsUploadRequestHandler : RequestHandlerBase<ModuleLogsUploadRequest, TaskStatusResponse>
     {
         static readonly Version ExpectedSchemaVersion = new Version("1.0");
 
-        readonly ILogsUploader logsUploader;
+        readonly IRequestsUploader requestsUploader;
         readonly ILogsProvider logsProvider;
         readonly IRuntimeInfoProvider runtimeInfoProvider;
 
-        public LogsUploadRequestHandler(ILogsUploader logsUploader, ILogsProvider logsProvider, IRuntimeInfoProvider runtimeInfoProvider)
+        public ModuleLogsUploadRequestHandler(IRequestsUploader requestsUploader, ILogsProvider logsProvider, IRuntimeInfoProvider runtimeInfoProvider)
         {
             this.logsProvider = Preconditions.CheckNotNull(logsProvider, nameof(logsProvider));
-            this.logsUploader = Preconditions.CheckNotNull(logsUploader, nameof(logsUploader));
+            this.requestsUploader = Preconditions.CheckNotNull(requestsUploader, nameof(requestsUploader));
             this.runtimeInfoProvider = Preconditions.CheckNotNull(runtimeInfoProvider, nameof(runtimeInfoProvider));
         }
 
-        public override string RequestName => "UploadLogs";
+        public override string RequestName => "UploadModuleLogs";
 
-        protected override async Task<Option<TaskStatusResponse>> HandleRequestInternal(Option<LogsUploadRequest> payloadOption, CancellationToken cancellationToken)
+        protected override async Task<Option<TaskStatusResponse>> HandleRequestInternal(Option<ModuleLogsUploadRequest> payloadOption, CancellationToken cancellationToken)
         {
-            LogsUploadRequest payload = payloadOption.Expect(() => new ArgumentException("Request payload not found"));
+            ModuleLogsUploadRequest payload = payloadOption.Expect(() => new ArgumentException("Request payload not found"));
             if (ExpectedSchemaVersion.CompareMajorVersion(payload.SchemaVersion, "logs upload request schema") != 0)
             {
                 Events.MismatchedMinorVersions(payload.SchemaVersion, ExpectedSchemaVersion);
@@ -69,11 +69,11 @@ async Task UploadLogs(string sasUrl, string id, ModuleLogOptions moduleLogOption
             if (moduleLogOptions.ContentType == LogsContentType.Json)
             {
                 byte[] logBytes = await this.logsProvider.GetLogs(id, moduleLogOptions, token);
-                await this.logsUploader.Upload(sasUrl, id, logBytes, moduleLogOptions.ContentEncoding, moduleLogOptions.ContentType);
+                await this.requestsUploader.UploadLogs(sasUrl, id, logBytes, moduleLogOptions.ContentEncoding, moduleLogOptions.ContentType);
             }
             else if (moduleLogOptions.ContentType == LogsContentType.Text)
             {
-                Func<ArraySegment<byte>, Task> uploaderCallback = await this.logsUploader.GetUploaderCallback(sasUrl, id, moduleLogOptions.ContentEncoding, moduleLogOptions.ContentType);
+                Func<ArraySegment<byte>, Task> uploaderCallback = await this.requestsUploader.GetLogsUploaderCallback(sasUrl, id, moduleLogOptions.ContentEncoding, moduleLogOptions.ContentType);
                 await this.logsProvider.GetLogsStream(id, moduleLogOptions, uploaderCallback, token);
             }
 
@@ -83,7 +83,7 @@ async Task UploadLogs(string sasUrl, string id, ModuleLogOptions moduleLogOption
         static class Events
         {
             const int IdStart = AgentEventIds.LogsUploadRequestHandler;
-            static readonly ILogger Log = Logger.Factory.CreateLogger<LogsUploadRequestHandler>();
+            static readonly ILogger Log = Logger.Factory.CreateLogger<ModuleLogsUploadRequestHandler>();
 
             enum EventIds
             {
@@ -98,7 +98,7 @@ public static void MismatchedMinorVersions(string payloadSchemaVersion, Version
                 Log.LogWarning((int)EventIds.MismatchedMinorVersions, $"Logs upload request schema version {payloadSchemaVersion} does not match expected schema version {expectedSchemaVersion}. Some settings may not be supported.");
             }
 
-            public static void ProcessingRequest(LogsUploadRequest payload)
+            public static void ProcessingRequest(ModuleLogsUploadRequest payload)
             {
                 Log.LogInformation((int)EventIds.ProcessingRequest, $"Processing request to upload logs for {payload.ToJson()}");
             }

edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Core/requests/SupportBundleRequest.cs

@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+namespace Microsoft.Azure.Devices.Edge.Agent.Core.Requests
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Text;
+    using Microsoft.Azure.Devices.Edge.Util;
+    using Newtonsoft.Json;
+
+    public class SupportBundleRequest
+    {
+        public SupportBundleRequest(string schemaVersion, string sasUrl, string since, string iothubHostname, bool? edgeRuntimeOnly)
+        {
+            this.SchemaVersion = Preconditions.CheckNonWhiteSpace(schemaVersion, nameof(schemaVersion));
+            this.SasUrl = Preconditions.CheckNotNull(sasUrl, nameof(sasUrl));
+            this.Since = Option.Maybe(since);
+            this.IothubHostname = Option.Maybe(iothubHostname);
+            this.EdgeRuntimeOnly = Option.Maybe(edgeRuntimeOnly);
+        }
+
+        [JsonProperty("schemaVersion")]
+        public string SchemaVersion { get; }
+
+        [JsonIgnore]
+        public string SasUrl { get; }
+
+        [JsonProperty("since")]
+        public Option<string> Since { get; }
+
+        [JsonProperty("iothubHostname")]
+        public Option<string> IothubHostname { get; }
+
+        [JsonProperty("edgeRuntimeOnly")]
+        public Option<bool> EdgeRuntimeOnly { get; }
+    }
+}

edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Core/requests/SupportBundleRequestHandler.cs

@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+namespace Microsoft.Azure.Devices.Edge.Agent.Core.Requests
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics;
+    using System.IO;
+    using System.Text;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.Azure.Devices.Edge.Agent.Core.Logs;
+    using Microsoft.Azure.Devices.Edge.Util;
+
+    public class SupportBundleRequestHandler : RequestHandlerBase<SupportBundleRequest, TaskStatusResponse>
+    {
+        public delegate Task<Stream> GetSupportBundle(Option<string> since, Option<string> iothubHostname, Option<bool> edgeRuntimeOnly, CancellationToken token);
+
+        readonly GetSupportBundle getSupportBundle;
+        readonly IRequestsUploader requestsUploader;
+
+        public SupportBundleRequestHandler(GetSupportBundle getSupportBundle, IRequestsUploader requestsUploader)
+        {
+            this.getSupportBundle = getSupportBundle;
+            this.requestsUploader = requestsUploader;
+        }
+
+        public override string RequestName => "UploadSupportBundle";
+
+        protected override Task<Option<TaskStatusResponse>> HandleRequestInternal(Option<SupportBundleRequest> payloadOption, CancellationToken cancellationToken)
+        {
+            SupportBundleRequest payload = payloadOption.Expect(() => new ArgumentException("Request payload not found"));
+
+            (string correlationId, BackgroundTaskStatus status) = BackgroundTask.Run(
+                async () =>
+                    {
+                        Stream source = await this.getSupportBundle(payload.Since, payload.IothubHostname, payload.EdgeRuntimeOnly, cancellationToken);
+                        await this.requestsUploader.UploadSupportBundle(payload.SasUrl, source);
+                    },
+                "upload support bundle",
+                cancellationToken);
+
+            return Task.FromResult(Option.Some(TaskStatusResponse.Create(correlationId, status)));
+        }
+    }
+}

edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Edgelet/IModuleManager.cs

@@ -35,5 +35,7 @@ public interface IModuleManager
         Task PrepareUpdateAsync(ModuleSpec moduleSpec);
 
         Task<Stream> GetModuleLogs(string name, bool follow, Option<int> tail, Option<string> since, CancellationToken cancellationToken);
+
+        Task<Stream> GetSupportBundle(Option<string> since, Option<string> iothubHostname, Option<bool> edgeRuntimeOnly, CancellationToken token);
     }
 }

edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Edgelet/ModuleManagementHttpClient.cs

@@ -13,7 +13,7 @@ namespace Microsoft.Azure.Devices.Edge.Agent.Edgelet
     using Microsoft.Azure.Devices.Edge.Util;
     using Microsoft.Azure.Devices.Edge.Util.Edged;
 
-    public class ModuleManagementHttpClient : IModuleManager, IIdentityManager, IDeviceManager
+    public class ModuleManagementHttpClient : IModuleManager, IIdentityManager, IDeviceManager, IDisposable
     {
         readonly ModuleManagementHttpClientVersioned inner;
 
@@ -60,9 +60,13 @@ public ModuleManagementHttpClient(Uri managementUri, string serverSupportedApiVe
         public Task<Stream> GetModuleLogs(string name, bool follow, Option<int> tail, Option<string> since, CancellationToken cancellationToken) =>
             this.inner.GetModuleLogs(name, follow, tail, since, cancellationToken);
 
+        public Task<Stream> GetSupportBundle(Option<string> since, Option<string> iothubHostname, Option<bool> edgeRuntimeOnly, CancellationToken token) =>
+            this.inner.GetSupportBundle(since, iothubHostname, edgeRuntimeOnly, token);
+
         internal static ModuleManagementHttpClientVersioned GetVersionedModuleManagement(Uri managementUri, string serverSupportedApiVersion, string clientSupportedApiVersion)
         {
             ApiVersion supportedVersion = GetSupportedVersion(serverSupportedApiVersion, clientSupportedApiVersion);
+
             if (supportedVersion == ApiVersion.Version20180628)
             {
                 return new Version_2018_06_28.ModuleManagementHttpClient(managementUri);
@@ -108,5 +112,10 @@ static ApiVersion GetSupportedVersion(string serverSupportedApiVersion, string c
 
             return serverVersion.Value < clientVersion.Value ? serverVersion : clientVersion;
         }
+
+        public void Dispose()
+        {
+            this.inner.Dispose();
+        }
     }
 }

edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Edgelet/RuntimeInfoProvider.cs

@@ -24,5 +24,8 @@ public Task<Stream> GetModuleLogs(string module, bool follow, Option<int> tail,
             this.moduleManager.GetModuleLogs(module, follow, tail, since, cancellationToken);
 
         public Task<SystemInfo> GetSystemInfo(CancellationToken token) => this.moduleManager.GetSystemInfoAsync(token);
+
+        public Task<Stream> GetSupportBundle(Option<string> since, Option<string> iothubHostname, Option<bool> edgeRuntimeOnly, CancellationToken token) =>
+            this.moduleManager.GetSupportBundle(since, iothubHostname, edgeRuntimeOnly, token);
     }
 }

edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Edgelet/version_2018_06_28/ModuleManagementHttpClient.cs

@@ -193,6 +193,11 @@ public override Task<SystemResources> GetSystemResourcesAsync()
             return Task.FromResult<SystemResources>(null);
         }
 
+        public override Task<System.IO.Stream> GetSupportBundle(Option<string> since, Option<string> iothubHostname, Option<bool> edgeRuntimeOnly, CancellationToken token)
+        {
+            return Task.FromResult(System.IO.Stream.Null);
+        }
+
         protected override void HandleException(Exception exception, string operation)
         {
             switch (exception)

edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Edgelet/version_2019_01_30/ModuleManagementHttpClient.cs

@@ -197,6 +197,11 @@ public override Task<SystemResources> GetSystemResourcesAsync()
             return Task.FromResult<SystemResources>(null);
         }
 
+        public override Task<System.IO.Stream> GetSupportBundle(Option<string> since, Option<string> iothubHostname, Option<bool> edgeRuntimeOnly, CancellationToken token)
+        {
+            return Task.FromResult(System.IO.Stream.Null);
+        }
+
         protected override void HandleException(Exception exception, string operation)
         {
             switch (exception)