NAS-129964: Remove host id from bug reports

truenas · Jul 9, 2024 · 8087d35 · 8087d35
1 parent 46677f8
commit 8087d35
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 25 deletions.
diff --git a/src/app/modules/feedback/services/feedback.service.spec.ts b/src/app/modules/feedback/services/feedback.service.spec.ts
@@ -94,20 +94,12 @@ describe('FeedbackService', () => {
     fileUploadService = spectator.inject(UploadService);
   });
 
-  describe('getHostId', () => {
-    it('return system host id from the store', async () => {
-      expect(await lastValueFrom(spectator.service.getHostId())).toBe('testHostId');
-    });
-  });
-
   describe('addDebugInfoToMessage', () => {
-    it('appends host ID and sentry session id to the error message', async () => {
+    it('appends sentry session id to the error message', async () => {
       const message = 'test message';
       const messageWithDebug = await lastValueFrom(spectator.service.addDebugInfoToMessage(message));
 
       expect(messageWithDebug).toBe('test message\n'
-        + '\n'
-        + 'Host ID: testHostId\n'
         + '\n'
         + 'Session ID: testSessionId');
     });
@@ -135,7 +127,7 @@ describe('FeedbackService', () => {
       const response = await lastValueFrom(spectator.service.createTicket('test-token', TicketType.Bug, data));
       expect(spectator.inject(WebSocketService).job).toHaveBeenCalledWith('support.new_ticket', [{
         attach_debug: true,
-        body: 'Help me\n\nHost ID: testHostId\n\nSession ID: testSessionId',
+        body: 'Help me\n\nSession ID: testSessionId',
         title: 'Cannot shutdown',
         token: 'test-token',
         type: TicketType.Bug,
@@ -158,7 +150,7 @@ describe('FeedbackService', () => {
       const response = await lastValueFrom(spectator.service.createTicket('test-token', TicketType.Bug, data));
       expect(spectator.inject(WebSocketService).job).toHaveBeenCalledWith('support.new_ticket', [{
         attach_debug: true,
-        body: 'Help me\n\nHost ID: testHostId\n\nSession ID: testSessionId',
+        body: 'Help me\n\nSession ID: testSessionId',
         title: 'Cannot shutdown',
         token: 'test-token',
         type: TicketType.Bug,
@@ -190,7 +182,7 @@ describe('FeedbackService', () => {
       const response = await lastValueFrom(spectator.service.createTicket('test-token', TicketType.Suggestion, data));
       expect(spectator.inject(WebSocketService).job).toHaveBeenCalledWith('support.new_ticket', [{
         attach_debug: false,
-        body: 'test msg\n\nHost ID: testHostId\n\nSession ID: testSessionId',
+        body: 'test msg\n\nSession ID: testSessionId',
         title: 'test title',
         token: 'test-token',
         type: TicketType.Suggestion,
@@ -256,7 +248,7 @@ describe('FeedbackService', () => {
 
       const response = await lastValueFrom(spectator.service.createTicketLicensed(data));
       expect(spectator.inject(WebSocketService).job).toHaveBeenCalledWith('support.new_ticket', [{
-        body: 'New request\n\nHost ID: testHostId\n\nSession ID: testSessionId',
+        body: 'New request\n\nSession ID: testSessionId',
         attach_debug: true,
         category: TicketCategory.Performance,
         cc: ['[email protected]'],

diff --git a/src/app/modules/feedback/services/feedback.service.ts b/src/app/modules/feedback/services/feedback.service.ts
@@ -32,7 +32,7 @@ import { UploadService } from 'app/services/upload.service';
 import { WebSocketService } from 'app/services/ws.service';
 import { AppState } from 'app/store';
 import { SystemInfoState } from 'app/store/system-info/system-info.reducer';
-import { selectSystemHostId, selectSystemInfoState, waitForSystemInfo } from 'app/store/system-info/system-info.selectors';
+import { selectSystemInfoState, waitForSystemInfo } from 'app/store/system-info/system-info.selectors';
 
 type ReviewData = FileReviewComponent['form']['value'];
 type TicketData = FileTicketComponent['form']['value'];
@@ -58,10 +58,6 @@ export class FeedbackService {
     @Inject(WINDOW) private window: Window,
   ) {}
 
-  getHostId(): Observable<string> {
-    return this.store$.select(selectSystemHostId).pipe(filter(Boolean), take(1));
-  }
-
   createReview(data: ReviewData): Observable<unknown> {
     return this.prepareReview(data).pipe(
       switchMap((review) => this.addReview(review)),
@@ -165,15 +161,11 @@ export class FeedbackService {
   }
 
   addDebugInfoToMessage(message: string): Observable<string> {
-    return combineLatest([
-      this.getHostId(),
-      this.sentryService.sessionId$,
-    ]).pipe(
+    return this.sentryService.sessionId$.pipe(
       take(1),
-      map(([hostId, sessionId]) => {
-        const hostText = `Host ID: ${hostId}`;
+      map((sessionId) => {
         const sessionText = `Session ID: ${sessionId}`;
-        return [message, hostText, sessionText].join('\n\n');
+        return [message, sessionText].join('\n\n');
       }),
     );
   }