Merge branch 'develop' into feature/WIN-183

Author: marcdemz

Src/StackifyLib/Config.cs

@@ -292,6 +292,8 @@ public static void ReadStackifyJSONConfig()
                 if (File.Exists(jsonPath))
                 {
                     using (var fs = new FileStream(jsonPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+
+                    if (string.IsNullOrEmpty(v))
                     {
                         using (var sr = new StreamReader(fs))
                         {
@@ -356,6 +358,29 @@ public static void ReadStackifyJSONConfig(string filePath)
                     {
                         json = sr.ReadToEnd();
                     }
+
+#if NETCORE || NETCOREX
+                    if (_configuration != null && string.IsNullOrEmpty(v))
+                    {
+                        var appSettings = _configuration.GetSection("Stackify");
+                        v = appSettings[key.Replace("Stackify.", string.Empty)];
+
+                        if (string.IsNullOrEmpty(v))
+                        {
+                            // Search in Retrace, but key will likely still be Stackify.name, not Retrace.name in the code
+                            var retraceAppSettings = _configuration.GetSection("Retrace");
+                            v = retraceAppSettings[key.Replace("Stackify.", string.Empty)];
+                        }
+                    }
+#endif
+
+#if NETFULL
+				    if (string.IsNullOrEmpty(v))
+				    {
+				        v = System.Configuration.ConfigurationManager.AppSettings[key];
+				    }
+#endif
+                    
                 }
 
                 var obj = JObject.Parse(json, Settings);

Src/StackifyLib/ProfileTracer.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Specialized;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using StackifyLib.Utils;
@@ -203,6 +204,12 @@ public ProfileTracer IgnoreChildFrames(bool value = true)
             return this;
         }
 
+        [MethodImpl(MethodImplOptions.PreserveSig | MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]
+        public void ApplyDistributedHeaders(string traceparent,string tracestate)
+        {
+
+        }
+
         //Method the profiler looks for
         [MethodImpl(MethodImplOptions.PreserveSig | MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]
         private void ExecInternal2(string values, Action action)

Src/StackifyLib/StackifyLib.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyTitle>Stackify API</AssemblyTitle>
-    <VersionPrefix>2.2.2</VersionPrefix>
+    <VersionPrefix>2.2.3</VersionPrefix>
     <TargetFrameworks>netstandard2.0;net40;net45;net451;net452;net46;net461;net462</TargetFrameworks>
     <AssemblyName>StackifyLib</AssemblyName>
     <PackageId>StackifyLib</PackageId>
@@ -13,15 +13,15 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <Version>2.2.2</Version>
+    <Version>2.2.3-beta</Version>
     <Authors>StackifyLib</Authors>
     <PackageProjectUrl>https://github.com/stackify/stackify-api-dotnet</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/stackify/stackify-api-dotnet/blob/master/LICENSE</PackageLicenseUrl>
     <RepositoryUrl>https://github.com/stackify/stackify-api-dotnet</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageIconUrl>https://stackify.com/wp-content/uploads/2017/02/stk.png</PackageIconUrl>
-    <AssemblyVersion>2.2.2.0</AssemblyVersion>
-    <FileVersion>2.2.2.0</FileVersion>
+    <AssemblyVersion>2.2.3.0</AssemblyVersion>
+    <FileVersion>2.2.3.0</FileVersion>
     <PackageReleaseNotes>Remove default internal file logger</PackageReleaseNotes>
   </PropertyGroup>