refactor: Eliminate redundant logic in enum-based datastore metric methods

Enum-based overloads in MetricNames now delegate to string-based overloads
for GetDatastoreStatement, GetDatastoreInstance, and the three VendorAll
variants; cache init lambdas call the string methods instead of inlining
identical path-building logic.

Remove dead DatastoreVendor overloads from MetricWireModel (TryBuildDatastoreStatementMetric,
TryBuildDatastoreVendorOperationMetric, TryBuildDatastoreInstanceMetric) — all
call sites in DatastoreSegmentData already use the string-based versions.

Author: tippmar-nr

src/Agent/NewRelic/Agent/Core/Metrics/MetricNames.cs

@@ -175,27 +175,28 @@ public static class MetricNames
     static MetricNames()
     {
         _databaseVendorAll = GetEnumerationFunc<DatastoreVendor, MetricName>(vendor =>
-            MetricName.Create(Datastore + PathSeparator + EnumNameCache<DatastoreVendor>.GetName(vendor) + PathSeparator + All));
+            GetDatastoreVendorAll(EnumNameCache<DatastoreVendor>.GetName(vendor)));
         _databaseVendorAllWeb = GetEnumerationFunc<DatastoreVendor, MetricName>(vendor =>
-            MetricName.Create(Datastore + PathSeparator + EnumNameCache<DatastoreVendor>.GetName(vendor) + PathSeparator + AllWeb));
+            GetDatastoreVendorAllWeb(EnumNameCache<DatastoreVendor>.GetName(vendor)));
         _databaseVendorAllOther = GetEnumerationFunc<DatastoreVendor, MetricName>(vendor =>
-            MetricName.Create(Datastore + PathSeparator + EnumNameCache<DatastoreVendor>.GetName(vendor) + PathSeparator + AllOther));
+            GetDatastoreVendorAllOther(EnumNameCache<DatastoreVendor>.GetName(vendor)));
 
         var operations = new HashSet<string>(SqlParser.Operations);
         operations.Add(DatastoreUnknownOperationName);
         _databaseVendorOperations = GetEnumerationFunc<DatastoreVendor, Func<string, MetricName>>(
             vendor =>
             {
+                var vendorName = EnumNameCache<DatastoreVendor>.GetName(vendor);
                 var dict = new Dictionary<string, MetricName>(operations.Count);
-                var metricNamePrefix = DatastoreOperation + PathSeparator + EnumNameCache<DatastoreVendor>.GetName(vendor) + PathSeparator;
+                var metricNamePrefix = DatastoreOperation + PathSeparator + vendorName + PathSeparator;
                 foreach (var operation in operations)
                 {
                     dict[operation] = MetricName.Create(metricNamePrefix + operation);
                 }
 
                 return operation => (dict.TryGetValue(operation, out var name))
                     ? name
-                    : MetricName.Create(DatastoreOperation, EnumNameCache<DatastoreVendor>.GetName(vendor), operation);
+                    : GetDatastoreOperation(vendorName, operation);
             });
     }
 
@@ -484,13 +485,12 @@ public static MetricName GetDatastoreOperation(this DatastoreVendor vendor, stri
     public static MetricName GetDatastoreStatement(DatastoreVendor vendor, string model,
         string operation = null)
     {
-        operation = operation ?? DatastoreUnknownOperationName;
-        return MetricName.Create(DatastoreStatement, EnumNameCache<DatastoreVendor>.GetName(vendor), model, operation);
+        return GetDatastoreStatement(EnumNameCache<DatastoreVendor>.GetName(vendor), model, operation);
     }
 
     public static MetricName GetDatastoreInstance(DatastoreVendor vendor, string host, string portPathOrId)
     {
-        return MetricName.Create(DatastoreInstance, EnumNameCache<DatastoreVendor>.GetName(vendor), host, portPathOrId);
+        return GetDatastoreInstance(EnumNameCache<DatastoreVendor>.GetName(vendor), host, portPathOrId);
     }
 
     // String-based overloads for custom vendor names via RecordDatastoreSegment()

src/Agent/NewRelic/Agent/Core/WireModels/MetricWireModel.cs

@@ -440,39 +440,6 @@ public static void TryBuildDatastoreRollupMetrics(DatastoreVendor vendor, TimeSp
         }
 
         // Datastore/statement/<vendor>/<model>/<operation>
-        public static void TryBuildDatastoreStatementMetric(DatastoreVendor vendor, ParsedSqlStatement sqlStatement,
-            TimeSpan totalTime, TimeSpan exclusiveDuration, TransactionMetricStatsCollection txStats)
-        {
-            var proposedName = MetricName.Create(sqlStatement.DatastoreStatementMetricName);
-            var data = MetricDataWireModel.BuildTimingData(totalTime, exclusiveDuration);
-            txStats.MergeUnscopedStats(proposedName, data);
-            txStats.MergeScopedStats(proposedName, data);
-        }
-
-        // Datastore/operation/<vendor>/<operation>
-        public static void TryBuildDatastoreVendorOperationMetric(DatastoreVendor vendor, string operation,
-            TimeSpan totalTime, TimeSpan exclusiveDuration, TransactionMetricStatsCollection txStats, bool onlyUnscoped)
-        {
-            var proposedName = vendor.GetDatastoreOperation(operation);
-            var data = MetricDataWireModel.BuildTimingData(totalTime, exclusiveDuration);
-            txStats.MergeUnscopedStats(proposedName, data);
-            if (!onlyUnscoped)
-            {
-                txStats.MergeScopedStats(proposedName, data);
-            }
-        }
-
-        //Datastore/instance/datastore/host/port_path_or_id
-        public static void TryBuildDatastoreInstanceMetric(DatastoreVendor vendor, string host, string portPathOrId,
-            TimeSpan totalTime, TimeSpan exclusiveDuration, TransactionMetricStatsCollection txStats)
-        {
-            var proposedName = MetricNames.GetDatastoreInstance(vendor, host, portPathOrId);
-            var data = MetricDataWireModel.BuildTimingData(totalTime, exclusiveDuration);
-            txStats.MergeUnscopedStats(proposedName, data);
-        }
-
-        // String-based overloads for custom vendor names via RecordDatastoreSegment()
-
         public static void TryBuildDatastoreStatementMetric(ParsedSqlStatement sqlStatement,
             TimeSpan totalTime, TimeSpan exclusiveDuration, TransactionMetricStatsCollection txStats)
         {