Rework counters

Author: dmelikyan

README.md

@@ -84,7 +84,7 @@ Graphsignal tracer is highly lightweight. The overhead per trace is measured to
 
 The Graphsignal tracer only establishes outbound connections to `api.graphsignal.com` to send data; inbound connections or commands are not possible.
 
-Payloads, such as prompts and completions, are recorded by default in case of automatic tracing. To disable, set `record_payloads=False` in `graphsignal.configure`.
+Content and sensitive information, such as prompts and completions, are not recorded.
 
 
 ## Troubleshooting

graphsignal/__init__.py

@@ -71,7 +71,6 @@ def configure(
     deployment: Optional[str] = None,
     tags: Optional[Dict[str, str]] = None,
     auto_instrument: Optional[bool] = None,
-    record_payloads: Optional[bool] = None,
     profiling_rate: Optional[float] = None,
     debug_mode: Optional[bool] = None
 ) -> None:
@@ -85,7 +84,6 @@ def configure(
     api_url = _read_config_param("api_url", str, api_url)
     tags = _read_config_tags(tags)
     auto_instrument = _read_config_param("auto_instrument", bool, auto_instrument, default_value=True)
-    record_payloads = _read_config_param("record_payloads", bool, record_payloads, default_value=True)
     profiling_rate = _read_config_param("profiling_rate", float, profiling_rate, default_value=0.1)
     debug_mode = _read_config_param("debug_mode", bool, debug_mode, default_value=False)
 
@@ -98,7 +96,6 @@ def configure(
         api_url=api_url,
         tags=tags,
         auto_instrument=auto_instrument,
-        record_payloads=record_payloads,
         profiling_rate=profiling_rate,
         debug_mode=debug_mode)
     _tracer.setup()

graphsignal/client/__init__.py

@@ -39,7 +39,6 @@
 from graphsignal.client.models.metric import Metric
 from graphsignal.client.models.metric_type import MetricType
 from graphsignal.client.models.param import Param
-from graphsignal.client.models.payload import Payload
 from graphsignal.client.models.profile import Profile
 from graphsignal.client.models.rate import Rate
 from graphsignal.client.models.score import Score

graphsignal/client/api/default_api.py

@@ -452,7 +452,6 @@ def _query_scores_serialize(
     def query_spans(
         self,
         tags: Annotated[Optional[StrictStr], Field(description="Filter spans by tags. Provide tags as a semicolon-separated list of key-value pairs (e.g., 'key1:value1;key2:value2').")] = None,
-        text: Annotated[Optional[StrictStr], Field(description="Filter spans by text. Provide text to search for in span payloads.")] = None,
         start_time: Annotated[Optional[datetime], Field(description="Start time for filtering spans, in ISO format.")] = None,
         end_time: Annotated[Optional[datetime], Field(description="End time for filtering spans, in ISO format.")] = None,
         limit: Annotated[Optional[StrictInt], Field(description="Limit the number of returned spans. Default is 100. Max is 1000.")] = None,
@@ -476,8 +475,6 @@ def query_spans(
 
         :param tags: Filter spans by tags. Provide tags as a semicolon-separated list of key-value pairs (e.g., 'key1:value1;key2:value2').
         :type tags: str
-        :param text: Filter spans by text. Provide text to search for in span payloads.
-        :type text: str
         :param start_time: Start time for filtering spans, in ISO format.
         :type start_time: datetime
         :param end_time: End time for filtering spans, in ISO format.
@@ -510,7 +507,6 @@ def query_spans(
 
         _param = self._query_spans_serialize(
             tags=tags,
-            text=text,
             start_time=start_time,
             end_time=end_time,
             limit=limit,
@@ -540,7 +536,6 @@ def query_spans(
     def query_spans_with_http_info(
         self,
         tags: Annotated[Optional[StrictStr], Field(description="Filter spans by tags. Provide tags as a semicolon-separated list of key-value pairs (e.g., 'key1:value1;key2:value2').")] = None,
-        text: Annotated[Optional[StrictStr], Field(description="Filter spans by text. Provide text to search for in span payloads.")] = None,
         start_time: Annotated[Optional[datetime], Field(description="Start time for filtering spans, in ISO format.")] = None,
         end_time: Annotated[Optional[datetime], Field(description="End time for filtering spans, in ISO format.")] = None,
         limit: Annotated[Optional[StrictInt], Field(description="Limit the number of returned spans. Default is 100. Max is 1000.")] = None,
@@ -564,8 +559,6 @@ def query_spans_with_http_info(
 
         :param tags: Filter spans by tags. Provide tags as a semicolon-separated list of key-value pairs (e.g., 'key1:value1;key2:value2').
         :type tags: str
-        :param text: Filter spans by text. Provide text to search for in span payloads.
-        :type text: str
         :param start_time: Start time for filtering spans, in ISO format.
         :type start_time: datetime
         :param end_time: End time for filtering spans, in ISO format.
@@ -598,7 +591,6 @@ def query_spans_with_http_info(
 
         _param = self._query_spans_serialize(
             tags=tags,
-            text=text,
             start_time=start_time,
             end_time=end_time,
             limit=limit,
@@ -628,7 +620,6 @@ def query_spans_with_http_info(
     def query_spans_without_preload_content(
         self,
         tags: Annotated[Optional[StrictStr], Field(description="Filter spans by tags. Provide tags as a semicolon-separated list of key-value pairs (e.g., 'key1:value1;key2:value2').")] = None,
-        text: Annotated[Optional[StrictStr], Field(description="Filter spans by text. Provide text to search for in span payloads.")] = None,
         start_time: Annotated[Optional[datetime], Field(description="Start time for filtering spans, in ISO format.")] = None,
         end_time: Annotated[Optional[datetime], Field(description="End time for filtering spans, in ISO format.")] = None,
         limit: Annotated[Optional[StrictInt], Field(description="Limit the number of returned spans. Default is 100. Max is 1000.")] = None,
@@ -652,8 +643,6 @@ def query_spans_without_preload_content(
 
         :param tags: Filter spans by tags. Provide tags as a semicolon-separated list of key-value pairs (e.g., 'key1:value1;key2:value2').
         :type tags: str
-        :param text: Filter spans by text. Provide text to search for in span payloads.
-        :type text: str
         :param start_time: Start time for filtering spans, in ISO format.
         :type start_time: datetime
         :param end_time: End time for filtering spans, in ISO format.
@@ -686,7 +675,6 @@ def query_spans_without_preload_content(
 
         _param = self._query_spans_serialize(
             tags=tags,
-            text=text,
             start_time=start_time,
             end_time=end_time,
             limit=limit,
@@ -711,7 +699,6 @@ def query_spans_without_preload_content(
     def _query_spans_serialize(
         self,
         tags,
-        text,
         start_time,
         end_time,
         limit,
@@ -742,10 +729,6 @@ def _query_spans_serialize(
 
             _query_params.append(('tags', tags))
 
-        if text is not None:
-            
-            _query_params.append(('text', text))
-            
         if start_time is not None:
             if isinstance(start_time, datetime):
                 _query_params.append(

graphsignal/client/models/__init__.py

@@ -22,7 +22,6 @@
 from graphsignal.client.models.metric import Metric
 from graphsignal.client.models.metric_type import MetricType
 from graphsignal.client.models.param import Param
-from graphsignal.client.models.payload import Payload
 from graphsignal.client.models.profile import Profile
 from graphsignal.client.models.rate import Rate
 from graphsignal.client.models.score import Score

graphsignal/client/models/payload.py

@@ -22,7 +22,6 @@
 from graphsignal.client.models.counter import Counter
 from graphsignal.client.models.exception import Exception
 from graphsignal.client.models.param import Param
-from graphsignal.client.models.payload import Payload
 from graphsignal.client.models.profile import Profile
 from graphsignal.client.models.tag import Tag
 from typing import Optional, Set
@@ -42,9 +41,8 @@ class Span(BaseModel):
     exceptions: Optional[List[Exception]] = Field(default=None, description="List of exceptions occurred during the span.")
     params: Optional[List[Param]] = Field(default=None, description="List of parameters associated with the span.")
     counters: Optional[List[Counter]] = Field(default=None, description="Counters associated with the span.")
-    payloads: Optional[List[Payload]] = Field(default=None, description="List of payloads related to the span.")
     profiles: Optional[List[Profile]] = Field(default=None, description="List of profiles related to the span.")
-    __properties: ClassVar[List[str]] = ["span_id", "root_span_id", "parent_span_id", "linked_span_ids", "start_us", "end_us", "tags", "exceptions", "params", "counters", "payloads", "profiles"]
+    __properties: ClassVar[List[str]] = ["span_id", "root_span_id", "parent_span_id", "linked_span_ids", "start_us", "end_us", "tags", "exceptions", "params", "counters", "profiles"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -113,13 +111,6 @@ def to_dict(self) -> Dict[str, Any]:
                 if _item_counters:
                     _items.append(_item_counters.to_dict())
             _dict['counters'] = _items
-        # override the default output from pydantic by calling `to_dict()` of each item in payloads (list)
-        _items = []
-        if self.payloads:
-            for _item_payloads in self.payloads:
-                if _item_payloads:
-                    _items.append(_item_payloads.to_dict())
-            _dict['payloads'] = _items
         # override the default output from pydantic by calling `to_dict()` of each item in profiles (list)
         _items = []
         if self.profiles:
@@ -149,7 +140,6 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             "exceptions": [Exception.from_dict(_item) for _item in obj["exceptions"]] if obj.get("exceptions") is not None else None,
             "params": [Param.from_dict(_item) for _item in obj["params"]] if obj.get("params") is not None else None,
             "counters": [Counter.from_dict(_item) for _item in obj["counters"]] if obj.get("counters") is not None else None,
-            "payloads": [Payload.from_dict(_item) for _item in obj["payloads"]] if obj.get("payloads") is not None else None,
             "profiles": [Profile.from_dict(_item) for _item in obj["profiles"]] if obj.get("profiles") is not None else None
         })
         return _obj

graphsignal/client/models/span.py

@@ -222,8 +222,6 @@ def trace_chat_completion(self, span, args, kwargs, ret, exc):
                     span.set_counter('uncached_prompt_tokens', total_prompt_tokens)
                     span.inc_counter_metric('usage', 'prompt_tokens', total_prompt_tokens)
                     span.inc_counter_metric('usage', 'uncached_prompt_tokens', total_prompt_tokens)
-
-            span.set_payload('request', params)
         else:
             ret = ret.model_dump()
 
@@ -233,10 +231,6 @@ def trace_chat_completion(self, span, args, kwargs, ret, exc):
             if ret and 'usage' in ret and not exc:
                 self.read_usage(span, ret['usage'])
 
-            span.set_payload('request', params)
-            if ret:
-                span.set_payload('response', ret)
-
     def trace_chat_completion_data(self, span, item):
         item = item.model_dump()
 
@@ -247,8 +241,6 @@ def trace_chat_completion_data(self, span, item):
                 span.inc_counter_metric('usage', 'completion_tokens', 1)
                 span.inc_counter('output_tokens', 1)
 
-            span.append_payload('response', [item])
-
         if item and 'usage' in item:
             self.read_usage(span, item['usage'])
 
@@ -274,9 +266,6 @@ def trace_embedding(self, span, args, kwargs, ret, exc):
                 span.set_counter('prompt_tokens', usage['prompt_tokens'])
                 span.inc_counter_metric('usage', 'prompt_tokens', usage['prompt_tokens'])
 
-
-        span.set_payload('request', params)
-
     def trace_image_generation(self, span, args, kwargs, ret, exc):
         params = kwargs
 
@@ -301,16 +290,13 @@ def trace_image_edit(self, span, args, kwargs, ret, exc):
     def trace_image_endpoint(self, span, args, kwargs, ret, exc):
         params = kwargs
 
-        span.set_payload('request', params, params)
-
         if ret and 'data' in ret:
             image_data = []
             for image in ret['data']:
                 if 'url' in image:
                     image_data.append(image['url'])
                 elif 'b64_json' in image:
                     image_data.append(image['b64_json'])
-            span.set_payload('response', image_data)
 
     def trace_audio_transcription(self, span, args, kwargs, ret, exc):
         params = kwargs
@@ -320,13 +306,6 @@ def trace_audio_transcription(self, span, args, kwargs, ret, exc):
             span.set_tag('model', params['model'])
             span.set_param('model', params['model'])
 
-        span.set_payload('request', params)
-
-        ret = ret.model_dump()
-
-        if ret and 'text' in ret:
-            span.set_payload('response', ret['text'])
-
     def trace_audio_translation(self, span, args, kwargs, ret, exc):
         params = kwargs
 
@@ -335,21 +314,10 @@ def trace_audio_translation(self, span, args, kwargs, ret, exc):
             span.set_tag('model', params['model'])
             span.set_param('model', params['model'])
 
-        input_data = {}
-
-        span.set_payload('request', params)
-
-        ret = ret.model_dump()
-
-        if ret and 'text' in ret:
-            span.set_payload('request', ret['text'])
-
     def trace_moderation(self, span, args, kwargs, ret, exc):
         params = kwargs
 
         self.set_common_tags(span, 'moderations', params)
         if 'model' in params:
             span.set_tag('model', params['model'])
             span.set_param('model', params['model'])
-
-        span.set_payload('request', params)