feat: Synchronize contexts from .NET to native #747

vaind · 2022-05-12T18:20:05Z

closes #650

Windows
Linux
MacOS - GPU & Unity contexts only - currently can't update existing contexts - see https://discord.com/channels/621778831602221064/814577827043082250/976931491357552741
iOS - same remarks as macOS
Android java
Android native

github-actions · 2022-05-12T18:20:42Z

	Messages
📖	Do not forget to update Sentry-docs with your feature once the pull request gets approved.

Generated by 🚫 dangerJS against b12a53f

vaind · 2022-05-21T12:46:39Z

update: I've worked around this by moving the reusable native context-writer static functions to Sentry.Unity.NativeUtils

@bitsandfoxes I've tried implementing the scope sync for Android native crashes (which internally use sentry-native) by reusing the code in the Sentry.Unity.Native project. However, I'm getting some unity errors which I can't figure out - you'll likely know more:

changes: 8e1d28c

errors in the Unity console:

Unable to update following assemblies:Packages/io.sentry.unity.dev/Tests/Runtime/Sentry.Unity.iOS.Tests.dll (Name = Sentry.Unity.iOS.Tests, Error = 131) (Output: C:\Users\dlugo\AppData\Local\Temp\tmp3c487b7b.tmp)

System.Reflection.TargetInvocationException: Exception has been thrown by the target of an invocation. ---> Mono.Cecil.AssemblyResolutionException: Failed to resolve assembly: 'Sentry, Version=3.17.0.0, Culture=neutral, PublicKeyToken=fba2ec45388e2af0'
  at Mono.Cecil.BaseAssemblyResolver.Resolve (Mono.Cecil.AssemblyNameReference name, Mono.Cecil.ReaderParameters parameters) [0x00105] in <a6860a9f6366437387ebdc1f225b7fd4>:0 
  at Mono.Cecil.BaseAssemblyResolver.Resolve (Mono.Cecil.AssemblyNameReference name) [0x00007] in <a6860a9f6366437387ebdc1f225b7fd4>:0 
  at Mono.Cecil.DefaultAssemblyResolver.Resolve (Mono.Cecil.AssemblyNameReference name) [0x0001d] in <a6860a9f6366437387ebdc1f225b7fd4>:0 
  at Mono.Cecil.MetadataResolver.Resolve (Mono.Cecil.TypeReference type) [0x00038] in <a6860a9f6366437387ebdc1f225b7fd4>:0 
  at Mono.Cecil.ModuleDefinition.Resolve (Mono.Cecil.TypeReference type) [0x00006] in <a6860a9f6366437387ebdc1f225b7fd4>:0 
  at Mono.Cecil.TypeReference.Resolve () [0x00006] in <a6860a9f6366437387ebdc1f225b7fd4>:0 
  at Mono.Cecil.Mixin.CheckedResolve (Mono.Cecil.TypeReference self) [0x00000] in <a6860a9f6366437387ebdc1f225b7fd4>:0 
  at Mono.Cecil.SignatureReader.ReadCustomAttributeEnum (Mono.Cecil.TypeReference enum_type) [0x00000] in <a6860a9f6366437387ebdc1f225b7fd4>:0 
  at Mono.Cecil.SignatureReader.ReadCustomAttributeElementValue (Mono.Cecil.TypeReference type) [0x0002f] in <a6860a9f6366437387ebdc1f225b7fd4>:0 
  at Mono.Cecil.SignatureReader.ReadCustomAttributeElement (Mono.Cecil.TypeReference type) [0x00015] in <a6860a9f6366437387ebdc1f225b7fd4>:0 
  at Mono.Cecil.SignatureReader.ReadCustomAttributeElement (Mono.Cecil.TypeReference type) [0x00030] in <a6860a9f6366437387ebdc1f225b7fd4>:0 
  at Mono.Cecil.SignatureReader.ReadCustomAttributeFixedArgument (Mono.Cecil.TypeReference type) [0x00015] in <a6860a9f6366437387ebdc1f225b7fd4>:0 
  at Mono.Cecil.SignatureReader.ReadCustomAttributeConstructorArguments (Mono.Cecil.CustomAttribute attribute, Mono.Collections.Generic.Collection`1[T] parameters) [0x0002e] in <a6860a9f6366437387ebdc1f225b7fd4>:0 
  at Mono.Cecil.MetadataReader.ReadCustomAttributeSignature (Mono.Cecil.CustomAttribute attribute) [0x0003c] in <a6860a9f6366437387ebdc1f225b7fd4>:0 
  at Mono.Cecil.CustomAttribute.<Resolve>b__35_0 (Mono.Cecil.CustomAttribute attribute, Mono.Cecil.MetadataReader reader) [0x00000] in <a6860a9f6366437387ebdc1f225b7fd4>:0 
  at Mono.Cecil.ModuleDefinition.Read[TItem,TRet] (TItem item, System.Func`3[T1,T2,TResult] read) [0x00029] in <a6860a9f6366437387ebdc1f225b7fd4>:0 
  at Mono.Cecil.CustomAttribute.Resolve () [0x00037] in <a6860a9f6366437387ebdc1f225b7fd4>:0 
  at Mono.Cecil.CustomAttribute.get_ConstructorArguments () [0x00000] in <a6860a9f6366437387ebdc1f225b7fd4>:0 
  at AssemblyUpdater.Steps.MoveToNamespace.Visit (Mono.Cecil.CustomAttribute customAttribute, Unity.Cecil.Visitor.Context context) [0x000c5] in <ea98cb70156f4362b5b9abd3c2968e12>:0 
  at Unity.Cecil.Visitor.Visitor.Visit (Mono.Cecil.MethodDefinition methodDefinition, Unity.Cecil.Visitor.Context context) [0x00032] in <afca345304574c67bedb060451119410>:0 
  at Unity.Cecil.Visitor.Visitor.Visit (Mono.Cecil.TypeDefinition typeDefinition, Unity.Cecil.Visitor.Context context) [0x00177] in <afca345304574c67bedb060451119410>:0 
  at Unity.Cecil.Visitor.Visitor.Visit (Mono.Cecil.ModuleDefinition moduleDefinition, Unity.Cecil.Visitor.Context context) [0x0001f] in <afca345304574c67bedb060451119410>:0 
  at Unity.Cecil.Visitor.Visitor.Visit (Mono.Cecil.AssemblyDefinition assemblyDefinition, Unity.Cecil.Visitor.Context context) [0x0001f] in <afca345304574c67bedb060451119410>:0 
  at AssemblyUpdater.Steps.AssemblyUpdaterStepBase.Visit (Mono.Cecil.AssemblyDefinition assemblyDefinition, Unity.Cecil.Visitor.Context context) [0x00000] in <ea98cb70156f4362b5b9abd3c2968e12>:0 
  at (wrapper managed-to-native) System.Reflection.RuntimeMethodInfo.InternalInvoke(System.Reflection.RuntimeMethodInfo,object,object[],System.Exception&)
  at System.Reflection.RuntimeMethodInfo.Invoke (System.Object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x0006a] in <919875e55a5b48959aa30f79ae9d9170>:0 
   --- End of inner exception stack trace ---
  at System.Reflection.RuntimeMethodInfo.Invoke (System.Object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00083] in <919875e55a5b48959aa30f79ae9d9170>:0 
  at System.Reflection.MethodBase.Invoke (System.Object obj, System.Object[] parameters) [0x00000] in <919875e55a5b48959aa30f79ae9d9170>:0 
  at Unity.Cecil.Visitor.Visitor.Visit[T] (T node, Unity.Cecil.Visitor.Context context) [0x0001b] in <afca345304574c67bedb060451119410>:0 
  at Unity.Cecil.Visitor.Extensions.DoAccept[T] (T definition, Unity.Cecil.Visitor.Visitor visitor) [0x00013] in <afca345304574c67bedb060451119410>:0 
  at Unity.Cecil.Visitor.Extensions.Accept (Mono.Cecil.AssemblyDefinition assemblyDefinition, Unity.Cecil.Visitor.Visitor visitor) [0x00000] in <afca345304574c67bedb060451119410>:0 
  at AssemblyUpdater.Steps.AssemblyUpdaterStepBase.Apply (AssemblyUpdater.Core.AssemblyUpdaterContext context) [0x00012] in <ea98cb70156f4362b5b9abd3c2968e12>:0 
  at AssemblyUpdater.Core.AssemblyUpdaterPipeline.RunUpdateRound (AssemblyUpdater.Core.AssemblyUpdaterContext context) [0x00030] in <ea98cb70156f4362b5b9abd3c2968e12>:0 
  at AssemblyUpdater.Core.AssemblyUpdaterPipeline.Run (AssemblyUpdater.Core.AssemblyUpdaterContext context) [0x00007] in <ea98cb70156f4362b5b9abd3c2968e12>:0 
  at AssemblyUpdater.Application.Program.UpdateAssembly (AssemblyUpdater.Application.UpdateOptions config, AssemblyUpdater.Core.AssemblyUpdaterContext context) [0x00024] in <ea98cb70156f4362b5b9abd3c2968e12>:0 
  at AssemblyUpdater.Application.Program+<>c__DisplayClass0_0.<Main>b__1 (AssemblyUpdater.Application.UpdateOptions o) [0x00046] in <ea98cb70156f4362b5b9abd3c2968e12>:0 
  at CommandLine.ParserResultExtensions.WithParsed[T] (CommandLine.ParserResult`1[T] result, System.Action`1[T] action) [0x0001e] in <5f6458f0234f43a48c09047109c24684>:0 
  at AssemblyUpdater.Application.Program.Main (System.String[] args) [0x00048] in <ea98cb70156f4362b5b9abd3c2968e12>:0 
