Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[IJ Plugin] Fix high latency field inspection #6142

Merged
merged 2 commits into from
Sep 10, 2024
Merged

[IJ Plugin] Fix high latency field inspection #6142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f0be26
Fix ApolloKotlinService.Id toString/fromString, so comparison with Ap…
BoD Sep 10, 2024
b8cf0d3
Try upstream services when getting latencies
BoD Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/ApolloKotlinService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ data class ApolloKotlinService(

@XCollection
val endpointHeaders: Map<String, String>? = null,

@XCollection
val upstreamServiceIds: List<Id> = emptyList(),
) {
data class Id(
@Attribute
Expand All @@ -52,21 +55,19 @@ data class ApolloKotlinService(
val serviceName: String = "",
) {
override fun toString(): String {
val formattedPath = gradleProjectPath.split(":").filterNot { it.isEmpty() }.joinToString("-")
return "$formattedPath/$serviceName"
return "$gradleProjectPath/$serviceName"
}

companion object {
fun fromString(string: String): Id? {
val split = string.split("/")
val split = string.split("/", limit = 2)
if (split.size != 2) return null
return Id(split[0], split[1])
}
}
}

val id
val id: Id
@Transient
get() = Id(gradleProjectPath, serviceName)

}
1 change: 1 addition & 0 deletions ...lij-plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/GradleToolingModelService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ class GradleToolingModelService(
.distinct(),
endpointUrl = serviceInfo.endpointUrlCompat(toolingModel),
endpointHeaders = serviceInfo.endpointHeadersCompat(toolingModel),
upstreamServiceIds = upstreamApolloKotlinServices.map { it.id }
)
}
}
Expand Down
14 changes: 13 additions & 1 deletion ...n/src/main/kotlin/com/apollographql/ijplugin/studio/fieldinsights/FieldInsightsService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,20 @@ class FieldInsightsServiceImpl(private val project: Project) : FieldInsightsServ
return fieldLatenciesByService.isNotEmpty()
}

private fun getFieldLatenciesForService(serviceId: ApolloKotlinService.Id): FieldInsights.FieldLatencies? {
if (fieldLatenciesByService.containsKey(serviceId)) {
return fieldLatenciesByService[serviceId]
}
// Try upstream services
val apolloKotlinService = GradleToolingModelService.getApolloKotlinServices(project).firstOrNull { it.id == serviceId } ?: return null
for (upstreamServiceId in apolloKotlinService.upstreamServiceIds) {
return getFieldLatenciesForService(upstreamServiceId) ?: continue
}
return null
}

override fun getLatency(serviceId: ApolloKotlinService.Id, typeName: String, fieldName: String): Double? {
return fieldLatenciesByService[serviceId]?.getLatency(parentType = typeName, fieldName = fieldName)
return getFieldLatenciesForService(serviceId)?.getLatency(parentType = typeName, fieldName = fieldName)
}

private fun refreshInspections() {
Expand Down
Loading