[pinpoint-apm#243] Fix API Metadata gRPC stream error

* Support Send Messages by local gRPC Fixtures a Server
feelform · Dec 17, 2024 · e8b6d72 · e8b6d72
1 parent 7c15f3a
commit e8b6d72
Show file tree

Hide file tree

Showing 19 changed files with 740 additions and 622 deletions.
diff --git a/demo/express/package-lock.json b/demo/express/package-lock.json
diff --git a/demo/express/package.json b/demo/express/package.json
@@ -16,6 +16,6 @@
     "morgan": "~1.9.1",
     "mysql": "^2.18.1",
     "mysql2": "^3.9.1",
-    "pinpoint-node-agent": "^0.8.4"
+    "pinpoint-node-agent": "^0.8.6"
   }
 }
diff --git a/demo/express/routes/index.js b/demo/express/routes/index.js
@@ -48,7 +48,9 @@ router.get('/', async function(req, res, next) {
   const json = await response.json()
   console.log(json)
 
-  res.render('index', { title: 'Express' });
+  setTimeout(() => {
+    res.render('index', { title: 'Express' })
+  }, 1000)
 })
 
 router.get('/api', function(req, res, next) {

diff --git a/lib/client/call-arguments-builder.js b/lib/client/call-arguments-builder.js
@@ -34,8 +34,10 @@ class CallArguments {
 
 const DEFAULT_CLIENT_REQUEST_TIMEOUT = 6000
 class CallArgumentsBuilder {
-    static emptyCallArguments = new CallArgumentsBuilder().build()
-
+    static emptyCallArguments() {
+        return new CallArgumentsBuilder().build()
+    }
+
     constructor(callback) {
         this.callback = callback
         this.metadata = new grpc.Metadata()
@@ -56,7 +58,7 @@ class CallArgumentsBuilder {
         const callArguments = new CallArguments(this.callback)
         callArguments.metadata = this.metadata
         callArguments.options = this.options
-        callArguments.deadlineMilliseconds = this.deadlineMilliseconds || DEFAULT_CLIENT_REQUEST_TIMEOUT
+        callArguments.deadlineMilliseconds = this.deadlineMilliseconds ?? DEFAULT_CLIENT_REQUEST_TIMEOUT
         return callArguments
     }
 }

diff --git a/lib/client/grpc-data-sender.js b/lib/client/grpc-data-sender.js
@@ -412,7 +412,7 @@ module.exports = GrpcDataSender
 
 function guardCallArguments(callArguments) {
   if (!callArguments) {
-    return CallArgumentsBuilder.emptyCallArguments
+    return CallArgumentsBuilder.emptyCallArguments()
   }
 
   if (typeof callArguments === 'function') {

diff --git a/lib/data/grpc-data-convertor.js b/lib/data/grpc-data-convertor.js
@@ -173,7 +173,7 @@ const convertMessageEvent = (spanEvent) => {
 
 const addAnnotations = (target, annotations) => {
   if (annotations && annotations.length > 0) {
-    annotations.forEach(annotation => { 
+    annotations.forEach(annotation => {
       const pAnnotation = convertAnnotation(annotation)
       if (pAnnotation) {
         target.addAnnotation(pAnnotation)

diff --git a/lib/instrumentation/http-shared.js b/lib/instrumentation/http-shared.js
@@ -43,7 +43,7 @@ exports.instrumentRequest2 = function (agent) {
       const trace = requestTrace.makeTrace()
       return localStorage.run(trace, () => {
         endOfStream(res, function (err) {
-          const spanRecorder = trace.spanRecorder
+          const spanRecorder = trace.getSpanRecorder()
           if (err) {
             const end = res.end
             res.end = function () {