Upgrade telemetry, remove last manual telemetry publish (#2107)

abrooksv · web-flow · commit 0b0240b7ca15 · 2020-09-28T13:47:15.000-07:00
diff --git a/gradle.properties b/gradle.properties
@@ -16,7 +16,7 @@ coroutinesVersion=1.3.3
 ideaPluginVersion=0.4.20
 ktlintVersion=0.38.1
 jacksonVersion=2.9.8
-telemetryVersion=0.0.57
+telemetryVersion=0.0.58
 
 assertjVersion=3.15.0
 junitVersion=4.12
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/ChangeConnectionSettingsMenu.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/ChangeConnectionSettingsMenu.kt
@@ -165,12 +165,12 @@ internal class ChangeRegionAction(private val region: AwsRegion) : ToggleAction(
 
             if (oldRegion?.partitionId != region.partitionId) {
                 AwsTelemetry.setPartition(
-                    partitionid = region.partitionId
+                    partitionId = region.partitionId
                 )
             }
 
             AwsTelemetry.setRegion(
-                regionid = region.id
+                regionId = region.id
             )
         }
     }
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/CloudDebugResolver.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/CloudDebugResolver.kt
@@ -202,7 +202,7 @@ object CloudDebugResolver {
         ClouddebugTelemetry.install(
             project,
             version = newVersion.toString(),
-            oldversion = oldVersion.toString(),
+            oldVersion = oldVersion.toString(),
             result = result,
             value = Duration.between(startTime, Instant.now()).toMillis().toDouble(),
             createTime = startTime
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/execution/steps/AttachDebuggers.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/execution/steps/AttachDebuggers.kt
@@ -99,8 +99,8 @@ class AttachDebugger(
             ClouddebugTelemetry.attachDebugger(
                 project = context.project,
                 result = result,
-                workflowtoken = context.workflowToken,
-                clouddebugplatform = CloudDebugPlatform.from(containerOptions.platform.name),
+                workflowToken = context.workflowToken,
+                cloudDebugPlatform = CloudDebugPlatform.from(containerOptions.platform.name),
                 value = Duration.between(startTime, Instant.now()).toMillis().toDouble(),
                 createTime = startTime
             )
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/execution/steps/CopyArtifacts.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/execution/steps/CopyArtifacts.kt
@@ -70,7 +70,7 @@ class ResourceTransferStep(private val localPath: String, private val remotePath
         ClouddebugTelemetry.copy(
             context.project,
             result = result,
-            workflowtoken = context.workflowToken,
+            workflowToken = context.workflowToken,
             value = Duration.between(startTime, Instant.now()).toMillis().toDouble()
         )
     }
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/execution/steps/PortForwarding.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/execution/steps/PortForwarding.kt
@@ -119,7 +119,7 @@ class PortForwarder(
         ClouddebugTelemetry.portForward(
             context.project,
             result,
-            workflowtoken = context.workflowToken,
+            workflowToken = context.workflowToken,
             value = Duration.between(startTime, Instant.now()).toMillis().toDouble(),
             createTime = startTime
         )
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/execution/steps/ResourceInstrumenter.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/execution/steps/ResourceInstrumenter.kt
@@ -44,9 +44,9 @@ class ResourceInstrumenter(private val settings: EcsServiceCloudDebuggingRunSett
 
     override fun recordTelemetry(context: Context, startTime: Instant, result: Result) {
         ClouddebugTelemetry.instrument(
-            context.project,
+            project = context.project,
             result = result,
-            workflowtoken = context.workflowToken,
+            workflowToken = context.workflowToken,
             value = Duration.between(startTime, Instant.now()).toMillis().toDouble()
         )
     }
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/execution/steps/RetrieveRole.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/execution/steps/RetrieveRole.kt
@@ -45,7 +45,7 @@ class RetrieveRole(private val settings: EcsServiceCloudDebuggingRunSettings) :
         } finally {
             ClouddebugTelemetry.retrieveRole(
                 project = context.project,
-                workflowtoken = context.workflowToken,
+                workflowToken = context.workflowToken,
                 result = result,
                 value = Duration.between(startTime, Instant.now()).toMillis().toDouble(),
                 createTime = startTime
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/execution/steps/StartApplications.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/execution/steps/StartApplications.kt
@@ -50,9 +50,9 @@ class StartApplication(
 
     override fun recordTelemetry(context: Context, startTime: Instant, result: Result) {
         ClouddebugTelemetry.startApplication(
-            context.project,
+            project = context.project,
             result = result,
-            workflowtoken = context.workflowToken,
+            workflowToken = context.workflowToken,
             value = Duration.between(startTime, Instant.now()).toMillis().toDouble()
         )
     }
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/execution/steps/StopApplications.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/execution/steps/StopApplications.kt
@@ -60,9 +60,9 @@ class StopApplication(
 
     override fun recordTelemetry(context: Context, startTime: Instant, result: Result) {
         ClouddebugTelemetry.stopApplication(
-            context.project,
+            project = context.project,
             result = result,
-            workflowtoken = context.workflowToken,
+            workflowToken = context.workflowToken,
             value = Duration.between(startTime, Instant.now()).toMillis().toDouble()
         )
     }
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/local/SamInvokeRunner.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/local/SamInvokeRunner.kt
@@ -29,13 +29,13 @@ import software.aws.toolkits.jetbrains.services.lambda.BuildLambdaFromHandler
 import software.aws.toolkits.jetbrains.services.lambda.BuildLambdaFromTemplate
 import software.aws.toolkits.jetbrains.services.lambda.LambdaBuilderUtils
 import software.aws.toolkits.jetbrains.services.lambda.runtimeGroup
-import software.aws.toolkits.jetbrains.services.lambda.sam.SamCommon
 import software.aws.toolkits.jetbrains.services.lambda.sam.SamTemplateUtils
 import software.aws.toolkits.jetbrains.services.lambda.validOrNull
 import software.aws.toolkits.jetbrains.services.sts.StsResources
-import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
-import software.aws.toolkits.telemetry.Result
+import software.aws.toolkits.jetbrains.services.telemetry.MetricEventMetadata
+import software.aws.toolkits.telemetry.LambdaTelemetry
 import java.io.File
+import software.aws.toolkits.telemetry.Runtime.Companion as TelemetryRuntime
 
 class SamInvokeRunner : AsyncProgramRunner<RunnerSettings>() {
     override fun getRunnerId(): String = "SamInvokeRunner"
@@ -117,26 +117,17 @@ class SamInvokeRunner : AsyncProgramRunner<RunnerSettings>() {
                 buildingPromise.setError(it)
                 throw it
             }.whenComplete { _, exception ->
-                AwsResourceCache.getInstance(state.environment.project)
-                    .getResource(StsResources.ACCOUNT, lambdaSettings.region, lambdaSettings.credentials)
-                    .whenComplete { account, _ ->
-                        TelemetryService.getInstance().record(
-                            TelemetryService.MetricEventMetadata(
-                                awsAccount = account ?: METADATA_INVALID,
-                                awsRegion = lambdaSettings.region.id
-                            )
-                        ) {
-                            datum("lambda_invokeLocal") {
-                                count()
-                                // exception can be null but is not annotated as nullable
-                                metadata("debug", environment.isDebug())
-                                metadata("result", if (exception == null) Result.Succeeded.value else Result.Failed.value)
-                                metadata("runtime", lambdaSettings.runtime.name)
-                                metadata("samVersion", SamCommon.getVersionString())
-                                metadata("templateBased", buildRequest is BuildLambdaFromTemplate)
-                            }
-                        }
-                    }
+                val account = AwsResourceCache.getInstance(state.environment.project)
+                    .getResourceIfPresent(StsResources.ACCOUNT, lambdaSettings.region, lambdaSettings.credentials)
+                LambdaTelemetry.invokeLocal(
+                    metadata = MetricEventMetadata(
+                        awsAccount = account ?: METADATA_INVALID,
+                        awsRegion = lambdaSettings.region.id
+                    ),
+                    debug = environment.isDebug(),
+                    runtime = TelemetryRuntime.from(lambdaSettings.runtime.toString()),
+                    success = exception == null
+                )
             }
 
         return buildingPromise
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamProjectWizard.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamProjectWizard.kt
@@ -149,13 +149,13 @@ abstract class SamProjectTemplate {
             throw e
         } finally {
             SamTelemetry.init(
-                project,
+                project = project,
                 name = getName(),
                 success = success,
                 runtime = TelemetryRuntime.from(runtime.toString()),
                 version = SamCommon.getVersionString(),
-                templatename = this.javaClass.simpleName,
-                eventbridgeschema = if (schemaParameters?.schema?.registryName == AWS_EVENTS_REGISTRY) schemaParameters.schema.name else null
+                templateName = this.javaClass.simpleName,
+                eventBridgeSchema = if (schemaParameters?.schema?.registryName == AWS_EVENTS_REGISTRY) schemaParameters.schema.name else null
             )
         }
     }
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/code/DownloadCodeForSchemaDialog.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/code/DownloadCodeForSchemaDialog.kt
@@ -136,7 +136,11 @@ class DownloadCodeForSchemaDialog(
         val schemaCodeDownloadDetails = viewToSchemaCodeDownloadDetails()
 
         // Telemetry for download code language
-        SchemasTelemetry.download(project, success = true, schemalanguage = SchemaLanguage.from(schemaCodeDownloadDetails.language.apiValue))
+        SchemasTelemetry.download(
+            project = project,
+            success = true,
+            schemaLanguage = SchemaLanguage.from(schemaCodeDownloadDetails.language.apiValue)
+        )
 
         val schemaName = schemaCodeDownloadDetails.schema.name
         ProgressManager.getInstance().run(
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/telemetry/TelemetryService.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/telemetry/TelemetryService.kt
@@ -21,19 +21,20 @@ import software.aws.toolkits.jetbrains.services.sts.StsResources
 import software.aws.toolkits.jetbrains.settings.AwsSettings
 import java.util.concurrent.atomic.AtomicBoolean
 
+data class MetricEventMetadata(
+    val awsAccount: String = METADATA_NA,
+    val awsRegion: String = METADATA_NA
+)
+
 abstract class TelemetryService(private val publisher: TelemetryPublisher, private val batcher: TelemetryBatcher) : Disposable {
-    data class MetricEventMetadata(
-        val awsAccount: String = METADATA_NA,
-        val awsRegion: String = METADATA_NA
-    )
 
     private val isDisposing = AtomicBoolean(false)
 
     init {
         setTelemetryEnabled(AwsSettings.getInstance().isTelemetryEnabled)
     }
 
-    fun record(project: Project?, buildEvent: MetricEvent.Builder.() -> Unit = {}) {
+    fun record(project: Project?, buildEvent: MetricEvent.Builder.() -> Unit) {
         val metricEventMetadata = if (project == null) MetricEventMetadata() else MetricEventMetadata(
             awsAccount = project.activeAwsAccountIfKnown() ?: METADATA_NOT_SET,
             awsRegion = project.activeRegion().id
diff --git a/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/telemetry/TelemetryServiceTest.kt b/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/telemetry/TelemetryServiceTest.kt
@@ -164,7 +164,7 @@ class TelemetryServiceTest {
         val telemetryService = TestTelemetryService(batcher)
 
         telemetryService.record(
-            TelemetryService.MetricEventMetadata(
+            MetricEventMetadata(
                 awsAccount = "222222222222",
                 awsRegion = "bar-region"
             )

Original file line number	Diff line number	Diff line change
`@@ -165,12 +165,12 @@ internal class ChangeRegionAction(private val region: AwsRegion) : ToggleAction(`
`165`	`165`
`166`	`166`	`if (oldRegion?.partitionId != region.partitionId) {`
`167`	`167`	`AwsTelemetry.setPartition(`
`168`		`- partitionid = region.partitionId`
	`168`	`+ partitionId = region.partitionId`
`169`	`169`	`)`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`AwsTelemetry.setRegion(`
`173`		`- regionid = region.id`
	`173`	`+ regionId = region.id`
`174`	`174`	`)`
`175`	`175`	`}`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class ResourceTransferStep(private val localPath: String, private val remotePath`
`70`	`70`	`ClouddebugTelemetry.copy(`
`71`	`71`	`context.project,`
`72`	`72`	`result = result,`
`73`		`- workflowtoken = context.workflowToken,`
	`73`	`+ workflowToken = context.workflowToken,`
`74`	`74`	`value = Duration.between(startTime, Instant.now()).toMillis().toDouble()`
`75`	`75`	`)`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ class PortForwarder(`
`119`	`119`	`ClouddebugTelemetry.portForward(`
`120`	`120`	`context.project,`
`121`	`121`	`result,`
`122`		`- workflowtoken = context.workflowToken,`
	`122`	`+ workflowToken = context.workflowToken,`
`123`	`123`	`value = Duration.between(startTime, Instant.now()).toMillis().toDouble(),`
`124`	`124`	`createTime = startTime`
`125`	`125`	`)`
Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,9 @@ class ResourceInstrumenter(private val settings: EcsServiceCloudDebuggingRunSett`
`44`	`44`
`45`	`45`	`override fun recordTelemetry(context: Context, startTime: Instant, result: Result) {`
`46`	`46`	`ClouddebugTelemetry.instrument(`
`47`		`- context.project,`
	`47`	`+ project = context.project,`
`48`	`48`	`result = result,`
`49`		`- workflowtoken = context.workflowToken,`
	`49`	`+ workflowToken = context.workflowToken,`
`50`	`50`	`value = Duration.between(startTime, Instant.now()).toMillis().toDouble()`
`51`	`51`	`)`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,9 @@ class StartApplication(`
`50`	`50`
`51`	`51`	`override fun recordTelemetry(context: Context, startTime: Instant, result: Result) {`
`52`	`52`	`ClouddebugTelemetry.startApplication(`
`53`		`- context.project,`
	`53`	`+ project = context.project,`
`54`	`54`	`result = result,`
`55`		`- workflowtoken = context.workflowToken,`
	`55`	`+ workflowToken = context.workflowToken,`
`56`	`56`	`value = Duration.between(startTime, Instant.now()).toMillis().toDouble()`
`57`	`57`	`)`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,9 @@ class StopApplication(`
`60`	`60`
`61`	`61`	`override fun recordTelemetry(context: Context, startTime: Instant, result: Result) {`
`62`	`62`	`ClouddebugTelemetry.stopApplication(`
`63`		`- context.project,`
	`63`	`+ project = context.project,`
`64`	`64`	`result = result,`
`65`		`- workflowtoken = context.workflowToken,`
	`65`	`+ workflowToken = context.workflowToken,`
`66`	`66`	`value = Duration.between(startTime, Instant.now()).toMillis().toDouble()`
`67`	`67`	`)`
`68`	`68`	`}`