Skip to content

Commit bb47ee8

Browse files
martinbonninmartinbonnin
committed
Rename ApolloReports -> ApolloReporting
1 parent 50503b9 commit bb47ee8

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

‎apollo-execution-reporting/api/apollo-execution-reporting.api‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ public final class com/apollographql/execution/reporting/ApolloOperationTracing
44
public final fun toProtoTrace ()Lcom/apollographql/execution/reporting/Trace;
55
}
66

7-
public final class com/apollographql/execution/reporting/ApolloReportsInstrumentation : com/apollographql/execution/Instrumentation {
7+
public final class com/apollographql/execution/reporting/ApolloReportingInstrumentation : com/apollographql/execution/Instrumentation {
88
public fun <init> ()V
99
public fun <init> (Ljava/lang/String;)V
1010
public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -14,15 +14,15 @@ public final class com/apollographql/execution/reporting/ApolloReportsInstrument
1414
public fun onOperation (Lcom/apollographql/execution/OperationInfo;)Lcom/apollographql/execution/OperationCallback;
1515
}
1616

17-
public final class com/apollographql/execution/reporting/ApolloReportsOperationContext : com/apollographql/apollo/api/ExecutionContext$Element {
18-
public static final field Key Lcom/apollographql/execution/reporting/ApolloReportsOperationContext$Key;
17+
public final class com/apollographql/execution/reporting/ApolloReportingOperationContext : com/apollographql/apollo/api/ExecutionContext$Element {
18+
public static final field Key Lcom/apollographql/execution/reporting/ApolloReportingOperationContext$Key;
1919
public fun <init> ()V
2020
public final fun getApolloOperationTracing ()Lcom/apollographql/execution/reporting/ApolloOperationTracing;
2121
public synthetic fun getKey ()Lcom/apollographql/apollo/api/ExecutionContext$Key;
22-
public fun getKey ()Lcom/apollographql/execution/reporting/ApolloReportsOperationContext$Key;
22+
public fun getKey ()Lcom/apollographql/execution/reporting/ApolloReportingOperationContext$Key;
2323
}
2424

25-
public final class com/apollographql/execution/reporting/ApolloReportsOperationContext$Key : com/apollographql/apollo/api/ExecutionContext$Key {
25+
public final class com/apollographql/execution/reporting/ApolloReportingOperationContext$Key : com/apollographql/apollo/api/ExecutionContext$Key {
2626
}
2727

2828
public final class com/apollographql/execution/reporting/ContextualizedQueryLatencyStats : com/squareup/wire/Message {

‎apollo-execution-reporting/api/apollo-execution-reporting.klib.api‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ final class com.apollographql.execution.reporting/ApolloOperationTracing { // co
1111
final fun beforeField(com.apollographql.execution/ResolveInfo): com.apollographql.execution/FieldCallback? // com.apollographql.execution.reporting/ApolloOperationTracing.beforeField|beforeField(com.apollographql.execution.ResolveInfo){}[0]
1212
final fun toProtoTrace(): com.apollographql.execution.reporting/Trace // com.apollographql.execution.reporting/ApolloOperationTracing.toProtoTrace|toProtoTrace(){}[0]
1313
}
14-
final class com.apollographql.execution.reporting/ApolloReportsInstrumentation : com.apollographql.execution/Instrumentation { // com.apollographql.execution.reporting/ApolloReportsInstrumentation|null[0]
15-
constructor <init>(kotlin/String? = ...) // com.apollographql.execution.reporting/ApolloReportsInstrumentation.<init>|<init>(kotlin.String?){}[0]
16-
final fun onField(com.apollographql.execution/ResolveInfo): com.apollographql.execution/FieldCallback? // com.apollographql.execution.reporting/ApolloReportsInstrumentation.onField|onField(com.apollographql.execution.ResolveInfo){}[0]
17-
final fun onOperation(com.apollographql.execution/OperationInfo): com.apollographql.execution/OperationCallback? // com.apollographql.execution.reporting/ApolloReportsInstrumentation.onOperation|onOperation(com.apollographql.execution.OperationInfo){}[0]
18-
final val apolloKey // com.apollographql.execution.reporting/ApolloReportsInstrumentation.apolloKey|{}apolloKey[0]
19-
final fun <get-apolloKey>(): kotlin/String? // com.apollographql.execution.reporting/ApolloReportsInstrumentation.apolloKey.<get-apolloKey>|<get-apolloKey>(){}[0]
20-
final val client // com.apollographql.execution.reporting/ApolloReportsInstrumentation.client|{}client[0]
21-
final fun <get-client>(): io.ktor.client/HttpClient // com.apollographql.execution.reporting/ApolloReportsInstrumentation.client.<get-client>|<get-client>(){}[0]
14+
final class com.apollographql.execution.reporting/ApolloReportingInstrumentation : com.apollographql.execution/Instrumentation { // com.apollographql.execution.reporting/ApolloReportingInstrumentation|null[0]
15+
constructor <init>(kotlin/String? = ...) // com.apollographql.execution.reporting/ApolloReportingInstrumentation.<init>|<init>(kotlin.String?){}[0]
16+
final fun onField(com.apollographql.execution/ResolveInfo): com.apollographql.execution/FieldCallback? // com.apollographql.execution.reporting/ApolloReportingInstrumentation.onField|onField(com.apollographql.execution.ResolveInfo){}[0]
17+
final fun onOperation(com.apollographql.execution/OperationInfo): com.apollographql.execution/OperationCallback? // com.apollographql.execution.reporting/ApolloReportingInstrumentation.onOperation|onOperation(com.apollographql.execution.OperationInfo){}[0]
18+
final val apolloKey // com.apollographql.execution.reporting/ApolloReportingInstrumentation.apolloKey|{}apolloKey[0]
19+
final fun <get-apolloKey>(): kotlin/String? // com.apollographql.execution.reporting/ApolloReportingInstrumentation.apolloKey.<get-apolloKey>|<get-apolloKey>(){}[0]
20+
final val client // com.apollographql.execution.reporting/ApolloReportingInstrumentation.client|{}client[0]
21+
final fun <get-client>(): io.ktor.client/HttpClient // com.apollographql.execution.reporting/ApolloReportingInstrumentation.client.<get-client>|<get-client>(){}[0]
2222
}
23-
final class com.apollographql.execution.reporting/ApolloReportsOperationContext : com.apollographql.apollo.api/ExecutionContext.Element { // com.apollographql.execution.reporting/ApolloReportsOperationContext|null[0]
24-
constructor <init>() // com.apollographql.execution.reporting/ApolloReportsOperationContext.<init>|<init>(){}[0]
25-
final object Key : com.apollographql.apollo.api/ExecutionContext.Key<com.apollographql.execution.reporting/ApolloReportsOperationContext> // com.apollographql.execution.reporting/ApolloReportsOperationContext.Key|null[0]
26-
final val apolloOperationTracing // com.apollographql.execution.reporting/ApolloReportsOperationContext.apolloOperationTracing|{}apolloOperationTracing[0]
27-
final fun <get-apolloOperationTracing>(): com.apollographql.execution.reporting/ApolloOperationTracing // com.apollographql.execution.reporting/ApolloReportsOperationContext.apolloOperationTracing.<get-apolloOperationTracing>|<get-apolloOperationTracing>(){}[0]
28-
final val key // com.apollographql.execution.reporting/ApolloReportsOperationContext.key|{}key[0]
29-
final fun <get-key>(): com.apollographql.execution.reporting/ApolloReportsOperationContext.Key // com.apollographql.execution.reporting/ApolloReportsOperationContext.key.<get-key>|<get-key>(){}[0]
23+
final class com.apollographql.execution.reporting/ApolloReportingOperationContext : com.apollographql.apollo.api/ExecutionContext.Element { // com.apollographql.execution.reporting/ApolloReportingOperationContext|null[0]
24+
constructor <init>() // com.apollographql.execution.reporting/ApolloReportingOperationContext.<init>|<init>(){}[0]
25+
final object Key : com.apollographql.apollo.api/ExecutionContext.Key<com.apollographql.execution.reporting/ApolloReportingOperationContext> // com.apollographql.execution.reporting/ApolloReportingOperationContext.Key|null[0]
26+
final val apolloOperationTracing // com.apollographql.execution.reporting/ApolloReportingOperationContext.apolloOperationTracing|{}apolloOperationTracing[0]
27+
final fun <get-apolloOperationTracing>(): com.apollographql.execution.reporting/ApolloOperationTracing // com.apollographql.execution.reporting/ApolloReportingOperationContext.apolloOperationTracing.<get-apolloOperationTracing>|<get-apolloOperationTracing>(){}[0]
28+
final val key // com.apollographql.execution.reporting/ApolloReportingOperationContext.key|{}key[0]
29+
final fun <get-key>(): com.apollographql.execution.reporting/ApolloReportingOperationContext.Key // com.apollographql.execution.reporting/ApolloReportingOperationContext.key.<get-key>|<get-key>(){}[0]
3030
}
3131
final class com.apollographql.execution.reporting/ContextualizedQueryLatencyStats : com.squareup.wire/Message<com.apollographql.execution.reporting/ContextualizedQueryLatencyStats, kotlin/Nothing> { // com.apollographql.execution.reporting/ContextualizedQueryLatencyStats|null[0]
3232
constructor <init>(com.apollographql.execution.reporting/QueryLatencyStats? = ..., com.apollographql.execution.reporting/StatsContext? = ..., okio/ByteString = ...) // com.apollographql.execution.reporting/ContextualizedQueryLatencyStats.<init>|<init>(com.apollographql.execution.reporting.QueryLatencyStats?;com.apollographql.execution.reporting.StatsContext?;okio.ByteString){}[0]

‎apollo-execution-reporting/src/commonMain/kotlin/com/apollographql/execution/monograph/ApolloNode.kt‎ renamed to ‎apollo-execution-reporting/src/commonMain/kotlin/com/apollographql/execution/reporting/ApolloNode.kt‎

File renamed without changes.

‎apollo-execution-reporting/src/commonMain/kotlin/com/apollographql/execution/monograph/ApolloOperationTracing.kt‎ renamed to ‎apollo-execution-reporting/src/commonMain/kotlin/com/apollographql/execution/reporting/ApolloOperationTracing.kt‎

File renamed without changes.

‎apollo-execution-reporting/src/commonMain/kotlin/com/apollographql/execution/monograph/ApolloReportsInstrumentation.kt‎ renamed to ‎apollo-execution-reporting/src/commonMain/kotlin/com/apollographql/execution/reporting/ApolloReportingInstrumentation.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import kotlinx.coroutines.DelicateCoroutinesApi
2828
import kotlinx.coroutines.GlobalScope
2929
import kotlinx.coroutines.launch
3030

31-
class ApolloReportsInstrumentation(val apolloKey: String? = null) : Instrumentation() {
31+
class ApolloReportingInstrumentation(val apolloKey: String? = null) : Instrumentation() {
3232
val client = HttpClient(CIO)
3333

3434
private val operations = mutableMapOf<String, OperationData>()
@@ -64,7 +64,7 @@ class ApolloReportsInstrumentation(val apolloKey: String? = null) : Instrumentat
6464
val operationData = getOperationData(operationInfo)
6565
if (operationData != null) {
6666
val trace =
67-
operationInfo.executionContext[ApolloReportsOperationContext]!!.apolloOperationTracing.toProtoTrace()
67+
operationInfo.executionContext[ApolloReportingOperationContext]!!.apolloOperationTracing.toProtoTrace()
6868

6969
val operation = operations.getOrPut(operationData.statsReportKey) { operationData }
7070
operation.traces.add(trace)
@@ -80,7 +80,7 @@ class ApolloReportsInstrumentation(val apolloKey: String? = null) : Instrumentat
8080
}
8181

8282
override fun onField(resolveInfo: ResolveInfo): FieldCallback? {
83-
val atc = resolveInfo.executionContext[ApolloReportsOperationContext]
83+
val atc = resolveInfo.executionContext[ApolloReportingOperationContext]
8484
require(atc != null) {
8585
"ApolloTracingInstrumentation requires an ApolloTracingContext"
8686
}

‎apollo-execution-reporting/src/commonMain/kotlin/com/apollographql/execution/monograph/ApolloReportsOperationContext.kt‎ renamed to ‎apollo-execution-reporting/src/commonMain/kotlin/com/apollographql/execution/reporting/ApolloReportingOperationContext.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ package com.apollographql.execution.reporting
55
import com.apollographql.apollo.api.ExecutionContext
66
import kotlin.io.encoding.ExperimentalEncodingApi
77

8-
class ApolloReportsOperationContext() : ExecutionContext.Element {
8+
class ApolloReportingOperationContext() : ExecutionContext.Element {
99
val apolloOperationTracing = ApolloOperationTracing()
1010

1111
override val key = Key
1212

13-
companion object Key : ExecutionContext.Key<ApolloReportsOperationContext>
13+
companion object Key : ExecutionContext.Key<ApolloReportingOperationContext>
1414
}
1515

‎apollo-execution-reporting/src/commonTest/kotlin/TracingTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import com.apollographql.apollo.ast.toGQLDocument
44
import com.apollographql.execution.ExecutableSchema
55
import com.apollographql.execution.toGraphQLRequest
6-
import com.apollographql.execution.reporting.ApolloReportsInstrumentation
7-
import com.apollographql.execution.reporting.ApolloReportsOperationContext
6+
import com.apollographql.execution.reporting.ApolloReportingInstrumentation
7+
import com.apollographql.execution.reporting.ApolloReportingOperationContext
88
import com.apollographql.execution.reporting.Trace
99
import kotlinx.coroutines.runBlocking
1010
import kotlin.io.encoding.Base64
@@ -41,13 +41,13 @@ class TracingTest {
4141
else -> Unit
4242
}
4343
}
44-
.addInstrumentation(ApolloReportsInstrumentation())
44+
.addInstrumentation(ApolloReportingInstrumentation())
4545
.build()
4646
}
4747

4848
@Test
4949
fun testTracing() {
50-
val context = ApolloReportsOperationContext()
50+
val context = ApolloReportingOperationContext()
5151
runBlocking {
5252
schema().execute("{ widgets { foo, baz: bar }, listOfLists { foo }, listOfScalars }".toGraphQLRequest(), context)
5353
}

0 commit comments

Comments
 (0)