Skip to content

Commit 2717324

Browse files
committed
Merge branch 'main' into fix/maf-autogen-span-isolation
2 parents 6270e89 + c7618d2 commit 2717324

43 files changed

Lines changed: 1512 additions & 83 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/generate_workflows.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,9 @@
2525
batch_size=4,
2626
parallelism=4,
2727
)
28-
generate_misc_workflow(tox_ini_path, workflows_directory_path)
28+
generate_misc_workflow(
29+
tox_ini_path,
30+
workflows_directory_path,
31+
runner=arc_runner_label,
32+
)
2933
generate_contrib_workflow(workflows_directory_path)

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,11 +356,13 @@ def generate_contrib_workflow(
356356
def generate_misc_workflow(
357357
tox_ini_path: Path,
358358
workflow_directory_path: Path,
359+
runner="ubuntu-latest",
359360
) -> None:
360361
_generate_workflow(
361362
get_misc_job_datas(get_tox_envs(tox_ini_path)),
362363
"misc",
363364
workflow_directory_path,
365+
runner=runner,
364366
)
365367

366368

@@ -445,6 +447,7 @@ def generate_extension_misc_workflow(
445447
tox_ini_path: Path,
446448
workflow_directory_path: Path,
447449
additional_config_path: Path,
450+
runner="ubuntu-latest",
448451
) -> None:
449452
loongsuite_envs = get_loongsuite_tox_envs(additional_config_path)
450453
if not loongsuite_envs:
@@ -455,6 +458,7 @@ def generate_extension_misc_workflow(
455458
"loongsuite_misc",
456459
"loongsuite_misc",
457460
workflow_directory_path,
461+
runner=runner,
458462
)
459463

460464

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/loongsuite_misc.yml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
{{ job_data }}:
3838
name: LoongSuite {{ job_data }}
39-
runs-on: ubuntu-latest
39+
runs-on: {{ runner }}
4040
timeout-minutes: 30
4141
{%- if job_data == "generate-workflows" %}
4242
if: |

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ name: Misc {{ file_number }}
55

66
on:
77
push:
8-
branches-ignore:
9-
- 'release/*'
10-
- 'otelbot/*'
8+
branches:
9+
- main
1110
pull_request:
1211

1312
permissions:
@@ -36,7 +35,7 @@ jobs:
3635

3736
{{ job_data }}:
3837
name: {{ job_data }}
39-
runs-on: ubuntu-latest
38+
runs-on: {{ "ubuntu-latest" if job_data == "docker-tests" else runner }}
4039
timeout-minutes: 30
4140
{%- if job_data == "generate-workflows" %}
4241
if: |

.github/workflows/generate_workflows_loongsuite.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,8 @@
2929
control_runner=arc_runner_label,
3030
)
3131
generate_extension_misc_workflow(
32-
tox_ini_path, workflows_directory_path, tox_loongsuite_ini_path
32+
tox_ini_path,
33+
workflows_directory_path,
34+
tox_loongsuite_ini_path,
35+
runner=arc_runner_label,
3336
)

.github/workflows/loongsuite_misc_0.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
check-license-header:
3737
name: LoongSuite check-license-header
38-
runs-on: ubuntu-latest
38+
runs-on: loongsuite-python-arc
3939
timeout-minutes: 30
4040
steps:
4141
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -54,7 +54,7 @@ jobs:
5454

5555
generate-loongsuite:
5656
name: LoongSuite generate-loongsuite
57-
runs-on: ubuntu-latest
57+
runs-on: loongsuite-python-arc
5858
timeout-minutes: 30
5959
steps:
6060
- name: Checkout repo @ SHA - ${{ github.sha }}

.github/workflows/loongsuite_test_0.yml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

.github/workflows/misc_0.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ name: Misc 0
55

66
on:
77
push:
8-
branches-ignore:
9-
- 'release/*'
10-
- 'otelbot/*'
8+
branches:
9+
- main
1110
pull_request:
1211

1312
permissions:
@@ -35,7 +34,7 @@ jobs:
3534

3635
spellcheck:
3736
name: spellcheck
38-
runs-on: ubuntu-latest
37+
runs-on: loongsuite-python-arc
3938
timeout-minutes: 30
4039
steps:
4140
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -73,7 +72,7 @@ jobs:
7372

7473
docs:
7574
name: docs
76-
runs-on: ubuntu-latest
75+
runs-on: loongsuite-python-arc
7776
timeout-minutes: 30
7877
if: |
7978
github.event.pull_request.user.login != 'otelbot[bot]' && github.event_name == 'pull_request'
@@ -94,7 +93,7 @@ jobs:
9493

9594
generate:
9695
name: generate
97-
runs-on: ubuntu-latest
96+
runs-on: loongsuite-python-arc
9897
timeout-minutes: 30
9998
steps:
10099
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -116,7 +115,7 @@ jobs:
116115

117116
generate-workflows:
118117
name: generate-workflows
119-
runs-on: ubuntu-latest
118+
runs-on: loongsuite-python-arc
120119
timeout-minutes: 30
121120
if: |
122121
!contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
@@ -141,7 +140,7 @@ jobs:
141140

142141
shellcheck:
143142
name: shellcheck
144-
runs-on: ubuntu-latest
143+
runs-on: loongsuite-python-arc
145144
timeout-minutes: 30
146145
steps:
147146
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -160,7 +159,7 @@ jobs:
160159

161160
precommit:
162161
name: precommit
163-
runs-on: ubuntu-latest
162+
runs-on: loongsuite-python-arc
164163
timeout-minutes: 30
165164
steps:
166165
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -179,7 +178,7 @@ jobs:
179178

180179
typecheck:
181180
name: typecheck
182-
runs-on: ubuntu-latest
181+
runs-on: loongsuite-python-arc
183182
timeout-minutes: 30
184183
steps:
185184
- name: Checkout repo @ SHA - ${{ github.sha }}

CHANGELOG-loongsuite.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111
1212
## Unreleased
1313

14+
### Changed
15+
16+
- Adopt upstream semantic conventions for LoongSuite instrumentation packages.
17+
1418
## Version 0.7.0 (2026-07-03)
1519

1620
There are no changelog entries for this release.

instrumentation-loongsuite/loongsuite-instrumentation-agentscope/src/opentelemetry/instrumentation/agentscope/_v2_middleware.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ async def on_acting(
259259
handler.start_react_step(react_invocation, context=get_current())
260260
invocation = ExecuteToolInvocation(
261261
tool_name=getattr(tool_call, "name", "unknown_tool"),
262+
tool_type="function",
262263
tool_call_id=getattr(tool_call, "id", None),
263264
tool_call_arguments=_loads_json(getattr(tool_call, "input", None)),
264265
provider="agentscope",

0 commit comments

Comments
 (0)