Skip to content

Commit b220edf

Browse files
authored
Remove ff for graphql tracking (#3886)
1 parent 509ba42 commit b220edf

File tree

4 files changed

+2
-41
lines changed

4 files changed

+2
-41
lines changed

packages/core/src/tools/experimentalFeatures.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ export enum ExperimentalFeature {
1717
TRACK_INTAKE_REQUESTS = 'track_intake_requests',
1818
WRITABLE_RESOURCE_GRAPHQL = 'writable_resource_graphql',
1919
USE_TREE_WALKER_FOR_ACTION_NAME = 'use_tree_walker_for_action_name',
20-
GRAPHQL_TRACKING = 'graphql_tracking',
2120
FEATURE_OPERATION_VITAL = 'feature_operation_vital',
2221
SHORT_SESSION_INVESTIGATION = 'short_session_investigation',
2322
}

packages/rum-core/src/domain/resource/resourceCollection.spec.ts

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Duration, RelativeTime, ServerDuration, TaskQueue, TimeStamp } from '@datadog/browser-core'
2-
import { createTaskQueue, ExperimentalFeature, noop, RequestType, ResourceType } from '@datadog/browser-core'
3-
import { mockExperimentalFeatures, registerCleanupTask } from '@datadog/browser-core/test'
2+
import { createTaskQueue, noop, RequestType, ResourceType } from '@datadog/browser-core'
3+
import { registerCleanupTask } from '@datadog/browser-core/test'
44
import type { RumFetchResourceEventDomainContext, RumXhrResourceEventDomainContext } from '../../domainContext.types'
55
import {
66
collectAndValidateRawRumEvents,
@@ -152,9 +152,6 @@ describe('resourceCollection', () => {
152152
})
153153

154154
describe('GraphQL metadata enrichment', () => {
155-
beforeEach(() => {
156-
mockExperimentalFeatures([ExperimentalFeature.GRAPHQL_TRACKING])
157-
})
158155
interface TestCase {
159156
requestType: RequestType
160157
name: string
@@ -279,34 +276,6 @@ describe('resourceCollection', () => {
279276
})
280277
})
281278

282-
it('should not track GraphQL when feature flag is disabled', () => {
283-
mockExperimentalFeatures([])
284-
setupResourceCollection({
285-
trackResources: true,
286-
allowedGraphQlUrls: [{ match: 'https://api.example.com/graphql', trackPayload: true }],
287-
})
288-
289-
const requestBody = JSON.stringify({
290-
query: 'query GetUser { user { name } }',
291-
})
292-
293-
notifyRequest({
294-
request: {
295-
type: RequestType.FETCH,
296-
url: 'https://api.example.com/graphql',
297-
method: 'POST' as const,
298-
init: {
299-
method: 'POST' as const,
300-
body: requestBody,
301-
},
302-
input: 'https://api.example.com/graphql',
303-
},
304-
})
305-
306-
const resourceEvent = rawRumEvents[0].rawRumEvent as any
307-
expect(resourceEvent.resource.graphql).toBeUndefined()
308-
})
309-
310279
describe('with trackEarlyRequests enabled', () => {
311280
it('creates a resource from a performance entry without a matching request', () => {
312281
setupResourceCollection({ trackResources: true, trackEarlyRequests: true })

packages/rum-core/src/domain/resource/resourceCollection.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import {
77
toServerDuration,
88
relativeToClocks,
99
createTaskQueue,
10-
isExperimentalFeatureEnabled,
11-
ExperimentalFeature,
1210
} from '@datadog/browser-core'
1311
import type { RumConfiguration } from '../configuration'
1412
import type { RumPerformanceResourceTiming } from '../../browser/performanceObservable'
@@ -178,10 +176,6 @@ function computeGraphQlMetaData(
178176
request: RequestCompleteEvent,
179177
configuration: RumConfiguration
180178
): GraphQlMetadata | undefined {
181-
if (!isExperimentalFeatureEnabled(ExperimentalFeature.GRAPHQL_TRACKING)) {
182-
return
183-
}
184-
185179
const graphQlConfig = findGraphQlConfiguration(request.url, configuration)
186180
if (!graphQlConfig) {
187181
return

test/e2e/scenario/rum/graphql.scenario.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { createTest } from '../../lib/framework'
44
function buildGraphQlConfig({ trackPayload = false }: { trackPayload?: boolean } = {}) {
55
return {
66
allowedGraphQlUrls: [{ match: (url: string) => url.includes('graphql'), trackPayload }],
7-
enableExperimentalFeatures: ['graphql_tracking'],
87
}
98
}
109

0 commit comments

Comments
 (0)