Update Sentry-Android to 6.0.0-rc.1

CHANGELOG.md

@@ -12,7 +12,7 @@
 - Move tunnel functionality into Sentry.AspNetCore ([#1645](https://github.com/getsentry/sentry-dotnet/pull/1645))
 - Make `HttpContext` available for sampling decisions ([#1682](https://github.com/getsentry/sentry-dotnet/pull/1682))
 - Initial support for .NET MAUI ([#1663](https://github.com/getsentry/sentry-dotnet/pull/1663)) ([#1670](https://github.com/getsentry/sentry-dotnet/pull/1670))
-- Initial support for `net6.0-android` apps ([#1288](https://github.com/getsentry/sentry-dotnet/pull/1288)) ([#1669](https://github.com/getsentry/sentry-dotnet/pull/1669))
+- Initial support for `net6.0-android` apps ([#1288](https://github.com/getsentry/sentry-dotnet/pull/1288)) ([#1669](https://github.com/getsentry/sentry-dotnet/pull/1669)) ([#1686](https://github.com/getsentry/sentry-dotnet/pull/1686))
 
 ### Fixes
 

src/Sentry/Android/Sentry.Android.props

@@ -1,18 +1,14 @@
 <Project>
   <PropertyGroup>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
-    <!-- BINDINGSGENERATOR : warning BG8604: Could not find top ancestor type 'LifecycleWatcher' for nested type 'Sentry.Android.LifecycleWatcher._1' -->
-    <!-- BG8604 Results in a missing API and for as long as we don't need that (and all Java/Android SDK is internal to this lib), it just doesn't matter: -->
     <!-- BG8605 and BG8606 happen because there's a missing androidx.lifecycle dependency, but we don't need it here.  (The native Android Sentry SDK will use it if it exists.) -->
-    <NoWarn>$(NoWarn);BG8604;BG8605;BG8606</NoWarn>
-    <SentryAndroidSdkVersion>5.7.4</SentryAndroidSdkVersion>
+    <NoWarn>$(NoWarn);BG8605;BG8606</NoWarn>
+    <SentryAndroidSdkVersion>6.0.0-rc.1</SentryAndroidSdkVersion>
     <AndroidLibsDirectory>$(MSBuildProjectDirectory)/../../libs/Android/</AndroidLibsDirectory>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Android/Transforms/*.xml" />
     <TransformFile Include="Android/Transforms/*.xml" />
-    <!-- Gson will be dropped on sentry-android version 6.0.0 -->
-    <PackageReference Include="GoogleGson" Version="2.9.0.1" />
     <!-- TODO: How to add JavaDocPaths for each package? -->
     <AndroidLibrary Include="$(AndroidLibsDirectory)sentry-$(SentryAndroidSdkVersion).jar" />
     <AndroidLibrary Include="$(AndroidLibsDirectory)/sentry-android-core-$(SentryAndroidSdkVersion).aar" />

src/Sentry/Android/Transforms/Metadata.xml

@@ -1,50 +1,68 @@
 <metadata>
+
+  <!--
+    Reference: https://docs.microsoft.com/xamarin/android/platform/binding-java-library/customizing-bindings/java-bindings-metadata
+
+    Source API (before transformation):
+      src/Sentry/obj/Debug/net6.0-android/api.xml
+    Output API (after transformation):
+      src/Sentry/obj/Debug/net6.0-android/api.xml.fixed
+  -->
+
   <!-- Make all public types, internal -->
   <attr path="/api/package/class[@visibility='public']" name="visibility">internal</attr>
   <attr path="/api/package/interface[@visibility='public']" name="visibility">internal</attr>
 
+  <!-- Assign .NET namespaces for all Java packages imported -->
   <attr path="/api/package[@name='io.sentry']" name="managedName">Sentry.Java</attr>
+  <attr path="/api/package[@name='io.sentry.android.core']" name="managedName">Sentry.Android</attr>
+  <attr path="/api/package[@name='io.sentry.android.core.internal.gestures']" name="managedName">Sentry.Android.Internal.Gestures</attr>
+  <attr path="/api/package[@name='io.sentry.android.core.internal.util']" name="managedName">Sentry.Android.Internal.Util</attr>
+  <attr path="/api/package[@name='io.sentry.android.ndk']" name="managedName">Sentry.Android.Ndk</attr>
   <attr path="/api/package[@name='io.sentry.cache']" name="managedName">Sentry.Java.Cache</attr>
-  <attr path="/api/package[@name='io.sentry.transport']" name="managedName">Sentry.Java.Transport</attr>
+  <attr path="/api/package[@name='io.sentry.clientreport']" name="managedName">Sentry.Java.ClientReport</attr>
   <attr path="/api/package[@name='io.sentry.config']" name="managedName">Sentry.Java.Configuration</attr>
+  <attr path="/api/package[@name='io.sentry.exception']" name="managedName">Sentry.Java.Exception</attr>
   <attr path="/api/package[@name='io.sentry.hints']" name="managedName">Sentry.Java.Hints</attr>
-  <attr path="/api/package[@name='io.sentry.util']" name="managedName">Sentry.Java.Util</attr>
+  <attr path="/api/package[@name='io.sentry.instrumentation.file']" name="managedName">Sentry.Java.Instrumentation.File</attr>
+  <attr path="/api/package[@name='io.sentry.transport']" name="managedName">Sentry.Java.Transport</attr>
   <attr path="/api/package[@name='io.sentry.protocol']" name="managedName">Sentry.Java.Protocol</attr>
+  <attr path="/api/package[@name='io.sentry.util']" name="managedName">Sentry.Java.Util</attr>
   <attr path="/api/package[@name='io.sentry.vendor']" name="managedName">Sentry.Java.Vendor</attr>
-  <attr path="/api/package[@name='io.sentry.exception']" name="managedName">Sentry.Java.Exception</attr>
-  <attr path="/api/package[@name='io.sentry.android.core']" name="managedName">Sentry.Android</attr>
-  <attr path="/api/package[@name='io.sentry.android.ndk']" name="managedName">Sentry.Android.Ndk</attr>
+  <attr path="/api/package[@name='io.sentry.vendor.gson.stream']" name="managedName">Sentry.Java.Vendor.Gson.Stream</attr>
+  <attr path="/api/package[@name='io.sentry.vendor.gson.internal.bind.util']" name="managedName">Sentry.Java.Vendor.Gson.Internal.Bind.Util</attr>
 
-  <remove-node path="/api/package[@name='io.sentry.adapters']/class[@name='CollectionAdapter']" />
-  <remove-node path="/api/package[@name='io.sentry']/class[@name='SessionAdapter']" />
-  <remove-node path="/api/package[@name='io.sentry']/class[@name='SentryEnvelopeItemHeaderAdapter']" />
-  <remove-node path="/api/package[@name='io.sentry']/class[@name='Session']/method[@name='clone' and count(parameter)=0]" />
-  <remove-node path="/api/package[@name='io.sentry']/class[@name='HubAdapter']/method[@name='clone' and count(parameter)=0]" />
-  <remove-node path="/api/package[@name='io.sentry']/interface[@name='IHub']/method[@name='clone' and count(parameter)=0]" />
-  <remove-node path="/api/package[@name='io.sentry']/class[@name='NoOpHub']" />
-  <remove-node path="/api/package[@name='io.sentry']/class[@name='OutboxSender']" />
-  <remove-node path="/api/package[@name='io.sentry']/class[@name='TraceStateHeader']/field[@name='TRACE_STATE_HEADER']" />
-  <remove-node path="/api/package[@name='io.sentry']/class[@name='SentryOptions']/method[@name='setEnvelopeDiskCache']" />
-  <remove-node path="/api/package[@name='io.sentry']/class[@name='SentryOptions']/method[@name='getEnvelopeDiskCache']" />
-  <remove-node path="/api/package[@name='io.sentry']/class[@name='SentryTraceHeader']/field[@name='SENTRY_TRACE_HEADER']" />
-  <remove-node path="/api/package[@name='io.sentry']/class[@name='SentryEnvelopeHeaderAdapter']" />
-  <remove-node path="/api/package[@name='io.sentry.transport']/class[@name='NoOpEnvelopeCache']" />
-  <remove-node path="/api/package[@name='io.sentry']/class[@name='EnvelopeSender']" />
-  <remove-node path="/api/package[@name='io.sentry']/class[@name='Hub']/method[@name='clone' and count(parameter)=0]" />
+  <!--
+    These properties have conflicts that create BG8401 warnings ("Skipping '...' due to a duplicate field or property name.")
+    This happens where there is a both a method such as "public getFoo" and related field "protected foo" on the same class.
+    We assign a different name to the field to remove the conflict.
+  -->
+  <attr path="/api/package[@name='io.sentry']/class[@name='SentryBaseEvent']/field[@name='throwable']" name="managedName">ThrowableValue</attr>
+  <attr path="/api/package[@name='io.sentry']/class[@name='SpanContext']/field[@name='description']" name="managedName">DescriptionValue</attr>
+  <attr path="/api/package[@name='io.sentry']/class[@name='SpanContext']/field[@name='status']" name="managedName">StatusValue</attr>
+  <attr path="/api/package[@name='io.sentry']/class[@name='SpanContext']/field[@name='tags']" name="managedName">TagsValue</attr>
+
+  <!-- These constants need a different name than their class to avoid CS0542 compilation errors. -->
+  <attr path="/api/package[@name='io.sentry']/class[@name='SentryTraceHeader']/field[@name='SENTRY_TRACE_HEADER']" name="managedName">SentryTraceHeaderName</attr>
+  <attr path="/api/package[@name='io.sentry']/class[@name='TraceStateHeader']/field[@name='TRACE_STATE_HEADER']" name="managedName">TraceStateHeaderName</attr>
 
+  <!--
+    The remaining APIS are removed to prevent various errors/warnings.
+    TODO: Find other workarounds for each one, rather than removing the APIs.
+  -->
 
-  <remove-node path="/api/package[@name='io.sentry.android.core']/class[@name='AppLifecycleIntegration']" />
+  <remove-node path="/api/package[@name='io.sentry']/class[@name='EnvelopeSender']" />
+  <remove-node path="/api/package[@name='io.sentry']/class[@name='OutboxSender']" />
+  <remove-node path="/api/package[@name='io.sentry.cache']/class[@name='EnvelopeCache']" />
   <remove-node path="/api/package[@name='io.sentry.android.core']/class[@name='TempSensorBreadcrumbsIntegration']" />
   <remove-node path="/api/package[@name='io.sentry.android.core.internal.gestures']" />
-  <remove-node path="/api/package[@name='io.sentry.cache']" />
 
-  <remove-node path="/api/package[@name='io.sentry.adapters']" />
-  <remove-node path="/api/package[@name='io.sentry.exception']/class[@name='SentryEnvelopeException']" />
+  <remove-node path="/api/package[starts-with(@name,'io.sentry')]/*/method[@name='clone' and count(parameter)=0]" />
+  <remove-node path="/api/package[starts-with(@name,'io.sentry')]/class/implements[@name='io.sentry.JsonDeserializer']" />
+  <remove-node path="/api/package[@name='io.sentry.vendor.gson.stream']/class[@name='JsonToken']/field[@name='NAME']" />>
+
   <remove-node path="/api/package[@name='io.sentry.exception']/class[@name='ExceptionMechanismException']" />
   <remove-node path="/api/package[@name='io.sentry.exception']/class[@name='InvalidSentryTraceHeaderException']" />
-
-  <attr path="/api/package[@name='io.sentry']/class[@name='SpanContext']/field[@name='tags']" name="managedName">GetTags</attr>
-  <attr path="/api/package[@name='io.sentry']/class[@name='SpanContext']/field[@name='status']" name="managedName">GetStatus</attr>
-  <attr path="/api/package[@name='io.sentry']/class[@name='SpanContext']/field[@name='description']" name="managedName">GetDescription</attr>
-  <attr path="/api/package[@name='io.sentry']/class[@name='SentryBaseEvent']/field[@name='throwable']" name="managedName">GetThrowable</attr>
+  <remove-node path="/api/package[@name='io.sentry.exception']/class[@name='SentryEnvelopeException']" />
+  <remove-node path="/api/package[@name='io.sentry.vendor.gson.stream']/class[@name='MalformedJsonException']" />
 </metadata>