Skip to content

Commit dbfcbe2

Browse files
michaelsafyanmichaelsafyan
committed
Address generic names foo, bar flagged by lint.
1 parent 3011c84 commit dbfcbe2

File tree

2 files changed

+58
-58
lines changed

2 files changed

+58
-58
lines changed

‎instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/generate_content/test_tool_call_instrumentation.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def somefunction(somearg):
4444
wrapped_somefunction = tools[0]
4545

4646
self.assertIsNone(self.otel.get_span_named("tool_call somefunction"))
47-
wrapped_somefunction(somearg="foo")
47+
wrapped_somefunction(somearg="someparam")
4848
self.otel.assert_has_span_named("tool_call somefunction")
4949
generated_span = self.otel.get_span_named("tool_call somefunction")
5050
self.assertEqual(
@@ -75,7 +75,7 @@ def somefunction(somearg):
7575
wrapped_somefunction = tools[0]
7676

7777
self.assertIsNone(self.otel.get_span_named("tool_call somefunction"))
78-
wrapped_somefunction(somearg="foo")
78+
wrapped_somefunction(somearg="someparam")
7979
self.otel.assert_has_span_named("tool_call somefunction")
8080
generated_span = self.otel.get_span_named("tool_call somefunction")
8181
self.assertEqual(
@@ -92,8 +92,8 @@ def handle(*args, **kwargs):
9292
calls.append((args, kwargs))
9393
return "some result"
9494

95-
def somefunction(foo, bar=2):
96-
print("foo=%s, bar=%s", foo, bar)
95+
def somefunction(someparam, otherparam=2):
96+
print("someparam=%s, otherparam=%s", someparam, otherparam)
9797

9898
self.mock_generate_content.side_effect = handle
9999
self.client.models.generate_content(
@@ -107,14 +107,14 @@ def somefunction(foo, bar=2):
107107
config = calls[0][1]["config"]
108108
tools = config.tools
109109
wrapped_somefunction = tools[0]
110-
wrapped_somefunction(123, bar="abc")
110+
wrapped_somefunction(123, otherparam="abc")
111111
self.otel.assert_has_span_named("tool_call somefunction")
112112
generated_span = self.otel.get_span_named("tool_call somefunction")
113113
self.assertEqual(
114-
generated_span.attributes["code.function.params.foo"], "123"
114+
generated_span.attributes["code.function.params.someparam"], "123"
115115
)
116116
self.assertEqual(
117-
generated_span.attributes["code.function.params.bar"], "'abc'"
117+
generated_span.attributes["code.function.params.otherparam"], "'abc'"
118118
)
119119

120120
def test_tool_calls_do_not_record_parameter_values_if_not_enabled(self):
@@ -127,8 +127,8 @@ def handle(*args, **kwargs):
127127
calls.append((args, kwargs))
128128
return "some result"
129129

130-
def somefunction(foo, bar=2):
131-
print("foo=%s, bar=%s", foo, bar)
130+
def somefunction(someparam, otherparam=2):
131+
print("someparam=%s, otherparam=%s", someparam, otherparam)
132132

133133
self.mock_generate_content.side_effect = handle
134134
self.client.models.generate_content(
@@ -142,11 +142,11 @@ def somefunction(foo, bar=2):
142142
config = calls[0][1]["config"]
143143
tools = config.tools
144144
wrapped_somefunction = tools[0]
145-
wrapped_somefunction(123, bar="abc")
145+
wrapped_somefunction(123, otherparam="abc")
146146
self.otel.assert_has_span_named("tool_call somefunction")
147147
generated_span = self.otel.get_span_named("tool_call somefunction")
148-
self.assertNotIn("code.function.params.foo", generated_span.attributes)
149-
self.assertNotIn("code.function.params.bar", generated_span.attributes)
148+
self.assertNotIn("code.function.params.someparam", generated_span.attributes)
149+
self.assertNotIn("code.function.params.otherparam", generated_span.attributes)
150150

151151
def test_tool_calls_record_return_values_on_span_if_enabled(self):
152152
os.environ["OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT"] = (

‎instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/utils/test_tool_call_wrapper.py‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -56,70 +56,70 @@ def test_wraps_none(self):
5656
self.assertIsNone(result)
5757

5858
def test_wraps_single_tool_function(self):
59-
def foo():
59+
def somefunction():
6060
pass
6161

62-
wrapped_foo = self.wrap(foo)
63-
self.otel.assert_does_not_have_span_named("tool_call foo")
64-
foo()
65-
self.otel.assert_does_not_have_span_named("tool_call foo")
66-
wrapped_foo()
67-
self.otel.assert_has_span_named("tool_call foo")
62+
wrapped_somefunction = self.wrap(somefunction)
63+
self.otel.assert_does_not_have_span_named("tool_call somefunction")
64+
somefunction()
65+
self.otel.assert_does_not_have_span_named("tool_call somefunction")
66+
wrapped_somefunction()
67+
self.otel.assert_has_span_named("tool_call somefunction")
6868

6969
def test_wraps_multiple_tool_functions_as_list(self):
70-
def foo():
70+
def somefunction():
7171
pass
7272

73-
def bar():
73+
def otherfunction():
7474
pass
7575

76-
wrapped_functions = self.wrap([foo, bar])
77-
wrapped_foo = wrapped_functions[0]
78-
wrapped_bar = wrapped_functions[1]
79-
self.otel.assert_does_not_have_span_named("tool_call foo")
80-
self.otel.assert_does_not_have_span_named("tool_call bar")
81-
foo()
82-
bar()
83-
self.otel.assert_does_not_have_span_named("tool_call foo")
84-
self.otel.assert_does_not_have_span_named("tool_call bar")
85-
wrapped_foo()
86-
self.otel.assert_has_span_named("tool_call foo")
87-
self.otel.assert_does_not_have_span_named("tool_call bar")
88-
wrapped_bar()
89-
self.otel.assert_has_span_named("tool_call bar")
76+
wrapped_functions = self.wrap([somefunction, otherfunction])
77+
wrapped_somefunction = wrapped_functions[0]
78+
wrapped_otherfunction = wrapped_functions[1]
79+
self.otel.assert_does_not_have_span_named("tool_call somefunction")
80+
self.otel.assert_does_not_have_span_named("tool_call otherfunction")
81+
somefunction()
82+
otherfunction()
83+
self.otel.assert_does_not_have_span_named("tool_call somefunction")
84+
self.otel.assert_does_not_have_span_named("tool_call otherfunction")
85+
wrapped_somefunction()
86+
self.otel.assert_has_span_named("tool_call somefunction")
87+
self.otel.assert_does_not_have_span_named("tool_call otherfunction")
88+
wrapped_otherfunction()
89+
self.otel.assert_has_span_named("tool_call otherfunction")
9090

9191
def test_wraps_multiple_tool_functions_as_dict(self):
92-
def foo():
92+
def somefunction():
9393
pass
9494

95-
def bar():
95+
def otherfunction():
9696
pass
9797

98-
wrapped_functions = self.wrap({"foo": foo, "bar": bar})
99-
wrapped_foo = wrapped_functions["foo"]
100-
wrapped_bar = wrapped_functions["bar"]
101-
self.otel.assert_does_not_have_span_named("tool_call foo")
102-
self.otel.assert_does_not_have_span_named("tool_call bar")
103-
foo()
104-
bar()
105-
self.otel.assert_does_not_have_span_named("tool_call foo")
106-
self.otel.assert_does_not_have_span_named("tool_call bar")
107-
wrapped_foo()
108-
self.otel.assert_has_span_named("tool_call foo")
109-
self.otel.assert_does_not_have_span_named("tool_call bar")
110-
wrapped_bar()
111-
self.otel.assert_has_span_named("tool_call bar")
98+
wrapped_functions = self.wrap({"somefunction": somefunction, "otherfunction": otherfunction})
99+
wrapped_somefunction = wrapped_functions["somefunction"]
100+
wrapped_otherfunction = wrapped_functions["otherfunction"]
101+
self.otel.assert_does_not_have_span_named("tool_call somefunction")
102+
self.otel.assert_does_not_have_span_named("tool_call otherfunction")
103+
somefunction()
104+
otherfunction()
105+
self.otel.assert_does_not_have_span_named("tool_call somefunction")
106+
self.otel.assert_does_not_have_span_named("tool_call otherfunction")
107+
wrapped_somefunction()
108+
self.otel.assert_has_span_named("tool_call somefunction")
109+
self.otel.assert_does_not_have_span_named("tool_call otherfunction")
110+
wrapped_otherfunction()
111+
self.otel.assert_has_span_named("tool_call otherfunction")
112112

113113
def test_wraps_async_tool_function(self):
114-
async def foo():
114+
async def somefunction():
115115
pass
116116

117-
wrapped_foo = self.wrap(foo)
118-
self.otel.assert_does_not_have_span_named("tool_call foo")
119-
asyncio.run(foo())
120-
self.otel.assert_does_not_have_span_named("tool_call foo")
121-
asyncio.run(wrapped_foo())
122-
self.otel.assert_has_span_named("tool_call foo")
117+
wrapped_somefunction = self.wrap(somefunction)
118+
self.otel.assert_does_not_have_span_named("tool_call somefunction")
119+
asyncio.run(somefunction())
120+
self.otel.assert_does_not_have_span_named("tool_call somefunction")
121+
asyncio.run(wrapped_somefunction())
122+
self.otel.assert_has_span_named("tool_call somefunction")
123123

124124
def test_preserves_tool_dict(self):
125125
tool_dict = genai_types.ToolDict()

0 commit comments

Comments
 (0)