Skip to content

Commit c59966c

Browse files
xrmxxrmx
authored
Merge branch 'main' into stop-using-span-attributes
2 parents 2cf8e75 + e5a9307 commit c59966c

File tree

73 files changed

+1285
-1006
lines changed

Some content is hidden

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

73 files changed

+1285
-1006
lines changed

‎.github/workflows/ossf-scorecard.yml

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: OSSF Scorecard
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
schedule:
8+
- cron: "16 11 * * 4" # once a week
9+
workflow_dispatch:
10+
11+
permissions: read-all
12+
13+
jobs:
14+
analysis:
15+
runs-on: ubuntu-latest
16+
permissions:
17+
# Needed for Code scanning upload
18+
security-events: write
19+
# Needed for GitHub OIDC token if publish_results is true
20+
id-token: write
21+
steps:
22+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
23+
with:
24+
persist-credentials: false
25+
26+
- uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
27+
with:
28+
results_file: results.sarif
29+
results_format: sarif
30+
publish_results: true
31+
32+
# Upload the results as artifacts (optional). Commenting out will disable
33+
# uploads of run results in SARIF format to the repository Actions tab.
34+
# https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
35+
- name: "Upload artifact"
36+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
37+
with:
38+
name: SARIF file
39+
path: results.sarif
40+
retention-days: 5
41+
42+
# Upload the results to GitHub's code scanning dashboard (optional).
43+
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
44+
- name: "Upload to code-scanning"
45+
uses: github/codeql-action/upload-sarif@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
46+
with:
47+
sarif_file: results.sarif

‎CHANGELOG.md

