Cherry pick branch 'genexuslabs:feature/gxobservability-testing-and-docs' into beta

Author: iroqueta

gxobservability/src/main/java/com/genexus/opentelemetry/ExtractAttributeValueHelper.java

@@ -0,0 +1,31 @@
+package com.genexus.opentelemetry;
+
+/**
+ * Helper class to provide a testable version of the extractAttributeValue method from OtelTracer.
+ * This is used to support unit testing of the private method.
+ */
+public class ExtractAttributeValueHelper {
+    
+    /**
+     * Extracts an attribute value from a resource attributes string
+     * 
+     * @param resourceAttributes the resource attributes string
+     * @param attributeName the name of the attribute to extract
+     * @return the attribute value, or null if not found
+     */
+    public static String extractAttributeValue(String resourceAttributes, String attributeName) {
+        if (resourceAttributes == null || attributeName == null) {
+            return null;
+        }
+        
+        // Simple parsing for key-value pairs
+        String[] pairs = resourceAttributes.split(",");
+        for (String pair : pairs) {
+            String[] keyValue = pair.split("=");
+            if (keyValue.length == 2 && keyValue[0].equals(attributeName)) {
+                return keyValue[1];
+            }
+        }
+        return null;
+    }
+}

gxobservability/src/main/java/com/genexus/opentelemetry/OtelTracer.java

@@ -179,7 +179,7 @@ private static String extractAttributeValue(String resourceAttributes, String at
 			return null;
 		}
 
-		String pattern = "(?:\\b\\w+\\b=\\w+)(?:,(?:\\b\\w+\\b=\\w+))*";
+		String pattern = "(\\w[\\w.\\-]*?)=([^,]+)";
 		Pattern regex = Pattern.compile(pattern);
 		Matcher matcher = regex.matcher(resourceAttributes);
 

gxobservability/src/test/java/com/genexus/opentelemetry/ExtractAttributeValueTest.java

@@ -0,0 +1,38 @@
+package com.genexus.opentelemetry;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class ExtractAttributeValueTest {
+
+    @Test
+    void testExtractAttributeValue() {
+        // Test case 1: Test with null parameters
+        String attributeValue = ExtractAttributeValueHelper.extractAttributeValue(null, "service.name");
+        assertNull(attributeValue, "Should return null for null resource attributes");
+        
+        attributeValue = ExtractAttributeValueHelper.extractAttributeValue("service.name=test", null);
+        assertNull(attributeValue, "Should return null for null attribute name");
+        
+        // Test case 2: Empty resource attributes
+        attributeValue = ExtractAttributeValueHelper.extractAttributeValue("", "service.name");
+        assertNull(attributeValue, "Should return null for empty resource attributes");
+        
+        // Test case 3: Simple key-value pair
+        String simpleAttributes = "service.name=test-service";
+        attributeValue = ExtractAttributeValueHelper.extractAttributeValue(simpleAttributes, "service.name");
+        assertEquals("test-service", attributeValue, "Should extract simple attribute correctly");
+        
+        // Test case 4: Multiple key-value pairs
+        String multiAttributes = "service.name=my-service,service.version=1.0.0";
+        attributeValue = ExtractAttributeValueHelper.extractAttributeValue(multiAttributes, "service.name");
+        assertEquals("my-service", attributeValue, "Should extract first attribute correctly");
+        
+        attributeValue = ExtractAttributeValueHelper.extractAttributeValue(multiAttributes, "service.version");
+        assertEquals("1.0.0", attributeValue, "Should extract second attribute correctly");
+        
+        // Test case 5: Non-existent attribute
+        attributeValue = ExtractAttributeValueHelper.extractAttributeValue(multiAttributes, "non.existent");
+        assertNull(attributeValue, "Should return null for non-existent attribute");
+    }
+}

gxobservability/src/test/java/com/genexus/opentelemetry/OtelTracerTest.java

@@ -10,6 +10,8 @@
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 
+import java.lang.reflect.Method;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -121,4 +123,71 @@ void testCreateSpanWithNullIterator() {
 
         assertNotNull(span);
     }
+    
+    @Test
+    void testExtractAttributeValue() throws Exception {
+        // Get access to the private method using reflection
+        Method extractAttributeValueMethod = OtelTracer.class.getDeclaredMethod(
+            "extractAttributeValue", 
+            String.class, 
+            String.class
+        );
+        extractAttributeValueMethod.setAccessible(true);
+        
+        // Test case 1: Test with null parameters
+        String attributeValue = (String) extractAttributeValueMethod.invoke(
+            null, 
+            null, 
+            "service.name"
+        );
+        assertNull(attributeValue, "Should return null for null resource attributes");
+        
+        attributeValue = (String) extractAttributeValueMethod.invoke(
+            null, 
+            "service.name=test", 
+            null
+        );
+        assertNull(attributeValue, "Should return null for null attribute name");
+        
+        // Test case 2: Empty resource attributes
+        attributeValue = (String) extractAttributeValueMethod.invoke(
+            null, 
+            "", 
+            "service.name"
+        );
+        assertNull(attributeValue, "Should return null for empty resource attributes");
+        
+        // Test case 3: Simple key-value pair
+        String simpleAttributes = "service.name=test-service";
+        attributeValue = (String) extractAttributeValueMethod.invoke(
+            null, 
+            simpleAttributes, 
+            "service.name"
+        );
+        assertEquals("test-service", attributeValue, "Should extract simple attribute correctly");
+        
+        // Test case 4: Multiple key-value pairs
+        String multiAttributes = "service.name=my-service,service.version=1.0.0";
+        attributeValue = (String) extractAttributeValueMethod.invoke(
+            null, 
+            multiAttributes, 
+            "service.name"
+        );
+        assertEquals("my-service", attributeValue, "Should extract first attribute correctly");
+        
+        attributeValue = (String) extractAttributeValueMethod.invoke(
+            null, 
+            multiAttributes, 
+            "service.version"
+        );
+        assertEquals("1.0.0", attributeValue, "Should extract second attribute correctly");
+        
+        // Test case 5: Non-existent attribute
+        attributeValue = (String) extractAttributeValueMethod.invoke(
+            null, 
+            multiAttributes, 
+            "non.existent"
+        );
+        assertNull(attributeValue, "Should return null for non-existent attribute");
+    }
 }