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

feat(flags): Add LaunchDarkly integration #14207

Open
wants to merge 62 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
26722d7
Init package files
aliu39 Oct 29, 2024
72f9cc0
Merge branch 'develop' into aliu/launch-darkly
aliu39 Oct 29, 2024
419cd83
Revert changelog and move types file
aliu39 Oct 29, 2024
610da4d
Add ld to dependencies and skeleton code. Get rid of core/
aliu39 Oct 29, 2024
5b2e5ec
Fix readme, rename types file, bring back core/
aliu39 Oct 29, 2024
66b1253
Fix readme 2
aliu39 Oct 30, 2024
023604a
Merge branch 'develop' into aliu/launch-darkly
aliu39 Oct 30, 2024
1f99c28
Merge branch 'aliu/launch-darkly' of https://github.com/getsentry/sen…
aliu39 Oct 30, 2024
85acc6d
Finish implementing, minus scope.flags
aliu39 Oct 30, 2024
3b3a767
Implement flag buffer in sentry scope
aliu39 Oct 30, 2024
ab3181d
Revert changelog
aliu39 Oct 30, 2024
22684ea
fix types
michellewzhang Oct 30, 2024
79e5b24
docstring
michellewzhang Oct 30, 2024
63649c5
Export FeatureFlag type in index.ts
aliu39 Oct 30, 2024
923500f
Merge branch 'aliu/launch-darkly' of https://github.com/getsentry/sen…
aliu39 Oct 30, 2024
bd04755
Clean up comments
aliu39 Oct 30, 2024
91a4db9
Fix build (uses yalc for scope changes) and use LRUMap util
aliu39 Oct 31, 2024
1849673
Merge branch 'develop' into aliu/launch-darkly
aliu39 Nov 5, 2024
1ca9d53
Tweak hook name and docs
aliu39 Nov 5, 2024
893cd62
FlagBuffer class and interface, add to scope._contexts. Remove old fl…
aliu39 Nov 6, 2024
f172683
Call clone in scope.clone()
aliu39 Nov 6, 2024
b96c17f
Rewrite as a util fx instead of class. Use in LD integration
aliu39 Nov 6, 2024
f9a659b
Delete LD pkg
aliu39 Nov 6, 2024
d9c5860
Delete LD from package.json and update lock
aliu39 Nov 6, 2024
cf24b75
Readd LD integration
aliu39 Nov 6, 2024
5561633
Fix dependencies and rename exports
aliu39 Nov 7, 2024
6eab55f
Fix normalize depth of 3 for contexts.flags, improve docstrings
aliu39 Nov 8, 2024
d90d346
Rm eslint rules, todos
aliu39 Nov 8, 2024
19ccb19
Merge branch 'develop' into aliu/launch-darkly-integration
aliu39 Nov 8, 2024
548858d
Update sentry dependency vers
aliu39 Nov 9, 2024
c289e63
Update insertToFlagBuffer and unit test it
aliu39 Nov 9, 2024
f5c6995
Move ld to devDependencies and rm shim-preact from build:types
aliu39 Nov 11, 2024
334aa51
Move to browser integrations, delete package
aliu39 Nov 11, 2024
c27f766
Init browser-integration-tests
aliu39 Nov 12, 2024
948cea7
Fix test
aliu39 Nov 12, 2024
d371316
Merge branch 'develop' into aliu/launch-darkly-integration
aliu39 Nov 12, 2024
aef6dba
Finialize test and make handler synchronous
aliu39 Nov 12, 2024
7b14926
Move util to browser pkg
aliu39 Nov 12, 2024
8ec8680
Review comments, fix buffer size import, clean up todos
aliu39 Nov 13, 2024
6e22c17
Restructure src and test modules, rename util and type files
aliu39 Nov 13, 2024
dc7e74a
Inline LD types
aliu39 Nov 13, 2024
3c686c5
Copy flags when attaching to event
aliu39 Nov 13, 2024
88f8251
Add withScope test and delete bad not modified test
aliu39 Nov 13, 2024
05036ae
Merge branch 'develop' into aliu/launch-darkly-integration
aliu39 Nov 13, 2024
fc79f4a
Del unnecesary devDep
aliu39 Nov 13, 2024
7a5f29d
Log insertToFlagBuffer error instead of throwing
aliu39 Nov 13, 2024
7e24158
Merge branch 'develop' into aliu/launch-darkly-integration
aliu39 Nov 13, 2024
969c5c0
Fix playwright tests
aliu39 Nov 13, 2024
ac8faf7
Use Sentry namespace in init
aliu39 Nov 13, 2024
b1cb0a5
(Temporarily?) move to exports
aliu39 Nov 13, 2024
3b784a6
Skip CDN bundle tests, fix unit test, un-export FLAG_BUFFER_SIZE, upd…
aliu39 Nov 13, 2024
b93c062
Merge branch 'develop' into aliu/launch-darkly-integration
aliu39 Nov 13, 2024
8ffafd1
Revert lockfile
aliu39 Nov 13, 2024
83ee34b
biome formatting
aliu39 Nov 13, 2024
a2ba257
Bump size limits for vue (w/tracing) and browser (w/async feedback)
aliu39 Nov 14, 2024
611df2c
Merge branch 'develop' into aliu/launch-darkly-integration
aliu39 Nov 14, 2024
be9ccc2
Merge branch 'develop' into aliu/launch-darkly-integration
billyvg Nov 19, 2024
7b3382f
make `shouldSkipLaunchDarklyTest` to be generic for feature flags
billyvg Nov 19, 2024
d292da2
Merge branch 'develop' into aliu/launch-darkly-integration
billyvg Nov 20, 2024
c4ba65b
fix tests
billyvg Nov 19, 2024
fb0bf05
Update dev-packages/browser-integration-tests/utils/helpers.ts
billyvg Nov 20, 2024
90577bf
import from core
billyvg Nov 20, 2024
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: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
"packages/gatsby",
"packages/google-cloud-serverless",
"packages/integration-shims",
"packages/launchdarkly",
"packages/nestjs",
"packages/nextjs",
"packages/node",
Expand Down
15 changes: 14 additions & 1 deletion packages/core/src/scope.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,13 @@ import type {
SeverityLevel,
User,
} from '@sentry/types';
import { dateTimestampInSeconds, generatePropagationContext, isPlainObject, logger, uuid4 } from '@sentry/utils';
import {
dateTimestampInSeconds,
generatePropagationContext,
isPlainObject,
logger,
uuid4,
} from '@sentry/utils';

