Skip to content

Commit b885592

Browse files
authored
[chore] Sync with the latest upstream changes in OpenTelemetry.
[chore] Sync OpenTelemetry upstream main.
2 parents e519645 + 5a01929 commit b885592

File tree

96 files changed

+5247
-2880
lines changed

Some content is hidden

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

96 files changed

+5247
-2880
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def get_contrib_job_datas(tox_envs: list) -> list:
143143

144144
contrib_job_datas.append(
145145
{
146-
"ui_name": (f"{groups['name']}" f"{contrib_requirements}"),
146+
"ui_name": (f"{groups['name']}{contrib_requirements}"),
147147
"tox_env": tox_env,
148148
}
149149
)

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
33
# Ruff version.
4-
rev: v0.6.9
4+
rev: v0.14.1
55
hooks:
66
# Run the linter.
77
- id: ruff

CHANGELOG-loongsuite.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Changelog for LoongSuite
2+
3+
All notable changes to loongsuite components will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
6+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7+
8+
> [!NOTE]
9+
> The following components are released independently and maintain individual CHANGELOG files.
10+
> Use [this search for a list of all CHANGELOG-loongsuite.md files in this repo](https://github.com/search?q=repo%3Aalibaba%2Floongsuite-python-agent+path%3A**%2FCHANGELOG-loongsuite.md&type=code).
11+
12+
## Unreleased
13+
14+
# Added
15+
16+
- `loongsuite-instrumentation-mem0`: add support for mem0
17+
([#67](https://github.com/alibaba/loongsuite-python-agent/pull/67))

CHANGELOG-upstream.md

Lines changed: 0 additions & 2197 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 2213 additions & 6 deletions
Large diffs are not rendered by default.
File renamed without changes.
File renamed without changes.

README-upstream.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ For more information about the maintainer role, see the [community repository](h
124124
- [Dylan Russell](https://github.com/dylanrussell), Google
125125
- [Emídio Neto](https://github.com/emdneto), PicPay
126126
- [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
127+
- [Liudmila Molkova](https://github.com/lmolkova), Grafana Labs
127128
- [Owais Lone](https://github.com/owais), Splunk
128129
- [Pablo Collins](https://github.com/pmcollins), Splunk
129130
- [Sanket Mehta](https://github.com/sanketmehta28), Cisco

dev-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ ruamel.yaml==0.17.21
1515
flaky==3.7.0
1616
pre-commit==3.7.0; python_version >= '3.9'
1717
pre-commit==3.5.0; python_version < '3.9'
18-
ruff==0.6.9
18+
ruff==0.14.1

exporter/opentelemetry-exporter-prometheus-remote-write/tests/test_prometheus_remote_write_exporter.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ def test_parse_metric(metric, prom_rw):
122122
"bool_value": True,
123123
}
124124

125-
assert (
126-
len(metric.data.data_points) == 1
127-
), "We can only support a single datapoint in tests"
125+
assert len(metric.data.data_points) == 1, (
126+
"We can only support a single datapoint in tests"
127+
)
128128
series = prom_rw._parse_metric(metric, tuple(attributes.items()))
129129
timestamp = metric.data.data_points[0].time_unix_nano // 1_000_000
130130
for single_series in series:

0 commit comments

Comments
 (0)