Following assemblies were successfully updated but due to the failed ones above they were ignored (not copied to the destination folder):Packages/io.sentry.unity.dev/Runtime/Sentry.Unity.dll	(Result = 0) (Output: C:\Users\dlugo\AppData\Local\Temp\tmp7f9d6b9.tmp)

Packages/io.sentry.unity.dev/Editor/Sentry.Unity.Editor.dll	(Result = 0) (Output: C:\Users\dlugo\AppData\Local\Temp\tmp50fb70f2.tmp)

Packages/io.sentry.unity.dev/Editor/iOS/Sentry.Unity.Editor.iOS.dll	(Result = 0) (Output: C:\Users\dlugo\AppData\Local\Temp\tmp71bbf21d.tmp)

Packages/io.sentry.unity.dev/Runtime/Sentry.Unity.Native.dll	(Result = 0) (Output: C:\Users\dlugo\AppData\Local\Temp\tmp56d7472e.tmp)

Packages/io.sentry.unity.dev/Tests/Runtime/Sentry.Unity.Native.dll	(Result = 0) (Output: C:\Users\dlugo\AppData\Local\Temp\tmp208714e.tmp)

Packages/io.sentry.unity.dev/Runtime/Sentry.Unity.Android.dll	(Result = 0) (Output: C:\Users\dlugo\AppData\Local\Temp\tmp30fd3bff.tmp)

