diff --git a/src/JustEat.StatsD/TagsFormatter.cs b/src/JustEat.StatsD/TagsFormatter.cs
index ce3ee203..e892da30 100644
--- a/src/JustEat.StatsD/TagsFormatter.cs
+++ b/src/JustEat.StatsD/TagsFormatter.cs
@@ -10,35 +10,35 @@ public static class TagsFormatter
///
/// Gets an AWS CloudWatch tags formatter.
///
- public static IStatsDTagsFormatter CloudWatch => new TrailingTagsFormatter();
+ public static IStatsDTagsFormatter CloudWatch => TrailingTagsFormatter.Instance;
///
/// Gets a DataDog tags formatter.
///
- public static IStatsDTagsFormatter DataDog => new TrailingTagsFormatter();
+ public static IStatsDTagsFormatter DataDog => TrailingTagsFormatter.Instance;
///
/// Gets a GraphiteDB tags formatter.
///
- public static IStatsDTagsFormatter GraphiteDb => new GraphiteDbTagsFormatter();
+ public static IStatsDTagsFormatter GraphiteDb { get; } = new GraphiteDbTagsFormatter();
///
/// Gets an InfluxDB tags formatter.
///
- public static IStatsDTagsFormatter InfluxDb => new InfluxDbTagsFormatter();
+ public static IStatsDTagsFormatter InfluxDb { get; } = new InfluxDbTagsFormatter();
///
/// Gets a Librato tags formatter.
///
- public static IStatsDTagsFormatter Librato => new LibratoTagsFormatter();
+ public static IStatsDTagsFormatter Librato { get; } = new LibratoTagsFormatter();
///
/// Gets a SignalFX dimensions formatter.
///
- public static IStatsDTagsFormatter SignalFx => new SignalFxTagsFormatter();
+ public static IStatsDTagsFormatter SignalFx { get; } = new SignalFxTagsFormatter();
///
/// Gets a Splunk tags formatter.
///
- public static IStatsDTagsFormatter Splunk => new TrailingTagsFormatter();
+ public static IStatsDTagsFormatter Splunk => TrailingTagsFormatter.Instance;
}
diff --git a/src/JustEat.StatsD/TagsFormatters/TrailingTagsFormatter.cs b/src/JustEat.StatsD/TagsFormatters/TrailingTagsFormatter.cs
index f2d1111d..7ace17ff 100644
--- a/src/JustEat.StatsD/TagsFormatters/TrailingTagsFormatter.cs
+++ b/src/JustEat.StatsD/TagsFormatters/TrailingTagsFormatter.cs
@@ -25,4 +25,9 @@ public TrailingTagsFormatter()
})
{
}
+
+ ///
+ /// Gets the singleton instance of the class.
+ ///
+ public static TrailingTagsFormatter Instance { get; } = new TrailingTagsFormatter();
}