diff --git a/packages/relay-experimental/__tests__/useLazyLoadQueryNode-test.js b/packages/relay-experimental/__tests__/useLazyLoadQueryNode-test.js index f27ea0529d96c..0ed02db657616 100644 --- a/packages/relay-experimental/__tests__/useLazyLoadQueryNode-test.js +++ b/packages/relay-experimental/__tests__/useLazyLoadQueryNode-test.js @@ -607,13 +607,9 @@ describe('useLazyLoadQueryNode', () => { }); expect(logs).toMatchObject([ - { - name: 'execute.start', - transactionID: 100000, - }, { name: 'network.start', - transactionID: 100001, + transactionID: 100000, }, { name: 'queryresource.fetch', @@ -622,18 +618,10 @@ describe('useLazyLoadQueryNode', () => { }, { name: 'network.next', - transactionID: 100001, - }, - { - name: 'execute.next', transactionID: 100000, }, { name: 'network.complete', - transactionID: 100001, - }, - { - name: 'execute.complete', transactionID: 100000, }, { @@ -717,13 +705,8 @@ describe('useLazyLoadQueryNode', () => { }, { // request for variables one starts - name: 'execute.start', - transactionID: 100000, - variables: variablesOne, - }, - { name: 'network.start', - transactionID: 100001, + transactionID: 100000, variables: variablesOne, }, { @@ -740,13 +723,8 @@ describe('useLazyLoadQueryNode', () => { }, { // request for variables two starts - name: 'execute.start', - transactionID: 100002, - variables: variablesTwo, - }, - { name: 'network.start', - transactionID: 100003, + transactionID: 100001, variables: variablesTwo, }, { @@ -765,18 +743,10 @@ describe('useLazyLoadQueryNode', () => { // since it's already cached and reused { name: 'network.next', - transactionID: 100001, - }, - { - name: 'execute.next', transactionID: 100000, }, { name: 'network.complete', - transactionID: 100001, - }, - { - name: 'execute.complete', transactionID: 100000, }, // retain event for variables one diff --git a/packages/relay-runtime/store/RelayModernEnvironment.js b/packages/relay-runtime/store/RelayModernEnvironment.js index 2cf9af178672b..96d0922a6f054 100644 --- a/packages/relay-runtime/store/RelayModernEnvironment.js +++ b/packages/relay-runtime/store/RelayModernEnvironment.js @@ -30,7 +30,6 @@ import type {HandlerProvider} from '../handlers/RelayDefaultHandlerProvider'; import type { GraphQLResponse, INetwork, - LogRequestInfoFunction, PayloadData, UploadableMap, } from '../network/RelayNetworkTypes'; @@ -367,10 +366,6 @@ class RelayModernEnvironment implements IEnvironment { operation: OperationDescriptor, updater?: ?SelectorStoreUpdater, |}): RelayObservable { - const logObserver = this.__createExecuteLogObserver( - operation.request.node.params, - operation.request.variables, - ); return RelayObservable.create(sink => { const source = this._network.execute( operation.request.node.params, @@ -395,7 +390,7 @@ class RelayModernEnvironment implements IEnvironment { treatMissingFieldsAsNull: this._treatMissingFieldsAsNull, }); return () => executor.cancel(); - }).do(logObserver); + }); } /** @@ -421,10 +416,6 @@ class RelayModernEnvironment implements IEnvironment { updater?: ?SelectorStoreUpdater, uploadables?: ?UploadableMap, |}): RelayObservable { - const logObserver = this.__createExecuteLogObserver( - operation.request.node.params, - operation.request.variables, - ); return RelayObservable.create(sink => { let optimisticConfig; if (optimisticResponse || optimisticUpdater) { @@ -460,7 +451,7 @@ class RelayModernEnvironment implements IEnvironment { treatMissingFieldsAsNull: this._treatMissingFieldsAsNull, }); return () => executor.cancel(); - }).do(logObserver); + }); } /** @@ -479,10 +470,6 @@ class RelayModernEnvironment implements IEnvironment { operation: OperationDescriptor, source: RelayObservable, |}): RelayObservable { - const logObserver = this.__createExecuteLogObserver( - operation.request.node.params, - operation.request.variables, - ); return RelayObservable.create(sink => { const executor = RelayModernQueryExecutor.execute({ operation, @@ -500,57 +487,13 @@ class RelayModernEnvironment implements IEnvironment { treatMissingFieldsAsNull: this._treatMissingFieldsAsNull, }); return () => executor.cancel(); - }).do(logObserver); + }); } toJSON(): mixed { return `RelayModernEnvironment(${this.configName ?? ''})`; } - __createExecuteLogObserver( - params: RequestParameters, - variables: Variables, - ): Observer { - const transactionID = generateID(); - const log = this.__log; - return { - start: subscription => { - log({ - name: 'execute.start', - transactionID, - params, - variables, - }); - }, - next: response => { - log({ - name: 'execute.next', - transactionID, - response, - }); - }, - error: error => { - log({ - name: 'execute.error', - transactionID, - error, - }); - }, - complete: () => { - log({ - name: 'execute.complete', - transactionID, - }); - }, - unsubscribe: () => { - log({ - name: 'execute.unsubscribe', - transactionID, - }); - }, - }; - } - /** * Wraps the network with logging to ensure that network requests are * always logged. Relying on each network callsite to be wrapped is diff --git a/packages/relay-runtime/store/RelayStoreTypes.js b/packages/relay-runtime/store/RelayStoreTypes.js index e7f462a8e1b58..0f69705adb447 100644 --- a/packages/relay-runtime/store/RelayStoreTypes.js +++ b/packages/relay-runtime/store/RelayStoreTypes.js @@ -464,30 +464,6 @@ export type LogEvent = // value from ProfilerContext +profilerContext: mixed, |} - | {| - +name: 'execute.start', - +transactionID: number, - +params: RequestParameters, - +variables: Variables, - |} - | {| - +name: 'execute.next', - +transactionID: number, - +response: GraphQLResponse, - |} - | {| - +name: 'execute.error', - +transactionID: number, - +error: Error, - |} - | {| - +name: 'execute.complete', - +transactionID: number, - |} - | {| - +name: 'execute.unsubscribe', - +transactionID: number, - |} | {| +name: 'network.info', +transactionID: number,