[openwhisk] branch master updated: use user.namespace.name instead of user.namespace for metric label (#4950)

[tysonnorris]

This is an automated email from the ASF dual-hosted git repository.

tysonnorris pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 39131e2  use user.namespace.name instead of user.namespace for metric 
label (#4950)
39131e2 is described below

commit 39131e2cde5f30ecb331f06c47e2b70129b2aa3c
Author: tysonnorris <tysonnor...@gmail.com>
AuthorDate: Thu Sep 10 16:50:38 2020 -0700

    use user.namespace.name instead of user.namespace for metric label (#4950)
    
    * use user.namespace.name instead of user.namespace for metric label
    
    Co-authored-by: rodric rabbah <rod...@gmail.com>
---
 .../org/apache/openwhisk/core/containerpool/ContainerPool.scala  | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git 
a/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/ContainerPool.scala
 
b/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/ContainerPool.scala
index 7ebaec5..c745bef 100644
--- 
a/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/ContainerPool.scala
+++ 
b/core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/ContainerPool.scala
@@ -100,18 +100,15 @@ class ContainerPool(childFactory: ActorRefFactory => 
ActorRef,
   context.system.scheduler.schedule(2.seconds, interval, self, 
AdjustPrewarmedContainer)
 
   def logContainerStart(r: Run, containerState: String, activeActivations: 
Int, container: Option[Container]): Unit = {
-    val namespaceName = r.msg.user.namespace.name
+    val namespaceName = r.msg.user.namespace.name.asString
     val actionName = r.action.name.name
+    val actionNamespace = r.action.namespace.namespace
     val maxConcurrent = r.action.limits.concurrency.maxConcurrent
     val activationId = r.msg.activationId.toString
 
     r.msg.transid.mark(
       this,
-      LoggingMarkers.INVOKER_CONTAINER_START(
-        containerState,
-        r.msg.user.namespace.toString,
-        r.msg.action.namespace.toString,
-        r.msg.action.name.toString),
+      LoggingMarkers.INVOKER_CONTAINER_START(containerState, namespaceName, 
actionNamespace, actionName),
       s"containerStart containerState: $containerState container: $container 
activations: $activeActivations of max $maxConcurrent action: $actionName 
namespace: $namespaceName activationId: $activationId",
       akka.event.Logging.InfoLevel)
   }