fix(agent): If segment is already named, use the name to create the metric.

Author: zsistla

agent/php_execute.c

@@ -1255,14 +1255,26 @@ static inline void nr_php_execute_segment_add_metric(
     bool create_metric) {
   char buf[METRIC_NAME_MAX_LEN];
 
-  nr_php_execute_metadata_metric(metadata, buf, sizeof(buf));
-
-  if (create_metric) {
-    nr_segment_add_metric(segment, buf, true);
-  }
+/*
+   * If the name is not already set, use the metadata to get the class and
+   * function name to name the metric and the segment.
+   *
+   * If the segment name is already set, use that to name the metric.
+   */
   if (!segment->name) {
-    /* Only set the segment name if it is not already set. */
+    nr_php_execute_metadata_metric(metadata, buf, sizeof(buf));
+
+    if (create_metric) {
+      nr_segment_add_metric(segment, buf, true);
+    }
     nr_segment_set_name(segment, buf);
+  } else {
+    /* Segment already named, so only create the metric with the name. */
+    if (create_metric) {
+      nr_segment_add_metric(
+          segment, nr_string_get(segment->txn->trace_strings, segment->name),
+          true);
+    }
   }
 }