Skip to content

Commit 761df8c

Browse files
rlirli
committed
build
1 parent ce1b4d2 commit 761df8c

File tree

8 files changed

+67
-78
lines changed

8 files changed

+67
-78
lines changed

‎telemetry/jetbrains/build.gradle.kts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ dependencies {
4545

4646
tasks {
4747
withType<KotlinCompile> {
48-
compilerOptions.jvmTarget = JvmTarget.JVM_17
48+
compilerOptions {
49+
jvmTarget = JvmTarget.JVM_17
50+
freeCompilerArgs.add("-Xcontext-receivers")
51+
}
4952
}
5053

5154
val validatePackagedSchema by registering {

‎telemetry/jetbrains/src/test/resources/generateOverrides/output/software/aws/toolkits/telemetry/MetadataTelemetry.kt‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,27 @@ package software.aws.toolkits.telemetry
88
import com.intellij.openapi.project.Project
99
import java.time.Instant
1010
import kotlin.Boolean
11+
import kotlin.Deprecated
1112
import kotlin.Double
1213
import kotlin.Suppress
1314
import software.amazon.awssdk.services.toolkittelemetry.model.Unit
1415
import software.aws.toolkits.core.ConnectionSettings
1516
import software.aws.toolkits.jetbrains.services.telemetry.MetricEventMetadata
1617
import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
1718

19+
@Deprecated(
20+
message = "Name conflicts with the Kotlin standard library",
21+
replaceWith = ReplaceWith("MetricResult", "software.aws.toolkits.telemetry.MetricResult"),
22+
)
23+
public typealias Result = MetricResult
24+
1825
public object MetadataTelemetry {
1926
/**
2027
* It does not actually have a result, yep
2128
*/
2229
public fun hasResult(
2330
project: Project?,
24-
result: Result? = null,
31+
result: MetricResult? = null,
2532
passive: Boolean = false,
2633
`value`: Double = 1.0,
2734
createTime: Instant = Instant.now(),
@@ -44,7 +51,7 @@ public object MetadataTelemetry {
4451
*/
4552
public fun hasResult(
4653
connectionSettings: ConnectionSettings? = null,
47-
result: Result? = null,
54+
result: MetricResult? = null,
4855
passive: Boolean = false,
4956
`value`: Double = 1.0,
5057
createTime: Instant = Instant.now(),
@@ -67,7 +74,7 @@ public object MetadataTelemetry {
6774
*/
6875
public fun hasResult(
6976
metadata: MetricEventMetadata,
70-
result: Result? = null,
77+
result: MetricResult? = null,
7178
passive: Boolean = false,
7279
`value`: Double = 1.0,
7380
createTime: Instant = Instant.now(),
@@ -95,8 +102,8 @@ public object MetadataTelemetry {
95102
`value`: Double = 1.0,
96103
createTime: Instant = Instant.now(),
97104
) {
98-
hasResult(project, if(success) Result.Succeeded else Result.Failed, passive, value,
99-
createTime)
105+
hasResult(project, if(success) MetricResult.Succeeded else MetricResult.Failed, passive,
106+
value, createTime)
100107
}
101108

102109
/**
@@ -109,8 +116,8 @@ public object MetadataTelemetry {
109116
`value`: Double = 1.0,
110117
createTime: Instant = Instant.now(),
111118
) {
112-
hasResult(connectionSettings, if(success) Result.Succeeded else Result.Failed, passive,
113-
value, createTime)
119+
hasResult(connectionSettings, if(success) MetricResult.Succeeded else MetricResult.Failed,
120+
passive, value, createTime)
114121
}
115122

116123
/**
@@ -123,7 +130,7 @@ public object MetadataTelemetry {
123130
`value`: Double = 1.0,
124131
createTime: Instant = Instant.now(),
125132
) {
126-
hasResult(metadata, if(success) Result.Succeeded else Result.Failed, passive, value,
127-
createTime)
133+
hasResult(metadata, if(success) MetricResult.Succeeded else MetricResult.Failed, passive,
134+
value, createTime)
128135
}
129136
}

‎telemetry/jetbrains/src/test/resources/generateOverrides/output/software/aws/toolkits/telemetry/TelemetryEnums.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import kotlin.Suppress
1111
/**
1212
* The result of the operation
1313
*/
14-
public enum class Result(
14+
public enum class MetricResult(
1515
private val `value`: String,
1616
) {
1717
Succeeded("Succeeded"),
@@ -21,6 +21,7 @@ public enum class Result(
2121
override fun toString(): String = value
2222

2323
public companion object {
24-
public fun from(type: String): Result = values().firstOrNull { it.value == type } ?: Unknown
24+
public fun from(type: String): MetricResult = values().firstOrNull { it.value == type }
25+
?: Unknown
2526
}
2627
}

‎telemetry/jetbrains/src/test/resources/generateWithGlobalMetadata/output/software/aws/toolkits/telemetry/TelemetryEnums.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import kotlin.Suppress
1111
/**
1212
* The result of the operation
1313
*/
14-
public enum class Result(
14+
public enum class MetricResult(
1515
private val `value`: String,
1616
) {
1717
Succeeded("Succeeded"),
@@ -23,6 +23,7 @@ public enum class Result(
2323
override fun toString(): String = value
2424

2525
public companion object {
26-
public fun from(type: String): Result = values().firstOrNull { it.value == type } ?: Unknown
26+
public fun from(type: String): MetricResult = values().firstOrNull { it.value == type }
27+
?: Unknown
2728
}
2829
}

‎telemetry/jetbrains/src/test/resources/generateWithGlobalMetadata/output/software/aws/toolkits/telemetry/TestTelemetry.kt‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package software.aws.toolkits.telemetry
88
import com.intellij.openapi.project.Project
99
import java.time.Instant
1010
import kotlin.Boolean
11+
import kotlin.Deprecated
1112
import kotlin.Double
1213
import kotlin.String
1314
import kotlin.Suppress
@@ -16,6 +17,12 @@ import software.aws.toolkits.core.ConnectionSettings
1617
import software.aws.toolkits.jetbrains.services.telemetry.MetricEventMetadata
1718
import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
1819

20+
@Deprecated(
21+
message = "Name conflicts with the Kotlin standard library",
22+
replaceWith = ReplaceWith("MetricResult", "software.aws.toolkits.telemetry.MetricResult"),
23+
)
24+
public typealias Result = MetricResult
25+
1926
public object TestTelemetry {
2027
/**
2128
* Testing metric with global metadata fields
@@ -28,7 +35,7 @@ public object TestTelemetry {
2835
reasonDesc: String? = null,
2936
requestId: String? = null,
3037
requestServiceType: String? = null,
31-
result: Result? = null,
38+
result: MetricResult? = null,
3239
traceId: String? = null,
3340
metricId: String? = null,
3441
parentId: String? = null,
@@ -87,7 +94,7 @@ public object TestTelemetry {
8794
reasonDesc: String? = null,
8895
requestId: String? = null,
8996
requestServiceType: String? = null,
90-
result: Result? = null,
97+
result: MetricResult? = null,
9198
traceId: String? = null,
9299
metricId: String? = null,
93100
parentId: String? = null,
@@ -146,7 +153,7 @@ public object TestTelemetry {
146153
reasonDesc: String? = null,
147154
requestId: String? = null,
148155
requestServiceType: String? = null,
149-
result: Result? = null,
156+
result: MetricResult? = null,
150157
traceId: String? = null,
151158
metricId: String? = null,
152159
parentId: String? = null,
@@ -214,8 +221,8 @@ public object TestTelemetry {
214221
createTime: Instant = Instant.now(),
215222
) {
216223
metric(project, duration, httpStatusCode, reason, reasonDesc, requestId, requestServiceType,
217-
if(success) Result.Succeeded else Result.Failed, traceId, metricId, parentId,
218-
passive, value, createTime)
224+
if(success) MetricResult.Succeeded else MetricResult.Failed, traceId, metricId,
225+
parentId, passive, value, createTime)
219226
}
220227

221228
/**
@@ -238,8 +245,8 @@ public object TestTelemetry {
238245
createTime: Instant = Instant.now(),
239246
) {
240247
metric(connectionSettings, duration, httpStatusCode, reason, reasonDesc, requestId,
241-
requestServiceType, if(success) Result.Succeeded else Result.Failed, traceId,
242-
metricId, parentId, passive, value, createTime)
248+
requestServiceType, if(success) MetricResult.Succeeded else MetricResult.Failed,
249+
traceId, metricId, parentId, passive, value, createTime)
243250
}
244251

245252
/**
@@ -262,7 +269,7 @@ public object TestTelemetry {
262269
createTime: Instant = Instant.now(),
263270
) {
264271
metric(metadata, duration, httpStatusCode, reason, reasonDesc, requestId,
265-
requestServiceType, if(success) Result.Succeeded else Result.Failed, traceId,
266-
metricId, parentId, passive, value, createTime)
272+
requestServiceType, if(success) MetricResult.Succeeded else MetricResult.Failed,
273+
traceId, metricId, parentId, passive, value, createTime)
267274
}
268275
}

‎telemetry/jetbrains/src/test/resources/generatesWithNormalInput/output/software/aws/toolkits/telemetry/NoTelemetry.kt‎

Lines changed: 22 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,85 +9,78 @@ import com.intellij.openapi.project.Project
99
import java.time.Instant
1010
import kotlin.Boolean
1111
import kotlin.Double
12-
import kotlin.String
1312
import kotlin.Suppress
1413
import software.amazon.awssdk.services.toolkittelemetry.model.Unit
1514
import software.aws.toolkits.core.ConnectionSettings
1615
import software.aws.toolkits.jetbrains.services.telemetry.MetricEventMetadata
1716
import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
1817

19-
/**
20-
* The result of the operation
21-
*/
22-
public enum class MetricResult(
23-
private val `value`: String,
24-
) {
25-
Succeeded("Succeeded"),
26-
Unknown("unknown"),
27-
;
28-
29-
override fun toString(): String = value
30-
31-
public companion object {
32-
public fun from(type: String): MetricResult = values().firstOrNull { it.value == type }
33-
?: Unknown
34-
}
35-
}
36-
37-
public object MetadataTelemetry {
18+
public object NoTelemetry {
3819
/**
39-
* It does not actually have a result, yep
20+
* called when invoking lambdas remotely
4021
*/
41-
public fun hasResult(
22+
public fun metadata(
4223
project: Project?,
24+
duration: Double? = null,
4325
passive: Boolean = false,
4426
`value`: Double = 1.0,
4527
createTime: Instant = Instant.now(),
4628
) {
4729
TelemetryService.getInstance().record(project) {
48-
datum("metadata_hasResult") {
30+
datum("no_metadata") {
4931
createTime(createTime)
5032
unit(Unit.NONE)
5133
value(value)
5234
passive(passive)
35+
if(duration != null) {
36+
metadata("duration", duration.toString())
37+
}
5338
}
5439
}
5540
}
5641

5742
/**
58-
* It does not actually have a result, yep
43+
* called when invoking lambdas remotely
5944
*/
60-
public fun hasResult(
45+
public fun metadata(
6146
connectionSettings: ConnectionSettings? = null,
47+
duration: Double? = null,
6248
passive: Boolean = false,
6349
`value`: Double = 1.0,
6450
createTime: Instant = Instant.now(),
6551
) {
6652
TelemetryService.getInstance().record(connectionSettings) {
67-
datum("metadata_hasResult") {
53+
datum("no_metadata") {
6854
createTime(createTime)
6955
unit(Unit.NONE)
7056
value(value)
7157
passive(passive)
58+
if(duration != null) {
59+
metadata("duration", duration.toString())
60+
}
7261
}
7362
}
7463
}
7564

7665
/**
77-
* It does not actually have a result, yep
66+
* called when invoking lambdas remotely
7867
*/
79-
public fun hasResult(
68+
public fun metadata(
8069
metadata: MetricEventMetadata,
70+
duration: Double? = null,
8171
passive: Boolean = false,
8272
`value`: Double = 1.0,
8373
createTime: Instant = Instant.now(),
8474
) {
8575
TelemetryService.getInstance().record(metadata) {
86-
datum("metadata_hasResult") {
76+
datum("no_metadata") {
8777
createTime(createTime)
8878
unit(Unit.NONE)
8979
value(value)
9080
passive(passive)
81+
if(duration != null) {
82+
metadata("duration", duration.toString())
83+
}
9184
}
9285
}
9386
}

‎telemetry/jetbrains/src/test/resources/resultGeneratesTwoFunctions/output/software/aws/toolkits/telemetry/MetadataTelemetry.kt‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,12 @@ import java.time.Instant
1010
import kotlin.Boolean
1111
import kotlin.Deprecated
1212
import kotlin.Double
13-
import kotlin.String
1413
import kotlin.Suppress
1514
import software.amazon.awssdk.services.toolkittelemetry.model.Unit
1615
import software.aws.toolkits.core.ConnectionSettings
1716
import software.aws.toolkits.jetbrains.services.telemetry.MetricEventMetadata
1817
import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
1918

20-
/**
21-
* The result of the operation
22-
*/
23-
public enum class MetricResult(
24-
private val `value`: String,
25-
) {
26-
Succeeded("Succeeded"),
27-
Failed("Failed"),
28-
Cancelled("Cancelled"),
29-
CamelCase("CamelCase"),
30-
DashSeparated("dash-separated"),
31-
UnderscoreSeparated("underscore_separated"),
32-
Unknown("unknown"),
33-
;
34-
35-
override fun toString(): String = value
36-
37-
public companion object {
38-
public fun from(type: String): MetricResult = values().firstOrNull { it.value == type }
39-
?: Unknown
40-
}
41-
}
42-
4319
@Deprecated(
4420
message = "Name conflicts with the Kotlin standard library",
4521
replaceWith = ReplaceWith("MetricResult", "software.aws.toolkits.telemetry.MetricResult"),

‎telemetry/jetbrains/src/test/resources/resultGeneratesTwoFunctions/output/software/aws/toolkits/telemetry/TelemetryEnums.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import kotlin.Suppress
1111
/**
1212
* The result of the operation
1313
*/
14-
public enum class Result(
14+
public enum class MetricResult(
1515
private val `value`: String,
1616
) {
1717
Succeeded("Succeeded"),
@@ -26,6 +26,7 @@ public enum class Result(
2626
override fun toString(): String = value
2727

2828
public companion object {
29-
public fun from(type: String): Result = values().firstOrNull { it.value == type } ?: Unknown
29+
public fun from(type: String): MetricResult = values().firstOrNull { it.value == type }
30+
?: Unknown
3031
}
3132
}

0 commit comments

Comments
 (0)