Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
14ab0b4
Create a utility to simplify recording request attributes.
michaelsafyan Mar 6, 2025
cd5a36a
Merge branch 'open-telemetry:main' into google_genai_attribute_improv…
michaelsafyan Mar 14, 2025
2fc0ad1
Update recording mechanism to record more request options.
michaelsafyan Mar 14, 2025
969c003
Merge branch 'open-telemetry:main' into google_genai_attribute_improv…
michaelsafyan Mar 19, 2025
88b7e45
Improve the recording of span request attributes.
michaelsafyan Mar 19, 2025
744ef1c
Reformat with ruff.
michaelsafyan Mar 19, 2025
76c84c3
Update TODOs to reflect change made here.
michaelsafyan Mar 19, 2025
3953ea1
Update changelog now that PR has been created and can be referenced.
michaelsafyan Mar 19, 2025
d6f5f36
Merge branch 'open-telemetry:main' into google_genai_attribute_improv…
michaelsafyan Mar 25, 2025
7354e6f
Merge branch 'main' into google_genai_attribute_improvements
michaelsafyan Mar 26, 2025
d3526fa
Merge branch 'main' into google_genai_attribute_improvements
michaelsafyan Mar 27, 2025
80c8df1
Fix lint issues.
michaelsafyan Mar 27, 2025
43987e4
Reformat with ruff.
michaelsafyan Mar 27, 2025
6b8c599
Merge branch 'main' into google_genai_attribute_improvements
michaelsafyan Mar 28, 2025
aaaa017
Add more documentation comments requested in the pull request.
michaelsafyan Mar 28, 2025
3d911b6
Merge branch 'main' into google_genai_attribute_improvements
michaelsafyan Mar 28, 2025
5153080
Merge branch 'main' into google_genai_attribute_improvements
michaelsafyan Mar 31, 2025
031369b
Merge branch 'main' into google_genai_attribute_improvements
michaelsafyan Apr 2, 2025
fa8fa60
Add tests and comments that provide some additional clarity regarding…
michaelsafyan Apr 4, 2025
2a08ecd
Add tests and comments that provide some additional clarity regarding…
michaelsafyan Apr 4, 2025
97dab62
Handle corner case where flatten function returns compound output.
michaelsafyan Apr 4, 2025
3107e56
Update prefix to match currently proposed SemConv.
michaelsafyan Apr 4, 2025
cb4ca3b
Update to specify attributes from SemConv constants per PR feedback.
michaelsafyan Apr 4, 2025
0b9c5bb
Use an allowlist for dynamic keys per PR feedback.
michaelsafyan Apr 7, 2025
ff73608
Reformat with ruff.
michaelsafyan Apr 7, 2025
d0f5444
Fix lint issues.
michaelsafyan Apr 7, 2025
ffb898b
Reformat with ruff.
michaelsafyan Apr 7, 2025
f583614
Merge branch 'main' into google_genai_attribute_improvements
michaelsafyan Apr 8, 2025
d6fe6a7
Handle flattening errors more gracefully.
michaelsafyan Apr 8, 2025
c4a7d12
Add support for more wildcards in the allowlist.
michaelsafyan Apr 8, 2025
f23216f
Add a clearer type for the flatten functions.
michaelsafyan Apr 8, 2025
d522ea0
Simplify 'exclude_keys' initialization per PR feedback.
michaelsafyan Apr 8, 2025
0e441b2
Simplify AllowList constructor type annotation per PR feedback.
michaelsafyan Apr 8, 2025
5902b35
Reformat with ruff.
michaelsafyan Apr 8, 2025
a609776
Resolve lint error concerning too many returns.
michaelsafyan Apr 8, 2025
f92758b
Reformat with ruff.
michaelsafyan Apr 8, 2025
72bc998
Merge branch 'main' into google_genai_attribute_improvements
michaelsafyan Apr 10, 2025
c8f033a
Merge branch 'main' into google_genai_attribute_improvements
michaelsafyan Apr 15, 2025
676c251
Merge branch 'main' into google_genai_attribute_improvements
michaelsafyan Apr 15, 2025
3458eab
Merge branch 'main' into google_genai_attribute_improvements
michaelsafyan Apr 17, 2025
49f7bd2
Update name to reflect requested changes in Semantic Conventions pull…
michaelsafyan Apr 17, 2025
58eae49
Add test to verify correct handling of Unicode.
michaelsafyan Apr 17, 2025
755e641
Merge branch 'open-telemetry:main' into google_genai_attribute_improv…
michaelsafyan Apr 21, 2025
79b082e
Reformat with ruff.
michaelsafyan Apr 22, 2025
b2a6cd1
Remove deuplicated test.
michaelsafyan Apr 22, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,41 @@ def _flatten_with_flatten_func(
return False, func_output


def _flatten_compound_value_using_json(
key: str,
value: Any,
exclude_keys: Set[str],
rename_keys: Dict[str, str],
flatten_functions: Dict[str, FlattenFunc],
_from_json=False) -> FlattenedDict:
if _from_json:
_logger.debug(
"Cannot flatten value with key %s; value: %s", key, value
)
return {}
try:
json_string = json.dumps(value)
Comment thread
michaelsafyan marked this conversation as resolved.
except TypeError:
_logger.debug(
"Cannot flatten value with key %s; value: %s. Not JSON serializable.",
key,
value,
)
return {}
json_value = json.loads(json_string)
return _flatten_value(
key,
json_value,
exclude_keys=exclude_keys,
rename_keys=rename_keys,
flatten_functions=flatten_functions,
# Ensure that we don't recurse indefinitely if "json.loads()" somehow returns
# a complex, compound object that does not get handled by the "primitive", "list",
# or "dict" cases. Prevents falling back on the JSON serialization fallback path.
_from_json=True,
)


def _flatten_compound_value(
key: str,
value: Any,
Expand Down Expand Up @@ -160,32 +195,13 @@ def _flatten_compound_value(
rename_keys=rename_keys,
flatten_functions=flatten_functions,
)
if _from_json:
_logger.debug(
"Cannot flatten value with key %s; value: %s", key, value
)
return {}
try:
json_string = json.dumps(value)
except TypeError:
_logger.debug(
"Cannot flatten value with key %s; value: %s. Not JSON serializable.",
key,
value,
)
return {}
json_value = json.loads(json_string)
return _flatten_value(
return _flatten_compound_value_using_json(
key,
json_value,
value,
exclude_keys=exclude_keys,
rename_keys=rename_keys,
flatten_functions=flatten_functions,
# Ensure that we don't recurse indefinitely if "json.loads()" somehow returns
# a complex, compound object that does not get handled by the "primitive", "list",
# or "dict" cases. Prevents falling back on the JSON serialization fallback path.
_from_json=True,
)
_from_json=_from_json)


def _flatten_value(
Expand Down