This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking-nodejs.git
commit 0a7f7c0eca8f58c6de60f1c54ffa2b41395fac0d Author: kezhenxu94 <kezhenx...@163.com> AuthorDate: Tue Jun 23 11:54:12 2020 +0800 Replace path aliases with relative paths --- src/agent/Buffer.ts | 6 +++--- src/agent/protocol/grpc/AuthInterceptor.ts | 2 +- src/agent/protocol/grpc/GrpcProtocol.ts | 6 +++--- src/agent/protocol/grpc/SegmentObjectAdapter.ts | 8 ++++---- src/agent/protocol/grpc/clients/HeartbeatClient.ts | 14 ++++++------- .../protocol/grpc/clients/TraceReportClient.ts | 14 ++++++------- src/core/PluginInstaller.ts | 8 ++++---- src/index.ts | 10 ++++----- src/plugins/HttpPlugin.ts | 12 +++++------ src/trace/NewID.ts | 2 +- src/trace/context/Context.ts | 8 ++++---- src/trace/context/ContextCarrier.ts | 4 ++-- src/trace/context/ContextManager.ts | 4 ++-- src/trace/context/DummyContext.ts | 16 +++++++-------- src/trace/context/Segment.ts | 8 ++++---- src/trace/context/SegmentRef.ts | 8 ++++---- src/trace/context/Snapshot.ts | 2 +- src/trace/context/SpanContext.ts | 24 +++++++++++----------- src/trace/span/DummySpan.ts | 2 +- src/trace/span/EntrySpan.ts | 12 +++++------ src/trace/span/ExitSpan.ts | 10 ++++----- src/trace/span/LocalSpan.ts | 4 ++-- src/trace/span/Span.ts | 20 +++++++++--------- src/trace/span/StackedSpan.ts | 8 ++++---- tsconfig.json | 21 ++++++++----------- 25 files changed, 115 insertions(+), 118 deletions(-) diff --git a/src/agent/Buffer.ts b/src/agent/Buffer.ts index 022066f..48f6181 100644 --- a/src/agent/Buffer.ts +++ b/src/agent/Buffer.ts @@ -17,9 +17,9 @@ * */ -import { createLogger } from '@/logging'; -import Segment from '@/trace/context/Segment'; -import config from '@/config/AgentConfig'; +import { createLogger } from '../logging'; +import Segment from '../trace/context/Segment'; +import config from '../config/AgentConfig'; const logger = createLogger(__filename); diff --git a/src/agent/protocol/grpc/AuthInterceptor.ts b/src/agent/protocol/grpc/AuthInterceptor.ts index 6b30e1d..e8d12b7 100644 --- a/src/agent/protocol/grpc/AuthInterceptor.ts +++ b/src/agent/protocol/grpc/AuthInterceptor.ts @@ -19,7 +19,7 @@ import * as grpc from 'grpc'; import { InterceptingCall, Listener, Metadata, Requester } from 'grpc'; -import config from '@/config/AgentConfig'; +import config from '../../../config/AgentConfig'; type Options = { [key: string]: string | number } diff --git a/src/agent/protocol/grpc/GrpcProtocol.ts b/src/agent/protocol/grpc/GrpcProtocol.ts index 1597491..f5462f6 100644 --- a/src/agent/protocol/grpc/GrpcProtocol.ts +++ b/src/agent/protocol/grpc/GrpcProtocol.ts @@ -17,9 +17,9 @@ * */ -import Protocol from '@/agent/protocol/Protocol'; -import HeartbeatClient from '@/agent/protocol/grpc/clients/HeartbeatClient'; -import TraceReportClient from '@/agent/protocol/grpc/clients/TraceReportClient'; +import Protocol from '../../../agent/protocol/Protocol'; +import HeartbeatClient from '../../../agent/protocol/grpc/clients/HeartbeatClient'; +import TraceReportClient from '../../../agent/protocol/grpc/clients/TraceReportClient'; export default class GrpcProtocol implements Protocol { diff --git a/src/agent/protocol/grpc/SegmentObjectAdapter.ts b/src/agent/protocol/grpc/SegmentObjectAdapter.ts index 3d57186..3909323 100644 --- a/src/agent/protocol/grpc/SegmentObjectAdapter.ts +++ b/src/agent/protocol/grpc/SegmentObjectAdapter.ts @@ -17,10 +17,10 @@ * */ -import { Log, RefType, SegmentObject, SegmentReference, SpanObject } from '@/proto/language-agent/Tracing_pb'; -import config from '@/config/AgentConfig'; -import { KeyStringValuePair } from '@/proto/common/Common_pb'; -import Segment from '@/trace/context/Segment'; +import { Log, RefType, SegmentObject, SegmentReference, SpanObject } from '../../../proto/language-agent/Tracing_pb'; +import config from '../../../config/AgentConfig'; +import { KeyStringValuePair } from '../../../proto/common/Common_pb'; +import Segment from '../../../trace/context/Segment'; /** * An adapter that adapts {@link Segment} objects to gRPC object {@link SegmentObject}. diff --git a/src/agent/protocol/grpc/clients/HeartbeatClient.ts b/src/agent/protocol/grpc/clients/HeartbeatClient.ts index 9d7d9ad..0bf6169 100644 --- a/src/agent/protocol/grpc/clients/HeartbeatClient.ts +++ b/src/agent/protocol/grpc/clients/HeartbeatClient.ts @@ -18,16 +18,16 @@ */ -import { ManagementServiceClient } from '@/proto/management/Management_grpc_pb'; import * as grpc from 'grpc'; import { connectivityState } from 'grpc'; -import { createLogger } from '@/logging'; -import AuthInterceptor from '@/agent/protocol/grpc/AuthInterceptor'; -import { InstancePingPkg } from '@/proto/management/Management_pb'; -import config from '@/config/AgentConfig'; -import Client from '@/agent/protocol/grpc/clients/Client'; -import * as packageInfo from 'package.json'; +import * as packageInfo from '../../../../../package.json'; +import { createLogger } from '../../../../logging'; +import Client from './Client'; +import { ManagementServiceClient } from '../../../../proto/management/Management_grpc_pb'; +import AuthInterceptor from '../AuthInterceptor'; +import { InstancePingPkg } from '../../../../proto/management/Management_pb'; +import config from '../../../../config/AgentConfig'; const logger = createLogger(__filename); diff --git a/src/agent/protocol/grpc/clients/TraceReportClient.ts b/src/agent/protocol/grpc/clients/TraceReportClient.ts index 92b81d8..585ff2a 100644 --- a/src/agent/protocol/grpc/clients/TraceReportClient.ts +++ b/src/agent/protocol/grpc/clients/TraceReportClient.ts @@ -17,15 +17,15 @@ * */ -import { TraceSegmentReportServiceClient } from '@/proto/language-agent/Tracing_grpc_pb'; -import config from '@/config/AgentConfig'; +import config from '../../../../config/AgentConfig'; import * as grpc from 'grpc'; import { connectivityState } from 'grpc'; -import AuthInterceptor from '@/agent/protocol/grpc/AuthInterceptor'; -import buffer from '@/agent/Buffer'; -import SegmentObjectAdapter from '@/agent/protocol/grpc/SegmentObjectAdapter'; -import { createLogger } from '@/logging'; -import Client from '@/agent/protocol/grpc/clients/Client'; +import { createLogger } from '../../../../logging'; +import Client from './Client'; +import { TraceSegmentReportServiceClient } from '../../../../proto/language-agent/Tracing_grpc_pb'; +import AuthInterceptor from '../AuthInterceptor'; +import buffer from '../../../../agent/Buffer'; +import SegmentObjectAdapter from '../SegmentObjectAdapter'; const logger = createLogger(__filename); diff --git a/src/core/PluginInstaller.ts b/src/core/PluginInstaller.ts index 7a78cdc..ea7cf66 100644 --- a/src/core/PluginInstaller.ts +++ b/src/core/PluginInstaller.ts @@ -17,10 +17,10 @@ * */ -import fs = require('fs'); -import path = require('path'); -import SwPlugin from '@/core/SwPlugin'; -import { createLogger } from '@/logging'; +import * as fs from 'fs'; +import * as path from 'path'; +import SwPlugin from '../core/SwPlugin'; +import { createLogger } from '../logging'; const logger = createLogger(__filename); diff --git a/src/index.ts b/src/index.ts index 260331f..413a8ac 100644 --- a/src/index.ts +++ b/src/index.ts @@ -17,11 +17,11 @@ * */ -import config, { AgentConfig } from '@/config/AgentConfig'; -import GrpcProtocol from '@/agent/protocol/grpc/GrpcProtocol'; -import { createLogger } from '@/logging'; -import Protocol from '@/agent/protocol/Protocol'; -import PluginInstaller from '@/core/PluginInstaller'; +import config, { AgentConfig } from './config/AgentConfig'; +import GrpcProtocol from './agent/protocol/grpc/GrpcProtocol'; +import { createLogger } from './logging'; +import Protocol from './agent/protocol/Protocol'; +import PluginInstaller from './core/PluginInstaller'; const logger = createLogger(__filename); diff --git a/src/plugins/HttpPlugin.ts b/src/plugins/HttpPlugin.ts index f552e6f..246f546 100644 --- a/src/plugins/HttpPlugin.ts +++ b/src/plugins/HttpPlugin.ts @@ -17,14 +17,14 @@ * */ -import SwPlugin from '@/core/SwPlugin'; +import SwPlugin from '../core/SwPlugin'; import { URL } from 'url'; import { ClientRequest, IncomingMessage, RequestOptions, ServerResponse } from 'http'; -import ContextManager from '@/trace/context/ContextManager'; -import { Component } from '@/trace/Component'; -import Tag from '@/Tag'; -import { SpanLayer } from '@/proto/language-agent/Tracing_pb'; -import { ContextCarrier } from '@/trace/context/ContextCarrier'; +import ContextManager from '../trace/context/ContextManager'; +import { Component } from '../trace/Component'; +import Tag from '../Tag'; +import { SpanLayer } from '../proto/language-agent/Tracing_pb'; +import { ContextCarrier } from '../trace/context/ContextCarrier'; type RequestFunctionType = ( url: string | URL, diff --git a/src/trace/NewID.ts b/src/trace/NewID.ts index e8b6bee..3db214f 100644 --- a/src/trace/NewID.ts +++ b/src/trace/NewID.ts @@ -17,7 +17,7 @@ * */ -import ID from '@/trace/ID'; +import ID from '../trace/ID'; export default class NewID extends ID { } diff --git a/src/trace/context/Context.ts b/src/trace/context/Context.ts index 590e0af..7393887 100644 --- a/src/trace/context/Context.ts +++ b/src/trace/context/Context.ts @@ -17,10 +17,10 @@ * */ -import Span from '@/trace/span/Span'; -import Segment from '@/trace/context/Segment'; -import Snapshot from '@/trace/context/Snapshot'; -import { ContextCarrier } from '@/trace/context/ContextCarrier'; +import Span from '../../trace/span/Span'; +import Segment from '../../trace/context/Segment'; +import Snapshot from '../../trace/context/Snapshot'; +import { ContextCarrier } from './ContextCarrier'; export default interface Context { segment: Segment; diff --git a/src/trace/context/ContextCarrier.ts b/src/trace/context/ContextCarrier.ts index 36a037a..466db95 100644 --- a/src/trace/context/ContextCarrier.ts +++ b/src/trace/context/ContextCarrier.ts @@ -17,8 +17,8 @@ * */ -import ID from '@/trace/ID'; -import { CarrierItem } from '@/trace/context/CarrierItem'; +import ID from '../../trace/ID'; +import { CarrierItem } from './CarrierItem'; export class ContextCarrier extends CarrierItem { constructor( diff --git a/src/trace/context/ContextManager.ts b/src/trace/context/ContextManager.ts index e0d4f7f..3360031 100644 --- a/src/trace/context/ContextManager.ts +++ b/src/trace/context/ContextManager.ts @@ -17,8 +17,8 @@ * */ -import Context from '@/trace/context/Context'; -import SpanContext from '@/trace/context/SpanContext'; +import Context from '../../trace/context/Context'; +import SpanContext from '../../trace/context/SpanContext'; import { executionAsyncId } from 'async_hooks'; class ContextManager { diff --git a/src/trace/context/DummyContext.ts b/src/trace/context/DummyContext.ts index a86b4ee..f41ebbe 100644 --- a/src/trace/context/DummyContext.ts +++ b/src/trace/context/DummyContext.ts @@ -17,14 +17,14 @@ * */ -import Context from '@/trace/context/Context'; -import Span from '@/trace/span/Span'; -import DummySpan from '@/trace/span/DummySpan'; -import Segment from '@/trace/context/Segment'; -import { SpanType } from '@/proto/language-agent/Tracing_pb'; -import Snapshot from '@/trace/context/Snapshot'; -import ID from '@/trace/ID'; -import { ContextCarrier } from '@/trace/context/ContextCarrier'; +import Context from '../../trace/context/Context'; +import Span from '../../trace/span/Span'; +import DummySpan from '../../trace/span/DummySpan'; +import Segment from '../../trace/context/Segment'; +import { SpanType } from '../../proto/language-agent/Tracing_pb'; +import Snapshot from '../../trace/context/Snapshot'; +import ID from '../../trace/ID'; +import { ContextCarrier } from './ContextCarrier'; export default class DummyContext implements Context { span: Span = new DummySpan({ diff --git a/src/trace/context/Segment.ts b/src/trace/context/Segment.ts index cb56b9a..8d9346c 100644 --- a/src/trace/context/Segment.ts +++ b/src/trace/context/Segment.ts @@ -17,10 +17,10 @@ * */ -import Span from '@/trace/span/Span'; -import ID from '@/trace/ID'; -import NewID from '@/trace/NewID'; -import SegmentRef from '@/trace/context/SegmentRef'; +import Span from '../../trace/span/Span'; +import ID from '../../trace/ID'; +import NewID from '../../trace/NewID'; +import SegmentRef from '../../trace/context/SegmentRef'; export default class Segment { segmentId = new ID(); diff --git a/src/trace/context/SegmentRef.ts b/src/trace/context/SegmentRef.ts index 9c07abc..2cc8cad 100644 --- a/src/trace/context/SegmentRef.ts +++ b/src/trace/context/SegmentRef.ts @@ -17,10 +17,10 @@ * */ -import Snapshot from '@/trace/context/Snapshot'; -import ID from '@/trace/ID'; -import config from '@/config/AgentConfig'; -import { ContextCarrier } from '@/trace/context/ContextCarrier'; +import Snapshot from '../../trace/context/Snapshot'; +import ID from '../../trace/ID'; +import config from '../../config/AgentConfig'; +import { ContextCarrier } from './ContextCarrier'; export default class SegmentRef { private constructor( diff --git a/src/trace/context/Snapshot.ts b/src/trace/context/Snapshot.ts index e8733b6..e5de84b 100644 --- a/src/trace/context/Snapshot.ts +++ b/src/trace/context/Snapshot.ts @@ -17,7 +17,7 @@ * */ -import ID from '@/trace/ID'; +import ID from '../../trace/ID'; export default interface Snapshot { segmentId: ID; diff --git a/src/trace/context/SpanContext.ts b/src/trace/context/SpanContext.ts index 821dc93..e53a24a 100644 --- a/src/trace/context/SpanContext.ts +++ b/src/trace/context/SpanContext.ts @@ -17,19 +17,19 @@ * */ -import Context from '@/trace/context/Context'; -import Span from '@/trace/span/Span'; -import Segment from '@/trace/context/Segment'; -import EntrySpan from '@/trace/span/EntrySpan'; -import ExitSpan from '@/trace/span/ExitSpan'; -import LocalSpan from '@/trace/span/LocalSpan'; -import * as packageInfo from 'package.json'; -import buffer from '@/agent/Buffer'; -import { createLogger } from '@/logging'; +import Context from '../../trace/context/Context'; +import Span from '../../trace/span/Span'; +import Segment from '../../trace/context/Segment'; +import EntrySpan from '../../trace/span/EntrySpan'; +import ExitSpan from '../../trace/span/ExitSpan'; +import LocalSpan from '../../trace/span/LocalSpan'; +import * as packageInfo from '../../../package.json'; +import buffer from '../../agent/Buffer'; +import { createLogger } from '../../logging'; import { executionAsyncId } from 'async_hooks'; -import Snapshot from '@/trace/context/Snapshot'; -import SegmentRef from '@/trace/context/SegmentRef'; -import { ContextCarrier } from '@/trace/context/ContextCarrier'; +import Snapshot from '../../trace/context/Snapshot'; +import SegmentRef from '../../trace/context/SegmentRef'; +import { ContextCarrier } from './ContextCarrier'; const logger = createLogger(__filename); diff --git a/src/trace/span/DummySpan.ts b/src/trace/span/DummySpan.ts index cb1da59..2d65f8e 100644 --- a/src/trace/span/DummySpan.ts +++ b/src/trace/span/DummySpan.ts @@ -17,7 +17,7 @@ * */ -import Span from '@/trace/span/Span'; +import Span from '../../trace/span/Span'; export default class DummySpan extends Span { } diff --git a/src/trace/span/EntrySpan.ts b/src/trace/span/EntrySpan.ts index d87be6e..8f2ebdb 100644 --- a/src/trace/span/EntrySpan.ts +++ b/src/trace/span/EntrySpan.ts @@ -17,12 +17,12 @@ * */ -import StackedSpan from '@/trace/span/StackedSpan'; -import { Component } from '@/trace/Component'; -import { SpanCtorOptions } from '@/trace/span/Span'; -import SegmentRef from '@/trace/context/SegmentRef'; -import { SpanLayer, SpanType } from '@/proto/language-agent/Tracing_pb'; -import { ContextCarrier } from '@/trace/context/ContextCarrier'; +import StackedSpan from '../../trace/span/StackedSpan'; +import { Component } from '../Component'; +import { SpanCtorOptions } from './Span'; +import SegmentRef from '../../trace/context/SegmentRef'; +import { SpanLayer, SpanType } from '../../proto/language-agent/Tracing_pb'; +import { ContextCarrier } from '../context/ContextCarrier'; export default class EntrySpan extends StackedSpan { maxDepth = 0; diff --git a/src/trace/span/ExitSpan.ts b/src/trace/span/ExitSpan.ts index fd0f516..d9d67a3 100644 --- a/src/trace/span/ExitSpan.ts +++ b/src/trace/span/ExitSpan.ts @@ -17,11 +17,11 @@ * */ -import StackedSpan from '@/trace/span/StackedSpan'; -import { SpanCtorOptions } from '@/trace/span/Span'; -import config from '@/config/AgentConfig'; -import { SpanType } from '@/proto/language-agent/Tracing_pb'; -import { ContextCarrier } from '@/trace/context/ContextCarrier'; +import StackedSpan from '../../trace/span/StackedSpan'; +import { SpanCtorOptions } from './Span'; +import config from '../../config/AgentConfig'; +import { SpanType } from '../../proto/language-agent/Tracing_pb'; +import { ContextCarrier } from '../context/ContextCarrier'; export default class ExitSpan extends StackedSpan { constructor(options: SpanCtorOptions) { diff --git a/src/trace/span/LocalSpan.ts b/src/trace/span/LocalSpan.ts index c20e4da..dc4651d 100644 --- a/src/trace/span/LocalSpan.ts +++ b/src/trace/span/LocalSpan.ts @@ -17,8 +17,8 @@ * */ -import Span, { SpanCtorOptions } from '@/trace/span/Span'; -import { SpanType } from '@/proto/language-agent/Tracing_pb'; +import Span, { SpanCtorOptions } from '../../trace/span/Span'; +import { SpanType } from '../../proto/language-agent/Tracing_pb'; export default class LocalSpan extends Span { constructor(options: SpanCtorOptions) { diff --git a/src/trace/span/Span.ts b/src/trace/span/Span.ts index e893fd4..a5972b3 100644 --- a/src/trace/span/Span.ts +++ b/src/trace/span/Span.ts @@ -17,16 +17,16 @@ * */ -import Context from '@/trace/context/Context'; -import { Component } from '@/trace/Component'; -import { Tag } from '@/Tag'; -import Log, { LogItem } from '@/Log'; -import Segment from '@/trace/context/Segment'; -import SegmentRef from '@/trace/context/SegmentRef'; -import { SpanLayer, SpanType } from '@/proto/language-agent/Tracing_pb'; -import { createLogger } from '@/logging'; -import * as packageInfo from 'package.json'; -import { ContextCarrier } from '@/trace/context/ContextCarrier'; +import Context from '../../trace/context/Context'; +import { Component } from '../Component'; +import { Tag } from '../../Tag'; +import Log, { LogItem } from '../../Log'; +import Segment from '../../trace/context/Segment'; +import SegmentRef from '../../trace/context/SegmentRef'; +import { SpanLayer, SpanType } from '../../proto/language-agent/Tracing_pb'; +import { createLogger } from '../../logging'; +import * as packageInfo from '../../../package.json'; +import { ContextCarrier } from '../context/ContextCarrier'; export type SpanCtorOptions = { context: Context; diff --git a/src/trace/span/StackedSpan.ts b/src/trace/span/StackedSpan.ts index cab2f48..d06a8bc 100644 --- a/src/trace/span/StackedSpan.ts +++ b/src/trace/span/StackedSpan.ts @@ -17,10 +17,10 @@ * */ -import Span, { SpanCtorOptions } from '@/trace/span/Span'; -import Segment from '@/trace/context/Segment'; -import { createLogger } from '@/logging'; -import { SpanType } from '@/proto/language-agent/Tracing_pb'; +import Span, { SpanCtorOptions } from '../../trace/span/Span'; +import Segment from '../../trace/context/Segment'; +import { createLogger } from '../../logging'; +import { SpanType } from '../../proto/language-agent/Tracing_pb'; const logger = createLogger(__filename); diff --git a/tsconfig.json b/tsconfig.json index 6b99a3c..9c2237e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,19 +1,16 @@ { "compilerOptions": { - "target": "es6", - "module": "commonjs", - "declaration": true, - "outDir": "./lib", + "target": "es5", + "module": "esnext", "strict": true, - "baseUrl": ".", - "moduleResolution": "Node", + "importHelpers": true, + "moduleResolution": "node", + "experimentalDecorators": true, + "esModuleInterop": true, + "allowSyntheticDefaultImports": true, + "outDir": "./lib", "resolveJsonModule": true, - "paths": { - "@/*": [ - "src/*" - ] - }, - "allowJs": true + "declaration": true }, "include": [ "src/**/*"