Skip to content

Commit 98519e1

Browse files
nikhilc-microsoftnikhilc-microsoft
committed
fix rush issues
1 parent 3670119 commit 98519e1

6 files changed

Lines changed: 61 additions & 34 deletions

File tree

‎libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/execute_tool_scope.py‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,19 @@ def __init__(
7878
span_details: Optional span configuration (parent context, timing, kind)
7979
"""
8080
# spanKind defaults to INTERNAL; allow override via span_details
81-
resolved_span_details = SpanDetails(
82-
span_kind=span_details.span_kind if span_details and span_details.span_kind else SpanKind.INTERNAL,
83-
parent_context=span_details.parent_context if span_details else None,
84-
start_time=span_details.start_time if span_details else None,
85-
end_time=span_details.end_time if span_details else None,
86-
span_links=span_details.span_links if span_details else None,
87-
) if span_details else SpanDetails(span_kind=SpanKind.INTERNAL)
81+
resolved_span_details = (
82+
SpanDetails(
83+
span_kind=span_details.span_kind
84+
if span_details and span_details.span_kind
85+
else SpanKind.INTERNAL,
86+
parent_context=span_details.parent_context if span_details else None,
87+
start_time=span_details.start_time if span_details else None,
88+
end_time=span_details.end_time if span_details else None,
89+
span_links=span_details.span_links if span_details else None,
90+
)
91+
if span_details
92+
else SpanDetails(span_kind=SpanKind.INTERNAL)
93+
)
8894

8995
super().__init__(
9096
operation_name=EXECUTE_TOOL_OPERATION_NAME,

‎libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/inference_scope.py‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,17 @@ def __init__(
7777
span_details: Optional span configuration (parent context, timing)
7878
"""
7979
# spanKind for InferenceScope is always CLIENT
80-
resolved_span_details = SpanDetails(
81-
span_kind=SpanKind.CLIENT,
82-
parent_context=span_details.parent_context if span_details else None,
83-
start_time=span_details.start_time if span_details else None,
84-
end_time=span_details.end_time if span_details else None,
85-
span_links=span_details.span_links if span_details else None,
86-
) if span_details else SpanDetails(span_kind=SpanKind.CLIENT)
80+
resolved_span_details = (
81+
SpanDetails(
82+
span_kind=SpanKind.CLIENT,
83+
parent_context=span_details.parent_context if span_details else None,
84+
start_time=span_details.start_time if span_details else None,
85+
end_time=span_details.end_time if span_details else None,
86+
span_links=span_details.span_links if span_details else None,
87+
)
88+
if span_details
89+
else SpanDetails(span_kind=SpanKind.CLIENT)
90+
)
8791

8892
super().__init__(
8993
operation_name=details.operationName.value,

‎libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/invoke_agent_scope.py‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,19 @@ def __init__(
9494
activity_name = f"{INVOKE_AGENT_OPERATION_NAME} {agent_details.agent_name}"
9595

9696
# spanKind defaults to CLIENT; allow override via span_details
97-
resolved_span_details = SpanDetails(
98-
span_kind=span_details.span_kind if span_details and span_details.span_kind else SpanKind.CLIENT,
99-
parent_context=span_details.parent_context if span_details else None,
100-
start_time=span_details.start_time if span_details else None,
101-
end_time=span_details.end_time if span_details else None,
102-
span_links=span_details.span_links if span_details else None,
103-
) if span_details else SpanDetails(span_kind=SpanKind.CLIENT)
97+
resolved_span_details = (
98+
SpanDetails(
99+
span_kind=span_details.span_kind
100+
if span_details and span_details.span_kind
101+
else SpanKind.CLIENT,
102+
parent_context=span_details.parent_context if span_details else None,
103+
start_time=span_details.start_time if span_details else None,
104+
end_time=span_details.end_time if span_details else None,
105+
span_links=span_details.span_links if span_details else None,
106+
)
107+
if span_details
108+
else SpanDetails(span_kind=SpanKind.CLIENT)
109+
)
104110

105111
super().__init__(
106112
operation_name=INVOKE_AGENT_OPERATION_NAME,

‎libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/middleware/baggage_builder.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,7 @@ def user_client_ip(self, value: str | None) -> "BaggageBuilder":
169169
self._set(GEN_AI_CALLER_CLIENT_IP_KEY, validate_and_normalize_ip(value))
170170
return self
171171

172-
def invoke_agent_server(
173-
self, address: str | None, port: int | None = None
174-
) -> "BaggageBuilder":
172+
def invoke_agent_server(self, address: str | None, port: int | None = None) -> "BaggageBuilder":
175173
"""Set the invoke agent server address and port baggage values.
176174
177175
Args:

‎libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/opentelemetry_scope.py‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,17 @@ def __init__(
114114
start_time = span_details.start_time if span_details else None
115115
end_time = span_details.end_time if span_details else None
116116
span_links = span_details.span_links if span_details else None
117-
kind = span_details.span_kind if span_details and span_details.span_kind else SpanKind.CLIENT
117+
kind = (
118+
span_details.span_kind if span_details and span_details.span_kind else SpanKind.CLIENT
119+
)
120+
if not isinstance(kind, SpanKind):
121+
logger.warning(
122+
"span_details.span_kind has invalid type %s (value: %r); "
123+
"falling back to SpanKind.CLIENT",
124+
type(kind).__name__,
125+
kind,
126+
)
127+
kind = SpanKind.CLIENT
118128

119129
self._span: Span | None = None
120130
self._custom_start_time: datetime | None = start_time
@@ -127,8 +137,7 @@ def __init__(
127137
if self._is_telemetry_enabled():
128138
tracer = self._get_tracer()
129139

130-
# Resolve activity_kind from SpanKind enum
131-
activity_kind = kind if isinstance(kind, SpanKind) else SpanKind.CLIENT
140+
activity_kind = kind
132141

133142
# Get context for parent relationship
134143
# If parent_context is provided, use it directly

‎libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/spans_scopes/output_scope.py‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,17 @@ def __init__(
6767
span_details: Optional span configuration (parent context, timing)
6868
"""
6969
# spanKind for OutputScope is always CLIENT
70-
resolved_span_details = SpanDetails(
71-
span_kind=SpanKind.CLIENT,
72-
parent_context=span_details.parent_context if span_details else None,
73-
start_time=span_details.start_time if span_details else None,
74-
end_time=span_details.end_time if span_details else None,
75-
span_links=span_details.span_links if span_details else None,
76-
) if span_details else SpanDetails(span_kind=SpanKind.CLIENT)
70+
resolved_span_details = (
71+
SpanDetails(
72+
span_kind=SpanKind.CLIENT,
73+
parent_context=span_details.parent_context if span_details else None,
74+
start_time=span_details.start_time if span_details else None,
75+
end_time=span_details.end_time if span_details else None,
76+
span_links=span_details.span_links if span_details else None,
77+
)
78+
if span_details
79+
else SpanDetails(span_kind=SpanKind.CLIENT)
80+
)
7781

7882
super().__init__(
7983
operation_name=OUTPUT_OPERATION_NAME,

0 commit comments

Comments
 (0)