From 3808d74b278510da085ae2b4c962cb900d7a57ea Mon Sep 17 00:00:00 2001 From: Evan Jones Date: Mon, 8 Apr 2024 16:47:46 -0400 Subject: [PATCH] instrument with flagon --- superset-frontend/package-lock.json | 15 +++++++++++++++ superset-frontend/package.json | 1 + .../src/middleware/loggerMiddleware.js | 2 +- superset-frontend/src/views/App.tsx | 8 ++++++++ superset/config.py | 2 ++ 5 files changed, 27 insertions(+), 1 deletion(-) diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index 875cfaff571e7..6641b2ca6adbd 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -70,6 +70,7 @@ "dom-to-pdf": "^0.3.1", "emotion-rgba": "0.0.12", "fast-glob": "^3.2.7", + "flagon-userale": "^2.3.0", "fontsource-fira-code": "^4.0.0", "fs-extra": "^10.0.0", "fuse.js": "^7.0.0", @@ -37138,6 +37139,15 @@ "node": ">=0.10.0" } }, + "node_modules/flagon-userale": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/flagon-userale/-/flagon-userale-2.3.0.tgz", + "integrity": "sha512-1jMxLZyfw1Pv7BruMr+U96SNYCto7iRxZb/zzeo+CQerC22T8zaNKV7p1CwsP2hvpbwaykkIzUHuPz8EnzRcLQ==", + "engines": { + "node": "10.10.0 || 11.10.0 - 12.20.1 || >=13.7.0", + "npm": "6.4.1 || 6.7.0 - 6.12.1 || >=6.13.4" + } + }, "node_modules/flat": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", @@ -100585,6 +100595,11 @@ "readable-stream": "^2.0.2" } }, + "flagon-userale": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/flagon-userale/-/flagon-userale-2.3.0.tgz", + "integrity": "sha512-1jMxLZyfw1Pv7BruMr+U96SNYCto7iRxZb/zzeo+CQerC22T8zaNKV7p1CwsP2hvpbwaykkIzUHuPz8EnzRcLQ==" + }, "flat": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", diff --git a/superset-frontend/package.json b/superset-frontend/package.json index 63214e1ef1bb3..6783a0f2c97bc 100644 --- a/superset-frontend/package.json +++ b/superset-frontend/package.json @@ -136,6 +136,7 @@ "dom-to-pdf": "^0.3.1", "emotion-rgba": "0.0.12", "fast-glob": "^3.2.7", + "flagon-userale": "^2.3.0", "fontsource-fira-code": "^4.0.0", "fs-extra": "^10.0.0", "fuse.js": "^7.0.0", diff --git a/superset-frontend/src/middleware/loggerMiddleware.js b/superset-frontend/src/middleware/loggerMiddleware.js index 5a651095368d1..fabb41a72389d 100644 --- a/superset-frontend/src/middleware/loggerMiddleware.js +++ b/superset-frontend/src/middleware/loggerMiddleware.js @@ -26,7 +26,7 @@ import { LOG_EVENT } from '../logger/actions'; import { LOG_EVENT_TYPE_TIMING } from '../logger/LogUtils'; import DebouncedMessageQueue from '../utils/DebouncedMessageQueue'; -const LOG_ENDPOINT = 'http://userale-test:8000'; +const LOG_ENDPOINT ='http://localhost:8085/topics/superset-logs'; const sendBeacon = events => { if (events.length <= 0) { diff --git a/superset-frontend/src/views/App.tsx b/superset-frontend/src/views/App.tsx index a3c0715f39ea0..d003ea733cf45 100644 --- a/superset-frontend/src/views/App.tsx +++ b/superset-frontend/src/views/App.tsx @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ +import * as userale from 'flagon-userale'; import React, { Suspense, useEffect } from 'react'; import { hot } from 'react-hot-loader/root'; import { @@ -51,6 +52,13 @@ let lastLocationPathname: string; const boundActions = bindActionCreators({ logEvent }, store.dispatch); +userale.options({ + userId: bootstrapData.user?.username, + autostart: true, + url: 'http://localhost:8085/topics/superset', + logDetails: true, +}); + const LocationPathnameLogger = () => { const location = useLocation(); useEffect(() => { diff --git a/superset/config.py b/superset/config.py index 1b06f96db8e71..a33233ed55e8c 100644 --- a/superset/config.py +++ b/superset/config.py @@ -1459,6 +1459,7 @@ def EMAIL_HEADER_MUTATOR( # pylint: disable=invalid-name,unused-argument "'self'", "https://api.mapbox.com", "https://events.mapbox.com", + "http://localhost:*", ], "object-src": "'none'", "style-src": [ @@ -1488,6 +1489,7 @@ def EMAIL_HEADER_MUTATOR( # pylint: disable=invalid-name,unused-argument "'self'", "https://api.mapbox.com", "https://events.mapbox.com", + "http://localhost:*", ], "object-src": "'none'", "style-src": [