Add support for resource attributes (#295)

Signed-off-by: Pavol Loffay <[email protected]>

Author: pavolloffay

javaagent-core/src/main/java/org/hypertrace/agent/core/config/EnvironmentConfig.java

@@ -38,6 +38,7 @@ private EnvironmentConfig() {}
   public static final String CONFIG_FILE_PROPERTY = HT_PREFIX + "config.file";
   static final String SERVICE_NAME = HT_PREFIX + "service.name";
   static final String ENABLED = HT_PREFIX + "enabled";
+  static final String RESOURCE_ATTRIBUTES = HT_PREFIX + ".resource.attributes";
 
   static final String PROPAGATION_FORMATS = HT_PREFIX + "propagation.formats";
 
@@ -71,6 +72,19 @@ public static AgentConfig.Builder applyPropertiesAndEnvVars(AgentConfig.Builder
       builder.setEnabled(BoolValue.newBuilder().setValue(Boolean.valueOf(enabled)).build());
     }
 
+    String attributes = getProperty(RESOURCE_ATTRIBUTES);
+    if (attributes != null) {
+      String[] attrs = attributes.split(",");
+      for (String attr : attrs) {
+        String[] keyValArr = attr.split("=");
+        if (keyValArr.length == 2) {
+          String key = keyValArr[0];
+          String val = keyValArr[1];
+          builder.putResourceAttributes(key, val);
+        }
+      }
+    }
+
     Reporting.Builder reportingBuilder = applyReporting(builder.getReporting().toBuilder());
     builder.setReporting(reportingBuilder);
 

javaagent-core/src/main/proto

@@ -39,6 +39,7 @@ class EnvironmentConfigTest {
   @ClearSystemProperty(key = EnvironmentConfig.CAPTURE_BODY_MAX_SIZE_BYTES)
   @ClearSystemProperty(key = EnvironmentConfig.JAVAAGENT_FILTER_JAR_PATHS)
   @ClearSystemProperty(key = EnvironmentConfig.ENABLED)
+  @ClearSystemProperty(key = EnvironmentConfig.RESOURCE_ATTRIBUTES)
   public void systemProperties() {
     // when tests are run in parallel the env vars/sys props set it junit-pioneer are visible to
     // parallel tests
@@ -53,13 +54,17 @@ public void systemProperties() {
     System.setProperty(EnvironmentConfig.CAPTURE_BODY_MAX_SIZE_BYTES, "512");
     System.setProperty(EnvironmentConfig.JAVAAGENT_FILTER_JAR_PATHS, "/path1.jar,/path/2/jar.jar");
     System.setProperty(EnvironmentConfig.ENABLED, "false");
+    System.setProperty(EnvironmentConfig.RESOURCE_ATTRIBUTES, "key1=val1,key2=val2");
 
     AgentConfig.Builder configBuilder = AgentConfig.newBuilder();
     configBuilder.setServiceName(StringValue.newBuilder().setValue("foo"));
 
     AgentConfig agentConfig = EnvironmentConfig.applyPropertiesAndEnvVars(configBuilder).build();
     Assertions.assertEquals(false, agentConfig.getEnabled().getValue());
     Assertions.assertEquals("foo", agentConfig.getServiceName().getValue());
+    Assertions.assertEquals(2, agentConfig.getResourceAttributesCount());
+    Assertions.assertEquals("val1", agentConfig.getResourceAttributesMap().get("key1"));
+    Assertions.assertEquals("val2", agentConfig.getResourceAttributesMap().get("key2"));
     Assertions.assertEquals(
         Arrays.asList(PropagationFormat.B3, PropagationFormat.TRACECONTEXT),
         agentConfig.getPropagationFormatsList());