import { updateSession } from './session';
import { _getSpanForScope, _setSpanForScope } from './utils/spanOnScope';
Expand Down Expand Up @@ -122,6 +128,13 @@ class ScopeClass implements ScopeInterface {
newScope._tags = { ...this._tags };
newScope._extra = { ...this._extra };
newScope._contexts = { ...this._contexts };
if (this._contexts.flags) {
// The flags context needs a deep copy.
aliu39 marked this conversation as resolved.
Show resolved Hide resolved
newScope._contexts.flags = {
values: [...this._contexts.flags.values]
}
}

newScope._user = this._user;
newScope._level = this._level;
newScope._session = this._session;
Expand Down
8 changes: 8 additions & 0 deletions packages/core/src/utils/prepareEvent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,14 @@ function normalizeEvent(event: Event | null, depth: number, maxBreadth: number):
});
}

// event.contexts.flags (FeatureFlagContext) stores context for our feature
// flag integrations. It has a greater nesting depth than our other typed
// Contexts, so we re-normalize with a fixed depth of 3 here. We do not want
// to skip this in case of conflicting, user-provided context.
if (event.contexts && event.contexts.flags && normalized.contexts) {
normalized.contexts.flags = normalize(event.contexts.flags, 3, maxBreadth);
}

return normalized;
}

