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.

Sign up for GitHub

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

🐛 Fix dependency issue #1549

Merged
merged 1 commit into from
May 18, 2022
Merged

🐛 Fix dependency issue #1549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 1 addition & 6 deletions packages/core/src/domain/configuration/endpointBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { timeStampNow } from '../../tools/timeUtils'
import { normalizeUrl } from '../../tools/urlPolyfill'
import { generateUUID } from '../../tools/utils'
import type { InitConfiguration } from './configuration'
import { INTAKE_SITE_US } from './intakeSites'

// replaced at build time
declare const __BUILD_ENV__SDK_VERSION__: string
Expand All @@ -20,12 +21,6 @@ const INTAKE_TRACKS = {

type EndpointType = keyof typeof ENDPOINTS

export const INTAKE_SITE_STAGING = 'datad0g.com'
export const INTAKE_SITE_US = 'datadoghq.com'
export const INTAKE_SITE_US3 = 'us3.datadoghq.com'
export const INTAKE_SITE_US5 = 'us5.datadoghq.com'
export const INTAKE_SITE_EU = 'datadoghq.eu'

export type EndpointBuilder = ReturnType<typeof createEndpointBuilder>

export function createEndpointBuilder(
Expand Down
11 changes: 2 additions & 9 deletions packages/core/src/domain/configuration/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,10 @@ export {
DefaultPrivacyLevel,
validateAndBuildConfiguration,
} from './configuration'
export {
createEndpointBuilder,
EndpointBuilder,
INTAKE_SITE_STAGING,
INTAKE_SITE_US5,
INTAKE_SITE_US,
INTAKE_SITE_US3,
INTAKE_SITE_EU,
} from './endpointBuilder'
export { createEndpointBuilder, EndpointBuilder } from './endpointBuilder'
export {
isExperimentalFeatureEnabled,
updateExperimentalFeatures,
resetExperimentalFeatures,
} from './experimentalFeatures'
export * from './intakeSites'
5 changes: 5 additions & 0 deletions packages/core/src/domain/configuration/intakeSites.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export const INTAKE_SITE_STAGING = 'datad0g.com'
export const INTAKE_SITE_US = 'datadoghq.com'
export const INTAKE_SITE_US3 = 'us3.datadoghq.com'
export const INTAKE_SITE_US5 = 'us5.datadoghq.com'
export const INTAKE_SITE_EU = 'datadoghq.eu'
3 changes: 2 additions & 1 deletion packages/core/src/domain/configuration/transportConfiguration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { assign, objectValues } from '../../tools/utils'
import type { InitConfiguration } from './configuration'
import type { EndpointBuilder } from './endpointBuilder'
import { createEndpointBuilder, INTAKE_SITE_US } from './endpointBuilder'
import { createEndpointBuilder } from './endpointBuilder'
import { buildTags } from './tags'
import { INTAKE_SITE_US } from './intakeSites'

export interface TransportConfiguration {
logsEndpointBuilder: EndpointBuilder
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/domain/internalMonitoring/internalMonitoring.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import type { Configuration } from '../configuration'
import {
updateExperimentalFeatures,
resetExperimentalFeatures,
INTAKE_SITE_US,
INTAKE_SITE_US3,
INTAKE_SITE_EU,
INTAKE_SITE_US5,
INTAKE_SITE_US3,
INTAKE_SITE_US,
} from '../configuration'
import type { InternalMonitoring, MonitoringMessage } from './internalMonitoring'
import {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/domain/internalMonitoring/internalMonitoring.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { Configuration } from '../configuration'
import { computeStackTrace } from '../tracekit'
import { Observable } from '../../tools/observable'
import { timeStampNow } from '../../tools/timeUtils'
import { isExperimentalFeatureEnabled, INTAKE_SITE_STAGING, INTAKE_SITE_US5, INTAKE_SITE_US3 } from '../configuration'
import { isExperimentalFeatureEnabled, INTAKE_SITE_US5, INTAKE_SITE_US3, INTAKE_SITE_STAGING } from '../configuration'
import type { TelemetryEvent } from './telemetryEvent.types'

// replaced at build time
Expand Down