Browse Source

disable otel

liubing 1 month ago
parent
commit
ebb6193602
3 changed files with 6 additions and 39 deletions
  1. 1 1
      src/settings.js
  2. 2 38
      src/utils/tracing.js
  3. 3 0
      src/views/disposition/index.vue

+ 1 - 1
src/settings.js

@@ -41,6 +41,6 @@ module.exports = {
   //dark light
   themeStyle: 'dark',
 
-  enableOTEL: true,
+  enableOTEL: false,
   otelCollectorURL: 'http://otel-collector.cestong.com.cn/v1/traces'
 }

+ 2 - 38
src/utils/tracing.js

@@ -18,42 +18,6 @@ import promise from 'es6-promise';
 import {W3CTraceContextPropagator} from "@opentelemetry/core";
 
 promise.polyfill();
-
-const testSendSpan = (tracer) => {
-  tracer.startActiveSpan('main', (span) => {
-    for (let i = 0; i < 10; i += 1) {
-      console.log(i);
-    }
-
-    //一定要写end()方法结束
-    span.end();
-  });
-
-  const mainWork = () => {
-    tracer.startActiveSpan('box', (parentSpan) => {
-      for (let i = 0; i < 3; i += 1) {
-        doWork(i);
-      }
-      // Be sure to end the parent span!
-      parentSpan.end();
-    });
-  };
-
-  const doWork = (i) => {
-    tracer.startActiveSpan(`doWork:${i}`, (span) => {
-      // simulate some random work.
-      for (let i = 0; i <= Math.floor(Math.random() * 40000000); i += 1) {
-        // empty
-      }
-
-      // Make sure to end this child span! If you don't,
-      // it will continue to track work beyond 'doWork'!
-      span.end();
-    });
-  };
-}
-
-
 let tracer;
 const initOTELReport = (collectorURL) => {
   const resource =
@@ -61,13 +25,13 @@ const initOTELReport = (collectorURL) => {
       new Resource({
         [ATTR_SERVICE_NAME]: "ob-front",
         [ATTR_SERVICE_VERSION]: "0.1.0",
+        "process.command_line":"OBSERVE",
       })
     );
 
   const provider = new WebTracerProvider({
     resource: resource,
     spanProcessors: [
-      new SimpleSpanProcessor(new ConsoleSpanExporter()),
       new BatchSpanProcessor(new OTLPTraceExporter({
         url: collectorURL,
         headers: {}
@@ -136,7 +100,7 @@ function spanSendInterceptorResponse(response) {
       span.end();
     })
   }
-  return response.data;
+  return response;
 }
 
 function spanSendInterceptorError(error) {

+ 3 - 0
src/views/disposition/index.vue

@@ -414,6 +414,7 @@ export default {
   },
   methods: {
     unbindServiceFromApp(row) {
+      this.serviceFilterKeyword = ""
       if (this.form.serviceNotIncluded.findIndex(({serviceName, appName}) => {
         return serviceName === row.serviceName
       }) < 0) {
@@ -425,6 +426,7 @@ export default {
       this.form.serviceIncluded.splice(index, index !== -1 ? 1 : 0)
     },
     pickService(row) {
+      this.serviceFilterKeyword = ""
       this.form.serviceIncluded.push(row)
       const index = this.form.serviceNotIncluded.findIndex(e => {
         return e.serviceName === row.serviceName
@@ -496,6 +498,7 @@ export default {
     },
     // 表单重置
     reset() {
+      this.serviceFilterKeyword = ""
       this.form = {
         id: undefined,
         name: undefined,