Skip to content

Commit ebd8954

Browse files
committed
fix(/dev): remove telemetry verification as it is no-op
1 parent d0fc4cc commit ebd8954

File tree

3 files changed

+5
-37
lines changed

3 files changed

+5
-37
lines changed

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevConstants.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const val DEFAULT_RETRY_LIMIT = 0
1717
// Max allowed size for a repository in bytes
1818
const val MAX_PROJECT_SIZE_BYTES: Long = 200 * 1024 * 1024
1919

20-
enum class ModifySourceFolderReason(
20+
enum class ModifySourceFolderErrorReason(
2121
private val reasonText: String
2222
) {
2323
ClosedBeforeSelection("ClosedBeforeSelection"),

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.CodeIterationL
3131
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.DEFAULT_RETRY_LIMIT
3232
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FEATURE_NAME
3333
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.InboundAppMessagesHandler
34-
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ModifySourceFolderReason
34+
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ModifySourceFolderErrorReason
3535
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MonthlyConversationLimitError
3636
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.PlanIterationLimitError
3737
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.createUserFacingErrorMessage
@@ -612,7 +612,7 @@ class FeatureDevController(
612612
)
613613

614614
var result: Result = Result.Failed
615-
var reason: ModifySourceFolderReason? = null
615+
var reason: ModifySourceFolderErrorReason? = null
616616

617617
withContext(EDT) {
618618
val selectedFolder = selectFolder(context.project, currentSourceFolder)
@@ -625,7 +625,7 @@ class FeatureDevController(
625625
followUp = listOf(modifyFolderFollowUp),
626626
)
627627

628-
reason = ModifySourceFolderReason.ClosedBeforeSelection
628+
reason = ModifySourceFolderErrorReason.ClosedBeforeSelection
629629
return@withContext
630630
}
631631

@@ -644,7 +644,7 @@ class FeatureDevController(
644644
followUp = listOf(modifyFolderFollowUp),
645645
)
646646

647-
reason = ModifySourceFolderReason.NotInWorkspaceFolder
647+
reason = ModifySourceFolderErrorReason.NotInWorkspaceFolder
648648
return@withContext
649649
}
650650

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevControllerTest.kt

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthController
3535
import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthNeededStates
3636
import software.aws.toolkits.jetbrains.services.amazonq.messages.MessagePublisher
3737
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevTestBase
38-
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ModifySourceFolderReason
3938
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.clients.FeatureDevClient
4039
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.FeatureDevMessageType
4140
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.FollowUp
@@ -62,7 +61,6 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.selectFol
6261
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.uploadArtifactToS3
6362
import software.aws.toolkits.resources.message
6463
import software.aws.toolkits.telemetry.AmazonqTelemetry
65-
import software.aws.toolkits.telemetry.Result
6664
import org.mockito.kotlin.verify as mockitoVerify
6765

6866
class FeatureDevControllerTest : FeatureDevTestBase() {
@@ -407,9 +405,6 @@ class FeatureDevControllerTest : FeatureDevTestBase() {
407405
whenever(featureDevClient.createTaskAssistConversation()).thenReturn(exampleCreateTaskAssistConversationResponse)
408406
whenever(chatSessionStorage.getSession(any(), any())).thenReturn(spySession)
409407

410-
mockkObject(AmazonqTelemetry)
411-
every { AmazonqTelemetry.modifySourceFolder(amazonqConversationId = any()) } just runs
412-
413408
mockkStatic("software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.FileUtilsKt")
414409
every { selectFolder(any(), any()) } returns null
415410

@@ -427,13 +422,6 @@ class FeatureDevControllerTest : FeatureDevTestBase() {
427422
)
428423
)
429424
)
430-
AmazonqTelemetry.modifySourceFolder(
431-
amazonqConversationId = spySession.conversationId,
432-
credentialStartUrl = any(),
433-
result = Result.Failed,
434-
reason = ModifySourceFolderReason.ClosedBeforeSelection.toString(),
435-
createTime = any()
436-
)
437425
}
438426
}
439427

@@ -445,9 +433,6 @@ class FeatureDevControllerTest : FeatureDevTestBase() {
445433
whenever(featureDevClient.createTaskAssistConversation()).thenReturn(exampleCreateTaskAssistConversationResponse)
446434
whenever(chatSessionStorage.getSession(any(), any())).thenReturn(spySession)
447435

448-
mockkObject(AmazonqTelemetry)
449-
every { AmazonqTelemetry.modifySourceFolder(amazonqConversationId = any()) } just runs
450-
451436
mockkStatic("software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.FileUtilsKt")
452437
every { selectFolder(any(), any()) } returns LightVirtualFile("/path")
453438

@@ -470,13 +455,6 @@ class FeatureDevControllerTest : FeatureDevTestBase() {
470455
)
471456
)
472457
)
473-
AmazonqTelemetry.modifySourceFolder(
474-
amazonqConversationId = spySession.conversationId,
475-
credentialStartUrl = any(),
476-
result = Result.Failed,
477-
reason = ModifySourceFolderReason.NotInWorkspaceFolder.toString(),
478-
createTime = any()
479-
)
480458
}
481459
}
482460

@@ -488,9 +466,6 @@ class FeatureDevControllerTest : FeatureDevTestBase() {
488466
whenever(featureDevClient.createTaskAssistConversation()).thenReturn(exampleCreateTaskAssistConversationResponse)
489467
whenever(chatSessionStorage.getSession(any(), any())).thenReturn(spySession)
490468

491-
mockkObject(AmazonqTelemetry)
492-
every { AmazonqTelemetry.modifySourceFolder(amazonqConversationId = any()) } just runs
493-
494469
val folder = LightVirtualFile("${spySession.context.projectRoot.name}/path/to/sub/folder")
495470
mockkStatic("software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.FileUtilsKt")
496471
every { selectFolder(any(), any()) } returns folder
@@ -504,13 +479,6 @@ class FeatureDevControllerTest : FeatureDevTestBase() {
504479
messageType = FeatureDevMessageType.Answer,
505480
message = message("amazonqFeatureDev.follow_up.modified_source_folder", folder.path)
506481
)
507-
AmazonqTelemetry.modifySourceFolder(
508-
amazonqConversationId = spySession.conversationId,
509-
credentialStartUrl = any(),
510-
result = Result.Succeeded,
511-
reason = isNull(),
512-
createTime = any()
513-
)
514482
}
515483
}
516484
}

0 commit comments

Comments
 (0)