added missing protocol fields

sentry-core/src/main/java/io/sentry/core/MainEventProcessor.java

@@ -29,7 +29,7 @@ public SentryEvent process(SentryEvent event) {
 
     Throwable throwable = event.getThrowable();
     if (throwable != null) {
-      event.setException(sentryExceptionFactory.getSentryExceptions(throwable));
+      event.setExceptions(sentryExceptionFactory.getSentryExceptions(throwable));
     }
 
     return event;

sentry-core/src/main/java/io/sentry/core/Scope.java

@@ -40,11 +40,11 @@ public void setUser(User user) {
     this.user = user;
   }
 
-  public List<String> getFingerprint() {
+  public List<String> getFingerprints() {
     return fingerprint;
   }
 
-  public void setFingerprint(List<String> fingerprint) {
+  public void setFingerprints(List<String> fingerprint) {
     this.fingerprint = fingerprint;
   }
 
@@ -67,7 +67,7 @@ public void setTag(String key, String value) {
     this.tags.put(key, value);
   }
 
-  public Map<String, Object> getExtra() {
+  public Map<String, Object> getExtras() {
     return extra;
   }
 

sentry-core/src/main/java/io/sentry/core/SentryClient.java

@@ -45,8 +45,8 @@ public SentryId captureEvent(SentryEvent event, @Nullable Scope scope) {
       if (event.getUser() == null) {
         event.setUser(scope.getUser());
       }
-      if (event.getFingerprint() == null) {
-        event.setFingerprint(scope.getFingerprint());
+      if (event.getFingerprints() == null) {
+        event.setFingerprints(scope.getFingerprints());
       }
       if (event.getBreadcrumbs() == null) {
         event.setBreadcrumbs(new ArrayList<>(scope.getBreadcrumbs()));
@@ -62,12 +62,12 @@ public SentryId captureEvent(SentryEvent event, @Nullable Scope scope) {
           }
         }
       }
-      if (event.getExtra() == null) {
-        event.setExtra(new HashMap<>(scope.getExtra()));
+      if (event.getExtras() == null) {
+        event.setExtras(new HashMap<>(scope.getExtras()));
       } else {
-        for (Map.Entry<String, Object> item : scope.getExtra().entrySet()) {
-          if (!event.getExtra().containsKey(item.getKey())) {
-            event.getExtra().put(item.getKey(), item.getValue());
+        for (Map.Entry<String, Object> item : scope.getExtras().entrySet()) {
+          if (!event.getExtras().containsKey(item.getKey())) {
+            event.getExtras().put(item.getKey(), item.getValue());
           }
         }
       }

sentry-core/src/main/java/io/sentry/core/SentryEvent.java

@@ -32,6 +32,8 @@ public class SentryEvent implements IUnknownPropertiesConsumer {
   private Map<String, String> tags;
   private Map<String, Object> extra;
   private Map<String, Object> unknown;
+  private Map<String, String> modules;
+  // TODO: missing Debug Meta Interface?
 
   SentryEvent(SentryId eventId, Date timestamp) {
     this.eventId = eventId;
@@ -119,11 +121,11 @@ public void setThreads(List<SentryThread> threads) {
     this.threads = new SentryValues<>(threads);
   }
 
-  public List<SentryException> getException() {
+  public List<SentryException> getExceptions() {
     return exception.getValues();
   }
 
-  public void setException(List<SentryException> exception) {
+  public void setExceptions(List<SentryException> exception) {
     this.exception = new SentryValues<>(exception);
   }
 
@@ -187,11 +189,11 @@ public void setSdk(SdkVersion sdk) {
     this.sdk = sdk;
   }
 
-  public List<String> getFingerprint() {
+  public List<String> getFingerprints() {
     return fingerprint;
   }
 
-  public void setFingerprint(List<String> fingerprint) {
+  public void setFingerprints(List<String> fingerprint) {
     this.fingerprint = fingerprint;
   }
 
@@ -225,11 +227,11 @@ public void setTag(String key, String value) {
     tags.put(key, value);
   }
 
-  public Map<String, Object> getExtra() {
+  public Map<String, Object> getExtras() {
     return extra;
   }
 
-  public void setExtra(Map<String, Object> extra) {
+  public void setExtras(Map<String, Object> extra) {
     this.extra = extra;
   }
 
@@ -257,4 +259,12 @@ public void acceptUnknownProperties(Map<String, Object> unknown) {
   public Map<String, Object> getUnknown() {
     return unknown;
   }
+
+  public Map<String, String> getModules() {
+    return modules;
+  }
+
+  public void setModules(Map<String, String> modules) {
+    this.modules = modules;
+  }
 }

sentry-core/src/main/java/io/sentry/core/protocol/Request.java

@@ -62,19 +62,19 @@ public void setHeaders(Map<String, String> headers) {
     this.headers = headers;
   }
 
-  public Map<String, String> getEnv() {
+  public Map<String, String> getEnvs() {
     return env;
   }
 
-  public void setEnv(Map<String, String> env) {
+  public void setEnvs(Map<String, String> env) {
     this.env = env;
   }
 
-  public Map<String, String> getOther() {
+  public Map<String, String> getOthers() {
     return other;
   }
 
-  public void setOther(Map<String, String> other) {
+  public void setOthers(Map<String, String> other) {
     this.other = other;
   }
 

sentry-core/src/main/java/io/sentry/core/protocol/SdkVersion.java

@@ -3,12 +3,14 @@
 import io.sentry.core.IUnknownPropertiesConsumer;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 public class SdkVersion implements IUnknownPropertiesConsumer {
   private String name;
   private String version;
   private List<Package> packages = new CopyOnWriteArrayList<>();
+  private Map<String, String> integrations = new ConcurrentHashMap<>();
   private Map<String, Object> unknown;
 
   public String getVersion() {
@@ -45,4 +47,12 @@ public void addPackage(String name, String version) {
   public void acceptUnknownProperties(Map<String, Object> unknown) {
     this.unknown = unknown;
   }
+
+  public Map<String, String> getIntegrations() {
+    return integrations;
+  }
+
+  public void setIntegrations(Map<String, String> integrations) {
+    this.integrations = integrations;
+  }
 }

sentry-core/src/main/java/io/sentry/core/protocol/SentryStackFrame.java

@@ -25,6 +25,7 @@ public class SentryStackFrame implements IUnknownPropertiesConsumer {
   private Long symbolAddr;
   private Long instructionAddr;
   private Map<String, Object> unknown;
+  private String rawFunction;
 
   public List<String> getPreContext() {
     return preContext;
@@ -174,4 +175,12 @@ public void setNative(Boolean _native) {
   public void acceptUnknownProperties(Map<String, Object> unknown) {
     this.unknown = unknown;
   }
+
+  public String getRawFunction() {
+    return rawFunction;
+  }
+
+  public void setRawFunction(String rawFunction) {
+    this.rawFunction = rawFunction;
+  }
 }

sentry-core/src/main/java/io/sentry/core/protocol/SentryStackTrace.java

@@ -7,7 +7,7 @@
 /** The Sentry stacktrace. */
 public class SentryStackTrace implements IUnknownPropertiesConsumer {
   private List<SentryStackFrame> frames;
-  // TODO registers is missing?
+  private Map<String, String> registers;
   private Map<String, Object> unknown;
 
   public SentryStackTrace() {}
@@ -37,4 +37,12 @@ public void setFrames(List<SentryStackFrame> frames) {
   public void acceptUnknownProperties(Map<String, Object> unknown) {
     this.unknown = unknown;
   }
+
+  public Map<String, String> getRegisters() {
+    return registers;
+  }
+
+  public void setRegisters(Map<String, String> registers) {
+    this.registers = registers;
+  }
 }

sentry-core/src/main/java/io/sentry/core/protocol/User.java

@@ -89,7 +89,7 @@ public void setIpAddress(String ipAddress) {
    *
    * @return the other user data.
    */
-  public Map<String, String> getOther() {
+  public Map<String, String> getOthers() {
     return other;
   }
 
@@ -98,7 +98,7 @@ public Map<String, String> getOther() {
    *
    * @param other the other user related data..
    */
-  public void setOther(Map<String, String> other) {
+  public void setOthers(Map<String, String> other) {
     this.other = other;
   }
 

sentry-core/src/test/java/io/sentry/core/HubTest.kt

@@ -13,13 +13,13 @@ class HubTest {
     @Test
     fun `when cloning Scope it returns the same values`() {
         val scope = Scope()
-        scope.extra["test"] = "test"
+        scope.extras["test"] = "test"
         val breadcrumb = Breadcrumb()
         breadcrumb.message = "test"
         scope.breadcrumbs.add(breadcrumb)
         scope.level = SentryLevel.DEBUG
         scope.transaction = "test"
-        scope.fingerprint.add("test")
+        scope.fingerprints.add("test")
         scope.tags["test"] = "test"
         val user = User()
         user.email = "[email protected]"
@@ -28,10 +28,10 @@ class HubTest {
         val clone = scope.clone()
         assertNotNull(clone)
         assertNotSame(scope, clone)
-        assertEquals("test", clone.extra["test"])
+        assertEquals("test", clone.extras["test"])
         assertEquals("test", clone.breadcrumbs[0].message)
         assertEquals("test", scope.transaction)
-        assertEquals("test", scope.fingerprint[0])
+        assertEquals("test", scope.fingerprints[0])
         assertEquals("test", clone.tags["test"])
         assertEquals("[email protected]", clone.user.email)
     }

sentry-core/src/test/java/io/sentry/core/SentryClientTest.kt

@@ -167,9 +167,9 @@ class SentryClientTest {
 
         sut.captureEvent(event, scope)
         assertEquals("message", event.breadcrumbs[0].message)
-        assertEquals("extra", event.extra["extra"])
+        assertEquals("extra", event.extras["extra"])
         assertEquals("tags", event.tags["tags"])
-        assertEquals("fp", event.fingerprint[0])
+        assertEquals("fp", event.fingerprints[0])
         assertEquals("transaction", event.transaction)
         assertEquals("id", event.user.id)
         assertEquals(SentryLevel.FATAL, event.level)
@@ -190,16 +190,16 @@ class SentryClientTest {
         assertEquals("message", event.breadcrumbs[1].message)
 
         // extras are appending
-        assertEquals("eventExtra", event.extra["eventExtra"])
-        assertEquals("extra", event.extra["extra"])
+        assertEquals("eventExtra", event.extras["eventExtra"])
+        assertEquals("extra", event.extras["extra"])
 
         // tags are appending
         assertEquals("eventTag", event.tags["eventTag"])
         assertEquals("tags", event.tags["tags"])
 
         // fingerprint is replaced
-        assertEquals("eventFp", event.fingerprint[0])
-        assertEquals(1, event.fingerprint.size)
+        assertEquals("eventFp", event.fingerprints[0])
+        assertEquals(1, event.fingerprints.size)
 
         assertEquals("eventTransaction", event.transaction)
 
@@ -221,7 +221,7 @@ class SentryClientTest {
         sut.captureEvent(event, scope)
 
         // extras are appending
-        assertEquals("eventExtra", event.extra["eventExtra"])
+        assertEquals("eventExtra", event.extras["eventExtra"])
 
         // tags are appending
         assertEquals("eventTag", event.tags["eventTag"])
@@ -246,7 +246,7 @@ class SentryClientTest {
             })
             setExtra("extra", "extra")
             setTag("tags", "tags")
-            fingerprint.add("fp")
+            fingerprints.add("fp")
             transaction = "transaction"
             level = SentryLevel.FATAL
             user = User().apply {
@@ -262,7 +262,7 @@ class SentryClientTest {
             })
             setExtra("eventExtra", "eventExtra")
             setTag("eventTag", "eventTag")
-            fingerprint = listOf("eventFp")
+            fingerprints = listOf("eventFp")
             transaction = "eventTransaction"
             level = SentryLevel.DEBUG
             user = User().apply {