diff --git a/lib/entry-points.js b/lib/entry-points.js
index 347343d0e..40655483f 100644
--- a/lib/entry-points.js
+++ b/lib/entry-points.js
@@ -147779,13 +147779,16 @@ function flushDiagnostics(config) {
   unwrittenDiagnostics = [];
   unwrittenDefaultLanguageDiagnostics = [];
 }
-function makeTelemetryDiagnostic(id, name, attributes) {
+function makeTelemetryDiagnostic(id, name, attributes, tags) {
   return makeDiagnostic(id, name, {
     attributes,
     visibility: {
       cliSummaryTable: false,
       statusPage: false,
       telemetry: true
+    },
+    source: {
+      tags
     }
   });
 }
diff --git a/src/diagnostics.ts b/src/diagnostics.ts
index 5b3ce19b9..fa0e87c04 100644
--- a/src/diagnostics.ts
+++ b/src/diagnostics.ts
@@ -272,6 +272,7 @@ export function makeTelemetryDiagnostic(
   id: string,
   name: string,
   attributes: { [key: string]: any },
+  tags?: DiagnosticTag[],
 ): DiagnosticMessage {
   return makeDiagnostic(id, name, {
     attributes,
@@ -280,5 +281,8 @@ export function makeTelemetryDiagnostic(
       statusPage: false,
       telemetry: true,
     },
+    source: {
+      tags,
+    },
   });
 }