Cleanup Metric Attributes (#78)

* Cleanup Metric Attributes

* Cleanup Metric Attributes

* Cleanup Metric Attributes

---------

Co-authored-by: brunnert <brunnert@hm.edu>

Author: brunnert

extension/src/main/java/io/retit/opentelemetry/javaagent/extension/commons/Constants.java

@@ -21,6 +21,12 @@
  */
 @SuppressWarnings("checkstyle:javadocVariable")
 public class Constants {
+    public static final String NETWORK_NAMESPACE = "network";
+    public static final String THREAD_NAMESPACE = "thread";
+    public static final String USER_NAMESPACE = "user";
+    public static final String CLIENT_NAMESPACE = "client";
+    public static final String INSTANCE_NAMESPACE = "instance";
+
     public static final String RETIT_NAMESPACE = "io.retit";
     public static final String RETIT_RESPONSE_TIME_LOGGING_CONFIGURATION_PROPERTY = RETIT_NAMESPACE + ".log.response.time";
     public static final String RETIT_CPU_DEMAND_LOGGING_CONFIGURATION_PROPERTY = RETIT_NAMESPACE + ".log.cpu.demand";

extension/src/main/java/io/retit/opentelemetry/javaagent/extension/metrics/MetricPublishingService.java

@@ -157,7 +157,7 @@ public void publishResourceDemandVectorOfTransaction(final ReadWriteSpan readWri
             Long endThread = readWriteSpan.getAttributes().get(AttributeKey.longKey(Constants.SPAN_ATTRIBUTE_SPAN_END_THREAD));
 
             if (startThread != null && startThread.equals(endThread)) {
-                Attributes filteredAttributes = getAttributesWithoutRETITSpanAttributes(readWriteSpan.getAttributes());
+                Attributes filteredAttributes = getAttributesWithoutRETITThreadUserAndNetworkClientAttributes(readWriteSpan.getAttributes());
                 // add resource demands to resource demand vector
                 publishCpuDemandMetricForTransaction(logCPUTime, readWriteSpan.getAttributes(), filteredAttributes);
                 publishMemoryDemandMetricForTransaction(logHeapConsumption, readWriteSpan.getAttributes(), filteredAttributes);
@@ -229,12 +229,17 @@ private void publishNetworkDemandMetricForTransaction(final boolean logNetworkDe
         }
     }
 
-    private Attributes getAttributesWithoutRETITSpanAttributes(final Attributes spanAttributes) {
+    private Attributes getAttributesWithoutRETITThreadUserAndNetworkClientAttributes(final Attributes spanAttributes) {
         AttributesBuilder attributesBuilder = Attributes.builder();
 
         attributesBuilder.putAll(spanAttributes);
 
-        attributesBuilder.removeIf(key -> key.getKey().startsWith(Constants.RETIT_NAMESPACE));
+        attributesBuilder.removeIf(key -> key.getKey().startsWith(Constants.RETIT_NAMESPACE)
+                || key.getKey().startsWith(Constants.NETWORK_NAMESPACE)
+                || key.getKey().startsWith(Constants.THREAD_NAMESPACE)
+                || key.getKey().startsWith(Constants.USER_NAMESPACE)
+                || key.getKey().startsWith(Constants.CLIENT_NAMESPACE)
+                || key.getKey().startsWith(Constants.INSTANCE_NAMESPACE));
 
         return attributesBuilder.build();
     }