Add new option DisableAppendingUnitName in order to avoid appending the unit name in the metric name

Author: Gpower2

src/OpenTelemetry.Exporter.Prometheus.AspNetCore/.publicApi/PublicAPI.Unshipped.txt

@@ -1,6 +1,8 @@
 Microsoft.AspNetCore.Builder.PrometheusExporterApplicationBuilderExtensions
 Microsoft.AspNetCore.Builder.PrometheusExporterEndpointRouteBuilderExtensions
 OpenTelemetry.Exporter.PrometheusAspNetCoreOptions
+OpenTelemetry.Exporter.PrometheusAspNetCoreOptions.DisableAppendingUnitName.get -> bool
+OpenTelemetry.Exporter.PrometheusAspNetCoreOptions.DisableAppendingUnitName.set -> void
 OpenTelemetry.Exporter.PrometheusAspNetCoreOptions.DisableTotalNameSuffixForCounters.get -> bool
 OpenTelemetry.Exporter.PrometheusAspNetCoreOptions.DisableTotalNameSuffixForCounters.set -> void
 OpenTelemetry.Exporter.PrometheusAspNetCoreOptions.PrometheusAspNetCoreOptions() -> void

src/OpenTelemetry.Exporter.Prometheus.AspNetCore/PrometheusAspNetCoreOptions.cs

@@ -38,5 +38,14 @@ public int ScrapeResponseCacheDurationMilliseconds
         set => this.ExporterOptions.ScrapeResponseCacheDurationMilliseconds = value;
     }
 
+    /// <summary>
+    /// Gets or sets a value indicating whether addition of the unit name for metric names is disabled. Default value: <see langword="false"/>.
+    /// </summary>
+    public bool DisableAppendingUnitName
+    {
+        get => this.ExporterOptions.DisableAppendingUnitName;
+        set => this.ExporterOptions.DisableAppendingUnitName = value;
+    }
+
     internal PrometheusExporterOptions ExporterOptions { get; } = new();
 }

src/OpenTelemetry.Exporter.Prometheus.HttpListener/.publicApi/PublicAPI.Unshipped.txt

@@ -1,4 +1,6 @@
 OpenTelemetry.Exporter.PrometheusHttpListenerOptions
+OpenTelemetry.Exporter.PrometheusHttpListenerOptions.DisableAppendingUnitName.get -> bool
+OpenTelemetry.Exporter.PrometheusHttpListenerOptions.DisableAppendingUnitName.set -> void
 OpenTelemetry.Exporter.PrometheusHttpListenerOptions.DisableTotalNameSuffixForCounters.get -> bool
 OpenTelemetry.Exporter.PrometheusHttpListenerOptions.DisableTotalNameSuffixForCounters.set -> void
 OpenTelemetry.Exporter.PrometheusHttpListenerOptions.UriPrefixes.get -> System.Collections.Generic.IReadOnlyCollection<string!>!

src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/PrometheusCollectionManager.cs

@@ -361,7 +361,7 @@ private PrometheusMetric GetPrometheusMetric(Metric metric)
         // Optimize writing metrics with bounded cache that has pre-calculated Prometheus names.
         if (!this.metricsCache.TryGetValue(metric, out var prometheusMetric))
         {
-            prometheusMetric = PrometheusMetric.Create(metric, this.exporter.DisableTotalNameSuffixForCounters);
+            prometheusMetric = PrometheusMetric.Create(metric, this.exporter.DisableTotalNameSuffixForCounters, this.exporter.DisableAppendingUnitName);
 
             // Add to the cache if there is space.
             if (this.metricsCacheCount < MaxCachedMetrics)

src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/PrometheusExporter.cs

@@ -27,6 +27,7 @@ public PrometheusExporter(PrometheusExporterOptions options)
 
         this.ScrapeResponseCacheDurationMilliseconds = options.ScrapeResponseCacheDurationMilliseconds;
         this.DisableTotalNameSuffixForCounters = options.DisableTotalNameSuffixForCounters;
+        this.DisableAppendingUnitName = options.DisableAppendingUnitName;
 
         this.CollectionManager = new PrometheusCollectionManager(this);
     }
@@ -48,6 +49,8 @@ public PrometheusExporter(PrometheusExporterOptions options)
 
     internal bool DisableTotalNameSuffixForCounters { get; }
 
