W-16656937: add graphite.prefix.withHostname

salesforce · Sep 11, 2024 · 9c9298f · 9c9298f
1 parent 5719cc4
commit 9c9298f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/carbonj.service/src/main/java/com/demandware/core/config/cfgMetric.java b/carbonj.service/src/main/java/com/demandware/core/config/cfgMetric.java
@@ -58,6 +58,8 @@ NameUtils nameUtils()
 
     @Value( "${graphite.prefix:}" ) private String graphitePrefix;
 
+    @Value( "${graphite.prefix.withHostname:}" ) private String graphitePrefixWithHostname;
+
     @Value( "${dw.podId:-1}" ) private int podId;
 
     @Value( "${dw.groupId:}" ) private String groupId;
@@ -82,7 +84,8 @@ NameUtils nameUtils()
         {
             GraphiteReporter graphiteReporter =
                             Util.getGraphiteReporter( metricRegistry, graphiteHost, graphitePort, graphiteTransport,
-                                            Util.getGraphiteMetricPrefix( graphitePrefix, podId, groupId, svcVersion ) );
+                                            Util.getGraphiteMetricPrefix( graphitePrefixWithHostname, graphitePrefix,
+                                                    podId, groupId, svcVersion ) );
             if ( graphiteReporter != null )
             {
                 graphiteReporter.start( 60, TimeUnit.SECONDS );

diff --git a/carbonj.service/src/main/java/com/demandware/core/metric/Util.java b/carbonj.service/src/main/java/com/demandware/core/metric/Util.java
@@ -24,8 +24,8 @@ public class Util
 
     private static GraphiteReporter graphiteReporter = null;
 
-    public static String getGraphiteMetricPrefix( String graphiteMetricsPrefix, int podId, String groupId,
-                                                  String version )
+    public static String getGraphiteMetricPrefix( String graphiteMetricsPrefixWithHostname, String graphiteMetricsPrefix,
+                                                  int podId, String groupId, String version )
                     throws UnknownHostException
     {
         String fqdn = InetAddress.getLocalHost().getHostName();
@@ -36,6 +36,10 @@ public static String getGraphiteMetricPrefix( String graphiteMetricsPrefix, int
             graphiteMetricsPrefix = String.format( "pod%s.%s.%s.%s.%s", podId, groupId, "carbonj", hostname,
                             version.replaceAll( "\\.", "_" ));
         }
+        else if ( !StringUtils.isEmpty(graphiteMetricsPrefixWithHostname) )
+        {
+            graphiteMetricsPrefix = graphiteMetricsPrefixWithHostname + hostname;
+        }
         else if ( StringUtils.isEmpty( graphiteMetricsPrefix ) )
         {
             graphiteMetricsPrefix = "um.dev.carbonj." + hostname;