diff --git a/bklog/web/package-lock.json b/bklog/web/package-lock.json index ff9a833e5c..a1ff907042 100644 --- a/bklog/web/package-lock.json +++ b/bklog/web/package-lock.json @@ -27,13 +27,6 @@ "@codemirror/language": "6.10.2", "@codemirror/state": "6.4.1", "@codemirror/view": "6.33.0", - "@opentelemetry/api": "1.8.0", - "@opentelemetry/context-zone": "1.23.0", - "@opentelemetry/instrumentation": "0.50.0", - "@opentelemetry/instrumentation-http": "0.50.0", - "@opentelemetry/instrumentation-xml-http-request": "0.50.0", - "@opentelemetry/sdk-trace-base": "1.23.0", - "@opentelemetry/sdk-trace-web": "1.23.0", "@vue/babel-helper-vue-jsx-merge-props": "1.4.0", "@vue/babel-preset-jsx": "1.4.0", "axios": "1.6.0", @@ -4247,171 +4240,6 @@ "node": ">= 8" } }, - "node_modules/@opentelemetry/api": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.8.0.tgz", - "integrity": "sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/api-logs": { - "version": "0.50.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.50.0.tgz", - "integrity": "sha512-JdZuKrhOYggqOpUljAq4WWNi5nB10PmgoF0y2CvedLGXd0kSawb/UBnWT8gg1ND3bHCNHStAIVT0ELlxJJRqrA==", - "dependencies": { - "@opentelemetry/api": "^1.0.0" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/@opentelemetry/context-zone": { - "version": "1.23.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-zone/-/context-zone-1.23.0.tgz", - "integrity": "sha512-7piNTrpH+gZNMDDOHIJXCSwp0Xslh3R96HWH5HwXw+4PykR4+jVoXvd6jziQxudX9rFAfu2B64A10DHs4ZWrfA==", - "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.23.0", - "zone.js": "^0.11.0 || ^0.13.0 || ^0.14.0" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/@opentelemetry/context-zone-peer-dep": { - "version": "1.23.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-zone-peer-dep/-/context-zone-peer-dep-1.23.0.tgz", - "integrity": "sha512-3ia5w2y3CGHIhMSggttliGbeRBWclIyMMXdfRCcit1NHg1ocieA9qYxyUEetbOvPrQpoti3O3k+5eyQUv7r8nw==", - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.9.0", - "zone.js": "^0.10.2 || ^0.11.0 || ^0.13.0 || ^0.14.0" - } - }, - "node_modules/@opentelemetry/core": { - "version": "1.23.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.23.0.tgz", - "integrity": "sha512-hdQ/a9TMzMQF/BO8Cz1juA43/L5YGtCSiKoOHmrTEf7VMDAZgy8ucpWx3eQTnQ3gBloRcWtzvcrMZABC3PTSKQ==", - "dependencies": { - "@opentelemetry/semantic-conventions": "1.23.0" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.9.0" - } - }, - "node_modules/@opentelemetry/instrumentation": { - "version": "0.50.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.50.0.tgz", - "integrity": "sha512-bhGhbJiZKpuu7wTaSak4hyZcFPlnDeuSF/2vglze8B4w2LubcSbbOnkVTzTs5SXtzh4Xz8eRjaNnAm+u2GYufQ==", - "dependencies": { - "@opentelemetry/api-logs": "0.50.0", - "@types/shimmer": "^1.0.2", - "import-in-the-middle": "1.7.1", - "require-in-the-middle": "^7.1.1", - "semver": "^7.5.2", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, - "node_modules/@opentelemetry/instrumentation-http": { - "version": "0.50.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-http/-/instrumentation-http-0.50.0.tgz", - "integrity": "sha512-bsd6Nv0FtN9C6M6vX/kgPzvJY9UhJc4CZZNvqDbsfVQv3/MWvPrYgthf41AhrehqeDnpfn/QGzNKtdWUduGanQ==", - "dependencies": { - "@opentelemetry/core": "1.23.0", - "@opentelemetry/instrumentation": "0.50.0", - "@opentelemetry/semantic-conventions": "1.23.0", - "semver": "^7.5.2" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, - "node_modules/@opentelemetry/instrumentation-xml-http-request": { - "version": "0.50.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-xml-http-request/-/instrumentation-xml-http-request-0.50.0.tgz", - "integrity": "sha512-o9z6SDQByqc3GvmUcy6Npt/SAIrv2Pk0Hm0Hl54B3Ny8WUrTsrlt6MULx8d+EjuifE4uVo8op8DekmvKJ1FHoQ==", - "dependencies": { - "@opentelemetry/core": "1.23.0", - "@opentelemetry/instrumentation": "0.50.0", - "@opentelemetry/sdk-trace-web": "1.23.0", - "@opentelemetry/semantic-conventions": "1.23.0" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - } - }, - "node_modules/@opentelemetry/resources": { - "version": "1.23.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.23.0.tgz", - "integrity": "sha512-iPRLfVfcEQynYGo7e4Di+ti+YQTAY0h5mQEUJcHlU9JOqpb4x965O6PZ+wMcwYVY63G96KtdS86YCM1BF1vQZg==", - "dependencies": { - "@opentelemetry/core": "1.23.0", - "@opentelemetry/semantic-conventions": "1.23.0" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.9.0" - } - }, - "node_modules/@opentelemetry/sdk-trace-base": { - "version": "1.23.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.23.0.tgz", - "integrity": "sha512-PzBmZM8hBomUqvCddF/5Olyyviayka44O5nDWq673np3ctnvwMOvNrsUORZjKja1zJbwEuD9niAGbnVrz3jwRQ==", - "dependencies": { - "@opentelemetry/core": "1.23.0", - "@opentelemetry/resources": "1.23.0", - "@opentelemetry/semantic-conventions": "1.23.0" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.9.0" - } - }, - "node_modules/@opentelemetry/sdk-trace-web": { - "version": "1.23.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-web/-/sdk-trace-web-1.23.0.tgz", - "integrity": "sha512-tx9N3hIkd6k567BeujBnpXYdhu3ptYVk0ZkhdcjyQ3I8ZDJ+/JkVtaVNLAuf8hp1buTqNDmxSipALMxEmK2fnw==", - "dependencies": { - "@opentelemetry/core": "1.23.0", - "@opentelemetry/sdk-trace-base": "1.23.0", - "@opentelemetry/semantic-conventions": "1.23.0" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.9.0" - } - }, - "node_modules/@opentelemetry/semantic-conventions": { - "version": "1.23.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.23.0.tgz", - "integrity": "sha512-MiqFvfOzfR31t8cc74CTP1OZfz7MbqpAnLCra8NqQoaHJX6ncIRTdYOQYBDQ2uFISDq0WY8Y9dDTWvsgzzBYRg==", - "engines": { - "node": ">=14" - } - }, "node_modules/@parcel/watcher": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz", @@ -4801,11 +4629,6 @@ "@types/send": "*" } }, - "node_modules/@types/shimmer": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.2.0.tgz", - "integrity": "sha512-UE7oxhQLLd9gub6JKIAhDq06T0F6FnztwMNRvYgjeQSBeMc1ZG/tA47EwfduvkuQS8apbkM/lpLpWsaCeYsXVg==" - }, "node_modules/@types/sockjs": { "version": "0.3.36", "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz", @@ -5593,15 +5416,6 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-import-assertions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", - "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", - "deprecated": "package has been renamed to acorn-import-attributes", - "peerDependencies": { - "acorn": "^8" - } - }, "node_modules/acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", @@ -6674,11 +6488,6 @@ "node": ">=8" } }, - "node_modules/cjs-module-lexer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz", - "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==" - }, "node_modules/class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", @@ -10807,17 +10616,6 @@ "node": ">=4" } }, - "node_modules/import-in-the-middle": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.1.tgz", - "integrity": "sha512-1LrZPDtW+atAxH42S6288qyDFNQ2YCty+2mxEPRtfazH6Z5QwkaBSTS2ods7hnVJioF6rkRfNoA6A/MstpFXLg==", - "dependencies": { - "acorn": "^8.8.2", - "acorn-import-assertions": "^1.9.0", - "cjs-module-lexer": "^1.2.2", - "module-details-from-path": "^1.0.3" - } - }, "node_modules/import-local": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", @@ -12727,11 +12525,6 @@ "node": ">=10" } }, - "node_modules/module-details-from-path": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz", - "integrity": "sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==" - }, "node_modules/monaco-editor": { "version": "0.33.0", "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.33.0.tgz", @@ -16429,19 +16222,6 @@ "node": ">=0.10.0" } }, - "node_modules/require-in-the-middle": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-7.4.0.tgz", - "integrity": "sha512-X34iHADNbNDfr6OTStIAHWSAvvKQRYgLO6duASaVf7J2VA3lvmNYboAHOuLC2huav1IwgZJtyEcJCKVzFxOSMQ==", - "dependencies": { - "debug": "^4.3.5", - "module-details-from-path": "^1.0.3", - "resolve": "^1.22.8" - }, - "engines": { - "node": ">=8.6.0" - } - }, "node_modules/requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -17078,11 +16858,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/shimmer": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz", - "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==" - }, "node_modules/side-channel": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", @@ -21316,11 +21091,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/zone.js": { - "version": "0.14.10", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.10.tgz", - "integrity": "sha512-YGAhaO7J5ywOXW6InXNlLmfU194F8lVgu7bRntUF3TiG8Y3nBK0x1UJJuHUP/e8IyihkjCYqhCScpSwnlaSRkQ==" - }, "node_modules/zrender": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.6.0.tgz", diff --git a/bklog/web/package.json b/bklog/web/package.json index e200fc3df8..cdf136df31 100644 --- a/bklog/web/package.json +++ b/bklog/web/package.json @@ -39,13 +39,7 @@ "@codemirror/language": "6.10.2", "@codemirror/state": "6.4.1", "@codemirror/view": "6.33.0", - "@opentelemetry/api": "1.8.0", - "@opentelemetry/context-zone": "1.23.0", - "@opentelemetry/instrumentation": "0.50.0", - "@opentelemetry/instrumentation-http": "0.50.0", - "@opentelemetry/instrumentation-xml-http-request": "0.50.0", - "@opentelemetry/sdk-trace-base": "1.23.0", - "@opentelemetry/sdk-trace-web": "1.23.0", + "@vue/babel-helper-vue-jsx-merge-props": "1.4.0", "@vue/babel-preset-jsx": "1.4.0", "axios": "1.6.0", diff --git a/bklog/web/src/api/index.js b/bklog/web/src/api/index.js index c4bb226e89..2473a09031 100644 --- a/bklog/web/src/api/index.js +++ b/bklog/web/src/api/index.js @@ -38,7 +38,6 @@ import { makeMessage } from '@/common/util'; import i18n from '@/language/i18n'; import serviceList from '@/services/index.js'; import { showLoginModal } from '@blueking/login-modal'; -import { context, trace } from '@opentelemetry/api'; import axios from 'axios'; import { random } from '../common/util'; @@ -70,11 +69,11 @@ axiosInstance.interceptors.request.use( if (window.IS_EXTERNAL && JSON.parse(window.IS_EXTERNAL) && store.state.spaceUid) { config.headers['X-Bk-Space-Uid'] = store.state.spaceUid; } - if (window.__IS_MONITOR_COMPONENT__) { + // if (window.__IS_MONITOR_COMPONENT__) { // 监控上层并没有使用 OT 这里直接自己生成traceparent id const traceparent = `00-${random(32, 'abcdef0123456789')}-${random(16, 'abcdef0123456789')}-01`; config.headers.Traceparent = traceparent; - } + // } return config; }, error => Promise.reject(error), @@ -150,17 +149,15 @@ async function getPromise(method, url, data, userConfig = {}) { } promise = new Promise(async (resolve, reject) => { - context.with(trace.setSpan(context.active(), config.span), async () => { - try { - const axiosRequest = http.$request.request(url, data, config); - const response = await axiosRequest; - Object.assign(config, response.config || {}); - handleResponse({ config, response, resolve, reject }); - } catch (error) { - Object.assign(config, error.config); - reject(error); + try { + const axiosRequest = http.$request.request(url, data, config); + const response = await axiosRequest; + Object.assign(config, response.config || {}); + handleResponse({ config, response, resolve, reject }); + } catch (error) { + Object.assign(config, error.config); + reject(error); } - }); }).catch(error => handleReject(error, config)); // 添加请求队列 @@ -210,8 +207,8 @@ function handleReject(error, config) { // const service = getHttpService(url, serviceList); // const ajaxUrl = service ? service.url : ''; // console.error('Request error UrlPath：', ajaxUrl); - const traceparent = config.span._spanContext.traceId; + const traceparent = config?.headers?.traceparent; http.queue.delete(config.requestId); // 捕获 http status 错误 @@ -289,12 +286,11 @@ function handleReject(error, config) { */ function initConfig(method, url, userConfig) { // const traceparent = `00-${random(32, 'abcdef0123456789')}-${random(16, 'abcdef0123456789')}-01`; - // const copyUserConfig = Object.assign({}, userConfig ?? {}); + const copyUserConfig = Object.assign({}, userConfig ?? {}); // copyUserConfig.headers = { // ...(userConfig.headers ?? {}), // traceparent, // }; - const defaultConfig = { ...getCancelToken(), // http 请求默认 id @@ -313,9 +309,8 @@ function initConfig(method, url, userConfig) { cancelPrevious: true, // 接口报错是否弹bkMessage弹窗 catchIsShowMessage: true, - span: trace.getTracer('bk-log').startSpan('api'), }; - return Object.assign(defaultConfig, userConfig); + return Object.assign(defaultConfig, copyUserConfig); } /** diff --git a/bklog/web/src/common/util.js b/bklog/web/src/common/util.js index 988d634e05..939ef9b8b8 100644 --- a/bklog/web/src/common/util.js +++ b/bklog/web/src/common/util.js @@ -669,13 +669,13 @@ export const makeMessage = (message, traceId) => { ${traceId || '--'} ： ${message} `; - message && - console.log(` - ------------------【日志】------------------ - 【TraceID】：${traceId} - 【Message】：${message} - ---------------------------------------------- - `); + // message && + // console.log(` + // ------------------【日志】------------------ + // 【TraceID】：${traceId} + // 【Message】：${message} + // ---------------------------------------------- + // `); return resMsg; }; diff --git a/bklog/web/src/main.js b/bklog/web/src/main.js index 0afd44074a..b3d62b57f2 100644 --- a/bklog/web/src/main.js +++ b/bklog/web/src/main.js @@ -31,11 +31,7 @@ import Vue from 'vue'; import LogButton from '@/components/log-button'; import i18n from '@/language/i18n'; import docsLinkMixin from '@/mixins/docs-link-mixin'; -import { ZoneContextManager } from '@opentelemetry/context-zone'; -import { registerInstrumentations } from '@opentelemetry/instrumentation'; -import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request'; -// 接入OTLP -import { WebTracerProvider } from '@opentelemetry/sdk-trace-web'; + import { debounce } from 'lodash'; import App from './App'; @@ -50,20 +46,7 @@ import store from './store'; import './static/style.css'; -const provider = new WebTracerProvider(); -provider.register({ - contextManager: new ZoneContextManager(), -}); -registerInstrumentations({ - instrumentations: [ - new XMLHttpRequestInstrumentation({ - // propagateTraceHeaderCorsUrls: new RegExp('.*'), - }), - ], -}); -const tracer = provider.getTracer('bk-log'); Vue.prototype.$renderHeader = renderHeader; -Vue.prototype.tracer = tracer; try { const id = window.TAM_AEGIS_KEY; diff --git a/bklog/web/src/store/index.js b/bklog/web/src/store/index.js index 30317529d7..f9a6ee4cc4 100644 --- a/bklog/web/src/store/index.js +++ b/bklog/web/src/store/index.js @@ -41,7 +41,8 @@ import { getStorageIndexItem, } from '@/common/util'; import { handleTransformToTimestamp } from '@/components/time-range/utils'; -import axios from 'axios'; +// import axios from 'axios'; +import { axiosInstance } from '@/api'; import Vuex from 'vuex'; import { deepClone } from '../components/monitor-echarts/utils'; @@ -1201,7 +1202,7 @@ const store = new Vuex.Store({ }; } - return axios(params) + return axiosInstance(params) .then(resp => { if (resp.data && !resp.message) { return readBlobRespToJson(resp.data).then(({ code, data, result, message }) => { diff --git a/bklog/web/webpack.config.js b/bklog/web/webpack.config.js index 092622f276..8b17e73a0d 100644 --- a/bklog/web/webpack.config.js +++ b/bklog/web/webpack.config.js @@ -83,10 +83,7 @@ const logPluginConfig = { window.BCS_WEB_CONSOLE_DOMAIN = '\${BCS_WEB_CONSOLE_DOMAIN}' window.VERSION = '\${VERSION}' window.BK_SHARED_RES_URL = '\${BK_SHARED_RES_URL}' - - % if TAM_AEGIS_KEY != "" : - - % endif\n`, + `, }; if (fs.existsSync(path.resolve(__dirname, './local.settings.js'))) { const localConfig = require('./local.settings');