@superblocksteam/sdk 2.0.22-next.0 → 2.0.22-next.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/telemetry/attributes.d.ts +1 -0
- package/dist/telemetry/attributes.d.ts.map +1 -1
- package/dist/telemetry/attributes.js +23 -0
- package/dist/telemetry/attributes.js.map +1 -1
- package/dist/telemetry/index.d.ts.map +1 -1
- package/dist/telemetry/index.js +7 -6
- package/dist/telemetry/index.js.map +1 -1
- package/package.json +5 -5
- package/src/telemetry/attributes.ts +18 -0
- package/src/telemetry/index.ts +12 -5
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -4,4 +4,5 @@ export declare const ATTR_SUPERBLOCKS_CLI_TOKEN = "superblocks.cli_token";
|
|
|
4
4
|
export declare const ATTR_SUPERBLOCKS_IS_CSB = "superblocks.is_csb";
|
|
5
5
|
export declare const ATTR_SUPERBLOCKS_USER_ID = "user-id";
|
|
6
6
|
export declare const ATTR_SUPERBLOCKS_CSB_ID = "csb_id";
|
|
7
|
+
export declare function getEnvironmentFromHostname(hostname: string): string;
|
|
7
8
|
//# sourceMappingURL=attributes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attributes.d.ts","sourceRoot":"","sources":["../../src/telemetry/attributes.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,2BAA2B,2BAA2B,CAAC;AAEpE,eAAO,MAAM,yBAAyB,yBAAyB,CAAC;AAChE,eAAO,MAAM,0BAA0B,0BAA0B,CAAC;AAClE,eAAO,MAAM,uBAAuB,uBAAuB,CAAC;AAC5D,eAAO,MAAM,wBAAwB,YAAY,CAAC;AAClD,eAAO,MAAM,uBAAuB,WAAW,CAAC"}
|
|
1
|
+
{"version":3,"file":"attributes.d.ts","sourceRoot":"","sources":["../../src/telemetry/attributes.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,2BAA2B,2BAA2B,CAAC;AAEpE,eAAO,MAAM,yBAAyB,yBAAyB,CAAC;AAChE,eAAO,MAAM,0BAA0B,0BAA0B,CAAC;AAClE,eAAO,MAAM,uBAAuB,uBAAuB,CAAC;AAC5D,eAAO,MAAM,wBAAwB,YAAY,CAAC;AAClD,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAEhD,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAgBnE"}
|
|
@@ -6,4 +6,27 @@ export const ATTR_SUPERBLOCKS_CLI_TOKEN = "superblocks.cli_token";
|
|
|
6
6
|
export const ATTR_SUPERBLOCKS_IS_CSB = "superblocks.is_csb";
|
|
7
7
|
export const ATTR_SUPERBLOCKS_USER_ID = "user-id";
|
|
8
8
|
export const ATTR_SUPERBLOCKS_CSB_ID = "csb_id";
|
|
9
|
+
export function getEnvironmentFromHostname(hostname) {
|
|
10
|
+
if (hostname.match(/^https:\/\/app\.superblocks(?:hq)?\.com/)) {
|
|
11
|
+
return "prod";
|
|
12
|
+
}
|
|
13
|
+
else if (hostname.match(/^https:\/\/eu\.superblocks(?:hq)?\.com/)) {
|
|
14
|
+
return "prod-eu";
|
|
15
|
+
}
|
|
16
|
+
else if (hostname.match(/^https:\/\/staging\.superblocks(?:hq)?\.com/)) {
|
|
17
|
+
return "staging";
|
|
18
|
+
}
|
|
19
|
+
else if (hostname.match(/^https:\/\/dev\.superblocks(?:hq)?\.com/)) {
|
|
20
|
+
return "dev";
|
|
21
|
+
}
|
|
22
|
+
else if (hostname.match(/^https:\/\/pr-[0-9]+\.superblocks(?:hq)?\.dev/)) {
|
|
23
|
+
return "ephemeral";
|
|
24
|
+
}
|
|
25
|
+
else if (hostname.match(/^http:\/\/localhost/)) {
|
|
26
|
+
return "local";
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
return "other";
|
|
30
|
+
}
|
|
31
|
+
}
|
|
9
32
|
//# sourceMappingURL=attributes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attributes.js","sourceRoot":"","sources":["../../src/telemetry/attributes.ts"],"names":[],"mappings":"AAAA,8KAA8K;AAC9K,MAAM,CAAC,MAAM,2BAA2B,GAAG,wBAAwB,CAAC;AACpE,yGAAyG;AACzG,MAAM,CAAC,MAAM,yBAAyB,GAAG,sBAAsB,CAAC;AAChE,MAAM,CAAC,MAAM,0BAA0B,GAAG,uBAAuB,CAAC;AAClE,MAAM,CAAC,MAAM,uBAAuB,GAAG,oBAAoB,CAAC;AAC5D,MAAM,CAAC,MAAM,wBAAwB,GAAG,SAAS,CAAC;AAClD,MAAM,CAAC,MAAM,uBAAuB,GAAG,QAAQ,CAAC"}
|
|
1
|
+
{"version":3,"file":"attributes.js","sourceRoot":"","sources":["../../src/telemetry/attributes.ts"],"names":[],"mappings":"AAAA,8KAA8K;AAC9K,MAAM,CAAC,MAAM,2BAA2B,GAAG,wBAAwB,CAAC;AACpE,yGAAyG;AACzG,MAAM,CAAC,MAAM,yBAAyB,GAAG,sBAAsB,CAAC;AAChE,MAAM,CAAC,MAAM,0BAA0B,GAAG,uBAAuB,CAAC;AAClE,MAAM,CAAC,MAAM,uBAAuB,GAAG,oBAAoB,CAAC;AAC5D,MAAM,CAAC,MAAM,wBAAwB,GAAG,SAAS,CAAC;AAClD,MAAM,CAAC,MAAM,uBAAuB,GAAG,QAAQ,CAAC;AAEhD,MAAM,UAAU,0BAA0B,CAAC,QAAgB;IACzD,IAAI,QAAQ,CAAC,KAAK,CAAC,yCAAyC,CAAC,EAAE,CAAC;QAC9D,OAAO,MAAM,CAAC;IAChB,CAAC;SAAM,IAAI,QAAQ,CAAC,KAAK,CAAC,wCAAwC,CAAC,EAAE,CAAC;QACpE,OAAO,SAAS,CAAC;IACnB,CAAC;SAAM,IAAI,QAAQ,CAAC,KAAK,CAAC,6CAA6C,CAAC,EAAE,CAAC;QACzE,OAAO,SAAS,CAAC;IACnB,CAAC;SAAM,IAAI,QAAQ,CAAC,KAAK,CAAC,yCAAyC,CAAC,EAAE,CAAC;QACrE,OAAO,KAAK,CAAC;IACf,CAAC;SAAM,IAAI,QAAQ,CAAC,KAAK,CAAC,+CAA+C,CAAC,EAAE,CAAC;QAC3E,OAAO,WAAW,CAAC;IACrB,CAAC;SAAM,IAAI,QAAQ,CAAC,KAAK,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACjD,OAAO,OAAO,CAAC;IACjB,CAAC;SAAM,CAAC;QACN,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/telemetry/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/telemetry/index.ts"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EAAE,2CAA2C,EAAE,MAAM,mBAAmB,CAAC;AACrF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AActD,wBAAsB,kBAAkB,CACtC,iBAAiB,CAAC,EAAE,2CAA2C,iBA8EhE;AAED,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED,wBAAgB,SAAS,IAAI,MAAM,CAElC"}
|
package/dist/telemetry/index.js
CHANGED
|
@@ -7,11 +7,11 @@ import { ExpressInstrumentation } from "@opentelemetry/instrumentation-express";
|
|
|
7
7
|
import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
|
|
8
8
|
import { Resource } from "@opentelemetry/resources";
|
|
9
9
|
import { NodeSDK, logs, api } from "@opentelemetry/sdk-node";
|
|
10
|
-
import { ATTR_SERVICE_NAME } from "@opentelemetry/semantic-conventions";
|
|
10
|
+
import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION, } from "@opentelemetry/semantic-conventions";
|
|
11
11
|
import { OBS_TAG_APPLICATION_ID, OBS_TAG_BRANCH, OBS_TAG_ORG_ID, OBS_TAG_USER_EMAIL, } from "@superblocksteam/shared";
|
|
12
12
|
import ddTrace from "dd-trace";
|
|
13
13
|
import packageJson from "../../package.json" with { type: "json" };
|
|
14
|
-
import { ATTR_DEPLOYMENT_ENVIRONMENT, ATTR_SUPERBLOCKS_BASE_URL, ATTR_SUPERBLOCKS_CLI_TOKEN, ATTR_SUPERBLOCKS_CSB_ID, ATTR_SUPERBLOCKS_IS_CSB, ATTR_SUPERBLOCKS_USER_ID, } from "./attributes.js";
|
|
14
|
+
import { ATTR_DEPLOYMENT_ENVIRONMENT, ATTR_SUPERBLOCKS_BASE_URL, ATTR_SUPERBLOCKS_CLI_TOKEN, ATTR_SUPERBLOCKS_CSB_ID, ATTR_SUPERBLOCKS_IS_CSB, ATTR_SUPERBLOCKS_USER_ID, getEnvironmentFromHostname, } from "./attributes.js";
|
|
15
15
|
import { getConfiguration, SERVICE_NAME } from "./util.js";
|
|
16
16
|
let config = undefined;
|
|
17
17
|
let configured = false;
|
|
@@ -45,13 +45,13 @@ export async function configureTelemetry(applicationConfig) {
|
|
|
45
45
|
// NOTE: @joeyagreco - "There is currently no way to define a retention filter directly for “LLM apps” unless those apps are associated with a specific service tag."
|
|
46
46
|
const SERVICE_NAME_LLM = "superblocks-ai-code-gen";
|
|
47
47
|
ddTrace.init({
|
|
48
|
-
env:
|
|
48
|
+
env: getEnvironmentFromHostname(config.superblocksHostname),
|
|
49
49
|
service: SERVICE_NAME_LLM,
|
|
50
50
|
version: packageJson.version,
|
|
51
51
|
plugins: false,
|
|
52
52
|
tags: {
|
|
53
|
-
[ATTR_SUPERBLOCKS_BASE_URL]: config
|
|
54
|
-
[ATTR_SUPERBLOCKS_CLI_TOKEN]: config
|
|
53
|
+
[ATTR_SUPERBLOCKS_BASE_URL]: config.superblocksHostname,
|
|
54
|
+
[ATTR_SUPERBLOCKS_CLI_TOKEN]: config.token,
|
|
55
55
|
[ATTR_SUPERBLOCKS_IS_CSB]: !!process.env.SUPERBLOCKS_IS_CSB,
|
|
56
56
|
[ATTR_SUPERBLOCKS_CSB_ID]: process.env.SUPERBLOCKS_IS_CSB
|
|
57
57
|
? os.hostname()
|
|
@@ -68,7 +68,8 @@ export async function configureTelemetry(applicationConfig) {
|
|
|
68
68
|
sdkInstance = new NodeSDK({
|
|
69
69
|
resource: Resource.default().merge(new Resource({
|
|
70
70
|
[ATTR_SERVICE_NAME]: config.serviceName,
|
|
71
|
-
[
|
|
71
|
+
[ATTR_SERVICE_VERSION]: packageJson.version,
|
|
72
|
+
[ATTR_DEPLOYMENT_ENVIRONMENT]: getEnvironmentFromHostname(config.superblocksHostname),
|
|
72
73
|
[ATTR_SUPERBLOCKS_BASE_URL]: config.superblocksHostname,
|
|
73
74
|
[ATTR_SUPERBLOCKS_CLI_TOKEN]: config.token,
|
|
74
75
|
[ATTR_SUPERBLOCKS_IS_CSB]: !!process.env.SUPERBLOCKS_IS_CSB,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/telemetry/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,IAAI,IAAI,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,+BAA+B,EAAE,MAAM,oCAAoC,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/telemetry/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@superblocksteam/sdk",
|
|
3
|
-
"version": "2.0.22-next.
|
|
3
|
+
"version": "2.0.22-next.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Superblocks JS SDK",
|
|
6
6
|
"homepage": "https://www.superblocks.com",
|
|
@@ -33,11 +33,11 @@
|
|
|
33
33
|
"@opentelemetry/semantic-conventions": "^1.28.0",
|
|
34
34
|
"@rollup/wasm-node": "^4.35.0",
|
|
35
35
|
"@superblocksteam/bucketeer-sdk": "0.5.0",
|
|
36
|
-
"@superblocksteam/library": "2.0.22-next.
|
|
37
|
-
"@superblocksteam/library-shared": "2.0.22-next.
|
|
36
|
+
"@superblocksteam/library": "2.0.22-next.2",
|
|
37
|
+
"@superblocksteam/library-shared": "2.0.22-next.2",
|
|
38
38
|
"@superblocksteam/shared": "0.9260.0",
|
|
39
|
-
"@superblocksteam/util": "2.0.22-next.
|
|
40
|
-
"@superblocksteam/vite-plugin-file-sync": "2.0.22-next.
|
|
39
|
+
"@superblocksteam/util": "2.0.22-next.2",
|
|
40
|
+
"@superblocksteam/vite-plugin-file-sync": "2.0.22-next.2",
|
|
41
41
|
"@vitejs/plugin-react": "4.3.4",
|
|
42
42
|
"axios": "^1.4.0",
|
|
43
43
|
"chokidar": "^4.0.3",
|
|
@@ -6,3 +6,21 @@ export const ATTR_SUPERBLOCKS_CLI_TOKEN = "superblocks.cli_token";
|
|
|
6
6
|
export const ATTR_SUPERBLOCKS_IS_CSB = "superblocks.is_csb";
|
|
7
7
|
export const ATTR_SUPERBLOCKS_USER_ID = "user-id";
|
|
8
8
|
export const ATTR_SUPERBLOCKS_CSB_ID = "csb_id";
|
|
9
|
+
|
|
10
|
+
export function getEnvironmentFromHostname(hostname: string): string {
|
|
11
|
+
if (hostname.match(/^https:\/\/app\.superblocks(?:hq)?\.com/)) {
|
|
12
|
+
return "prod";
|
|
13
|
+
} else if (hostname.match(/^https:\/\/eu\.superblocks(?:hq)?\.com/)) {
|
|
14
|
+
return "prod-eu";
|
|
15
|
+
} else if (hostname.match(/^https:\/\/staging\.superblocks(?:hq)?\.com/)) {
|
|
16
|
+
return "staging";
|
|
17
|
+
} else if (hostname.match(/^https:\/\/dev\.superblocks(?:hq)?\.com/)) {
|
|
18
|
+
return "dev";
|
|
19
|
+
} else if (hostname.match(/^https:\/\/pr-[0-9]+\.superblocks(?:hq)?\.dev/)) {
|
|
20
|
+
return "ephemeral";
|
|
21
|
+
} else if (hostname.match(/^http:\/\/localhost/)) {
|
|
22
|
+
return "local";
|
|
23
|
+
} else {
|
|
24
|
+
return "other";
|
|
25
|
+
}
|
|
26
|
+
}
|
package/src/telemetry/index.ts
CHANGED
|
@@ -7,7 +7,10 @@ import { ExpressInstrumentation } from "@opentelemetry/instrumentation-express";
|
|
|
7
7
|
import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
|
|
8
8
|
import { Resource } from "@opentelemetry/resources";
|
|
9
9
|
import { NodeSDK, logs, api } from "@opentelemetry/sdk-node";
|
|
10
|
-
import {
|
|
10
|
+
import {
|
|
11
|
+
ATTR_SERVICE_NAME,
|
|
12
|
+
ATTR_SERVICE_VERSION,
|
|
13
|
+
} from "@opentelemetry/semantic-conventions";
|
|
11
14
|
import {
|
|
12
15
|
OBS_TAG_APPLICATION_ID,
|
|
13
16
|
OBS_TAG_BRANCH,
|
|
@@ -23,6 +26,7 @@ import {
|
|
|
23
26
|
ATTR_SUPERBLOCKS_CSB_ID,
|
|
24
27
|
ATTR_SUPERBLOCKS_IS_CSB,
|
|
25
28
|
ATTR_SUPERBLOCKS_USER_ID,
|
|
29
|
+
getEnvironmentFromHostname,
|
|
26
30
|
} from "./attributes.js";
|
|
27
31
|
import { getConfiguration, SERVICE_NAME } from "./util.js";
|
|
28
32
|
import type { ApplicationConfigWithTokenConfigAndUserInfo } from "../types/index.js";
|
|
@@ -65,13 +69,13 @@ export async function configureTelemetry(
|
|
|
65
69
|
// NOTE: @joeyagreco - "There is currently no way to define a retention filter directly for “LLM apps” unless those apps are associated with a specific service tag."
|
|
66
70
|
const SERVICE_NAME_LLM = "superblocks-ai-code-gen";
|
|
67
71
|
ddTrace.init({
|
|
68
|
-
env:
|
|
72
|
+
env: getEnvironmentFromHostname(config.superblocksHostname),
|
|
69
73
|
service: SERVICE_NAME_LLM,
|
|
70
74
|
version: packageJson.version,
|
|
71
75
|
plugins: false,
|
|
72
76
|
tags: {
|
|
73
|
-
[ATTR_SUPERBLOCKS_BASE_URL]: config
|
|
74
|
-
[ATTR_SUPERBLOCKS_CLI_TOKEN]: config
|
|
77
|
+
[ATTR_SUPERBLOCKS_BASE_URL]: config.superblocksHostname,
|
|
78
|
+
[ATTR_SUPERBLOCKS_CLI_TOKEN]: config.token,
|
|
75
79
|
[ATTR_SUPERBLOCKS_IS_CSB]: !!process.env.SUPERBLOCKS_IS_CSB,
|
|
76
80
|
[ATTR_SUPERBLOCKS_CSB_ID]: process.env.SUPERBLOCKS_IS_CSB
|
|
77
81
|
? os.hostname()
|
|
@@ -90,7 +94,10 @@ export async function configureTelemetry(
|
|
|
90
94
|
resource: Resource.default().merge(
|
|
91
95
|
new Resource({
|
|
92
96
|
[ATTR_SERVICE_NAME]: config.serviceName,
|
|
93
|
-
[
|
|
97
|
+
[ATTR_SERVICE_VERSION]: packageJson.version,
|
|
98
|
+
[ATTR_DEPLOYMENT_ENVIRONMENT]: getEnvironmentFromHostname(
|
|
99
|
+
config.superblocksHostname,
|
|
100
|
+
),
|
|
94
101
|
[ATTR_SUPERBLOCKS_BASE_URL]: config.superblocksHostname,
|
|
95
102
|
[ATTR_SUPERBLOCKS_CLI_TOKEN]: config.token,
|
|
96
103
|
[ATTR_SUPERBLOCKS_IS_CSB]: !!process.env.SUPERBLOCKS_IS_CSB,
|