Remove tag helpers.

Author: tcdent

agentops/helpers/__init__.py

@@ -20,7 +20,6 @@
 from .version import get_agentops_version, check_agentops_update
 from .debug import debug_print_function_params
 from .env import get_env_bool, get_env_int, get_env_list
-from .config import get_config, get_tags_from_config
 
 __all__ = [
     "get_ISO_time",
@@ -46,6 +45,5 @@
     "get_env_bool",
     "get_env_int",
     "get_env_list",
-    "get_config",
     "get_tags_from_config",
 ]

agentops/helpers/config.py

@@ -21,7 +21,7 @@
 """
 from typing import Dict, Any, Optional, List
 from agentops.logging import logger
-from agentops.helpers import safe_serialize, get_agentops_version, get_tags_from_config
+from agentops.helpers import safe_serialize, get_agentops_version
 from agentops.semconv import (
     CoreAttributes,
     InstrumentationAttributes,
@@ -99,8 +99,15 @@ def get_base_trace_attributes(trace: Any) -> AttributeMap:
     }
 
     # Add tags from the config to the trace attributes (these should only be added to the trace)
-    if tags := get_tags_from_config():
-        attributes[CoreAttributes.TAGS] = tags
+    from agentops import get_client
+    
+    config = get_client().config
+    tags = []
+    if config.default_tags:
+        # `default_tags` can either be a `set` or a `list`
+        tags = list(config.default_tags)
+    
+    attributes[CoreAttributes.TAGS] = tags
 
     return attributes
 

agentops/instrumentation/common/attributes.py

@@ -142,24 +142,20 @@ def __init__(self):
         # Mock the common attributes and tags functions
         with patch("agentops.instrumentation.common.attributes.get_common_attributes", 
                    return_value={InstrumentationAttributes.NAME: "agentops", InstrumentationAttributes.VERSION: "0.1.2"}):
-            with patch("agentops.instrumentation.common.attributes.get_tags_from_config", 
-                       return_value={"tag1": "value1", "tag2": "value2"}):
-                # Get base trace attributes
-                attributes = get_base_trace_attributes(mock_trace)
-                
-                # Verify attributes
-                assert CoreAttributes.TRACE_ID in attributes
-                assert attributes[CoreAttributes.TRACE_ID] == "test_trace_id"
-                assert WorkflowAttributes.WORKFLOW_NAME in attributes
-                assert attributes[WorkflowAttributes.WORKFLOW_NAME] == "test_trace_name"
-                assert WorkflowAttributes.WORKFLOW_STEP_TYPE in attributes
-                assert attributes[WorkflowAttributes.WORKFLOW_STEP_TYPE] == "trace"
-                assert InstrumentationAttributes.NAME in attributes
-                assert attributes[InstrumentationAttributes.NAME] == "agentops"
-                assert InstrumentationAttributes.VERSION in attributes
-                assert attributes[InstrumentationAttributes.VERSION] == "0.1.2"
-                assert CoreAttributes.TAGS in attributes
-                assert attributes[CoreAttributes.TAGS] == {"tag1": "value1", "tag2": "value2"}
+            # Get base trace attributes
+            attributes = get_base_trace_attributes(mock_trace)
+            
+            # Verify attributes
+            assert CoreAttributes.TRACE_ID in attributes
+            assert attributes[CoreAttributes.TRACE_ID] == "test_trace_id"
+            assert WorkflowAttributes.WORKFLOW_NAME in attributes
+            assert attributes[WorkflowAttributes.WORKFLOW_NAME] == "test_trace_name"
+            assert WorkflowAttributes.WORKFLOW_STEP_TYPE in attributes
+            assert attributes[WorkflowAttributes.WORKFLOW_STEP_TYPE] == "trace"
+            assert InstrumentationAttributes.NAME in attributes
+            assert attributes[InstrumentationAttributes.NAME] == "agentops"
+            assert InstrumentationAttributes.VERSION in attributes
+            assert attributes[InstrumentationAttributes.VERSION] == "0.1.2"
 
     def test_get_base_trace_attributes_with_invalid_trace(self):
         """Test getting base trace attributes with an invalid trace (missing trace_id)."""