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.

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

🐛 [RUM-3598] Ignore collecting requests to logs PCI intake as RUM resources #2655

Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,12 @@ describe('transportConfiguration', () => {
;[
{ site: 'datadoghq.eu', intakeDomain: 'browser-intake-datadoghq.eu' },
{ site: 'datadoghq.com', intakeDomain: 'browser-intake-datadoghq.com' },
{ site: 'datadoghq.com', intakeDomain: 'pci.browser-intake-datadoghq.com' },
N-Boutaib marked this conversation as resolved.
Show resolved Hide resolved
{ site: 'us3.datadoghq.com', intakeDomain: 'browser-intake-us3-datadoghq.com' },
{ site: 'us5.datadoghq.com', intakeDomain: 'browser-intake-us5-datadoghq.com' },
{ site: 'ddog-gov.com', intakeDomain: 'browser-intake-ddog-gov.com' },
{ site: 'ap1.datadoghq.com', intakeDomain: 'browser-intake-ap1-datadoghq.com' },
{ site: 'ddog-gov.com', intakeDomain: 'browser-intake-ddog-gov.com' },
{ site: 'datad0g.com', intakeDomain: 'browser-intake-datad0g.com' },
{ site: 'dd0g-gov.com', intakeDomain: 'http-intake.logs.dd0g-gov.com' },
].forEach(({ site, intakeDomain }) => {
it(`should detect intake request for ${site} site`, () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { InitConfiguration } from './configuration'
import type { EndpointBuilder } from './endpointBuilder'
import { createEndpointBuilder } from './endpointBuilder'
import { buildTags } from './tags'
import { INTAKE_SITE_US1 } from './intakeSites'
import { INTAKE_SITE_FED_STAGING, INTAKE_SITE_US1 } from './intakeSites'

export interface TransportConfiguration {
logsEndpointBuilder: EndpointBuilder
Expand All @@ -28,9 +28,16 @@ export function computeTransportConfiguration(initConfiguration: InitConfigurati

const replicaConfiguration = computeReplicaConfiguration(initConfiguration, intakeUrlPrefixes, tags)

function isIntakeUrl(url: string) {
return (
getIntakePrefixesRegEx(initConfiguration).some((intakeRegEx) => intakeRegEx.test(url)) ||
intakeUrlPrefixes.some((intakeEndpoint) => url.indexOf(intakeEndpoint) === 0)
)
}

return assign(
{
isIntakeUrl: (url: string) => intakeUrlPrefixes.some((intakeEndpoint) => url.indexOf(intakeEndpoint) === 0),
isIntakeUrl,
replica: replicaConfiguration,
site: initConfiguration.site || INTAKE_SITE_US1,
},
Expand Down Expand Up @@ -69,3 +76,29 @@ function computeReplicaConfiguration(

return assign({ applicationId: initConfiguration.replica.applicationId }, replicaEndpointBuilders)
}

function getIntakePrefixesRegEx(initConfiguration: InitConfiguration): RegExp[] {
const { site = INTAKE_SITE_US1, internalAnalyticsSubdomain } = initConfiguration

const intakePrefixesRegEx: RegExp[] = []

if (internalAnalyticsSubdomain) {
intakePrefixesRegEx.push(new RegExp(`^https://${internalAnalyticsSubdomain}.datadoghq.com/api/v2/(logs|rum)`))
}

if (site === INTAKE_SITE_FED_STAGING) {
intakePrefixesRegEx.push(new RegExp(`^https://http-intake.logs.${site}/api/v2/(logs|rum|replay)`))
}

if (site === INTAKE_SITE_US1) {
intakePrefixesRegEx.push(new RegExp(`^https://(pci.)?browser-intake-${site}/api/v2/(logs|rum|replay)`))
} else {
const domainParts = site.split('.')
const extension = domainParts.pop()
intakePrefixesRegEx.push(
new RegExp(`^https://browser-intake-${domainParts.join('-')}.${extension!}/api/v2/(logs|rum|replay)`)
)
}

return intakePrefixesRegEx
}
N-Boutaib marked this conversation as resolved.
Show resolved Hide resolved