[pinpoint-apm#182] agentInfo retry tests

lib/client/call-arguments-builder.js

@@ -0,0 +1,62 @@
+/**
+ * Pinpoint Node.js Agent
+ * Copyright 2020-present NAVER Corp.
+ * Apache License v2.0
+ */
+
+'use strict'
+
+const grpc = require('@grpc/grpc-js')
+
+class CallArguments {
+    constructor(callback) {
+        this.callback = callback
+    }
+
+    getCallback() {
+        return this.callback
+    }
+
+    getMetadata() {
+        return this.metadata
+    }
+
+    getOptions() {
+        const options = this.options
+        if (this.deadlineMilliseconds) {
+            const deadline = new Date()
+            deadline.setMilliseconds(deadline.getMilliseconds() + this.deadlineMilliseconds)
+            options.deadline = deadline
+        }
+        return options
+    }
+}
+
+const DEFAULT_CLIENT_REQUEST_TIMEOUT = 6000
+class CallArgumentsBuilder {
+    constructor(callback) {
+        this.callback = callback
+        this.metadata = new grpc.Metadata()
+        this.options = {}
+    }
+
+    setDeadlineMilliseconds(deadlineMilliseconds) {
+        this.deadlineMilliseconds = deadlineMilliseconds
+        return this
+    }
+
+    setMetadata(key, value) {
+        this.metadata.set(key, value)
+        return this
+    }
+
+    build() {
+        const callArguments = new CallArguments(this.callback)
+        callArguments.metadata = this.metadata
+        callArguments.options = this.options
+        callArguments.deadlineMilliseconds = this.deadlineMilliseconds || DEFAULT_CLIENT_REQUEST_TIMEOUT
+        return callArguments
+    }
+}
+
+module.exports = CallArgumentsBuilder

lib/client/grpc-data-sender.js

@@ -16,8 +16,7 @@ const GrpcUnaryRPC = require('./grpc-unary-rpc')
 const Scheduler = require('../utils/scheduler')
 const makeAgentInformationMetadataInterceptor = require('./grpc/make-agent-information-metadata-interceptor')
 const socketIdInterceptor = require('./grpc/socketid-interceptor')
-const retryUnaryRequestInterceptor = require('./grpc/retry-unary-request-interceptor')
-const Deadline = require('./grpc/deadline')
+const CallArgumentsBuilder = require('./call-arguments-builder')
 
 // AgentInfoSender.java
 // refresh daily
@@ -46,7 +45,6 @@ class GrpcDataSender {
     this.initializeStatStream(collectorIp, collectorStatPort, config)
     this.initializePingStream()
     this.initializeAgentInfoScheduler()
-    this.deadline = new Deadline()
   }
 
   close() {
@@ -76,10 +74,10 @@ class GrpcDataSender {
 
   initializeClients(collectorIp, collectorTcpPort) {
     this.agentClient = new services.AgentClient(collectorIp + ":" + collectorTcpPort, grpc.credentials.createInsecure(),
-      { interceptors: [retryUnaryRequestInterceptor, makeAgentInformationMetadataInterceptor(this.agentInfo), socketIdInterceptor] })
+      { interceptors: [makeAgentInformationMetadataInterceptor(this.agentInfo), socketIdInterceptor] })
 
     this.metadataClient = new services.MetadataClient(collectorIp + ":" + collectorTcpPort, grpc.credentials.createInsecure(),
-      { interceptors: [retryUnaryRequestInterceptor, makeAgentInformationMetadataInterceptor(this.agentInfo)] })
+      { interceptors: [makeAgentInformationMetadataInterceptor(this.agentInfo)] })
     this.requestApiMetaData = new GrpcUnaryRPC('requestApiMetaData', this.metadataClient, this.metadataClient.requestApiMetaData, DEFAULT_METADATA_RETRY_DELAY_MILLIS, DEFAULT_METADATA_RETRY_MAX_COUNT)
     this.requestStringMetaData = new GrpcUnaryRPC('requestStringMetaData', this.metadataClient, this.metadataClient.requestStringMetaData, DEFAULT_METADATA_RETRY_DELAY_MILLIS, DEFAULT_METADATA_RETRY_MAX_COUNT)
     this.requestSqlMetaData = new GrpcUnaryRPC('requestSqlMetaData', this.metadataClient, this.metadataClient.requestSqlMetaData, DEFAULT_METADATA_RETRY_DELAY_MILLIS, DEFAULT_METADATA_RETRY_MAX_COUNT)
@@ -120,13 +118,24 @@ class GrpcDataSender {
     return DEFAULT_AGENT_INFO_REFRESH_INTERVAL_MS
   }
 
-  sendAgentInfo(agentInfo, callback) {
+  sendAgentInfo(agentInfo, callArguments) {
     const pAgentInfo = dataConvertor.convertAgentInfo(agentInfo)
     if (log.isDebug()) {
       log.debug(`sendAgentInfo pAgentInfo: ${pAgentInfo}`)
     }
-    const deadline = this.deadline.getDeadline()
-    this.agentClient.requestAgentInfo(pAgentInfo, { deadline }, (err, response) => {
+
+    if (typeof callArguments === 'function') {
+      callArguments = new CallArgumentsBuilder(callArguments).build()
+    }
+
+    if (!callArguments) {
+      callArguments = new CallArgumentsBuilder().build()
+    }
+
+    const metadata = callArguments.getMetadata()
+    let options = callArguments.getOptions()
+    const callback = callArguments.getCallback()
+    this.agentClient.requestAgentInfo(pAgentInfo, metadata, options, (err, response) => {
       if (typeof callback === 'function') {
         callback(err, response)
       }
@@ -135,7 +144,8 @@ class GrpcDataSender {
     this.closeScheduler()
     if (this.agentInfoDailyScheduler) {
       this.removeJobForAgentInfo = this.agentInfoDailyScheduler.addJob(() => {
-        this.agentClient.requestAgentInfo(pAgentInfo, { deadline }, (err, response) => {
+        options = callArguments.getOptions()
+        this.agentClient.requestAgentInfo(pAgentInfo, metadata, options, (err, response) => {
           if (typeof callback === 'function') {
             callback(err, response)
           }