+15-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10+
- opentelemetry-sdk: use stable code attributes: `code.function` -> `code.function.name`, `code.lineno` -> `code.line.number`, `code.filepath` -> `code.file.path`
11+
([#4508](https://github.com/open-telemetry/opentelemetry-python/pull/4508))
12+
13+
## Version 1.32.0/0.53b0 (2025-04-10)
14+
1015
- Fix user agent in OTLP HTTP metrics exporter
1116
([#4475](https://github.com/open-telemetry/opentelemetry-python/pull/4475))
1217
- Improve performance of baggage operations
@@ -17,8 +22,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1722
([#4494](https://github.com/open-telemetry/opentelemetry-python/pull/4494))
1823
- Improve CI by cancelling stale runs and setting timeouts
1924
([#4498](https://github.com/open-telemetry/opentelemetry-python/pull/4498))
20-
- opentelemetry-sdk: use stable code attributes: `code.function` -> `code.function.name`, `code.lineno` -> `code.line.number`, `code.filepath` -> `code.file.path`
21-
([#4508](https://github.com/open-telemetry/opentelemetry-python/pull/4508))
25+
- Patch logging.basicConfig so OTel logs don't cause console logs to disappear
26+
([#4436](https://github.com/open-telemetry/opentelemetry-python/pull/4436))
27+
- Bump semantic conventions to 1.32.0
28+
([#4530](https://github.com/open-telemetry/opentelemetry-python/pull/4530))
29+
- Fix ExplicitBucketHistogramAggregation to handle multiple explicit bucket boundaries advisories
30+
([#4521](https://github.com/open-telemetry/opentelemetry-python/pull/4521))
31+
- opentelemetry-sdk: Fix serialization of objects in log handler
32+
([#4528](https://github.com/open-telemetry/opentelemetry-python/pull/4528))
2233

2334
## Version 1.31.0/0.52b0 (2025-03-12)
2435

@@ -51,6 +62,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5162
([#4458](https://github.com/open-telemetry/opentelemetry-python/pull/4458))
5263
- pylint-ci updated python version to 3.13
5364
([#4450](https://github.com/open-telemetry/opentelemetry-python/pull/4450))
65+
- Fix memory leak in Log & Trace exporter
66+
([#4449](https://github.com/open-telemetry/opentelemetry-python/pull/4449))
5467

5568
## Version 1.30.0/0.51b0 (2025-02-03)
5669

‎docs/examples/fork-process-model/flask-gunicorn/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ googleapis-common-protos==1.52.0
44
grpcio==1.56.2
55
gunicorn==22.0.0
66
itsdangerous==2.1.2
7-
Jinja2==3.1.5
7+
Jinja2==3.1.6
88
MarkupSafe==2.1.3
99
opentelemetry-api==1.20.0
1010
opentelemetry-exporter-otlp==1.20.0

‎eachdist.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ sortfirst=
1111
exporter/*
1212

1313
[stable]
14-
version=1.32.0.dev
14+
version=1.33.0.dev
1515

1616
packages=
1717
opentelemetry-sdk
@@ -27,7 +27,7 @@ packages=
2727
opentelemetry-api
2828

2929
[prerelease]
30-
version=0.53b0.dev
30+
version=0.54b0.dev
3131

3232
packages=
3333
opentelemetry-opentracing-shim

‎exporter/opentelemetry-exporter-opencensus/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies = [
3232
"grpcio >= 1.63.2, < 2.0.0; python_version < '3.13'",
3333
"grpcio >= 1.66.2, < 2.0.0; python_version >= '3.13'",
3434
"opencensus-proto >= 0.1.0, < 1.0.0",
35-
"opentelemetry-api >= 1.32.0.dev",
35+
"opentelemetry-api >= 1.33.0.dev",
3636
"opentelemetry-sdk >= 1.15",
3737
"protobuf ~= 3.13",
3838
"setuptools >= 16.0",

‎exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.53b0.dev"
15+
__version__ = "0.54b0.dev"

‎exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ classifiers = [
2828
"Programming Language :: Python :: 3.13",
2929
]
3030
dependencies = [
31-
"opentelemetry-proto == 1.32.0.dev",
31+
"opentelemetry-proto == 1.33.0.dev",
3232
]
3333

3434
[project.urls]

‎exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/_internal/metrics_encoder/__init__.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,9 @@ def _get_temporality(
117117
_logger.warning(
118118
"Unrecognized OTEL_EXPORTER_METRICS_TEMPORALITY_PREFERENCE"
119119
" value found: "
120-
f"{otel_exporter_otlp_metrics_temporality_preference}, "
121-
"using CUMULATIVE"
120+
"%s, "
121+
"using CUMULATIVE",
122+
otel_exporter_otlp_metrics_temporality_preference,
122123
)
123124
instrument_class_temporality = {
124125
Counter: AggregationTemporality.CUMULATIVE,

‎exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.32.0.dev"
15+
__version__ = "1.33.0.dev"

‎exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ dependencies = [
3333
"grpcio >= 1.63.2, < 2.0.0; python_version < '3.13'",
3434
"grpcio >= 1.66.2, < 2.0.0; python_version >= '3.13'",
3535
"opentelemetry-api ~= 1.15",
36-
"opentelemetry-proto == 1.32.0.dev",
37-
"opentelemetry-sdk ~= 1.32.0.dev",
38-
"opentelemetry-exporter-otlp-proto-common == 1.32.0.dev",
36+
"opentelemetry-proto == 1.33.0.dev",
37+
"opentelemetry-sdk ~= 1.33.0.dev",
38+
"opentelemetry-exporter-otlp-proto-common == 1.33.0.dev",
3939
]
4040

4141
[project.entry-points.opentelemetry_logs_exporter]

‎exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/exporter.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ def _read_file(file_path: str) -> Optional[bytes]:
125125
return file.read()
126126
except FileNotFoundError as e:
127127
logger.exception(
128-
f"Failed to read file: {e.filename}. Please check if the file exists and is accessible."
128+
"Failed to read file: %s. Please check if the file exists and is accessible.",
129+
e.filename,
129130
)
130131
return None
131132

‎exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.32.0.dev"
15+
__version__ = "1.33.0.dev"

0 commit comments

Comments
 (0)