pinpoint-apm#92 update v1 protocol compiled

grpc/README.md

@@ -6,10 +6,6 @@ $ export PATH="$PATH:$(npm bin -g)"
 $ grpc_tools_node_protoc --version
 libprotoc 3.14.0
 
-$ grpc_tools_node_protoc --js_out=import_style=commonjs,binary:../ --grpc_out=grpc_js:../  --plugin=protoc-gen-grpc=`which grpc_tools_node_protoc_plugin` Span.proto
-$ grpc_tools_node_protoc --js_out=import_style=commonjs,binary:../ --grpc_out=grpc_js:../  --plugin=protoc-gen-grpc=`which grpc_tools_node_protoc_plugin` Service.proto
-$ grpc_tools_node_protoc --js_out=import_style=commonjs,binary:../ --grpc_out=grpc_js:../  --plugin=protoc-gen-grpc=`which grpc_tools_node_protoc_plugin` Cmd.proto
-$ grpc_tools_node_protoc --js_out=import_style=commonjs,binary:../ --grpc_out=grpc_js:../  --plugin=protoc-gen-grpc=`which grpc_tools_node_protoc_plugin` Annotation.proto
-$ grpc_tools_node_protoc --js_out=import_style=commonjs,binary:../ --grpc_out=grpc_js:../  --plugin=protoc-gen-grpc=`which grpc_tools_node_protoc_plugin` Stat.proto
-$ grpc_tools_node_protoc --js_out=import_style=commonjs,binary:../ --grpc_out=grpc_js:../  --plugin=protoc-gen-grpc=`which grpc_tools_node_protoc_plugin` ThreadDump.proto
+$ cd grpc-idl/proto
+$ grpc_tools_node_protoc --js_out=import_style=commonjs,binary:../../../lib/data --grpc_out=grpc_js:../../../lib/data --plugin=protoc-gen-grpc=`which grpc_tools_node_protoc_plugin` v1/*.proto
 ```

lib/client/grpc-data-sender.js

@@ -8,7 +8,7 @@
 
 const grpc = require('@grpc/grpc-js')
 const log = require('../utils/logger')
-const services = require('../data/grpc/Service_grpc_pb')
+const services = require('../data/v1/Service_grpc_pb')
 const dataConvertor = require('../data/grpc-data-convertor')
 const pingIdGenerator = require('../context/sequence-generator').pingIdGenerator
 const GrpcBidirectionalStream = require('./grpc-bidirectional-stream')

lib/context/span-chunk.js

@@ -6,12 +6,12 @@
 
 'use strict'
 
-const spanMessages = require('../data/grpc/Span_pb')
-const {convertTransactionId, convertLocalAsyncId} = require('../data/grpc-data-convertor')
+const spanMessages = require('../data/v1/Span_pb')
+const { convertTransactionId, convertLocalAsyncId } = require('../data/grpc-data-convertor')
 const SpanEvents = require('./span-events')
 
 class SpanChunk {
-  constructor (traceId, agentInfo, asyncId, spanEventList) {
+  constructor(traceId, agentInfo, asyncId, spanEventList) {
     if (!traceId || !agentInfo) {
       throw new Error('Can not initialize SpanChunk', traceId, agentInfo)
     }
@@ -29,44 +29,44 @@ class SpanChunk {
     this.localAsyncId = asyncId
   }
 
-  static getFactoryMethod (agentInfo, traceId) {
+  static getFactoryMethod(agentInfo, traceId) {
     return (spanEventList) => new SpanChunk(agentInfo, traceId, null, spanEventList)
   }
 
-  static getAsyncFactoryMethod (agentInfo, traceId, asyncId) {
+  static getAsyncFactoryMethod(agentInfo, traceId, asyncId) {
     return (spanEventList) => new SpanChunk(agentInfo, traceId, asyncId, spanEventList)
   }
 
   get spanMessage() {
     const pSpanMessage = new spanMessages.PSpanMessage()
     const pSpanChunk = new spanMessages.PSpanChunk()
-    pSpanChunk.setVersion(1);
-  
+    pSpanChunk.setVersion(1)
+
     const pTransactionId = convertTransactionId(this.transactionIdObject)
-    pSpanChunk.setTransactionid(pTransactionId);
-  
+    pSpanChunk.setTransactionid(pTransactionId)
+
     pSpanChunk.setSpanid(this.spanId)
     pSpanChunk.setEndpoint(this.endPoint)
     pSpanChunk.setApplicationservicetype(this.applicationServiceType)
     pSpanChunk.setLocalasyncid(convertLocalAsyncId(this.localAsyncId))
 
     const keyTime = this.keyTime
     pSpanChunk.setKeytime(keyTime)
-    
+
     const spanEvents = new SpanEvents(this.spanEventList)
     const pSpanEvents = spanEvents.getpSpanEvents(keyTime)
     if (pSpanEvents.length > 0) {
       pSpanEvents.forEach(pSpanEvent => pSpanChunk.addSpanevent(pSpanEvent))
     }
-    
+
     pSpanMessage.setSpanchunk(pSpanChunk)
     return pSpanMessage
   }
 
   get keyTime() {
     const minStartTimeSpanEvent = this.spanEventList.reduce((minStartTimeSpanEvent, currentSpanEvent) => minStartTimeSpanEvent.startTime < currentSpanEvent.startTime ? minStartTimeSpanEvent : currentSpanEvent)
     if (!minStartTimeSpanEvent) {
-      return 0;
+      return 0
     }
     return minStartTimeSpanEvent.startTime
   }

lib/context/span-events.js

@@ -6,8 +6,8 @@
 
 'use strict'
 
-const {convertIntStringValue, convertNextEvent, addAnnotations} = require('../data/grpc-data-convertor')
-const spanMessages = require('../data/grpc/Span_pb')
+const { convertIntStringValue, convertNextEvent, addAnnotations } = require('../data/grpc-data-convertor')
+const spanMessages = require('../data/v1/Span_pb')
 
 class SpanEvents {
     constructor(spanEvents) {

lib/context/span.js

@@ -6,12 +6,12 @@
 
 'use strict'
 
-const {convertTransactionId, convertAcceptEvent, convertIntStringValue, addAnnotations} = require('../data/grpc-data-convertor')
-const spanMessages = require('../data/grpc/Span_pb')
+const { convertTransactionId, convertAcceptEvent, convertIntStringValue, addAnnotations } = require('../data/grpc-data-convertor')
+const spanMessages = require('../data/v1/Span_pb')
 const SpanEvents = require('./span-events')
 
 class Span {
-  constructor (traceId, agentInfo, requestData = {}) {
+  constructor(traceId, agentInfo, requestData = {}) {
     if (!traceId || !agentInfo) {
       throw new Error('Can not initialize Span', traceId, agentInfo)
     }
@@ -42,13 +42,13 @@ class Span {
     this.parentApplicationType = requestData.parentApplicationType
   }
 
-  markElapsedTime () {
+  markElapsedTime() {
     if (this.startTime) {
       this.elapsedTime = Date.now() - this.startTime
     }
   }
 
-  get elapsed () {
+  get elapsed() {
     return this.elapsedTime
   }
 
@@ -57,12 +57,12 @@ class Span {
     const pSpanMessage = new spanMessages.PSpanMessage()
     const pSpan = new spanMessages.PSpan()
     pSpan.setVersion(1)
-  
+
     if (this.traceId) {
       const pTransactionId = convertTransactionId(this.traceId.transactionId)
       pSpan.setTransactionid(pTransactionId)
     }
-  
+
     pSpan.setSpanid(this.spanId)
     pSpan.setParentspanid(this.parentSpanId)
     pSpan.setStarttime(this.startTime)
@@ -75,14 +75,14 @@ class Span {
     pSpan.setExceptioninfo(convertIntStringValue(this.exceptionInfo))
     pSpan.setApplicationservicetype(this.applicationServiceType)
     pSpan.setLoggingtransactioninfo(this.loggingTransactionInfo)
-  
+
     const spanEvents = new SpanEvents(this.spanEventList)
     const pSpanEvents = spanEvents.getpSpanEvents(this.startTime)
     if (pSpanEvents.length > 0) {
       pSpanEvents.forEach(pSpanEvent => pSpan.addSpanevent(pSpanEvent))
     }
     addAnnotations(pSpan, this.annotations)
-  
+
     pSpanMessage.setSpan(pSpan)
     return pSpanMessage
   }

lib/data/grpc-data-convertor.js

@@ -6,10 +6,10 @@
 
 'use strict'
 
-const statMessages = require('./grpc/Stat_pb')
-const spanMessages = require('./grpc/Span_pb')
-const annotationMessages = require('./grpc/Annotation_pb')
-const cmdMessages = require('./grpc/Cmd_pb')
+const statMessages = require('./v1/Stat_pb')
+const spanMessages = require('./v1/Span_pb')
+const annotationMessages = require('./v1/Annotation_pb')
+const cmdMessages = require('./v1/Cmd_pb')
 const wrappers = require('google-protobuf/google/protobuf/wrappers_pb')
 
 const convertAgentInfo = (agentInfo) => {
@@ -93,7 +93,7 @@ const convertTransactionId = (transactionId) => {
   pTransactionId.setAgentid(transactionId.agentId)
   pTransactionId.setAgentstarttime(transactionId.agentStartTime)
   pTransactionId.setSequence(transactionId.sequence)
-return pTransactionId
+  return pTransactionId
 }
 
 const convertParentInfo = (span) => {
@@ -192,11 +192,11 @@ const convertStringStringValue = (value) => {
     return null
   }
   const pStringStringValue = new annotationMessages.PStringStringValue()
-  
+
   const stringValue1 = new wrappers.StringValue()
   stringValue1.setValue(value.stringValue1)
   pStringStringValue.setStringvalue1(stringValue1)
-  
+
   const stringValue2 = new wrappers.StringValue()
   stringValue2.setValue(value.stringValue2)
   pStringStringValue.setStringvalue2(stringValue2)
@@ -245,11 +245,11 @@ const convertStat = (stat) => {
     return null
   }
   const pStatMessage = new statMessages.PStatMessage()
-  
+
   const pAgentStat = new statMessages.PAgentStat()
   pAgentStat.setTimestamp(stat.timestamp)
   pAgentStat.setCollectinterval(stat.collectInterval)
-  
+
   const pCpuLoad = new statMessages.PCpuLoad()
   pCpuLoad.setJvmcpuload(stat.cpu.user)
   pCpuLoad.setSystemcpuload(stat.cpu.system)
@@ -270,7 +270,7 @@ const convertStat = (stat) => {
 
     const count = stat.activeTrace.fastCount + stat.activeTrace.normalCount + stat.activeTrace.slowCount + stat.activeTrace.verySlowCount
     pActiveTraceHistogram.addActivetracecount(count)
-    
+
     pActiveTrace.setHistogram(pActiveTraceHistogram)
   }
 

lib/data/typed-value.js

@@ -7,33 +7,33 @@
 'use strict'
 
 const ValuedType = require('../constant/valued-type').ValuedType
-const annotationMessages = require('./grpc/Annotation_pb')
-const {convertStringStringValue} = require('./grpc-data-convertor')
+const annotationMessages = require('./v1/Annotation_pb')
+const { convertStringStringValue } = require('./grpc-data-convertor')
 
 class TypedValue {
   constructor(value, valuedType) {
     switch (typeof value) {
       case 'number':
         this.intValue = value
-        break;
+        break
       case 'boolean':
         this.boolValue = value
-        break;
+        break
       case 'string':
         this.stringValue = value
-        break;
+        break
       case 'object':
         if (valuedType === ValuedType.stringStringValue) {
           this.stringStringValue = value
         }
-        break;
+        break
       case 'undefined':
         this.stringValue = value
-        break;
+        break
     }
   }
 
-  static of (value) {
+  static of(value) {
     return new TypedValue(value)
   }