From 587a41a1d3668547265f4d13334f80ba31806762 Mon Sep 17 00:00:00 2001 From: Matthew Zember Date: Tue, 14 May 2024 17:10:30 -0400 Subject: [PATCH 1/3] no collection metrics --- .../src/execution/executeIntegration.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/integration-sdk-runtime/src/execution/executeIntegration.ts b/packages/integration-sdk-runtime/src/execution/executeIntegration.ts index 893659a78..f21803048 100644 --- a/packages/integration-sdk-runtime/src/execution/executeIntegration.ts +++ b/packages/integration-sdk-runtime/src/execution/executeIntegration.ts @@ -285,6 +285,10 @@ export async function executeWithContext< } } + if (process.env.NO_COLLECTION_METRICS) { + logger.info('Disabling collection metrics'); + } + const integrationStepResults = await executeSteps({ executionContext: context, integrationSteps: config.integrationSteps, @@ -296,8 +300,12 @@ export async function executeWithContext< createStepGraphObjectDataUploader, beforeAddEntity: config.beforeAddEntity, beforeAddRelationship: config.beforeAddRelationship, - afterAddEntity: createAfterAddEntityInternalHook(logger), - afterAddRelationship: createAfterAddRelationshipInternalHook(logger), + afterAddEntity: process.env.NO_COLLECTION_METRICS + ? undefined + : createAfterAddEntityInternalHook(logger), + afterAddRelationship: process.env.NO_COLLECTION_METRICS + ? undefined + : createAfterAddRelationshipInternalHook(logger), dependencyGraphOrder: config.dependencyGraphOrder, executionHandlerWrapper: config.executionHandlerWrapper, }); From b76768798d1079b973786c06348dc28536e850e7 Mon Sep 17 00:00:00 2001 From: Matthew Zember Date: Tue, 14 May 2024 17:27:00 -0400 Subject: [PATCH 2/3] update CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b128ea06c..dc6a09696 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ and this project adheres to # Unreleased +# 12.7.1 - 2024-05-14 + +- Add `NO_COLLECTION_METRICS` for disabling data collection metrics + # 12.7.0 - 2024-05-08 - Add expiremental `OnDiskDuplicateKeyTracker` From 795f7faa8b69cd4f701bd030fa01b96161945a45 Mon Sep 17 00:00:00 2001 From: Matthew Zember Date: Tue, 14 May 2024 17:28:42 -0400 Subject: [PATCH 3/3] v12.7.1 --- lerna.json | 2 +- packages/cli/package.json | 6 +++--- packages/integration-sdk-benchmark/package.json | 6 +++--- packages/integration-sdk-cli/package.json | 8 ++++---- packages/integration-sdk-core/package.json | 4 ++-- packages/integration-sdk-dev-tools/package.json | 6 +++--- packages/integration-sdk-entities/package.json | 2 +- packages/integration-sdk-entity-validator/package.json | 2 +- packages/integration-sdk-http-client/package.json | 8 ++++---- packages/integration-sdk-private-test-utils/package.json | 4 ++-- packages/integration-sdk-runtime/package.json | 6 +++--- packages/integration-sdk-testing/package.json | 8 ++++---- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/lerna.json b/lerna.json index 652b4c2e3..4af5ba001 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ "packages/integration-sdk-*", "packages/cli" ], - "version": "12.7.0" + "version": "12.7.1" } diff --git a/packages/cli/package.json b/packages/cli/package.json index e5c10db7f..8d016880d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jupiterone/cli", - "version": "12.7.0", + "version": "12.7.1", "description": "The JupiterOne cli", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,8 +24,8 @@ "test": "jest" }, "dependencies": { - "@jupiterone/integration-sdk-core": "^12.7.0", - "@jupiterone/integration-sdk-runtime": "^12.7.0", + "@jupiterone/integration-sdk-core": "^12.7.1", + "@jupiterone/integration-sdk-runtime": "^12.7.1", "@lifeomic/attempt": "^3.0.3", "commander": "^5.0.0", "globby": "^11.0.1", diff --git a/packages/integration-sdk-benchmark/package.json b/packages/integration-sdk-benchmark/package.json index e06488388..d812d98dc 100644 --- a/packages/integration-sdk-benchmark/package.json +++ b/packages/integration-sdk-benchmark/package.json @@ -1,6 +1,6 @@ { "name": "@jupiterone/integration-sdk-benchmark", - "version": "12.7.0", + "version": "12.7.1", "private": true, "description": "SDK benchmarking scripts", "main": "./src/index.js", @@ -15,8 +15,8 @@ "benchmark": "for file in ./src/benchmarks/*; do yarn prebenchmark && node $file; done" }, "dependencies": { - "@jupiterone/integration-sdk-core": "^12.7.0", - "@jupiterone/integration-sdk-runtime": "^12.7.0", + "@jupiterone/integration-sdk-core": "^12.7.1", + "@jupiterone/integration-sdk-runtime": "^12.7.1", "benchmark": "^2.1.4" } } diff --git a/packages/integration-sdk-cli/package.json b/packages/integration-sdk-cli/package.json index 8926a88d8..86ccf92bb 100644 --- a/packages/integration-sdk-cli/package.json +++ b/packages/integration-sdk-cli/package.json @@ -1,6 +1,6 @@ { "name": "@jupiterone/integration-sdk-cli", - "version": "12.7.0", + "version": "12.7.1", "description": "The SDK for developing JupiterOne integrations", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -25,8 +25,8 @@ }, "dependencies": { "@jupiterone/data-model": "^0.55.0", - "@jupiterone/integration-sdk-core": "^12.7.0", - "@jupiterone/integration-sdk-runtime": "^12.7.0", + "@jupiterone/integration-sdk-core": "^12.7.1", + "@jupiterone/integration-sdk-runtime": "^12.7.1", "chalk": "^4", "commander": "^9.4.0", "fs-extra": "^10.1.0", @@ -43,7 +43,7 @@ "url-exists": "^1.0.3" }, "devDependencies": { - "@jupiterone/integration-sdk-private-test-utils": "^12.7.0", + "@jupiterone/integration-sdk-private-test-utils": "^12.7.1", "@pollyjs/adapter-node-http": "^6.0.5", "@pollyjs/core": "^6.0.5", "@pollyjs/persister-fs": "^6.0.5", diff --git a/packages/integration-sdk-core/package.json b/packages/integration-sdk-core/package.json index c9dd722a8..158053b2e 100644 --- a/packages/integration-sdk-core/package.json +++ b/packages/integration-sdk-core/package.json @@ -1,6 +1,6 @@ { "name": "@jupiterone/integration-sdk-core", - "version": "12.7.0", + "version": "12.7.1", "description": "The SDK for developing JupiterOne integrations", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ }, "dependencies": { "@jupiterone/data-model": "^0.57.0", - "@jupiterone/integration-sdk-entity-validator": "^12.7.0", + "@jupiterone/integration-sdk-entity-validator": "^12.7.1", "lodash": "^4.17.21" }, "devDependencies": { diff --git a/packages/integration-sdk-dev-tools/package.json b/packages/integration-sdk-dev-tools/package.json index 9c2747ec4..bbae0fc91 100644 --- a/packages/integration-sdk-dev-tools/package.json +++ b/packages/integration-sdk-dev-tools/package.json @@ -1,6 +1,6 @@ { "name": "@jupiterone/integration-sdk-dev-tools", - "version": "12.7.0", + "version": "12.7.1", "description": "A collection of developer tools that will assist with building integrations.", "repository": "git@github.com:JupiterOne/sdk.git", "author": "JupiterOne ", @@ -15,8 +15,8 @@ "access": "public" }, "dependencies": { - "@jupiterone/integration-sdk-cli": "^12.7.0", - "@jupiterone/integration-sdk-testing": "^12.7.0", + "@jupiterone/integration-sdk-cli": "^12.7.1", + "@jupiterone/integration-sdk-testing": "^12.7.1", "@types/jest": "^29.5.3", "@types/node": "^18", "@typescript-eslint/eslint-plugin": "^6.2.1", diff --git a/packages/integration-sdk-entities/package.json b/packages/integration-sdk-entities/package.json index abd22eacc..64de40673 100644 --- a/packages/integration-sdk-entities/package.json +++ b/packages/integration-sdk-entities/package.json @@ -1,6 +1,6 @@ { "name": "@jupiterone/integration-sdk-entities", - "version": "12.7.0", + "version": "12.7.1", "description": "Generated types for the JupiterOne data-model", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", diff --git a/packages/integration-sdk-entity-validator/package.json b/packages/integration-sdk-entity-validator/package.json index a31da1a58..947b3aadd 100644 --- a/packages/integration-sdk-entity-validator/package.json +++ b/packages/integration-sdk-entity-validator/package.json @@ -1,6 +1,6 @@ { "name": "@jupiterone/integration-sdk-entity-validator", - "version": "12.7.0", + "version": "12.7.1", "description": "Validator for JupiterOne integration entities", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", diff --git a/packages/integration-sdk-http-client/package.json b/packages/integration-sdk-http-client/package.json index 1d224021d..2cf9857ac 100644 --- a/packages/integration-sdk-http-client/package.json +++ b/packages/integration-sdk-http-client/package.json @@ -1,6 +1,6 @@ { "name": "@jupiterone/integration-sdk-http-client", - "version": "12.7.0", + "version": "12.7.1", "description": "The HTTP client for use in JupiterOne integrations", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,15 +24,15 @@ }, "dependencies": { "@jupiterone/hierarchical-token-bucket": "^0.3.1", - "@jupiterone/integration-sdk-core": "^12.7.0", + "@jupiterone/integration-sdk-core": "^12.7.1", "@lifeomic/attempt": "^3.0.3", "form-data": "^4.0.0", "lodash": "^4.17.21", "node-fetch": "^2.7.0" }, "devDependencies": { - "@jupiterone/integration-sdk-dev-tools": "^12.7.0", - "@jupiterone/integration-sdk-private-test-utils": "^12.7.0", + "@jupiterone/integration-sdk-dev-tools": "^12.7.1", + "@jupiterone/integration-sdk-private-test-utils": "^12.7.1", "@types/node-fetch": "^2.6.11" }, "bugs": { diff --git a/packages/integration-sdk-private-test-utils/package.json b/packages/integration-sdk-private-test-utils/package.json index 0b140d795..f77497956 100644 --- a/packages/integration-sdk-private-test-utils/package.json +++ b/packages/integration-sdk-private-test-utils/package.json @@ -1,7 +1,7 @@ { "name": "@jupiterone/integration-sdk-private-test-utils", "private": true, - "version": "12.7.0", + "version": "12.7.1", "description": "The SDK for developing JupiterOne integrations", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -15,7 +15,7 @@ "build:dist": "tsc -p tsconfig.json --declaration" }, "dependencies": { - "@jupiterone/integration-sdk-core": "^12.7.0", + "@jupiterone/integration-sdk-core": "^12.7.1", "lodash": "^4.17.15" }, "devDependencies": { diff --git a/packages/integration-sdk-runtime/package.json b/packages/integration-sdk-runtime/package.json index 7630a715d..935cc10f9 100644 --- a/packages/integration-sdk-runtime/package.json +++ b/packages/integration-sdk-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@jupiterone/integration-sdk-runtime", - "version": "12.7.0", + "version": "12.7.1", "description": "The SDK for developing JupiterOne integrations", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ "prepack": "yarn build:dist" }, "dependencies": { - "@jupiterone/integration-sdk-core": "^12.7.0", + "@jupiterone/integration-sdk-core": "^12.7.1", "@lifeomic/alpha": "^5.2.0", "@lifeomic/attempt": "^3.0.3", "async-sema": "^3.1.0", @@ -40,7 +40,7 @@ "rimraf": "^3.0.2" }, "devDependencies": { - "@jupiterone/integration-sdk-private-test-utils": "^12.7.0", + "@jupiterone/integration-sdk-private-test-utils": "^12.7.1", "get-port": "^5.1.1", "lmdb": "^3.0.8", "memfs": "^3.2.0", diff --git a/packages/integration-sdk-testing/package.json b/packages/integration-sdk-testing/package.json index fed307135..b76e396f8 100644 --- a/packages/integration-sdk-testing/package.json +++ b/packages/integration-sdk-testing/package.json @@ -1,6 +1,6 @@ { "name": "@jupiterone/integration-sdk-testing", - "version": "12.7.0", + "version": "12.7.1", "description": "Testing utilities for JupiterOne integrations", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,8 +23,8 @@ "prepack": "yarn build:dist" }, "dependencies": { - "@jupiterone/integration-sdk-core": "^12.7.0", - "@jupiterone/integration-sdk-runtime": "^12.7.0", + "@jupiterone/integration-sdk-core": "^12.7.1", + "@jupiterone/integration-sdk-runtime": "^12.7.1", "@pollyjs/adapter-node-http": "^6.0.5", "@pollyjs/core": "^6.0.5", "@pollyjs/persister-fs": "^6.0.5", @@ -32,7 +32,7 @@ "lodash": "^4.17.15" }, "devDependencies": { - "@jupiterone/integration-sdk-private-test-utils": "^12.7.0", + "@jupiterone/integration-sdk-private-test-utils": "^12.7.1", "@types/lodash": "^4.14.149", "get-port": "^5.1.1", "memfs": "^3.2.0"