[#176] initializeProfilerCommand client

pinpoint-apm · Aug 16, 2024 · eb113c8 · eb113c8
1 parent 95795ab
commit eb113c8
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 10 deletions.
diff --git a/lib/client/grpc-data-sender.js b/lib/client/grpc-data-sender.js
@@ -32,6 +32,7 @@ class GrpcDataSender {
     this.initializeStatStream(collectorIp, collectorStatPort, config)
     this.initializePingStream()
     this.initializeAgentInfoScheduler()
+    this.initializeProfilerClients()
   }
 
   close() {
@@ -57,6 +58,9 @@ class GrpcDataSender {
     if (this.statClient) {
       this.statClient.close()
     }
+    if (this.profilerClient) {
+      this.profilerClient.close()
+    }
   }
 
   initializeClients(collectorIp, collectorTcpPort, config) {
@@ -65,8 +69,8 @@ class GrpcDataSender {
       .addInterceptor(socketIdInterceptor)
       .addInterceptor(grpcBuiltInRetryHeaderInterceptor)
 
-    if (config && config.grpcServiceConfig && typeof config.grpcServiceConfig.getAgentServiceConfig === 'function') {
-      agentBuilder.setGrpcServiceConfig(config.grpcServiceConfig.getAgentServiceConfig())
+    if (config && config.grpcServiceConfig && typeof config.grpcServiceConfig.getAgent === 'function') {
+      agentBuilder.setGrpcServiceConfig(config.grpcServiceConfig.getAgent())
     }
     this.agentClient = new services.AgentClient(collectorIp + ":" + collectorTcpPort, grpc.credentials.createInsecure(), agentBuilder.build())
   }
@@ -76,8 +80,8 @@ class GrpcDataSender {
       .addInterceptor(makeAgentInformationMetadataInterceptor(this.agentInfo))
       .addInterceptor(grpcBuiltInRetryHeaderInterceptor)
 
-    if (config && config.grpcServiceConfig && typeof config.grpcServiceConfig.getMetadataServiceConfig === 'function') {
-      metadataBuilder.setGrpcServiceConfig(config.grpcServiceConfig.getMetadataServiceConfig())
+    if (config && config.grpcServiceConfig && typeof config.grpcServiceConfig.getMetadata === 'function') {
+      metadataBuilder.setGrpcServiceConfig(config.grpcServiceConfig.getMetadata())
     }
     this.metadataClient = new services.MetadataClient(collectorIp + ":" + collectorTcpPort, grpc.credentials.createInsecure(), metadataBuilder.build())
   }
@@ -112,6 +116,17 @@ class GrpcDataSender {
     this.agentInfoDailyScheduler = new Scheduler(this.agentInfoRefreshInterval())
   }
 
+  initializeProfilerClients(collectorIp, collectorTcpPort, config) {
+    const profilerBuilder = new OptionsBuilder()
+      .addInterceptor(makeAgentInformationMetadataInterceptor(this.agentInfo))
+      .addInterceptor(grpcBuiltInRetryHeaderInterceptor)
+
+    if (config && config.grpcServiceConfig && typeof config.grpcServiceConfig.getProfiler === 'function') {
+      profilerBuilder.setGrpcServiceConfig(config.grpcServiceConfig.getProfiler())
+    }
+    this.profilerClient = new services.ProfilerCommandServiceClient(collectorIp + ":" + collectorTcpPort, grpc.credentials.createInsecure(), profilerBuilder.build())
+  }
+
   agentInfoRefreshInterval() {
     return DEFAULT_AGENT_INFO_REFRESH_INTERVAL_MS
   }

diff --git a/lib/client/grpc/service-config-builder.js b/lib/client/grpc/service-config-builder.js
@@ -8,16 +8,21 @@
 
 class ServiceConfig {
     constructor(agentServiceConfig, metadataServiceConfig) {
-        this.agentServiceConfig = agentServiceConfig
-        this.metadataServiceConfig = metadataServiceConfig
+        this.agent = agentServiceConfig
+        this.metadata = metadataServiceConfig
+        this.profiler = metadataServiceConfig
     }
 
-    getAgentServiceConfig() {
-        return this.agentServiceConfig
+    getAgent() {
+        return this.agent
     }
 
-    getMetadataServiceConfig() {
-        return this.metadataServiceConfig
+    getMetadata() {
+        return this.metadata
+    }
+
+    getProfiler() {
+        return this.profiler
     }
 }
 
@@ -61,13 +66,23 @@ class ServiceConfigBuilder {
         return this
     }
 
+    setProfilerServiceConfig(config) {
+        if (typeof config !== 'string') {
+            return this
+        }
+
+        this.profilerServiceConfig = config
+        return this
+    }
+
     setJSON(config) {
         if (typeof config !== 'object') {
             return this
         }
 
         this.agentServiceConfig = JSON.stringify(config)
         this.metadataServiceConfig = JSON.stringify(config)
+        this.profilerServiceConfig = JSON.stringify(config)
         return this
     }
 

diff --git a/test/client/grpc-data-sender.test.js b/test/client/grpc-data-sender.test.js
@@ -741,4 +741,8 @@ test('sendStat', (t) => {
   const pCpuLoad = pAgentStat.getCpuload()
   t.equal(pCpuLoad.getJvmcpuload(), 0.0003919068831319893, 'cpu.user')
   t.equal(pCpuLoad.getSystemcpuload(), 0, 'cpu.system')
+})
+
+test('commandEcho', (t) => {
+  t.end()
 })