Expand Down
2 changes: 2 additions & 0 deletions packages/launchdarkly/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules/
build/
39 changes: 39 additions & 0 deletions packages/launchdarkly/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// Note: All paths are relative to the directory in which eslint is being run, rather than the directory where this file
// lives

// ESLint config docs: https://eslint.org/docs/user-guide/configuring/

module.exports = {
extends: ['../../.eslintrc.js'],
overrides: [
{
files: ['src/**/*.ts'],
},
{
files: ['test.setup.ts', 'vitest.config.ts'],
parserOptions: {
project: ['tsconfig.test.json'],
},
rules: {
'no-console': 'off',
},
},
{
files: ['test/**/*.ts'],

rules: {
// most of these errors come from `new Promise(process.nextTick)`
'@typescript-eslint/unbound-method': 'off',
// TODO: decide if we want to enable this again after the migration
// We can take the freedom to be a bit more lenient with tests
'@typescript-eslint/no-floating-promises': 'off',
},
},
{
files: ['src/types/deprecated.ts'],
rules: {
'@typescript-eslint/naming-convention': 'off',
},
},
],
};
4 changes: 4 additions & 0 deletions packages/launchdarkly/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node_modules
/*.tgz
.eslintcache
build
21 changes: 21 additions & 0 deletions packages/launchdarkly/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2023-2024 Functional Software, Inc. dba Sentry

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
15 changes: 15 additions & 0 deletions packages/launchdarkly/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<p align="center">
<a href="https://sentry.io/?utm_source=github&utm_medium=logo" target="_blank">
<img src="https://sentry-brand.storage.googleapis.com/sentry-wordmark-dark-280x84.png" alt="Sentry" width="280" height="84">
</a>
</p>

# Sentry Integration for LaunchDarkly

This SDK is **considered experimental and in a beta state**. It may experience breaking changes, and may be discontinued
at any time. Please reach out on [GitHub](https://github.com/getsentry/sentry-javascript/issues/new/choose) if you have
any feedback/concerns.

## Installation

## Configuration
74 changes: 74 additions & 0 deletions packages/launchdarkly/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"name": "@sentry/launchdarkly",
"version": "8.35.0",
"description": "Sentry SDK integration for Launch Darkly feature flagging",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/launchdarkly",
"author": "Sentry",
"license": "MIT",
"engines": {
"node": ">=14.18"
},
"files": [
"/build/npm"
],
"main": "build/npm/cjs/index.js",
"module": "build/npm/esm/index.js",
"types": "build/npm/types/index.d.ts",
"exports": {
"./package.json": "./package.json",
".": {
"import": {
"types": "./build/npm/types/index.d.ts",
"default": "./build/npm/esm/index.js"
},
"require": {
"types": "./build/npm/types/index.d.ts",
"default": "./build/npm/cjs/index.js"
}
}
},
"typesVersions": {
"<4.9": {
"build/npm/types/index.d.ts": [
"build/npm/types-ts3.8/index.d.ts"
]
}
},
"publishConfig": {
"access": "public"
},
"dependencies": {
"@sentry/browser": "^8.35.0",
"@sentry/core": "8.35.0",
"@sentry/types": "*",
"@sentry/utils": "*",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these versions should all be the same as current repo version (8.37.1) -- make sure you run yarn after you update

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can/should I add a ^ to any of these?

"launchdarkly-js-client-sdk": "^3.5.0"
aliu39 marked this conversation as resolved.
Show resolved Hide resolved
},
"scripts": {
"build": "run-p build:transpile build:types build:bundle",
"build:transpile": "rollup -c rollup.npm.config.mjs",
"build:bundle": "rollup -c rollup.bundle.config.mjs",
"build:dev": "run-p build:transpile build:types",
"build:types": "run-s build:types:core build:types:downlevel",
"build:types:core": "tsc -p tsconfig.types.json",
"build:types:downlevel": "yarn downlevel-dts build/npm/types build/npm/types-ts3.8 --to ts3.8 && yarn node ./scripts/shim-preact-export.js",
"build:watch": "run-p build:transpile:watch build:bundle:watch build:types:watch",
"build:dev:watch": "run-p build:transpile:watch build:types:watch",
"build:transpile:watch": "yarn build:transpile --watch",
"build:bundle:watch": "yarn build:bundle --watch",
"build:types:watch": "tsc -p tsconfig.types.json --watch",
"build:tarball": "npm pack",
"circularDepCheck": "madge --circular src/index.ts",
"clean": "rimraf build sentry-internal-launchdarkly-*.tgz",
"fix": "eslint . --format stylish --fix",
"lint": "eslint . --format stylish",
"test": "jest",
"test:watch": "jest --watch",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
"extends": "../../package.json"
},
"sideEffects": false
}
12 changes: 12 additions & 0 deletions packages/launchdarkly/rollup.bundle.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { makeBaseBundleConfig, makeBundleConfigVariants } from '@sentry-internal/rollup-utils';

const baseBundleConfig = makeBaseBundleConfig({
bundleType: 'addon',
entrypoints: ['src/index.ts'],
licenseTitle: '@sentry/launchdarkly',
outputFileBase: () => 'bundles/launchdarkly',
});

const builds = makeBundleConfigVariants(baseBundleConfig);

export default builds;
19 changes: 19 additions & 0 deletions packages/launchdarkly/rollup.npm.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';

export default makeNPMConfigVariants(
makeBaseNPMConfig({
hasBundles: true,
packageSpecificConfig: {
output: {
// set exports to 'named' or 'auto' so that rollup doesn't warn
exports: 'named',
// set preserveModules to false because for Replay we actually want
// to bundle everything into one file.
preserveModules:
process.env.SENTRY_BUILD_PRESERVE_MODULES === undefined
? false
: Boolean(process.env.SENTRY_BUILD_PRESERVE_MODULES),
},
},
}),
);
75 changes: 75 additions & 0 deletions packages/launchdarkly/scripts/shim-preact-export.js
aliu39 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
// preact does not support more modern TypeScript versions, which breaks our users that depend on older
// TypeScript versions. To fix this, we shim the types from preact to be any and remove the dependency on preact
// for types directly. This script is meant to be run after the build/npm/types-ts3.8 directory is created.

// Path: build/npm/types-ts3.8/global.d.ts

const fs = require('fs');
const path = require('path');

/**
* This regex looks for preact imports we can replace and shim out.
*
* Example:
* import { ComponentChildren, VNode } from 'preact';
*/
const preactImportRegex = /import\s*{\s*([\w\s,]+)\s*}\s*from\s*'preact'\s*;?/;

