count graph elements during proto conversion

flatgraph can log more cheaply log this info internally while loading a
graph. ODB graphs are converted on the fly to flatgraph, so that'll
happen for those graphs as well. Add this for protos, and all formats
are covered.

Author: maltek

codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/CpgLoader.scala

@@ -40,9 +40,7 @@ object CpgLoader {
       load(absolutePath, persistTo = path.resolveSibling(s"${path.getFileName}.fg"))
     } else {
       // assuming it's flatgraph format
-      val cpg = Cpg.withStorage(absolutePath)
-      logger.debug(s"Loaded Cpg with ${cpg.graph.nodeCount} nodes and ${cpg.graph.edgeCount} edges")
-      cpg
+      Cpg.withStorage(absolutePath)
     }
   }
 
@@ -60,7 +58,7 @@ object CpgLoader {
     if (persistTo != from)
       Files.deleteIfExists(persistTo)
 
-    val cpg = if (!Files.exists(absolutePath)) {
+    if (!Files.exists(absolutePath)) {
       throw new FileNotFoundException(s"given input file $absolutePath does not exist")
     } else if (isProtoFormat(absolutePath)) {
       logger.debug(s"Converting $from from proto cpg into new flatgraph storage: $persistTo")
@@ -75,9 +73,6 @@ object CpgLoader {
         s"unknown file format - we probed the first bytes but it didn't look like one of our known formats (proto.zip, flatgraph, overflowdb)"
       )
     }
-    logger.debug(s"Loaded Cpg with ${cpg.graph.nodeCount} nodes and ${cpg.graph.edgeCount} edges")
-
-    cpg
   }
 
   /** Determine whether the CPG is a legacy (proto) CPG */

codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ProtoCpgLoader.scala

@@ -41,6 +41,8 @@ object ProtoCpgLoader {
     implicit val interner: StringInterner = StringInterner.makeStrongInterner()
     val protoToGraphNodeMappings          = new ProtoToGraphNodeMappings
     val cpg                               = openOrCreateCpg(storagePath)
+    var edgeCount                         = 0
+    var propCount                         = 0
 
     // first pass: add the raw nodes without any properties or edges
     addNodesRaw(protoCpgs().flatMap(cpgProto => nodesIter(cpgProto)), cpg.graph, protoToGraphNodeMappings)
@@ -54,20 +56,23 @@ object ProtoCpgLoader {
           .findGNode(protoNode)
           .getOrElse(throw new ConversionException(s"node with proto node id=$protoNodeId not found in graph"))
         protoNode.getPropertyList.iterator().asScala.foreach { protoProperty =>
+          propCount += 1
           diffGraph.setNodeProperty(gNode, protoProperty.getName.name(), extractPropertyValue(protoProperty.getValue()))
         }
       }
 
       protoCpg.getEdgeList.iterator().asScala.foreach { protoEdge =>
         List(protoEdge.getSrc, protoEdge.getDst).map(protoToGraphNodeMappings.findGNode) match {
           case List(Some(srcNode), Some(dstNode)) =>
+            edgeCount += 1
             diffGraph.addEdge(srcNode, dstNode, protoEdge.getType.name(), extractEdgePropertyValue(protoEdge))
           case _ => // at least one of the nodes doesn't exist in the cpg, most likely because it was filtered out - ignore
         }
       }
     }
 
     DiffGraphApplier.applyDiff(cpg.graph, diffGraph)
+    logger.debug(s"Loaded proto graph with ${cpg.graph.nodeCount} nodes, $edgeCount edges, $propCount properties")
     cpg
   }