Skip to content

Commit

Permalink
Merge branch 'main' into pytyped
Browse files Browse the repository at this point in the history
  • Loading branch information
ocelotl committed Mar 20, 2024
2 parents 1a92f54 + cc05a80 commit 939cdc0
Show file tree
Hide file tree
Showing 44 changed files with 609 additions and 121 deletions.
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ notes=FIXME,
# List of decorators that produce context managers, such as
# contextlib.contextmanager. Add to this list to register other decorators that
# produce valid context managers.
contextmanager-decorators=contextlib.contextmanager
contextmanager-decorators=contextlib.contextmanager, _agnosticcontextmanager

# List of members which are set dynamically and missed by pylint inference
# system, and so shouldn't trigger E1101 when accessed. Python regular
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

- Make `tracer.start_as_current_span()` decorator work with async functions
([#3633](https://github.com/open-telemetry/opentelemetry-python/pull/3633))
- Fix python 3.12 deprecation warning
([#3751](https://github.com/open-telemetry/opentelemetry-python/pull/3751))
- bump mypy to 0.982
([#3776](https://github.com/open-telemetry/opentelemetry-python/pull/3776))
- Fix ValueError message for PeriodicExportingMetricsReader
([#3769](https://github.com/open-telemetry/opentelemetry-python/pull/3769))

## Version 1.23.0/0.44b0 (2024-02-23)

Expand Down
1 change: 1 addition & 0 deletions docs/examples/logs/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Start the Collector locally to see data being exported. Write the following file
exporters:
logging:
verbosity: detailed
service:
pipelines:
Expand Down
3 changes: 0 additions & 3 deletions exporter/opentelemetry-exporter-opencensus/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ dependencies = [
"setuptools >= 16.0",
]

[project.optional-dependencies]
test = []

[project.entry-points.opentelemetry_traces_exporter]
opencensus = "opentelemetry.exporter.opencensus.trace_exporter:OpenCensusSpanExporter"

Expand Down
23 changes: 23 additions & 0 deletions exporter/opentelemetry-exporter-opencensus/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
asgiref==3.7.2
attrs==23.2.0
Deprecated==1.2.14
flaky==3.7.0
grpcio==1.62.0
importlib-metadata==6.11.0
iniconfig==2.0.0
opencensus-proto==0.1.0
packaging==23.2
pluggy==1.4.0
protobuf==3.20.3
py==1.11.0
py-cpuinfo==9.0.0
pytest==7.1.3
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-api
-e opentelemetry-sdk
-e opentelemetry-semantic-conventions
-e exporter/opentelemetry-exporter-opencensus
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ dependencies = [
"opentelemetry-proto == 1.24.0.dev",
]

[project.optional-dependencies]
test = []

[project.urls]
Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-common"

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
asgiref==3.7.2
attrs==23.2.0
Deprecated==1.2.14
flaky==3.7.0
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==23.2
pluggy==1.4.0
protobuf==4.25.3
py==1.11.0
py-cpuinfo==9.0.0
pytest==7.1.3
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-proto
-e exporter/opentelemetry-exporter-otlp-proto-common
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@ dependencies = [
"requests ~= 2.7",
]

[project.optional-dependencies]
test = [
"responses >= 0.22.0, < 0.25",
]

[project.entry-points.opentelemetry_traces_exporter]
otlp_proto_http = "opentelemetry.exporter.otlp.proto.http.trace_exporter:OTLPSpanExporter"

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
asgiref==3.7.2
attrs==23.2.0
certifi==2024.2.2
charset-normalizer==3.3.2
Deprecated==1.2.14
flaky==3.7.0
googleapis-common-protos==1.62.0
idna==3.6
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==23.2
pluggy==1.4.0
protobuf==3.19.6
py==1.11.0
py-cpuinfo==9.0.0
pytest==7.1.3
pytest-benchmark==4.0.0
PyYAML==6.0.1
requests==2.31.0
responses==0.24.1
tomli==2.0.1
typing_extensions==4.10.0
urllib3==2.2.1
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-api
-e exporter/opentelemetry-exporter-otlp-proto-common
-e opentelemetry-proto
-e opentelemetry-sdk
-e opentelemetry-semantic-conventions
-e exporter/opentelemetry-exporter-otlp-proto-http
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
asgiref==3.7.2
attrs==23.2.0
certifi==2024.2.2
charset-normalizer==3.3.2
Deprecated==1.2.14
flaky==3.7.0
googleapis-common-protos==1.62.0
idna==3.6
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==23.2
pluggy==1.4.0
protobuf==4.25.3
py==1.11.0
py-cpuinfo==9.0.0
pytest==7.1.3
pytest-benchmark==4.0.0
PyYAML==6.0.1
requests==2.31.0
responses==0.24.1
tomli==2.0.1
typing_extensions==4.10.0
urllib3==2.2.1
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-api
-e exporter/opentelemetry-exporter-otlp-proto-common
-e opentelemetry-proto
-e opentelemetry-sdk
-e opentelemetry-semantic-conventions
-e exporter/opentelemetry-exporter-otlp-proto-http
3 changes: 0 additions & 3 deletions exporter/opentelemetry-exporter-otlp/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ dependencies = [
"opentelemetry-exporter-otlp-proto-http == 1.24.0.dev",
]

[project.optional-dependencies]
test = []

[project.entry-points.opentelemetry_logs_exporter]
otlp = "opentelemetry.exporter.otlp.proto.grpc._log_exporter:OTLPLogExporter"

Expand Down
24 changes: 24 additions & 0 deletions exporter/opentelemetry-exporter-otlp/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
asgiref==3.7.2
attrs==23.2.0
Deprecated==1.2.14
flaky==3.7.0
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==23.2
pluggy==1.4.0
py==1.11.0
py-cpuinfo==9.0.0
pytest==7.1.3
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-api
-e exporter/opentelemetry-exporter-otlp-proto-common
-e exporter/opentelemetry-exporter-otlp-proto-grpc
-e exporter/opentelemetry-exporter-otlp-proto-http
-e opentelemetry-proto
-e opentelemetry-sdk
-e opentelemetry-semantic-conventions
-e exporter/opentelemetry-exporter-otlp
3 changes: 0 additions & 3 deletions exporter/opentelemetry-exporter-prometheus/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ dependencies = [
"prometheus_client >= 0.5.0, < 1.0.0",
]

[project.optional-dependencies]
test = []

[project.entry-points.opentelemetry_metrics_exporter]
prometheus = "opentelemetry.exporter.prometheus:_AutoPrometheusMetricReader"

Expand Down
21 changes: 21 additions & 0 deletions exporter/opentelemetry-exporter-prometheus/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
asgiref==3.7.2
attrs==23.2.0
Deprecated==1.2.14
flaky==3.7.0
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==23.2
pluggy==1.4.0
prometheus_client==0.20.0
py==1.11.0
py-cpuinfo==9.0.0
pytest==7.1.3
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-api
-e opentelemetry-sdk
-e opentelemetry-semantic-conventions
-e exporter/opentelemetry-exporter-prometheus
3 changes: 0 additions & 3 deletions exporter/opentelemetry-exporter-zipkin-json/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ dependencies = [
"requests ~= 2.7",
]

[project.optional-dependencies]
test = []

[project.entry-points.opentelemetry_traces_exporter]
zipkin_json = "opentelemetry.exporter.zipkin.json:ZipkinExporter"

Expand Down
25 changes: 25 additions & 0 deletions exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
asgiref==3.7.2
attrs==23.2.0
certifi==2024.2.2
charset-normalizer==3.3.2
Deprecated==1.2.14
flaky==3.7.0
idna==3.6
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==23.2
pluggy==1.4.0
py==1.11.0
py-cpuinfo==9.0.0
pytest==7.1.3
pytest-benchmark==4.0.0
requests==2.31.0
tomli==2.0.1
typing_extensions==4.10.0
urllib3==2.2.1
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-api
-e opentelemetry-sdk
-e opentelemetry-semantic-conventions
-e exporter/opentelemetry-exporter-zipkin-json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ dependencies = [
"requests ~= 2.7",
]

[project.optional-dependencies]
test = []

[project.entry-points.opentelemetry_traces_exporter]
zipkin_proto = "opentelemetry.exporter.zipkin.proto.http:ZipkinExporter"

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
asgiref==3.7.2
attrs==23.2.0
certifi==2024.2.2
charset-normalizer==3.3.2
Deprecated==1.2.14
flaky==3.7.0
idna==3.6
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==23.2
pluggy==1.4.0
protobuf==3.20.3
py==1.11.0
py-cpuinfo==9.0.0
pytest==7.1.3
pytest-benchmark==4.0.0
requests==2.31.0
tomli==2.0.1
typing_extensions==4.10.0
urllib3==2.2.1
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-api
-e exporter/opentelemetry-exporter-zipkin-json
-e opentelemetry-sdk
-e opentelemetry-semantic-conventions
-e exporter/opentelemetry-exporter-zipkin-proto-http
3 changes: 0 additions & 3 deletions exporter/opentelemetry-exporter-zipkin/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ dependencies = [
"opentelemetry-exporter-zipkin-proto-http == 1.24.0.dev",
]

[project.optional-dependencies]
test = []

[project.entry-points.opentelemetry_traces_exporter]
zipkin = "opentelemetry.exporter.zipkin.proto.http:ZipkinExporter"

Expand Down
22 changes: 22 additions & 0 deletions exporter/opentelemetry-exporter-zipkin/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
asgiref==3.7.2
attrs==23.2.0
Deprecated==1.2.14
flaky==3.7.0
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==23.2
pluggy==1.4.0
py==1.11.0
py-cpuinfo==9.0.0
pytest==7.1.3
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-api
-e exporter/opentelemetry-exporter-zipkin-json
-e exporter/opentelemetry-exporter-zipkin-proto-http
-e opentelemetry-sdk
-e opentelemetry-semantic-conventions
-e exporter/opentelemetry-exporter-zipkin
5 changes: 1 addition & 4 deletions opentelemetry-api/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,12 @@ dependencies = [
"Deprecated >= 1.2.6",
# FIXME This should be able to be removed after 3.12 is released if there is a reliable API
# in importlib.metadata.
"importlib-metadata >= 6.0, < 7.0",
"importlib-metadata >= 6.0, <= 7.0",
]
dynamic = [
"version",
]

[project.optional-dependencies]
test = []

[project.entry-points.opentelemetry_context]
contextvars_context = "opentelemetry.context.contextvars_context:ContextVarsRuntimeContext"

Expand Down
Loading

0 comments on commit 939cdc0

Please sign in to comment.