feat: Provide correct platform and make a place to override event internals

Author: kamilogorek

packages/browser/src/client.ts

@@ -1,5 +1,5 @@
-import { API, BaseClient, SentryError } from '@sentry/core';
-import { DsnLike } from '@sentry/types';
+import { API, BaseClient, Scope, SentryError } from '@sentry/core';
+import { DsnLike, SentryEvent, SentryEventHint } from '@sentry/types';
 import { getGlobalObject } from '@sentry/utils/misc';
 import { BrowserBackend, BrowserOptions } from './backend';
 
@@ -19,6 +19,14 @@ export class BrowserClient extends BaseClient<BrowserBackend, BrowserOptions> {
     super(BrowserBackend, options);
   }
 
+  /**
+   * @inheritDoc
+   */
+  protected async prepareEvent(event: SentryEvent, scope?: Scope, hint?: SentryEventHint): Promise<SentryEvent | null> {
+    event.platform = event.platform || 'javascript';
+    return super.prepareEvent(event, scope, hint);
+  }
+
   /** JSDoc */
   public showReportDialog(options: {
     [key: string]: any;

packages/node/src/client.ts

@@ -1,4 +1,5 @@
-import { BaseClient } from '@sentry/core';
+import { BaseClient, Scope } from '@sentry/core';
+import { SentryEvent, SentryEventHint } from '@sentry/types';
 import { NodeBackend, NodeOptions } from './backend';
 
 /**
@@ -15,4 +16,15 @@ export class NodeClient extends BaseClient<NodeBackend, NodeOptions> {
   public constructor(options: NodeOptions) {
     super(NodeBackend, options);
   }
+
+  /**
+   * @inheritDoc
+   */
+  protected async prepareEvent(event: SentryEvent, scope?: Scope, hint?: SentryEventHint): Promise<SentryEvent | null> {
+    event.platform = event.platform || 'node';
+    if (this.getOptions().serverName) {
+      event.server_name = this.getOptions().serverName;
+    }
+    return super.prepareEvent(event, scope, hint);
+  }
 }

packages/node/src/integrations/clientoptions.ts

@@ -2,7 +2,6 @@ export { Console } from './console';
 export { Http } from './http';
 export { OnUncaughtException } from './onuncaughtexception';
 export { OnUnhandledRejection } from './onunhandledrejection';
-export { ClientOptions } from './clientoptions';
 export { LinkedErrors } from './linkederrors';
 
 export { Modules } from './pluggable/modules';

packages/node/src/integrations/index.ts

@@ -1,7 +1,7 @@
 import { initAndBind, Integrations as CoreIntegrations } from '@sentry/core';
 import { NodeOptions } from './backend';
 import { NodeClient } from './client';
-import { ClientOptions, Console, Http, LinkedErrors, OnUncaughtException, OnUnhandledRejection } from './integrations';
+import { Console, Http, LinkedErrors, OnUncaughtException, OnUnhandledRejection } from './integrations';
 import { SDK_NAME, SDK_VERSION } from './version';
 
 export const defaultIntegrations = [
@@ -21,7 +21,6 @@ export const defaultIntegrations = [
   new OnUncaughtException(),
   new OnUnhandledRejection(),
   // Misc
-  new ClientOptions(),
   new LinkedErrors(),
 ];