function walk(dir) {
const files = fs.readdirSync(dir);
files.forEach(file => {
const filePath = path.join(dir, file);
const stat = fs.lstatSync(filePath);
if (stat.isDirectory()) {
walk(filePath);
} else {
if (filePath.endsWith('.d.ts')) {
const content = fs.readFileSync(filePath, 'utf8');
Fixed Show fixed Hide fixed
const capture = preactImportRegex.exec(content);
if (capture) {
const groups = capture[1].split(',').map(s => s.trim());

// This generates a shim snippet to replace the type imports from preact
// It generates a snippet based on the capture groups of preactImportRegex.
//
// Example:
//
// import type { ComponentChildren, VNode } from 'preact';
// becomes
// type ComponentChildren: any;
// type VNode: any;
const snippet = groups.reduce((acc, curr) => {
const searchableValue = curr.includes(' as ') ? curr.split(' as ')[1] : curr;

// look to see if imported as value, then we have to use declare const
if (content.includes(`typeof ${searchableValue}`)) {
return `${acc}declare const ${searchableValue}: any;\n`;
}

// look to see if generic type like Foo<T>
if (content.includes(`${searchableValue}<`)) {
return `${acc}type ${searchableValue}<T> = any;\n`;
}

// otherwise we can just leave as type
return `${acc}type ${searchableValue} = any;\n`;
}, '');

// we then can remove the import from preact
const newContent = content.replace(preactImportRegex, '// replaced import from preact');

// and write the new content to the file
fs.writeFileSync(filePath, snippet + newContent, 'utf8');
Fixed Show fixed Hide fixed
}
}
}
});
}

