Rebasing fixes

Author: andrewlock

tracer/src/Datadog.Trace/LibDatadog/NativeInterop.cs

@@ -97,10 +97,7 @@ internal static class Common
     {
         [DllImport(DllName, EntryPoint = "ddog_Error_drop")]
         internal static extern void Drop(ErrorHandle error);
-    }
 
-    internal static class Common
-    {
         [DllImport(DllName, EntryPoint = "ddog_store_tracer_metadata")]
         internal static extern TracerMemfdHandleResult StoreTracerMetadata(
             byte schemaVersion,

tracer/src/Datadog.Trace/TracerManager.cs

@@ -698,7 +698,7 @@ private static void OneTimeSetup(TracerSettings tracerSettings)
                     var result = Utils.StoreTracerMetadata(1, Tracer.RuntimeId, TracerConstants.Language, TracerConstants.ThreePartVersion, Environment.MachineName, tracerSettings.ServiceName, tracerSettings.Environment, tracerSettings.ServiceVersion);
                     if (result.Tag == ResultTag.Error)
                     {
-                        Log.Error("Failed to store tracer metadata with message: {Error}", Error.Read(ref result.Error));
+                        Log.Error("Failed to store tracer metadata with message: {Error}", result.Error.Message.ToUtf8String());
                         NativeInterop.Common.DropError(ref result.Error);
                     }
                 }