Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion packages/core/src/tools/experimentalFeatures.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export enum ExperimentalFeature {
TRACK_INTAKE_REQUESTS = 'track_intake_requests',
WRITABLE_RESOURCE_GRAPHQL = 'writable_resource_graphql',
USE_TREE_WALKER_FOR_ACTION_NAME = 'use_tree_walker_for_action_name',
GRAPHQL_TRACKING = 'graphql_tracking',
FEATURE_OPERATION_VITAL = 'feature_operation_vital',
SHORT_SESSION_INVESTIGATION = 'short_session_investigation',
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Duration, RelativeTime, ServerDuration, TaskQueue, TimeStamp } from '@datadog/browser-core'
import { createTaskQueue, ExperimentalFeature, noop, RequestType, ResourceType } from '@datadog/browser-core'
import { mockExperimentalFeatures, registerCleanupTask } from '@datadog/browser-core/test'
import { createTaskQueue, noop, RequestType, ResourceType } from '@datadog/browser-core'
import { registerCleanupTask } from '@datadog/browser-core/test'
import type { RumFetchResourceEventDomainContext, RumXhrResourceEventDomainContext } from '../../domainContext.types'
import {
collectAndValidateRawRumEvents,
Expand Down Expand Up @@ -152,9 +152,6 @@ describe('resourceCollection', () => {
})

describe('GraphQL metadata enrichment', () => {
beforeEach(() => {
mockExperimentalFeatures([ExperimentalFeature.GRAPHQL_TRACKING])
})
interface TestCase {
requestType: RequestType
name: string
Expand Down Expand Up @@ -279,34 +276,6 @@ describe('resourceCollection', () => {
})
})

it('should not track GraphQL when feature flag is disabled', () => {
mockExperimentalFeatures([])
setupResourceCollection({
trackResources: true,
allowedGraphQlUrls: [{ match: 'https://api.example.com/graphql', trackPayload: true }],
})

const requestBody = JSON.stringify({
query: 'query GetUser { user { name } }',
})

notifyRequest({
request: {
type: RequestType.FETCH,
url: 'https://api.example.com/graphql',
method: 'POST' as const,
init: {
method: 'POST' as const,
body: requestBody,
},
input: 'https://api.example.com/graphql',
},
})

const resourceEvent = rawRumEvents[0].rawRumEvent as any
expect(resourceEvent.resource.graphql).toBeUndefined()
})

describe('with trackEarlyRequests enabled', () => {
it('creates a resource from a performance entry without a matching request', () => {
setupResourceCollection({ trackResources: true, trackEarlyRequests: true })
Expand Down
6 changes: 0 additions & 6 deletions packages/rum-core/src/domain/resource/resourceCollection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import {
toServerDuration,
relativeToClocks,
createTaskQueue,
isExperimentalFeatureEnabled,
ExperimentalFeature,
} from '@datadog/browser-core'
import type { RumConfiguration } from '../configuration'
import type { RumPerformanceResourceTiming } from '../../browser/performanceObservable'
Expand Down Expand Up @@ -178,10 +176,6 @@ function computeGraphQlMetaData(
request: RequestCompleteEvent,
configuration: RumConfiguration
): GraphQlMetadata | undefined {
if (!isExperimentalFeatureEnabled(ExperimentalFeature.GRAPHQL_TRACKING)) {
return
}

const graphQlConfig = findGraphQlConfiguration(request.url, configuration)
if (!graphQlConfig) {
return
Expand Down
1 change: 0 additions & 1 deletion test/e2e/scenario/rum/graphql.scenario.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { createTest } from '../../lib/framework'
function buildGraphQlConfig({ trackPayload = false }: { trackPayload?: boolean } = {}) {
return {
allowedGraphQlUrls: [{ match: (url: string) => url.includes('graphql'), trackPayload }],
enableExperimentalFeatures: ['graphql_tracking'],
}
}

Expand Down