+    internal bool DisableAppendingUnitName { get; }
+
     internal bool OpenMetricsRequested { get; set; }
 
     internal Resource Resource => this.resource ??= this.ParentProvider.GetResource();

src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/PrometheusExporterOptions.cs

@@ -33,4 +33,9 @@ public int ScrapeResponseCacheDurationMilliseconds
     /// Gets or sets a value indicating whether addition of _total suffix for counter metric names is disabled. Default value: <see langword="false"/>.
     /// </summary>
     public bool DisableTotalNameSuffixForCounters { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether addition of the unit name for metric names is disabled. Default value: <see langword="false"/>.
+    /// </summary>
+    public bool DisableAppendingUnitName { get; set; }
 }

src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/PrometheusMetric.cs

@@ -21,7 +21,7 @@ UpDownCounter becomes gauge
         PrometheusType.Untyped, PrometheusType.Counter, PrometheusType.Gauge, PrometheusType.Summary, PrometheusType.Histogram, PrometheusType.Histogram, PrometheusType.Histogram, PrometheusType.Histogram, PrometheusType.Gauge,
     ];
 
-    public PrometheusMetric(string name, string unit, PrometheusType type, bool disableTotalNameSuffixForCounters)
+    public PrometheusMetric(string name, string unit, PrometheusType type, bool disableTotalNameSuffixForCounters, bool disableAppendingUnitName)
     {
         // The metric name is
         // required to match the regex: `[a-zA-Z_:]([a-zA-Z0-9_:])*`. Invalid characters
@@ -32,7 +32,7 @@ public PrometheusMetric(string name, string unit, PrometheusType type, bool disa
         var openMetricsName = SanitizeOpenMetricsName(sanitizedName);
 
         string? sanitizedUnit = null;
-        if (!string.IsNullOrEmpty(unit))
+        if (!disableAppendingUnitName && !string.IsNullOrEmpty(unit))
         {
             sanitizedUnit = GetUnit(unit);
 
@@ -86,9 +86,9 @@ public PrometheusMetric(string name, string unit, PrometheusType type, bool disa
 
     public PrometheusType Type { get; }
 
-    public static PrometheusMetric Create(Metric metric, bool disableTotalNameSuffixForCounters)
+    public static PrometheusMetric Create(Metric metric, bool disableTotalNameSuffixForCounters, bool disableAppendingUnitName)
     {
-        return new PrometheusMetric(metric.Name, metric.Unit, GetPrometheusType(metric), disableTotalNameSuffixForCounters);
+        return new PrometheusMetric(metric.Name, metric.Unit, GetPrometheusType(metric), disableTotalNameSuffixForCounters, disableAppendingUnitName);
     }
 
     internal static string SanitizeMetricName(string metricName)

src/OpenTelemetry.Exporter.Prometheus.HttpListener/PrometheusHttpListenerMeterProviderBuilderExtensions.cs

@@ -69,6 +69,7 @@ private static BaseExportingMetricReader BuildPrometheusHttpListenerMetricReader
         {
             ScrapeResponseCacheDurationMilliseconds = 0,
             DisableTotalNameSuffixForCounters = options.DisableTotalNameSuffixForCounters,
+            DisableAppendingUnitName = options.DisableAppendingUnitName,
         });
 
         var reader = new BaseExportingMetricReader(exporter)

src/OpenTelemetry.Exporter.Prometheus.HttpListener/PrometheusHttpListenerOptions.cs

@@ -24,6 +24,11 @@ public class PrometheusHttpListenerOptions
     /// </summary>
     public bool DisableTotalNameSuffixForCounters { get; set; }
 
+    /// <summary>
+    /// Gets or sets a value indicating whether addition of the unit name for metric names is disabled. Default value: <see langword="false"/>.
+    /// </summary>
+    public bool DisableAppendingUnitName { get; set; }
+
     /// <summary>
     /// Gets or sets the URI (Uniform Resource Identifier) prefixes to use for the http listener.
     /// Default value: <c>["http://localhost:9464/"]</c>.

test/Benchmarks/Exporter/PrometheusSerializerBenchmarks.cs

@@ -66,7 +66,7 @@ private PrometheusMetric GetPrometheusMetric(Metric metric)
     {
         if (!this.cache.TryGetValue(metric, out var prometheusMetric))
         {
-            prometheusMetric = PrometheusMetric.Create(metric, false);
+            prometheusMetric = PrometheusMetric.Create(metric, false, false);
             this.cache[metric] = prometheusMetric;
         }