Merge remote-tracking branch 'origin/develop'

.vscode/launch.json

@@ -0,0 +1,28 @@
+{
+   // Use IntelliSense to find out which attributes exist for C# debugging
+   // Use hover for the description of the existing attributes
+   // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+   "version": "0.2.0",
+   "configurations": [
+        {
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/tests/UnitTests/bin/Debug/netcoreapp2.0/Microsoft.ApplicationInsights.Kubernetes.UnitTests.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/tests/UnitTests",
+            // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
+            "console": "internalConsole",
+            "stopAtEntry": false,
+            "internalConsoleOptions": "openOnSessionStart"
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command:pickProcess}"
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,15 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "taskName": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/tests/UnitTests/UnitTests.csproj"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

src/TelemetryInitializers/KubernetesTelemetryInitializer.cs

@@ -7,13 +7,27 @@
     using Newtonsoft.Json;
 
     using static Microsoft.ApplicationInsights.Kubernetes.StringUtils;
-    using static Microsoft.ApplicationInsights.Kubernetes.TelemetryInitializers.Prefixes;
+
+#if !NETSTANDARD1_3 && !NETSTANDARD1_6
+    using System.Diagnostics;
+    using System.Globalization;
+#endif
 
     /// <summary>
     /// Telemetry Initializer for K8s Environment
     /// </summary>
     public class KubernetesTelemetryInitializer : ITelemetryInitializer
     {
+        public const string Container = "Container";
+        public const string Deployment = "Deployment";
+        public const string K8s = "Kubernetes";
+        public const string Node = "Node";
+        public const string Pod = "Pod";
+        public const string ReplicaSet = "ReplicaSet";
+        public const string ProcessString = "Process";
+        public const string CPU = "CPU";
+        public const string Memory = "Memory";
+
         private ILogger<KubernetesTelemetryInitializer> logger;
         internal IK8sEnvironment K8sEnvironment { get; private set; }
 
@@ -39,13 +53,21 @@ public void Initialize(ITelemetry telemetry)
         {
             if (K8sEnvironment != null)
             {
+#if NETSTANDARD2_0
+                Stopwatch cpuWatch = Stopwatch.StartNew();
+                TimeSpan startCPUTime = Process.GetCurrentProcess().TotalProcessorTime;
+#endif
                 // Setting the container name to role name
                 if (string.IsNullOrEmpty(telemetry.Context.Cloud.RoleName))
                 {
                     telemetry.Context.Cloud.RoleName = this.K8sEnvironment.ContainerName;
                 }
 
+#if NETSTANDARD2_0
+                SetCustomDimensions(telemetry, cpuWatch, startCPUTime);
+#else
                 SetCustomDimensions(telemetry);
+#endif
 
                 logger?.LogTrace(JsonConvert.SerializeObject(telemetry));
             }
@@ -79,6 +101,33 @@ private void SetCustomDimensions(ITelemetry telemetry)
             SetCustomDimension(telemetry, Invariant($"{K8s}.{Node}.Name"), this.K8sEnvironment.NodeName);
         }
 
+#if NETSTANDARD2_0
+        private void SetCustomDimensions(ITelemetry telemetry, Stopwatch cpuWatch, TimeSpan startCPUTime)
+        {
+            SetCustomDimensions(telemetry);
+
+            // Add CPU/Memory metrics to telemetry.
+            Process process = Process.GetCurrentProcess();
+            TimeSpan endCPUTime = process.TotalProcessorTime;
+            cpuWatch.Stop();
+
+            string cpuString = "NaN";
+            if (cpuWatch.ElapsedMilliseconds > 0)
+            {
+                int processorCount = Environment.ProcessorCount;
+                Debug.Assert(processorCount > 0, $"How could process count be {processorCount}?");
+                // A very simple but not that accruate evaluation of how much CPU the process is take out of a core.
+                double CPUPercentage = (endCPUTime - startCPUTime).TotalMilliseconds / (double)(cpuWatch.ElapsedMilliseconds);
+                cpuString = CPUPercentage.ToString("P2", CultureInfo.InvariantCulture);
+            }
+
+            long memoryInBytes = process.VirtualMemorySize64;
+
+            SetCustomDimension(telemetry, Invariant($"{ProcessString}.{CPU}(%)"), cpuString);
+            SetCustomDimension(telemetry, Invariant($"{ProcessString}.{Memory}"), memoryInBytes.GetReadableSize());
+        }
+#endif
+
         private void SetCustomDimension(ITelemetry telemetry, string key, string value)
         {
             if (telemetry == null)

src/Utilities/StringUtils.cs

@@ -8,5 +8,19 @@ public static string Invariant(FormattableString formattable)
         {
             return formattable.ToString(CultureInfo.InvariantCulture);
         }
+
+        public static string GetReadableSize(this long numInBytes)
+        {
+            double doubleBytes = numInBytes;
+            string[] sizes = { "B", "KB", "MB", "GB", "TB" };
+            int order = 0;
+            while (doubleBytes >= 1024 && order < sizes.Length - 1)
+            {
+                order++;
+                doubleBytes /= 1024.0;
+            }
+
+            return String.Format(CultureInfo.InvariantCulture, "{0:0.#}{1}", doubleBytes, sizes[order]);
+        }
     }
 }

tests/UnitTests/KubernetesTelemtryInitializerTests.cs

@@ -84,6 +84,11 @@ public void InitializeSetsCustomDimensions()
 
             Assert.Equal("Nid", telemetry.Context.Properties["Kubernetes.Node.ID"]);
             Assert.Equal("NName", telemetry.Context.Properties["Kubernetes.Node.Name"]);
+
+#if !NETSTANDARD1_3 && !NETSTANDARD1_6
+            Assert.NotNull(telemetry.Context.Properties["Process.CPU(%)"]);
+            Assert.NotNull(telemetry.Context.Properties["Process.Memory"]);
+#endif
         }
 
         [Fact(DisplayName = "K8sTelemetryInitializer will not overwrite custom dimension when it exists already.")]

tests/UnitTests/StringUtilsTest.cs

@@ -0,0 +1,22 @@
+using Microsoft.ApplicationInsights.Kubernetes;
+using Xunit;
+namespace Microsoft.ApplicationInsights.Netcore.Kubernetes
+{
+    public class StringUtilsTest
+    {
+        [Theory(DisplayName = "Verify proper output of size")]
+        [InlineData(25, "25B")]
+        [InlineData(1023, "1023B")]
+        [InlineData(1024, "1KB")]
+        [InlineData(1025, "1KB")]
+        [InlineData(2097152, "2MB")]
+        [InlineData(3758096384, "3.5GB")]
+        [InlineData(3848290697216, "3.5TB")]
+
+        public void VerifyServerCertificateShouldVerifyIssuer(long input, string expected)
+        {
+            string actual = input.GetReadableSize();
+            Assert.Equal(expected, actual);
+        }
+    }
+}