feat(feedback): Allow passing tags field to any feedback config param

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/init.js

@@ -4,5 +4,9 @@ window.Sentry = Sentry;
 
 Sentry.init({
  dsn: 'https://public@dsn.ingest.sentry.io/1337',
- integrations: [Sentry.feedbackIntegration()],
+ integrations: [
+ Sentry.feedbackIntegration({
+ tags: { from: 'integration init' },
+ }),
+ ],
 });

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/test.ts

@@ -59,6 +59,9 @@ sentryTest('should capture feedback', async ({ getLocalTestUrl, page }) => {
  },
  },
  level: 'info',
+ tags: {
+ from: 'integration init',
+ },
  timestamp: expect.any(Number),
  event_id: expect.stringMatching(/\w{32}/),
  environment: 'production',

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/test.ts

@@ -95,6 +95,7 @@ sentryTest('should capture feedback', async ({ forceFlushReplay, getLocalTestUrl
  },
  },
  level: 'info',
+ tags: {},
  timestamp: expect.any(Number),
  event_id: expect.stringMatching(/\w{32}/),
  environment: 'production',

packages/core/src/feedback.ts

@@ -6,11 +6,11 @@ import { getClient, getCurrentScope } from './currentScopes';
  * Send user feedback to Sentry.
  */
 export function captureFeedback(
-feedbackParams: SendFeedbackParams,
+params: SendFeedbackParams,
  hint: EventHint & { includeReplay?: boolean } = {},
  scope = getCurrentScope(),
 ): string {
- const { message, name, email, url, source, associatedEventId} = feedbackParams;
+ const { message, name, email, url, source, associatedEventId, tags } = params;
 
  const feedbackEvent: FeedbackEvent = {
  contexts: {
@@ -25,6 +25,7 @@ export function captureFeedback(
  },
  type: 'feedback',
  level: 'info',
+ tags,
  };
 
  const client = (scope && scope.getClient()) || getClient();

packages/feedback/src/core/integration.ts

@@ -64,17 +64,18 @@ export const buildFeedbackIntegration = ({
  const feedbackIntegration = (({
  // FeedbackGeneralConfiguration
  id = 'sentry-feedback',
- showBranding = true,
  autoInject = true,
+ showBranding = true,
+ isEmailRequired = false,
+ isNameRequired = false,
  showEmail = true,
  showName = true,
  enableScreenshot = true,
  useSentryUser = {
  email: 'email',
  name: 'username',
  },
- isNameRequired = false,
- isEmailRequired = false,
+ tags,
 
  // FeedbackThemeConfiguration
  colorScheme = 'system',
@@ -115,6 +116,7 @@ export const buildFeedbackIntegration = ({
  showName,
  enableScreenshot,
  useSentryUser,
+ tags,
 
  colorScheme,
  themeDark,

packages/feedback/src/core/sendFeedback.ts

@@ -1,18 +1,18 @@
 import { captureFeedback } from '@sentry/core';
 import { getClient } from '@sentry/core';
-import type { EventHint, SendFeedback, SendFeedbackParams, TransportMakeRequestResponse } from '@sentry/types';
-import type { Event } from '@sentry/types';
+import { getCurrentScope } from '@sentry/core';
+import type { Event, EventHint, SendFeedback, SendFeedbackParams, TransportMakeRequestResponse } from '@sentry/types';
 import { getLocationHref } from '@sentry/utils';
 import { FEEDBACK_API_SOURCE } from '../constants';
 
 /**
  * Public API to send a Feedback item to Sentry
  */
 export const sendFeedback: SendFeedback = (
-options: SendFeedbackParams,
+params: SendFeedbackParams,
  hint: EventHint & { includeReplay?: boolean } = { includeReplay: true },
 ): Promise<string> => {
- if (!options.message) {
+ if (!params.message) {
  throw new Error('Unable to submit feedback with empty message');
  }
 
@@ -23,11 +23,14 @@ export const sendFeedback: SendFeedback = (
  throw new Error('No client setup, cannot send feedback.');
  }
 
+ if (params.tags && Object.keys(params.tags).length) {
+ getCurrentScope().setTags(params.tags);
+ }
  const eventId = captureFeedback(
  {
  source: FEEDBACK_API_SOURCE,
  url: getLocationHref(),
- ...options,
+ ...params,
  },
  hint,
  );

packages/feedback/src/modal/components/Form.tsx

@@ -46,6 +46,7 @@ export function Form({
  screenshotInput,
 }: Props): VNode {
  const {
+ tags,
  addScreenshotButtonLabel,
  removeScreenshotButtonLabel,
  cancelButtonLabel,
@@ -122,6 +123,7 @@ export function Form({
  email: data.email,
  message: data.message,
  source: FEEDBACK_WIDGET_SOURCE,
+ tags,
  },
  { attachments: data.attachments },
  );

packages/feedback/src/util/mergeOptions.ts

@@ -11,6 +11,10 @@ export function mergeOptions(
  return {
  ...defaultOptions,
  ...optionOverrides,
+ tags: {
+ ...defaultOptions.tags,
+ ...optionOverrides.tags,
+ },
  onFormOpen: () => {
  optionOverrides.onFormOpen && optionOverrides.onFormOpen();
  defaultOptions.onFormOpen && defaultOptions.onFormOpen();

packages/types/src/feedback/config.ts

@@ -1,3 +1,4 @@
+import type { Primitive } from '../misc';
 import type { FeedbackFormData } from './form';
 import type { FeedbackTheme } from './theme';
 
@@ -55,6 +56,11 @@ export interface FeedbackGeneralConfiguration {
  email: string;
  name: string;
  };
+
+ /**
+ * Set an object that will be merged sent as tags data with the event.
+ */
+ tags?: { [key: string]: Primitive };
 }
 
 /**

packages/types/src/feedback/sendFeedback.ts

@@ -1,4 +1,5 @@
 import type { Event, EventHint } from '../event';
+import type { Primitive } from '../misc';
 import type { User } from '../user';
 
 /**
@@ -38,13 +39,14 @@ export interface SendFeedbackParams {
  url?: string;
  source?: string;
  associatedEventId?: string;
-}
 
-interface SendFeedbackOptions extends EventHint {
  /**
- * Should include replay with the feedback?
+ * Set an object that will be merged sent as tags data with the event.
  */
-includeReplay?: boolean;
+tags?: { [key: string]: Primitive };
 }
 
-export type SendFeedback = (params: SendFeedbackParams, options?: SendFeedbackOptions) => Promise<string>;
+export type SendFeedback = (
+ params: SendFeedbackParams,
+ hint?: EventHint & { includeReplay?: boolean },
+) => Promise<string>;

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/init.js

@@ -4,5 +4,9 @@ window.Sentry = Sentry;
 
 Sentry.init({
  dsn: 'https://public@dsn.ingest.sentry.io/1337',
- integrations: [Sentry.feedbackIntegration()],
+ integrations: [
+ Sentry.feedbackIntegration({
+ tags: { from: 'integration init' },
+ }),
+ ],
 });

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/test.ts

@@ -59,6 +59,9 @@ sentryTest('should capture feedback', async ({ getLocalTestUrl, page }) => {
  },
  },
  level: 'info',
+ tags: {
+ from: 'integration init',
+ },
  timestamp: expect.any(Number),
  event_id: expect.stringMatching(/\w{32}/),
  environment: 'production',

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/test.ts

@@ -95,6 +95,7 @@ sentryTest('should capture feedback', async ({ forceFlushReplay, getLocalTestUrl
  },
  },
  level: 'info',
+ tags: {},
  timestamp: expect.any(Number),
  event_id: expect.stringMatching(/\w{32}/),
  environment: 'production',

packages/core/src/feedback.ts

@@ -6,11 +6,11 @@ import { getClient, getCurrentScope } from './currentScopes';
  * Send user feedback to Sentry.
  */
 export function captureFeedback(
-feedbackParams: SendFeedbackParams,
+params: SendFeedbackParams,
  hint: EventHint & { includeReplay?: boolean } = {},
  scope = getCurrentScope(),
 ): string {
- const { message, name, email, url, source, associatedEventId} = feedbackParams;
+ const { message, name, email, url, source, associatedEventId, tags } = params;
 
  const feedbackEvent: FeedbackEvent = {
  contexts: {
@@ -25,6 +25,7 @@ export function captureFeedback(
  },
  type: 'feedback',
  level: 'info',
+ tags,
  };
 
  const client = (scope && scope.getClient()) || getClient();

packages/feedback/src/core/integration.ts

@@ -64,17 +64,18 @@ export const buildFeedbackIntegration = ({
  const feedbackIntegration = (({
  // FeedbackGeneralConfiguration
  id = 'sentry-feedback',
- showBranding = true,
  autoInject = true,
+ showBranding = true,
+ isEmailRequired = false,
+ isNameRequired = false,
  showEmail = true,
  showName = true,
  enableScreenshot = true,
  useSentryUser = {
  email: 'email',
  name: 'username',
  },
- isNameRequired = false,
- isEmailRequired = false,
+ tags,
 
  // FeedbackThemeConfiguration
  colorScheme = 'system',
@@ -115,6 +116,7 @@ export const buildFeedbackIntegration = ({
  showName,
  enableScreenshot,
  useSentryUser,
+ tags,
 
  colorScheme,
  themeDark,

packages/feedback/src/core/sendFeedback.ts

@@ -1,18 +1,18 @@
 import { captureFeedback } from '@sentry/core';
 import { getClient } from '@sentry/core';
-import type { EventHint, SendFeedback, SendFeedbackParams, TransportMakeRequestResponse } from '@sentry/types';
-import type { Event } from '@sentry/types';
+import { getCurrentScope } from '@sentry/core';
+import type { Event, EventHint, SendFeedback, SendFeedbackParams, TransportMakeRequestResponse } from '@sentry/types';
 import { getLocationHref } from '@sentry/utils';
 import { FEEDBACK_API_SOURCE } from '../constants';
 
 /**
  * Public API to send a Feedback item to Sentry
  */
 export const sendFeedback: SendFeedback = (
-options: SendFeedbackParams,
+params: SendFeedbackParams,
  hint: EventHint & { includeReplay?: boolean } = { includeReplay: true },
 ): Promise<string> => {
- if (!options.message) {
+ if (!params.message) {
  throw new Error('Unable to submit feedback with empty message');
  }
 
@@ -23,11 +23,14 @@ export const sendFeedback: SendFeedback = (
  throw new Error('No client setup, cannot send feedback.');
  }
 
+ if (params.tags && Object.keys(params.tags).length) {
+ getCurrentScope().setTags(params.tags);
+ }
  const eventId = captureFeedback(
  {
  source: FEEDBACK_API_SOURCE,
  url: getLocationHref(),
- ...options,
+ ...params,
  },
  hint,
  );

packages/feedback/src/modal/components/Form.tsx

@@ -46,6 +46,7 @@ export function Form({
  screenshotInput,
 }: Props): VNode {
  const {
+ tags,
  addScreenshotButtonLabel,
  removeScreenshotButtonLabel,
  cancelButtonLabel,
@@ -122,6 +123,7 @@ export function Form({
  email: data.email,
  message: data.message,
  source: FEEDBACK_WIDGET_SOURCE,
+ tags,
  },
  { attachments: data.attachments },
  );

packages/feedback/src/util/mergeOptions.ts

@@ -11,6 +11,10 @@ export function mergeOptions(
  return {
  ...defaultOptions,
  ...optionOverrides,
+ tags: {
+ ...defaultOptions.tags,
+ ...optionOverrides.tags,
+ },
  onFormOpen: () => {
  optionOverrides.onFormOpen && optionOverrides.onFormOpen();
  defaultOptions.onFormOpen && defaultOptions.onFormOpen();

packages/types/src/feedback/config.ts

@@ -1,3 +1,4 @@
+import type { Primitive } from '../misc';
 import type { FeedbackFormData } from './form';
 import type { FeedbackTheme } from './theme';
 
@@ -55,6 +56,11 @@ export interface FeedbackGeneralConfiguration {
  email: string;
  name: string;
  };
+
+ /**
+ * Set an object that will be merged sent as tags data with the event.
+ */
+ tags?: { [key: string]: Primitive };
 }
 
 /**

packages/types/src/feedback/sendFeedback.ts

@@ -1,4 +1,5 @@
 import type { Event, EventHint } from '../event';
+import type { Primitive } from '../misc';
 import type { User } from '../user';
 
 /**
@@ -38,13 +39,14 @@ export interface SendFeedbackParams {
  url?: string;
  source?: string;
  associatedEventId?: string;
-}
 
-interface SendFeedbackOptions extends EventHint {
  /**
- * Should include replay with the feedback?
+ * Set an object that will be merged sent as tags data with the event.
  */
-includeReplay?: boolean;
+tags?: { [key: string]: Primitive };
 }
 
-export type SendFeedback = (params: SendFeedbackParams, options?: SendFeedbackOptions) => Promise<string>;
+export type SendFeedback = (
+ params: SendFeedbackParams,
+ hint?: EventHint & { includeReplay?: boolean },
+) => Promise<string>;

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/init.js

@@ -4,5 +4,9 @@ window.Sentry = Sentry;
 
 Sentry.init({
  dsn: 'https://public@dsn.ingest.sentry.io/1337',
- integrations: [Sentry.feedbackIntegration()],
+ integrations: [
+ Sentry.feedbackIntegration({
+ tags: { from: 'integration init' },
+ }),
+ ],
 });

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/test.ts

@@ -59,6 +59,9 @@ sentryTest('should capture feedback', async ({ getLocalTestUrl, page }) => {
  },
  },
  level: 'info',
+ tags: {
+ from: 'integration init',
+ },
  timestamp: expect.any(Number),
  event_id: expect.stringMatching(/\w{32}/),
  environment: 'production',

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/test.ts

@@ -95,6 +95,7 @@ sentryTest('should capture feedback', async ({ forceFlushReplay, getLocalTestUrl
  },
  },
  level: 'info',
+ tags: {},
  timestamp: expect.any(Number),
  event_id: expect.stringMatching(/\w{32}/),
  environment: 'production',

packages/core/src/feedback.ts

@@ -6,11 +6,11 @@ import { getClient, getCurrentScope } from './currentScopes';
  * Send user feedback to Sentry.
  */
 export function captureFeedback(
-feedbackParams: SendFeedbackParams,
+params: SendFeedbackParams,
  hint: EventHint & { includeReplay?: boolean } = {},
  scope = getCurrentScope(),
 ): string {
- const { message, name, email, url, source, associatedEventId} = feedbackParams;
+ const { message, name, email, url, source, associatedEventId, tags } = params;
 
  const feedbackEvent: FeedbackEvent = {
  contexts: {
@@ -25,6 +25,7 @@ export function captureFeedback(
  },
  type: 'feedback',
  level: 'info',
+ tags,
  };
 
  const client = (scope && scope.getClient()) || getClient();

packages/feedback/src/core/integration.ts

@@ -64,17 +64,18 @@ export const buildFeedbackIntegration = ({
  const feedbackIntegration = (({
  // FeedbackGeneralConfiguration
  id = 'sentry-feedback',
- showBranding = true,
  autoInject = true,
+ showBranding = true,
+ isEmailRequired = false,
+ isNameRequired = false,
  showEmail = true,
  showName = true,
  enableScreenshot = true,
  useSentryUser = {
  email: 'email',
  name: 'username',
  },
- isNameRequired = false,
- isEmailRequired = false,
+ tags,
 
  // FeedbackThemeConfiguration
  colorScheme = 'system',
@@ -115,6 +116,7 @@ export const buildFeedbackIntegration = ({
  showName,
  enableScreenshot,
  useSentryUser,
+ tags,
 
  colorScheme,
  themeDark,

packages/feedback/src/core/sendFeedback.ts

@@ -1,18 +1,18 @@
 import { captureFeedback } from '@sentry/core';
 import { getClient } from '@sentry/core';
-import type { EventHint, SendFeedback, SendFeedbackParams, TransportMakeRequestResponse } from '@sentry/types';
-import type { Event } from '@sentry/types';
+import { getCurrentScope } from '@sentry/core';
+import type { Event, EventHint, SendFeedback, SendFeedbackParams, TransportMakeRequestResponse } from '@sentry/types';
 import { getLocationHref } from '@sentry/utils';
 import { FEEDBACK_API_SOURCE } from '../constants';
 
 /**
  * Public API to send a Feedback item to Sentry
  */
 export const sendFeedback: SendFeedback = (
-options: SendFeedbackParams,
+params: SendFeedbackParams,
  hint: EventHint & { includeReplay?: boolean } = { includeReplay: true },
 ): Promise<string> => {
- if (!options.message) {
+ if (!params.message) {
  throw new Error('Unable to submit feedback with empty message');
  }
 
@@ -23,11 +23,14 @@ export const sendFeedback: SendFeedback = (
  throw new Error('No client setup, cannot send feedback.');
  }
 
+ if (params.tags && Object.keys(params.tags).length) {
+ getCurrentScope().setTags(params.tags);
+ }
  const eventId = captureFeedback(
  {
  source: FEEDBACK_API_SOURCE,
  url: getLocationHref(),
- ...options,
+ ...params,
  },
  hint,
  );

packages/feedback/src/modal/components/Form.tsx

@@ -46,6 +46,7 @@ export function Form({
  screenshotInput,
 }: Props): VNode {
  const {
+ tags,
  addScreenshotButtonLabel,
  removeScreenshotButtonLabel,
  cancelButtonLabel,
@@ -122,6 +123,7 @@ export function Form({
  email: data.email,
  message: data.message,
  source: FEEDBACK_WIDGET_SOURCE,
+ tags,
  },
  { attachments: data.attachments },
  );

packages/feedback/src/util/mergeOptions.ts

@@ -11,6 +11,10 @@ export function mergeOptions(
  return {
  ...defaultOptions,
  ...optionOverrides,
+ tags: {
+ ...defaultOptions.tags,
+ ...optionOverrides.tags,
+ },
  onFormOpen: () => {
  optionOverrides.onFormOpen && optionOverrides.onFormOpen();
  defaultOptions.onFormOpen && defaultOptions.onFormOpen();

packages/types/src/feedback/config.ts

@@ -1,3 +1,4 @@
+import type { Primitive } from '../misc';
 import type { FeedbackFormData } from './form';
 import type { FeedbackTheme } from './theme';
 
@@ -55,6 +56,11 @@ export interface FeedbackGeneralConfiguration {
  email: string;
  name: string;
  };
+
+ /**
+ * Set an object that will be merged sent as tags data with the event.
+ */
+ tags?: { [key: string]: Primitive };
 }
 
 /**

packages/types/src/feedback/sendFeedback.ts

@@ -1,4 +1,5 @@
 import type { Event, EventHint } from '../event';
+import type { Primitive } from '../misc';
 import type { User } from '../user';
 
 /**
@@ -38,13 +39,14 @@ export interface SendFeedbackParams {
  url?: string;
  source?: string;
  associatedEventId?: string;
-}
 
-interface SendFeedbackOptions extends EventHint {
  /**
- * Should include replay with the feedback?
+ * Set an object that will be merged sent as tags data with the event.
  */
-includeReplay?: boolean;
+tags?: { [key: string]: Primitive };
 }
 
-export type SendFeedback = (params: SendFeedbackParams, options?: SendFeedbackOptions) => Promise<string>;
+export type SendFeedback = (
+ params: SendFeedbackParams,
+ hint?: EventHint & { includeReplay?: boolean },
+) => Promise<string>;

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/init.js

@@ -4,5 +4,9 @@ window.Sentry = Sentry;
 
 Sentry.init({
  dsn: 'https://public@dsn.ingest.sentry.io/1337',
- integrations: [Sentry.feedbackIntegration()],
+ integrations: [
+ Sentry.feedbackIntegration({
+ tags: { from: 'integration init' },
+ }),
+ ],
 });

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/test.ts

@@ -59,6 +59,9 @@ sentryTest('should capture feedback', async ({ getLocalTestUrl, page }) => {
  },
  },
  level: 'info',
+ tags: {
+ from: 'integration init',
+ },
  timestamp: expect.any(Number),
  event_id: expect.stringMatching(/\w{32}/),
  environment: 'production',

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/test.ts

@@ -95,6 +95,7 @@ sentryTest('should capture feedback', async ({ forceFlushReplay, getLocalTestUrl
  },
  },
  level: 'info',
+ tags: {},
  timestamp: expect.any(Number),
  event_id: expect.stringMatching(/\w{32}/),
  environment: 'production',

packages/core/src/feedback.ts

@@ -6,11 +6,11 @@ import { getClient, getCurrentScope } from './currentScopes';
  * Send user feedback to Sentry.
  */
 export function captureFeedback(
-feedbackParams: SendFeedbackParams,
+params: SendFeedbackParams,
  hint: EventHint & { includeReplay?: boolean } = {},
  scope = getCurrentScope(),
 ): string {
- const { message, name, email, url, source, associatedEventId} = feedbackParams;
+ const { message, name, email, url, source, associatedEventId, tags } = params;
 
  const feedbackEvent: FeedbackEvent = {
  contexts: {
@@ -25,6 +25,7 @@ export function captureFeedback(
  },
  type: 'feedback',
  level: 'info',
+ tags,
  };
 
  const client = (scope && scope.getClient()) || getClient();

packages/feedback/src/core/integration.ts

@@ -64,17 +64,18 @@ export const buildFeedbackIntegration = ({
  const feedbackIntegration = (({
  // FeedbackGeneralConfiguration
  id = 'sentry-feedback',
- showBranding = true,
  autoInject = true,
+ showBranding = true,
+ isEmailRequired = false,
+ isNameRequired = false,
  showEmail = true,
  showName = true,
  enableScreenshot = true,
  useSentryUser = {
  email: 'email',
  name: 'username',
  },
- isNameRequired = false,
- isEmailRequired = false,
+ tags,
 
  // FeedbackThemeConfiguration
  colorScheme = 'system',
@@ -115,6 +116,7 @@ export const buildFeedbackIntegration = ({
  showName,
  enableScreenshot,
  useSentryUser,
+ tags,
 
  colorScheme,
  themeDark,

packages/feedback/src/core/sendFeedback.ts

@@ -1,18 +1,18 @@
 import { captureFeedback } from '@sentry/core';
 import { getClient } from '@sentry/core';
-import type { EventHint, SendFeedback, SendFeedbackParams, TransportMakeRequestResponse } from '@sentry/types';
-import type { Event } from '@sentry/types';
+import { getCurrentScope } from '@sentry/core';
+import type { Event, EventHint, SendFeedback, SendFeedbackParams, TransportMakeRequestResponse } from '@sentry/types';
 import { getLocationHref } from '@sentry/utils';
 import { FEEDBACK_API_SOURCE } from '../constants';
 
 /**
  * Public API to send a Feedback item to Sentry
  */
 export const sendFeedback: SendFeedback = (
-options: SendFeedbackParams,
+params: SendFeedbackParams,
  hint: EventHint & { includeReplay?: boolean } = { includeReplay: true },
 ): Promise<string> => {
- if (!options.message) {
+ if (!params.message) {
  throw new Error('Unable to submit feedback with empty message');
  }
 
@@ -23,11 +23,14 @@ export const sendFeedback: SendFeedback = (
  throw new Error('No client setup, cannot send feedback.');
  }
 
+ if (params.tags && Object.keys(params.tags).length) {
+ getCurrentScope().setTags(params.tags);
+ }
  const eventId = captureFeedback(
  {
  source: FEEDBACK_API_SOURCE,
  url: getLocationHref(),
- ...options,
+ ...params,
  },
  hint,
  );

packages/feedback/src/modal/components/Form.tsx

@@ -46,6 +46,7 @@ export function Form({
  screenshotInput,
 }: Props): VNode {
  const {
+ tags,
  addScreenshotButtonLabel,
  removeScreenshotButtonLabel,
  cancelButtonLabel,
@@ -122,6 +123,7 @@ export function Form({
  email: data.email,
  message: data.message,
  source: FEEDBACK_WIDGET_SOURCE,
+ tags,
  },
  { attachments: data.attachments },
  );

packages/feedback/src/util/mergeOptions.ts

@@ -11,6 +11,10 @@ export function mergeOptions(
  return {
  ...defaultOptions,
  ...optionOverrides,
+ tags: {
+ ...defaultOptions.tags,
+ ...optionOverrides.tags,
+ },
  onFormOpen: () => {
  optionOverrides.onFormOpen && optionOverrides.onFormOpen();
  defaultOptions.onFormOpen && defaultOptions.onFormOpen();

packages/types/src/feedback/config.ts

@@ -1,3 +1,4 @@
+import type { Primitive } from '../misc';
 import type { FeedbackFormData } from './form';
 import type { FeedbackTheme } from './theme';
 
@@ -55,6 +56,11 @@ export interface FeedbackGeneralConfiguration {
  email: string;
  name: string;
  };
+
+ /**
+ * Set an object that will be merged sent as tags data with the event.
+ */
+ tags?: { [key: string]: Primitive };
 }
 
 /**

packages/types/src/feedback/sendFeedback.ts

@@ -1,4 +1,5 @@
 import type { Event, EventHint } from '../event';
+import type { Primitive } from '../misc';
 import type { User } from '../user';
 
 /**
@@ -38,13 +39,14 @@ export interface SendFeedbackParams {
  url?: string;
  source?: string;
  associatedEventId?: string;
-}
 
-interface SendFeedbackOptions extends EventHint {
  /**
- * Should include replay with the feedback?
+ * Set an object that will be merged sent as tags data with the event.
  */
-includeReplay?: boolean;
+tags?: { [key: string]: Primitive };
 }
 
-export type SendFeedback = (params: SendFeedbackParams, options?: SendFeedbackOptions) => Promise<string>;
+export type SendFeedback = (
+ params: SendFeedbackParams,
+ hint?: EventHint & { includeReplay?: boolean },
+) => Promise<string>;

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/init.js

@@ -4,5 +4,9 @@ window.Sentry = Sentry;
 
 Sentry.init({
  dsn: 'https://public@dsn.ingest.sentry.io/1337',
- integrations: [Sentry.feedbackIntegration()],
+ integrations: [
+ Sentry.feedbackIntegration({
+ tags: { from: 'integration init' },
+ }),
+ ],
 });

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/test.ts

@@ -59,6 +59,9 @@ sentryTest('should capture feedback', async ({ getLocalTestUrl, page }) => {
  },
  },
  level: 'info',
+ tags: {
+ from: 'integration init',
+ },
  timestamp: expect.any(Number),
  event_id: expect.stringMatching(/\w{32}/),
  environment: 'production',

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/test.ts

@@ -95,6 +95,7 @@ sentryTest('should capture feedback', async ({ forceFlushReplay, getLocalTestUrl
  },
  },
  level: 'info',
+ tags: {},
  timestamp: expect.any(Number),
  event_id: expect.stringMatching(/\w{32}/),
  environment: 'production',

packages/core/src/feedback.ts

@@ -6,11 +6,11 @@ import { getClient, getCurrentScope } from './currentScopes';
  * Send user feedback to Sentry.
  */
 export function captureFeedback(
-feedbackParams: SendFeedbackParams,
+params: SendFeedbackParams,
  hint: EventHint & { includeReplay?: boolean } = {},
  scope = getCurrentScope(),
 ): string {
- const { message, name, email, url, source, associatedEventId} = feedbackParams;
+ const { message, name, email, url, source, associatedEventId, tags } = params;
 
  const feedbackEvent: FeedbackEvent = {
  contexts: {
@@ -25,6 +25,7 @@ export function captureFeedback(
  },
  type: 'feedback',
  level: 'info',
+ tags,
  };
 
  const client = (scope && scope.getClient()) || getClient();

packages/feedback/src/core/integration.ts

@@ -64,17 +64,18 @@ export const buildFeedbackIntegration = ({
  const feedbackIntegration = (({
  // FeedbackGeneralConfiguration
  id = 'sentry-feedback',
- showBranding = true,
  autoInject = true,
+ showBranding = true,
+ isEmailRequired = false,
+ isNameRequired = false,
  showEmail = true,
  showName = true,
  enableScreenshot = true,
  useSentryUser = {
  email: 'email',
  name: 'username',
  },
- isNameRequired = false,
- isEmailRequired = false,
+ tags,
 
  // FeedbackThemeConfiguration
  colorScheme = 'system',
@@ -115,6 +116,7 @@ export const buildFeedbackIntegration = ({
  showName,
  enableScreenshot,
  useSentryUser,
+ tags,
 
  colorScheme,
  themeDark,

packages/feedback/src/core/sendFeedback.ts

@@ -1,18 +1,18 @@
 import { captureFeedback } from '@sentry/core';
 import { getClient } from '@sentry/core';
-import type { EventHint, SendFeedback, SendFeedbackParams, TransportMakeRequestResponse } from '@sentry/types';
-import type { Event } from '@sentry/types';
+import { getCurrentScope } from '@sentry/core';
+import type { Event, EventHint, SendFeedback, SendFeedbackParams, TransportMakeRequestResponse } from '@sentry/types';
 import { getLocationHref } from '@sentry/utils';
 import { FEEDBACK_API_SOURCE } from '../constants';
 
 /**
  * Public API to send a Feedback item to Sentry
  */
 export const sendFeedback: SendFeedback = (
-options: SendFeedbackParams,
+params: SendFeedbackParams,
  hint: EventHint & { includeReplay?: boolean } = { includeReplay: true },
 ): Promise<string> => {
- if (!options.message) {
+ if (!params.message) {
  throw new Error('Unable to submit feedback with empty message');
  }
 
@@ -23,11 +23,14 @@ export const sendFeedback: SendFeedback = (
  throw new Error('No client setup, cannot send feedback.');
  }
 
+ if (params.tags && Object.keys(params.tags).length) {
+ getCurrentScope().setTags(params.tags);
+ }
  const eventId = captureFeedback(
  {
  source: FEEDBACK_API_SOURCE,
  url: getLocationHref(),
- ...options,
+ ...params,
  },
  hint,
  );

packages/feedback/src/modal/components/Form.tsx

@@ -46,6 +46,7 @@ export function Form({
  screenshotInput,
 }: Props): VNode {
  const {
+ tags,
  addScreenshotButtonLabel,
  removeScreenshotButtonLabel,
  cancelButtonLabel,
@@ -122,6 +123,7 @@ export function Form({
  email: data.email,
  message: data.message,
  source: FEEDBACK_WIDGET_SOURCE,
+ tags,
  },
  { attachments: data.attachments },
  );

packages/feedback/src/util/mergeOptions.ts

@@ -11,6 +11,10 @@ export function mergeOptions(
  return {
  ...defaultOptions,
  ...optionOverrides,
+ tags: {
+ ...defaultOptions.tags,
+ ...optionOverrides.tags,
+ },
  onFormOpen: () => {
  optionOverrides.onFormOpen && optionOverrides.onFormOpen();
  defaultOptions.onFormOpen && defaultOptions.onFormOpen();

packages/types/src/feedback/config.ts

@@ -1,3 +1,4 @@
+import type { Primitive } from '../misc';
 import type { FeedbackFormData } from './form';
 import type { FeedbackTheme } from './theme';
 
@@ -55,6 +56,11 @@ export interface FeedbackGeneralConfiguration {
  email: string;
  name: string;
  };
+
+ /**
+ * Set an object that will be merged sent as tags data with the event.
+ */
+ tags?: { [key: string]: Primitive };
 }
 
 /**

packages/types/src/feedback/sendFeedback.ts

@@ -1,4 +1,5 @@
 import type { Event, EventHint } from '../event';
+import type { Primitive } from '../misc';
 import type { User } from '../user';
 
 /**
@@ -38,13 +39,14 @@ export interface SendFeedbackParams {
  url?: string;
  source?: string;
  associatedEventId?: string;
-}
 
-interface SendFeedbackOptions extends EventHint {
  /**
- * Should include replay with the feedback?
+ * Set an object that will be merged sent as tags data with the event.
  */
-includeReplay?: boolean;
+tags?: { [key: string]: Primitive };
 }
 
-export type SendFeedback = (params: SendFeedbackParams, options?: SendFeedbackOptions) => Promise<string>;
+export type SendFeedback = (
+ params: SendFeedbackParams,
+ hint?: EventHint & { includeReplay?: boolean },
+) => Promise<string>;

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/init.js

@@ -4,5 +4,9 @@ window.Sentry = Sentry;
 
 Sentry.init({
  dsn: 'https://public@dsn.ingest.sentry.io/1337',
- integrations: [Sentry.feedbackIntegration()],
+ integrations: [
+ Sentry.feedbackIntegration({
+ tags: { from: 'integration init' },
+ }),
+ ],
 });

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/test.ts

@@ -59,6 +59,9 @@ sentryTest('should capture feedback', async ({ getLocalTestUrl, page }) => {
  },
  },
  level: 'info',
+ tags: {
+ from: 'integration init',
+ },
  timestamp: expect.any(Number),
  event_id: expect.stringMatching(/\w{32}/),
  environment: 'production',

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/test.ts

@@ -95,6 +95,7 @@ sentryTest('should capture feedback', async ({ forceFlushReplay, getLocalTestUrl
  },
  },
  level: 'info',
+ tags: {},
  timestamp: expect.any(Number),
  event_id: expect.stringMatching(/\w{32}/),
  environment: 'production',

packages/core/src/feedback.ts

@@ -6,11 +6,11 @@ import { getClient, getCurrentScope } from './currentScopes';
  * Send user feedback to Sentry.
  */
 export function captureFeedback(
-feedbackParams: SendFeedbackParams,
+params: SendFeedbackParams,
  hint: EventHint & { includeReplay?: boolean } = {},
  scope = getCurrentScope(),
 ): string {
- const { message, name, email, url, source, associatedEventId} = feedbackParams;
+ const { message, name, email, url, source, associatedEventId, tags } = params;
 
  const feedbackEvent: FeedbackEvent = {
  contexts: {
@@ -25,6 +25,7 @@ export function captureFeedback(
  },
  type: 'feedback',
  level: 'info',
+ tags,
  };
 
  const client = (scope && scope.getClient()) || getClient();

packages/feedback/src/core/integration.ts

@@ -64,17 +64,18 @@ export const buildFeedbackIntegration = ({
  const feedbackIntegration = (({
  // FeedbackGeneralConfiguration
  id = 'sentry-feedback',
- showBranding = true,
  autoInject = true,
+ showBranding = true,
+ isEmailRequired = false,
+ isNameRequired = false,
  showEmail = true,
  showName = true,
  enableScreenshot = true,
  useSentryUser = {
  email: 'email',
  name: 'username',
  },
- isNameRequired = false,
- isEmailRequired = false,
+ tags,
 
  // FeedbackThemeConfiguration
  colorScheme = 'system',
@@ -115,6 +116,7 @@ export const buildFeedbackIntegration = ({
  showName,
  enableScreenshot,
  useSentryUser,
+ tags,
 
  colorScheme,
  themeDark,

packages/feedback/src/core/sendFeedback.ts

@@ -1,18 +1,18 @@
 import { captureFeedback } from '@sentry/core';
 import { getClient } from '@sentry/core';
-import type { EventHint, SendFeedback, SendFeedbackParams, TransportMakeRequestResponse } from '@sentry/types';
-import type { Event } from '@sentry/types';
+import { getCurrentScope } from '@sentry/core';
+import type { Event, EventHint, SendFeedback, SendFeedbackParams, TransportMakeRequestResponse } from '@sentry/types';
 import { getLocationHref } from '@sentry/utils';
 import { FEEDBACK_API_SOURCE } from '../constants';
 
 /**
  * Public API to send a Feedback item to Sentry
  */
 export const sendFeedback: SendFeedback = (
-options: SendFeedbackParams,
+params: SendFeedbackParams,
  hint: EventHint & { includeReplay?: boolean } = { includeReplay: true },
 ): Promise<string> => {
- if (!options.message) {
+ if (!params.message) {
  throw new Error('Unable to submit feedback with empty message');
  }
 
@@ -23,11 +23,14 @@ export const sendFeedback: SendFeedback = (
  throw new Error('No client setup, cannot send feedback.');
  }
 
+ if (params.tags && Object.keys(params.tags).length) {
+ getCurrentScope().setTags(params.tags);
+ }
  const eventId = captureFeedback(
  {
  source: FEEDBACK_API_SOURCE,
  url: getLocationHref(),
- ...options,
+ ...params,
  },
  hint,
  );

packages/feedback/src/modal/components/Form.tsx

@@ -46,6 +46,7 @@ export function Form({
  screenshotInput,
 }: Props): VNode {
  const {
+ tags,
  addScreenshotButtonLabel,
  removeScreenshotButtonLabel,
  cancelButtonLabel,
@@ -122,6 +123,7 @@ export function Form({
  email: data.email,
  message: data.message,
  source: FEEDBACK_WIDGET_SOURCE,
+ tags,
  },
  { attachments: data.attachments },
  );

packages/feedback/src/util/mergeOptions.ts

@@ -11,6 +11,10 @@ export function mergeOptions(
  return {
  ...defaultOptions,
  ...optionOverrides,
+ tags: {
+ ...defaultOptions.tags,
+ ...optionOverrides.tags,
+ },
  onFormOpen: () => {
  optionOverrides.onFormOpen && optionOverrides.onFormOpen();
  defaultOptions.onFormOpen && defaultOptions.onFormOpen();

packages/types/src/feedback/config.ts

@@ -1,3 +1,4 @@
+import type { Primitive } from '../misc';
 import type { FeedbackFormData } from './form';
 import type { FeedbackTheme } from './theme';
 
@@ -55,6 +56,11 @@ export interface FeedbackGeneralConfiguration {
  email: string;
  name: string;
  };
+
+ /**
+ * Set an object that will be merged sent as tags data with the event.
+ */
+ tags?: { [key: string]: Primitive };
 }
 
 /**

packages/types/src/feedback/sendFeedback.ts

@@ -1,4 +1,5 @@
 import type { Event, EventHint } from '../event';
+import type { Primitive } from '../misc';
 import type { User } from '../user';
 
 /**
@@ -38,13 +39,14 @@ export interface SendFeedbackParams {
  url?: string;
  source?: string;
  associatedEventId?: string;
-}
 
-interface SendFeedbackOptions extends EventHint {
  /**
- * Should include replay with the feedback?
+ * Set an object that will be merged sent as tags data with the event.
  */
-includeReplay?: boolean;
+tags?: { [key: string]: Primitive };
 }
 
-export type SendFeedback = (params: SendFeedbackParams, options?: SendFeedbackOptions) => Promise<string>;
+export type SendFeedback = (
+ params: SendFeedbackParams,
+ hint?: EventHint & { includeReplay?: boolean },
+) => Promise<string>;

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/init.js

@@ -4,5 +4,9 @@ window.Sentry = Sentry;
 
 Sentry.init({
  dsn: 'https://public@dsn.ingest.sentry.io/1337',
- integrations: [Sentry.feedbackIntegration()],
+ integrations: [
+ Sentry.feedbackIntegration({
+ tags: { from: 'integration init' },
+ }),
+ ],
 });

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/test.ts

@@ -59,6 +59,9 @@ sentryTest('should capture feedback', async ({ getLocalTestUrl, page }) => {
  },
  },
  level: 'info',
+ tags: {
+ from: 'integration init',
+ },
  timestamp: expect.any(Number),
  event_id: expect.stringMatching(/\w{32}/),
  environment: 'production',

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/test.ts

@@ -95,6 +95,7 @@ sentryTest('should capture feedback', async ({ forceFlushReplay, getLocalTestUrl
  },
  },
  level: 'info',
+ tags: {},
  timestamp: expect.any(Number),
  event_id: expect.stringMatching(/\w{32}/),
  environment: 'production',

packages/core/src/feedback.ts

@@ -6,11 +6,11 @@ import { getClient, getCurrentScope } from './currentScopes';
  * Send user feedback to Sentry.
  */
 export function captureFeedback(
-feedbackParams: SendFeedbackParams,
+params: SendFeedbackParams,
  hint: EventHint & { includeReplay?: boolean } = {},
  scope = getCurrentScope(),
 ): string {
- const { message, name, email, url, source, associatedEventId} = feedbackParams;
+ const { message, name, email, url, source, associatedEventId, tags } = params;
 
  const feedbackEvent: FeedbackEvent = {
  contexts: {
@@ -25,6 +25,7 @@ export function captureFeedback(
  },
  type: 'feedback',
  level: 'info',
+ tags,
  };
 
  const client = (scope && scope.getClient()) || getClient();

packages/feedback/src/core/integration.ts

@@ -64,17 +64,18 @@ export const buildFeedbackIntegration = ({
  const feedbackIntegration = (({
  // FeedbackGeneralConfiguration
  id = 'sentry-feedback',
- showBranding = true,
  autoInject = true,
+ showBranding = true,
+ isEmailRequired = false,
+ isNameRequired = false,
  showEmail = true,
  showName = true,
  enableScreenshot = true,
  useSentryUser = {
  email: 'email',
  name: 'username',
  },
- isNameRequired = false,
- isEmailRequired = false,
+ tags,
 
  // FeedbackThemeConfiguration
  colorScheme = 'system',
@@ -115,6 +116,7 @@ export const buildFeedbackIntegration = ({
  showName,
  enableScreenshot,
  useSentryUser,
+ tags,
 
  colorScheme,
  themeDark,

packages/feedback/src/core/sendFeedback.ts

@@ -1,18 +1,18 @@
 import { captureFeedback } from '@sentry/core';
 import { getClient } from '@sentry/core';
-import type { EventHint, SendFeedback, SendFeedbackParams, TransportMakeRequestResponse } from '@sentry/types';
-import type { Event } from '@sentry/types';
+import { getCurrentScope } from '@sentry/core';
+import type { Event, EventHint, SendFeedback, SendFeedbackParams, TransportMakeRequestResponse } from '@sentry/types';
 import { getLocationHref } from '@sentry/utils';
 import { FEEDBACK_API_SOURCE } from '../constants';
 
 /**
  * Public API to send a Feedback item to Sentry
  */
 export const sendFeedback: SendFeedback = (
-options: SendFeedbackParams,
+params: SendFeedbackParams,
  hint: EventHint & { includeReplay?: boolean } = { includeReplay: true },
 ): Promise<string> => {
- if (!options.message) {
+ if (!params.message) {
  throw new Error('Unable to submit feedback with empty message');
  }
 
@@ -23,11 +23,14 @@ export const sendFeedback: SendFeedback = (
  throw new Error('No client setup, cannot send feedback.');
  }
 
+ if (params.tags && Object.keys(params.tags).length) {
+ getCurrentScope().setTags(params.tags);
+ }
  const eventId = captureFeedback(
  {
  source: FEEDBACK_API_SOURCE,
  url: getLocationHref(),
- ...options,
+ ...params,
  },
  hint,
  );

packages/feedback/src/modal/components/Form.tsx

@@ -46,6 +46,7 @@ export function Form({
  screenshotInput,
 }: Props): VNode {
  const {
+ tags,
  addScreenshotButtonLabel,
  removeScreenshotButtonLabel,
  cancelButtonLabel,
@@ -122,6 +123,7 @@ export function Form({
  email: data.email,
  message: data.message,
  source: FEEDBACK_WIDGET_SOURCE,
+ tags,
  },
  { attachments: data.attachments },
  );

packages/feedback/src/util/mergeOptions.ts

@@ -11,6 +11,10 @@ export function mergeOptions(
  return {
  ...defaultOptions,
  ...optionOverrides,
+ tags: {
+ ...defaultOptions.tags,
+ ...optionOverrides.tags,
+ },
  onFormOpen: () => {
  optionOverrides.onFormOpen && optionOverrides.onFormOpen();
  defaultOptions.onFormOpen && defaultOptions.onFormOpen();

packages/types/src/feedback/config.ts

@@ -1,3 +1,4 @@
+import type { Primitive } from '../misc';
 import type { FeedbackFormData } from './form';
 import type { FeedbackTheme } from './theme';
 
@@ -55,6 +56,11 @@ export interface FeedbackGeneralConfiguration {
  email: string;
  name: string;
  };
+
+ /**
+ * Set an object that will be merged sent as tags data with the event.
+ */
+ tags?: { [key: string]: Primitive };
 }
 
 /**

packages/types/src/feedback/sendFeedback.ts

@@ -1,4 +1,5 @@
 import type { Event, EventHint } from '../event';
+import type { Primitive } from '../misc';
 import type { User } from '../user';
 
 /**
@@ -38,13 +39,14 @@ export interface SendFeedbackParams {
  url?: string;
  source?: string;
  associatedEventId?: string;
-}
 
-interface SendFeedbackOptions extends EventHint {
  /**
- * Should include replay with the feedback?
+ * Set an object that will be merged sent as tags data with the event.
  */
-includeReplay?: boolean;
+tags?: { [key: string]: Primitive };
 }
 
-export type SendFeedback = (params: SendFeedbackParams, options?: SendFeedbackOptions) => Promise<string>;
+export type SendFeedback = (
+ params: SendFeedbackParams,
+ hint?: EventHint & { includeReplay?: boolean },
+) => Promise<string>;

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/init.js

@@ -4,5 +4,9 @@ window.Sentry = Sentry;
 
 Sentry.init({
  dsn: 'https://public@dsn.ingest.sentry.io/1337',
- integrations: [Sentry.feedbackIntegration()],
+ integrations: [
+ Sentry.feedbackIntegration({
+ tags: { from: 'integration init' },
+ }),
+ ],
 });

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/test.ts

@@ -59,6 +59,9 @@ sentryTest('should capture feedback', async ({ getLocalTestUrl, page }) => {
  },
  },
  level: 'info',
+ tags: {
+ from: 'integration init',
+ },
  timestamp: expect.any(Number),
  event_id: expect.stringMatching(/\w{32}/),
  environment: 'production',

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/test.ts

@@ -95,6 +95,7 @@ sentryTest('should capture feedback', async ({ forceFlushReplay, getLocalTestUrl
  },
  },
  level: 'info',
+ tags: {},
  timestamp: expect.any(Number),
  event_id: expect.stringMatching(/\w{32}/),
  environment: 'production',

packages/core/src/feedback.ts

@@ -6,11 +6,11 @@ import { getClient, getCurrentScope } from './currentScopes';
  * Send user feedback to Sentry.
  */
 export function captureFeedback(
-feedbackParams: SendFeedbackParams,
+params: SendFeedbackParams,
  hint: EventHint & { includeReplay?: boolean } = {},
  scope = getCurrentScope(),
 ): string {
- const { message, name, email, url, source, associatedEventId} = feedbackParams;
+ const { message, name, email, url, source, associatedEventId, tags } = params;
 
  const feedbackEvent: FeedbackEvent = {
  contexts: {
@@ -25,6 +25,7 @@ export function captureFeedback(
  },
  type: 'feedback',
  level: 'info',
+ tags,
  };
 
  const client = (scope && scope.getClient()) || getClient();

packages/feedback/src/core/integration.ts

@@ -64,17 +64,18 @@ export const buildFeedbackIntegration = ({
  const feedbackIntegration = (({
  // FeedbackGeneralConfiguration
  id = 'sentry-feedback',
- showBranding = true,
  autoInject = true,
+ showBranding = true,
+ isEmailRequired = false,
+ isNameRequired = false,
  showEmail = true,
  showName = true,
  enableScreenshot = true,
  useSentryUser = {
  email: 'email',
  name: 'username',
  },
- isNameRequired = false,
- isEmailRequired = false,
+ tags,
 
  // FeedbackThemeConfiguration
  colorScheme = 'system',
@@ -115,6 +116,7 @@ export const buildFeedbackIntegration = ({
  showName,
  enableScreenshot,
  useSentryUser,
+ tags,
 
  colorScheme,
  themeDark,

packages/feedback/src/core/sendFeedback.ts

@@ -1,18 +1,18 @@
 import { captureFeedback } from '@sentry/core';
 import { getClient } from '@sentry/core';
-import type { EventHint, SendFeedback, SendFeedbackParams, TransportMakeRequestResponse } from '@sentry/types';
-import type { Event } from '@sentry/types';
+import { getCurrentScope } from '@sentry/core';
+import type { Event, EventHint, SendFeedback, SendFeedbackParams, TransportMakeRequestResponse } from '@sentry/types';
 import { getLocationHref } from '@sentry/utils';
 import { FEEDBACK_API_SOURCE } from '../constants';
 
 /**
  * Public API to send a Feedback item to Sentry
  */
 export const sendFeedback: SendFeedback = (
-options: SendFeedbackParams,
+params: SendFeedbackParams,
  hint: EventHint & { includeReplay?: boolean } = { includeReplay: true },
 ): Promise<string> => {
- if (!options.message) {
+ if (!params.message) {
  throw new Error('Unable to submit feedback with empty message');
  }
 
@@ -23,11 +23,14 @@ export const sendFeedback: SendFeedback = (
  throw new Error('No client setup, cannot send feedback.');
  }
 
+ if (params.tags && Object.keys(params.tags).length) {
+ getCurrentScope().setTags(params.tags);
+ }
  const eventId = captureFeedback(
  {
  source: FEEDBACK_API_SOURCE,
  url: getLocationHref(),
- ...options,
+ ...params,
  },
  hint,
  );

packages/feedback/src/modal/components/Form.tsx

@@ -46,6 +46,7 @@ export function Form({
  screenshotInput,
 }: Props): VNode {
  const {
+ tags,
  addScreenshotButtonLabel,
  removeScreenshotButtonLabel,
  cancelButtonLabel,
@@ -122,6 +123,7 @@ export function Form({
  email: data.email,
  message: data.message,
  source: FEEDBACK_WIDGET_SOURCE,
+ tags,
  },
  { attachments: data.attachments },
  );

packages/feedback/src/util/mergeOptions.ts

@@ -11,6 +11,10 @@ export function mergeOptions(
  return {
  ...defaultOptions,
  ...optionOverrides,
+ tags: {
+ ...defaultOptions.tags,
+ ...optionOverrides.tags,
+ },
  onFormOpen: () => {
  optionOverrides.onFormOpen && optionOverrides.onFormOpen();
  defaultOptions.onFormOpen && defaultOptions.onFormOpen();

packages/types/src/feedback/config.ts

@@ -1,3 +1,4 @@
+import type { Primitive } from '../misc';
 import type { FeedbackFormData } from './form';
 import type { FeedbackTheme } from './theme';
 
@@ -55,6 +56,11 @@ export interface FeedbackGeneralConfiguration {
  email: string;
  name: string;
  };
+
+ /**
+ * Set an object that will be merged sent as tags data with the event.
+ */
+ tags?: { [key: string]: Primitive };
 }
 
 /**

packages/types/src/feedback/sendFeedback.ts

@@ -1,4 +1,5 @@
 import type { Event, EventHint } from '../event';
+import type { Primitive } from '../misc';
 import type { User } from '../user';
 
 /**
@@ -38,13 +39,14 @@ export interface SendFeedbackParams {
  url?: string;
  source?: string;
  associatedEventId?: string;
-}
 
-interface SendFeedbackOptions extends EventHint {
  /**
- * Should include replay with the feedback?
+ * Set an object that will be merged sent as tags data with the event.
  */
-includeReplay?: boolean;
+tags?: { [key: string]: Primitive };
 }
 
-export type SendFeedback = (params: SendFeedbackParams, options?: SendFeedbackOptions) => Promise<string>;
+export type SendFeedback = (
+ params: SendFeedbackParams,
+ hint?: EventHint & { includeReplay?: boolean },
+) => Promise<string>;