Packages/io.sentry.unity.dev/Runtime/Sentry.Unity.iOS.dll	(Result = 0) (Output: C:\Users\dlugo\AppData\Local\Temp\tmp7c7990ce.tmp)

Packages/io.sentry.unity.dev/Tests/Runtime/Sentry.Unity.Tests.dll	(Result = 0) (Output: C:\Users\dlugo\AppData\Local\Temp\tmp7a17b2bb.tmp)

Packages/io.sentry.unity.dev/Tests/Editor/Sentry.Unity.Editor.Tests.dll	(Result = 0) (Output: C:\Users\dlugo\AppData\Local\Temp\tmp29a8b688.tmp)

Packages/io.sentry.unity.dev/Tests/Editor/Sentry.Unity.Editor.iOS.Tests.dll	(Result = 0) (Output: C:\Users\dlugo\AppData\Local\Temp\tmp1eb05de2.tmp)


UnityEditor.Scripting.APIUpdaterLogger:WriteErrorToConsole (string,object[])
UnityEditorInternal.APIUpdating.APIUpdaterManager:HandleAssemblyUpdaterErrors (System.Collections.Generic.IList`1<UnityEditorInternal.APIUpdating.AssemblyUpdaterUpdateTask>)
UnityEditorInternal.APIUpdating.APIUpdaterManager:UpdateAssemblies ()
UnityEditorInternal.APIUpdating.APIUpdaterManager:ProcessImportedAssemblies (string[])

Multiple precompiled assemblies with the same name Sentry.Unity.Native.dll included on the current platform. Only one assembly with the same name is allowed per platform. (C:/dev/sentry-unity/package-dev/Tests/Runtime/Sentry.Unity.Native.dll)
Multiple precompiled assemblies with the same name Sentry.Unity.Native.dll included on the current platform. Only one assembly with the same name is allowed per platform. (C:/dev/sentry-unity/package-dev/Runtime/Sentry.Unity.Native.dll)

bitsandfoxes · 2022-05-30T12:55:28Z

I've seen this before and I think I know what this is. Let me take a look.

…d tests

bitsandfoxes

LGTM! Maybe @bruno-garcia wants to take a look too?

package-dev/Plugins/iOS/SentryNativeBridge.m

bitsandfoxes · 2022-06-09T14:24:36Z

package-dev/Plugins/iOS/SentryNativeBridge.m

+}
+
+void SentryNativeBridgeWriteScope( // clang-format off
+    // // const char *AppStartTime,


Suggested change

// // const char *AppStartTime,

// const char *AppStartTime,

I know it looks weird but there's a hidden logic for these... the single-comment fields should actually be added, but we cannot do that because there's no way to merge existing contexts for iOS. So if you imagine commenting out the whole block, you'll end up with the fields that are missing and should be added, but depend on something currently not possible with sentry-cocoa. The double-commented lines (which would be just commented-out after un-commenting the whole block), are already present.

https://discord.com/channels/621778831602221064/814577827043082250/976931491357552741

Thanks for clarifying!

bitsandfoxes · 2022-06-09T14:24:50Z

package-dev/Plugins/iOS/SentryNativeBridge.m

+    // // const char *DeviceModel,
+    // // long DeviceMemorySize,


Suggested change

// // const char *DeviceModel,

// // long DeviceMemorySize,

// const char *DeviceModel,

// long DeviceMemorySize,

bitsandfoxes · 2022-06-09T14:25:16Z

package-dev/Plugins/iOS/SentryNativeBridge.m

+void SentryNativeBridgeWriteScope( // clang-format off
+    // // const char *AppStartTime,
+    // const char *AppBuildType,
+    // // const char *OperatingSystemRawDescription,


Suggested change

// // const char *OperatingSystemRawDescription,

// const char *OperatingSystemRawDescription,

bitsandfoxes · 2022-06-09T14:33:56Z

package-dev/Plugins/iOS/SentryNativeBridge.m

+    const char *UnityRenderingThreadingMode
+) // clang-format on
+{
+    // Note: we're using a NSMutableDictionary because it will skip fields with nil values.


What does skip mean? It will create no entry if the value is nil?

bitsandfoxes · 2022-06-09T14:56:56Z

src/Sentry.Unity.iOS/NativeContextWriter.cs

+            // // DeviceModel,
+            // // DeviceMemorySize,


Suggested change

// // DeviceModel,

// // DeviceMemorySize,

// DeviceModel,

// DeviceMemorySize,

bitsandfoxes · 2022-06-09T14:57:20Z

src/Sentry.Unity.iOS/NativeContextWriter.cs

+        // Additionally, there's currently no way to update existing contexts, so no more Device info for now...
+        [DllImport("__Internal")]
+        private static extern void SentryNativeBridgeWriteScope(
+            // // string? AppStartTime,


Suggested change

// // string? AppStartTime,

// string? AppStartTime,

bitsandfoxes · 2022-06-09T14:57:31Z

src/Sentry.Unity.iOS/NativeContextWriter.cs

+        private static extern void SentryNativeBridgeWriteScope(
+            // // string? AppStartTime,
+            // string? AppBuildType,
+            // // string? OperatingSystemRawDescription,


Suggested change

// // string? OperatingSystemRawDescription,

// string? OperatingSystemRawDescription,

bitsandfoxes · 2022-06-09T14:57:42Z

src/Sentry.Unity.iOS/NativeContextWriter.cs

+            // // string? DeviceModel,
+            // // long? DeviceMemorySize,


Suggested change

// // string? DeviceModel,

// // long? DeviceMemorySize,

// string? DeviceModel,

// long? DeviceMemorySize,

src/Sentry.Unity/ContextWriter.cs

src/Sentry.Unity/Integrations/UnityScopeIntegration.cs

Co-authored-by: Stefan Jandl <stefan.jandl@sentry.io>

bruno-garcia · 2022-06-13T19:37:30Z

src/Sentry.Unity.Android/SentryJava.cs

+        {
+            if (Attach())
+            {
+                using var gpu = new AndroidJavaObject("io.sentry.protocol.Gpu");


If the type isnt' found, is this going to blow up? (proguard)

yes, see #797

src/Sentry.Unity/ContextWriter.cs

src/Sentry.Unity/SentryUnity.cs

vaind changed the title ~~feat: add ContextWriter to enable c#->native context sync~~ feat: Synchronize contexts from .NET to native May 12, 2022

This was referenced May 12, 2022

Add Device/Unity context to native events #650

Closed

Feat: Automatic user IDs on native crashes & .NET events #728

Merged

vaind force-pushed the feat/context-sync branch 2 times, most recently from c3c8e8f to 74db263 Compare May 20, 2022 18:55

vaind force-pushed the feat/context-sync branch 3 times, most recently from 03fcf2f to 7913a02 Compare June 6, 2022 17:21

vaind and others added 13 commits June 7, 2022 09:12

feat: add ContextWriter to enable c#->native context sync

e515b9b

refactor: remove Lazy<> from MainThreadData

25720bd

refactor: move static info from EventProcessor to ConfigureScope

57cb723

chore: update smoke test after context changes

ee18995

refactor: change ContextWriter logic to single-method native call; ad…

0ff20ea

…d tests

refactor: run native context sync in Task.Run()

75019b1

feat: synchronize context info to sentry-native (Windows & Linux)

caff1e3

chore: update changelog

cdea17e

Format code

305679e

feat: iOS & macOS native context sync

d93bbb6

feat: Android (java) context sync

2f9c455

chore: update changelog

d05b969

feat: Android (native) context sync

be6c3c9

vaind force-pushed the feat/context-sync branch from 7913a02 to be6c3c9 Compare June 7, 2022 07:56

Merge branch 'main' into feat/context-sync

544bb24

vaind marked this pull request as ready for review June 9, 2022 14:09

vaind requested review from bruno-garcia and bitsandfoxes as code owners June 9, 2022 14:09

bitsandfoxes reviewed Jun 13, 2022

View reviewed changes

src/Sentry.Unity/Integrations/UnityScopeIntegration.cs Show resolved Hide resolved

Apply suggestions from code review

6e0625a

Co-authored-by: Stefan Jandl <stefan.jandl@sentry.io>

bruno-garcia approved these changes Jun 13, 2022

View reviewed changes

Merge branch 'main' into feat/context-sync

0a33733

vaind mentioned this pull request Jun 14, 2022

Support Proguard #797

Closed

review changes

b12a53f

vaind merged commit 9fd1afe into main Jun 14, 2022

vaind deleted the feat/context-sync branch June 14, 2022 12:16

This was referenced Jun 29, 2022

SDK internal error logged through Debug.LogError #839

Closed

fix: use LogWarning instead of LogError for potential SDK errors #861

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Synchronize contexts from .NET to native #747

feat: Synchronize contexts from .NET to native #747

vaind commented May 12, 2022 •

edited

Loading

github-actions bot commented May 12, 2022 •

edited

Loading

vaind commented May 21, 2022 •

edited

Loading

bitsandfoxes commented May 30, 2022

bitsandfoxes left a comment

bitsandfoxes Jun 9, 2022

vaind Jun 13, 2022

vaind Jun 13, 2022

bitsandfoxes Jun 14, 2022

bitsandfoxes Jun 9, 2022

bitsandfoxes Jun 9, 2022

bitsandfoxes Jun 9, 2022

vaind Jun 13, 2022

bitsandfoxes Jun 9, 2022

bitsandfoxes Jun 9, 2022

bitsandfoxes Jun 9, 2022

bitsandfoxes Jun 9, 2022

bruno-garcia Jun 13, 2022

vaind Jun 14, 2022

	// // const char *OperatingSystemRawDescription,
	// const char *OperatingSystemRawDescription,

	// // string? OperatingSystemRawDescription,
	// string? OperatingSystemRawDescription,

feat: Synchronize contexts from .NET to native #747

feat: Synchronize contexts from .NET to native #747

Conversation

vaind commented May 12, 2022 • edited Loading

github-actions bot commented May 12, 2022 • edited Loading

vaind commented May 21, 2022 • edited Loading

bitsandfoxes commented May 30, 2022

bitsandfoxes left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vaind commented May 12, 2022 •

edited

Loading

github-actions bot commented May 12, 2022 •

edited

Loading

vaind commented May 21, 2022 •

edited

Loading