function run() {
// recurse through build/npm/types-ts3.8 directory
const dir = path.join('build', 'npm', 'types-ts3.8');
walk(dir);
}

run();
68 changes: 68 additions & 0 deletions packages/launchdarkly/src/core/integration.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import * as Sentry from '@sentry/browser';
import type { Client as SentryClient, Event, EventHint, IntegrationFn } from '@sentry/types';
import type { LDContext, LDEvaluationDetail, LDInspectionFlagUsedHandler } from 'launchdarkly-js-client-sdk';
import type { LaunchDarklyOptions } from '../types';
import { insertToFlagBuffer } from '@sentry/utils';

/**
* Sentry integration for capturing feature flags from LaunchDarkly.
*
* See the [feature flag documentation](https://develop.sentry.dev/sdk/expected-features/#feature-flags) for more information.
aliu39 marked this conversation as resolved.
Show resolved Hide resolved
*
* @example
* ```
* import {buildSentryFlagUsedInspector, buildLaunchDarklyIntegration} from '@sentry/launchdarkly';
* import {LDClient} from 'launchdarkly-js-client-sdk';
*
* Sentry.init(..., integrations: [buildLaunchDarklyIntegration()])
* const ldClient = LDClient.initialize(..., {inspectors: [buildSentryFlagUsedInspector()]});
* ```
*/
export const buildLaunchDarklyIntegration = ((_options?: LaunchDarklyOptions) => {
return {
name: 'launchdarkly',

processEvent(event: Event, _hint: EventHint, _client: SentryClient): Event {
const scope = Sentry.getCurrentScope();
const flagContext = scope.getScopeData().contexts.flags;

if (event.contexts === undefined) {
event.contexts = {};
}
event.contexts.flags = flagContext;
return event;
},
};
}) satisfies IntegrationFn;

/**
* LaunchDarkly hook that listens for flag evaluations and updates the
* flagBuffer in our current scope.
*
* This needs to be registered separately in the LDClient, after initializing
* Sentry.
*/
export function buildSentryFlagUsedInspector(): LDInspectionFlagUsedHandler {
return {
name: 'sentry-flag-auditor',
type: 'flag-used',

// We don't want the handler to impact the performance of the user's flag evaluations.
synchronous: false,

/**
* Handle a flag evaluation by storing its name and value on the current scope.
*/
method: (flagKey: string, flagDetail: LDEvaluationDetail, _context: LDContext) => {
if (typeof flagDetail.value === 'boolean') {
const scopeContexts = Sentry.getCurrentScope().getScopeData().contexts;
if (!scopeContexts.flags) {
scopeContexts.flags = {values: []}
}
const flagBuffer = scopeContexts.flags.values;
insertToFlagBuffer(flagBuffer, flagKey, flagDetail.value);
}
return;
}
}
}
5 changes: 5 additions & 0 deletions packages/launchdarkly/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// This file is used as entry point to generate the npm package and CDN bundles.

export { buildLaunchDarklyIntegration, buildSentryFlagUsedInspector } from './core/integration';

export type { LaunchDarklyOptions } from './types'
1 change: 1 addition & 0 deletions packages/launchdarkly/src/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export type LaunchDarklyOptions = Record<string, never>; //TODO:
Loading