[pinpoint-apm#117] fix `error TS9006: Declaration emit for this file …

…requires using private name`
feelform · Sep 27, 2022 · fb9b626 · fb9b626
1 parent 80d621a
commit fb9b626
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 20 deletions.
diff --git a/lib/client/grpc-data-sender.js b/lib/client/grpc-data-sender.js
@@ -10,7 +10,7 @@ const grpc = require('@grpc/grpc-js')
 const log = require('../utils/logger')
 const services = require('../data/v1/Service_grpc_pb')
 const dataConvertor = require('../data/grpc-data-convertor')
-const pingIdGenerator = require('../context/sequence-generator').pingIdGenerator
+const pingIdGenerator = require('../context/sequence-generators').pingIdGenerator
 const GrpcBidirectionalStream = require('./grpc-bidirectional-stream')
 const GrpcClientSideStream = require('./grpc-client-side-stream')
 const GrpcUnaryRPC = require('./grpc-unary-rpc')

diff --git a/lib/context/api-meta-service.js b/lib/context/api-meta-service.js
@@ -6,7 +6,7 @@
 
 'use strict'
 
-const apiMetaCacheKeyGenerator = require('../context/sequence-generator').apiMetaCacheKeyGenerator
+const apiMetaCacheKeyGenerator = require('../context/sequence-generators').apiMetaCacheKeyGenerator
 const SimpleCache = require('../utils/simple-cache')
 const GeneralMethodDescriptor = require('../constant/method-descriptor').GeneralMethodDescriptor
 const ApiMetaInfo = require('../data/dto/api-meta-info')

diff --git a/lib/context/disable-span-event-recorder.js b/lib/context/disable-span-event-recorder.js
@@ -7,7 +7,7 @@
 'use strict'
 
 const AsyncId = require('./async-id')
-const asyncIdGenerator = require('./sequence-generator').asyncIdGenerator
+const asyncIdGenerator = require('./sequence-generators').asyncIdGenerator
 
 class DisableSpanEventRecorder {
   constructor() {

diff --git a/lib/context/sequence-generator.js b/lib/context/sequence-generator.js
@@ -26,12 +26,4 @@ class SequenceGenerator{
   }
 }
 
-module.exports = {
-  SequenceGenerator,
-  transactionIdGenerator: new SequenceGenerator(),
-  asyncIdGenerator: new SequenceGenerator(1),
-  stringMetaCacheKeyGenerator: new SequenceGenerator(1),
-  apiMetaCacheKeyGenerator: new SequenceGenerator(1),
-  pingIdGenerator: new SequenceGenerator(),
-  dummyIdGenerator: new SequenceGenerator(),
-}
+module.exports = SequenceGenerator
diff --git a/lib/context/sequence-generators.js b/lib/context/sequence-generators.js
@@ -0,0 +1,11 @@
+const SequenceGenerator = require('./sequence-generator')
+
+module.exports = {
+    transactionIdGenerator: new SequenceGenerator(),
+    asyncIdGenerator: new SequenceGenerator(1),
+    stringMetaCacheKeyGenerator: new SequenceGenerator(1),
+    apiMetaCacheKeyGenerator: new SequenceGenerator(1),
+    pingIdGenerator: new SequenceGenerator(),
+    dummyIdGenerator: new SequenceGenerator(),
+  }
+
diff --git a/lib/context/span-event-recorder.js b/lib/context/span-event-recorder.js
@@ -10,8 +10,8 @@ const Annotation = require('./annotation')
 const DefaultAnnotationKey = require('../constant/annotation-key').DefaultAnnotationKey
 const StringMetaService = require('./string-meta-service')
 const AsyncId = require('./async-id')
-const asyncIdGenerator = require('./sequence-generator').asyncIdGenerator
-const dummyIdGenerator = require('./sequence-generator').dummyIdGenerator
+const asyncIdGenerator = require('./sequence-generators').asyncIdGenerator
+const dummyIdGenerator = require('./sequence-generators').dummyIdGenerator
 const AnnotationKeyUtils = require('./annotation-key-utils')
 
 // https://github.com/pinpoint-apm/pinpoint/blob/master/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/context/SpanEventRecorder.java

diff --git a/lib/context/trace-context.js b/lib/context/trace-context.js
@@ -22,6 +22,14 @@ class TraceContext {
     this.dataSender = null
   }
 
+  /**
+   * trace context singleton instance
+   * @param {string} options 
+   * @param {string} dataSender 
+   * @param {string} config 
+   * @returns {TraceContext}
+   * @constructor
+   */
   static init (options, dataSender, config) {
     if (!options.agentId || !options.applicationName) {
       throw new Error('Fail to initialize pinpoint context')
@@ -132,7 +140,4 @@ class TraceContext {
   }
 }
 
-module.exports = {
-  init: TraceContext.init
-}
-
+module.exports = TraceContext
diff --git a/lib/context/transaction-id.js b/lib/context/transaction-id.js
@@ -6,7 +6,7 @@
 
 'use strict'
 
-const transactionIdGenerator = require('./sequence-generator').transactionIdGenerator
+const transactionIdGenerator = require('./sequence-generators').transactionIdGenerator
 
 const DELIMETER = '^'
 

diff --git a/lib/instrumentation/module/mysql2.js b/lib/instrumentation/module/mysql2.js
@@ -104,3 +104,4 @@ module.exports = function (agent, version, mysql2) {
       }
     }
   }
+}
diff --git a/test/context/transaction-id.test.js b/test/context/transaction-id.test.js
@@ -7,7 +7,7 @@
 const test = require('tape')
 const { log, fixture, util } = require('../test-helper')
 
-const transactionIdGenerator = require('../../lib/context/sequence-generator').transactionIdGenerator
+const transactionIdGenerator = require('../../lib/context/sequence-generators').transactionIdGenerator
 const TransactionId = require('../../lib/context/transaction-id')
 
 test('Should create with sequence number', function (t) {