diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4ccd180f81..12d2f85d11 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,7 +27,7 @@ mockitoKotlin = "5.4.0"
 mockk = "1.13.17"
 nimbus-jose-jwt = "9.40"
 node-gradle = "7.0.2"
-telemetryGenerator = "1.0.307"
+telemetryGenerator = "1.0.308"
 testLogger = "4.0.0"
 testRetry = "1.5.10"
 # test-only; platform provides slf4j transitively at runtime
diff --git a/plugins/core/jetbrains-community/resources/telemetryOverride.json b/plugins/core/jetbrains-community/resources/telemetryOverride.json
index 39e9d4ba31..5ad09ab9c0 100644
--- a/plugins/core/jetbrains-community/resources/telemetryOverride.json
+++ b/plugins/core/jetbrains-community/resources/telemetryOverride.json
@@ -49,16 +49,6 @@
             "type": "string",
             "description": "A detailed state of a specific auth connection. Use `authStatus` for a higher level view of an extension's general connection."
         },
-        {
-            "name": "cwsprChatActiveEditorImportCount",
-            "type": "int",
-            "description": "Number of import statements in the active editor"
-        },
-        {
-            "name": "cwsprChatActiveEditorTotalCharacters",
-            "type": "int",
-            "description": "Total number of characters in the active editor"
-        },
         {
             "name": "cwsprChatCommandName",
             "type": "string",
@@ -75,91 +65,11 @@
             ],
             "description": "Type of chat command (/command) executed"
         },
-        {
-            "name": "cwsprChatConversationType",
-            "type": "string",
-            "allowedValues": [
-                "Chat",
-                "Assign",
-                "Transform"
-            ],
-            "description": "Identifies the type of conversation"
-        },
-        {
-            "name": "cwsprChatHasCodeSnippet",
-            "type": "boolean",
-            "description": "true if user has selected code snippet, false otherwise."
-        },
         {
             "name": "cwsprChatModificationPercentage",
             "type": "double",
             "description": "Percentage of characters edited by user after copying/inserting code from a message"
         },
-        {
-            "name": "cwsprChatReferencesCount",
-            "type": "int",
-            "description": "Number of references in response"
-        },
-        {
-            "name": "cwsprChatFollowUpCount",
-            "type": "int",
-            "description": "Number of follow ups in response"
-        },
-        {
-            "name": "cwsprChatTimeToFirstChunk",
-            "type": "int",
-            "description": "Time taken in ms to get back the first chunk"
-        },
-        {
-            "name": "cwsprChatTimeBetweenChunks",
-            "type": "string",
-            "description": "Time (list of int) taken in ms between chunks"
-        },
-        {
-            "name": "cwsprChatFullResponseLatency",
-            "type": "int",
-            "description": "Time taken to get the full response in ms"
-        },
-        {
-            "name": "cwsprChatProjectContextQueryMs",
-            "type": "int",
-            "description": "query latency in ms for local project context"
-        },
-        {
-            "name": "cwsprChatResponseLength",
-            "type": "int",
-            "description": "Number of characters in response"
-        },
-        {
-            "name": "cwsprChatRequestLength",
-            "type": "int",
-            "description": "Number of characters in request"
-        },
-        {
-            "name": "cwsprChatResponseCode",
-            "type": "int",
-            "description": "HTTP response code for message API invocation"
-        },
-        {
-            "name": "cwsprChatResponseCodeSnippetCount",
-            "type": "int",
-            "description": "Number of code snippets in response"
-        },
-        {
-            "name": "cwsprChatSourceLinkCount",
-            "type": "int",
-            "description": "Number of links in response"
-        },
-        {
-            "name": "cwsprChatTriggerInteraction",
-            "type": "string",
-            "allowedValues": [
-                "hotkeys",
-                "click",
-                "contextMenu"
-            ],
-            "description": "Identifies the specific interaction that opens the chat panel"
-        },
         {
             "name": "executedCount",
             "type": "int",
@@ -195,95 +105,6 @@
         }
     ],
     "metrics": [
-        {
-            "name": "amazonq_addMessage",
-            "description": "When a message is added to the conversation",
-            "metadata": [
-                {
-                    "type": "cwsprChatConversationId"
-                },
-                {
-                    "type": "cwsprChatMessageId"
-                },
-                {
-                    "type": "cwsprChatTriggerInteraction"
-                },
-                {
-                    "type": "cwsprChatUserIntent",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatHasCodeSnippet",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatProgrammingLanguage",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatActiveEditorTotalCharacters",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatActiveEditorImportCount",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatResponseCodeSnippetCount",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatResponseCode"
-                },
-                {
-                    "type": "cwsprChatSourceLinkCount",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatReferencesCount",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatFollowUpCount",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatTimeToFirstChunk"
-                },
-                {
-                    "type": "cwsprChatTimeBetweenChunks"
-                },
-                {
-                    "type": "cwsprChatFullResponseLatency"
-                },
-                {
-                    "type": "cwsprChatRequestLength"
-                },
-                {
-                    "type": "cwsprChatResponseLength",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatConversationType"
-                },
-                {
-                    "type": "credentialStartUrl",
-                    "required": false
-                },
-                {
-                    "type": "codewhispererCustomizationArn",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatHasProjectContext",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatProjectContextQueryMs",
-                    "required": false
-                }
-            ]
-        },
         {
             "name": "amazonq_indexWorkspace",
             "description": "Indexing of local workspace",