Skip to content

Commit 26c4498

Browse files
allen-k1mallen-k1m
authored
Merge branch 'main' into feature/asyncio-instrumentation
2 parents aa48c40 + 3b9d626 commit 26c4498

File tree

153 files changed

+805
-425
lines changed

Some content is hidden

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

153 files changed

+805
-425
lines changed

‎.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: d054dff47d2da663a39b9656d106c3d15f344269
9+
CORE_REPO_SHA: 9831afaff5b4d371fd9a14266ab47884546bd971
1010

1111
jobs:
1212
build:

‎CHANGELOG.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
### Added
1111
- `opentelemetry-instrumentation-asyncio` Add support for asyncio
1212
([#1919](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1943))
13+
14+
## Version 1.21.0/0.42b0 (2023-11-01)
15+
1316
- `opentelemetry-instrumentation-aiohttp-server` Add instrumentor and auto instrumentation support for aiohttp-server
1417
([#1800](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1800))
18+
19+
### Added
20+
1521
- `opentelemetry-instrumentation-botocore` Include SNS topic ARN as a span attribute with name `messaging.destination.name` to uniquely identify the SNS topic
1622
([#1995](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1995))
1723
- `opentelemetry-instrumentation-system-metrics` Add support for collecting process metrics
1824
([#1948](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1948))
25+
- Added schema_url (`"https://opentelemetry.io/schemas/1.11.0"`) to all metrics and traces
26+
([#1977](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1977))
1927

2028
### Fixed
2129

@@ -62,7 +70,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
6270
([#1744](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1744))
6371
- Fix async redis clients not being traced correctly
6472
([#1830](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1830))
65-
- Make Flask request span attributes available for `start_span`.
73+
- Make Flask request span attributes available for `start_span`.
6674
([#1784](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1784))
6775
- Fix falcon instrumentation's usage of Span Status to only set the description if the status code is ERROR.
6876
([#1840](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1840))

‎_template/version.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.42b0.dev"
15+
__version__ = "0.43b0.dev"

‎eachdist.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sortfirst=
1616
ext/*
1717

1818
[stable]
19-
version=1.21.0.dev
19+
version=1.22.0.dev
2020

2121
packages=
2222
opentelemetry-sdk
@@ -34,7 +34,7 @@ packages=
3434
opentelemetry-api
3535

3636
[prerelease]
37-
version=0.42b0.dev
37+
version=0.43b0.dev
3838

3939
packages=
4040
all

‎exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/version.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.42b0.dev"
15+
__version__ = "0.43b0.dev"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ classifiers = [
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
2929
"opentelemetry-sdk ~= 1.12",
30-
"opentelemetry-semantic-conventions == 0.42b0.dev",
30+
"opentelemetry-semantic-conventions == 0.43b0.dev",
3131
"rich>=10.0.0",
3232
]
3333

‎exporter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.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.42b0.dev"
15+
__version__ = "0.43b0.dev"

‎instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ instruments = [
3535
]
3636
test = [
3737
"opentelemetry-instrumentation-aio-pika[instruments]",
38-
"opentelemetry-test-utils == 0.42b0.dev",
38+
"opentelemetry-test-utils == 0.43b0.dev",
3939
"pytest",
4040
"wrapt >= 1.0.0, < 2.0.0",
4141
]

‎instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/aio_pika_instrumentor.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@ async def wrapper(wrapped, instance, args, kwargs):
6464
def _instrument(self, **kwargs):
6565
tracer_provider = kwargs.get("tracer_provider", None)
6666
tracer = trace.get_tracer(
67-
_INSTRUMENTATION_MODULE_NAME, __version__, tracer_provider
67+
_INSTRUMENTATION_MODULE_NAME,
68+
__version__,
69+
tracer_provider,
70+
schema_url="https://opentelemetry.io/schemas/1.11.0",
6871
)
6972
self._instrument_queue(tracer)
7073
self._instrument_exchange(tracer)

‎instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/version.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.42b0.dev"
15+
__version__ = "0.43b0.dev"

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.42b0.dev",
30-
"opentelemetry-semantic-conventions == 0.42b0.dev",
31-
"opentelemetry-util-http == 0.42b0.dev",
29+
"opentelemetry-instrumentation == 0.43b0.dev",
30+
"opentelemetry-semantic-conventions == 0.43b0.dev",
31+
"opentelemetry-util-http == 0.43b0.dev",
3232
"wrapt >= 1.0.0, < 2.0.0",
3333
]
3434

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,12 @@ def create_trace_config(
163163
# Explicitly specify the type for the `request_hook` and `response_hook` param and rtype to work
164164
# around this issue.
165165

166-
tracer = get_tracer(__name__, __version__, tracer_provider)
166+
tracer = get_tracer(
167+
__name__,
168+
__version__,
169+
tracer_provider,
170+
schema_url="https://opentelemetry.io/schemas/1.11.0",
171+
)
167172

168173
def _end_trace(trace_config_ctx: types.SimpleNamespace):
169174
context_api.detach(trace_config_ctx.token)

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.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.42b0.dev"
15+
__version__ = "0.43b0.dev"

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py

+15
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,21 @@ def test_status_codes(self):
134134

135135
self.memory_exporter.clear()
136136

137+
def test_schema_url(self):
138+
with self.subTest(status_code=200):
139+
host, port = self._http_request(
140+
trace_config=aiohttp_client.create_trace_config(),
141+
url="/test-path?query=param#foobar",
142+
status_code=200,
143+
)
144+
145+
span = self.memory_exporter.get_finished_spans()[0]
146+
self.assertEqual(
147+
span.instrumentation_info.schema_url,
148+
"https://opentelemetry.io/schemas/1.11.0",
149+
)
150+
self.memory_exporter.clear()
151+
137152
def test_not_recording(self):
138153
mock_tracer = mock.Mock()
139154
mock_span = mock.Mock()

‎instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.42b0.dev",
30-
"opentelemetry-semantic-conventions == 0.42b0.dev",
31-
"opentelemetry-util-http == 0.42b0.dev",
29+
"opentelemetry-instrumentation == 0.43b0.dev",
30+
"opentelemetry-semantic-conventions == 0.43b0.dev",
31+
"opentelemetry-util-http == 0.43b0.dev",
3232
"wrapt >= 1.0.0, < 2.0.0",
3333
]
3434

‎instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/version.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.42b0.dev"
15+
__version__ = "0.43b0.dev"

‎instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.42b0.dev",
30-
"opentelemetry-instrumentation-dbapi == 0.42b0.dev",
29+
"opentelemetry-instrumentation == 0.43b0.dev",
30+
"opentelemetry-instrumentation-dbapi == 0.43b0.dev",
3131
"wrapt >= 1.0.0, < 2.0.0",
3232
]
3333

@@ -37,8 +37,8 @@ instruments = [
3737
]
3838
test = [
3939
"opentelemetry-instrumentation-aiopg[instruments]",
40-
"opentelemetry-semantic-conventions == 0.42b0.dev",
41-
"opentelemetry-test-utils == 0.42b0.dev",
40+
"opentelemetry-semantic-conventions == 0.43b0.dev",
41+
"opentelemetry-test-utils == 0.43b0.dev",
4242
]
4343

4444
[project.entry-points.opentelemetry_instrumentor]

‎instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.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.42b0.dev"
15+
__version__ = "0.43b0.dev"

‎instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ classifiers = [
2727
dependencies = [
2828
"asgiref ~= 3.0",
2929
"opentelemetry-api ~= 1.12",
30-
"opentelemetry-instrumentation == 0.42b0.dev",
31-
"opentelemetry-semantic-conventions == 0.42b0.dev",
32-
"opentelemetry-util-http == 0.42b0.dev",
30+
"opentelemetry-instrumentation == 0.43b0.dev",
31+
"opentelemetry-semantic-conventions == 0.43b0.dev",
32+
"opentelemetry-util-http == 0.43b0.dev",
3333
]
3434

3535
[project.optional-dependencies]
@@ -38,7 +38,7 @@ instruments = [
3838
]
3939
test = [
4040
"opentelemetry-instrumentation-asgi[instruments]",
41-
"opentelemetry-test-utils == 0.42b0.dev",
41+
"opentelemetry-test-utils == 0.43b0.dev",
4242
]
4343

4444
[project.urls]

‎instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py

+12-2
Original file line numberDiff line numberDiff line change
@@ -495,9 +495,19 @@ def __init__(
495495
meter=None,
496496
):
497497
self.app = guarantee_single_callable(app)
498-
self.tracer = trace.get_tracer(__name__, __version__, tracer_provider)
498+
self.tracer = trace.get_tracer(
499+
__name__,
500+
__version__,
501+
tracer_provider,
502+
schema_url="https://opentelemetry.io/schemas/1.11.0",
503+
)
499504
self.meter = (
500-
get_meter(__name__, __version__, meter_provider)
505+
get_meter(
506+
__name__,
507+
__version__,
508+
meter_provider,
509+
schema_url="https://opentelemetry.io/schemas/1.11.0",
510+
)
501511
if meter is None
502512
else meter
503513
)

‎instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.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.42b0.dev"
15+
__version__ = "0.43b0.dev"

‎instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.42b0.dev",
30-
"opentelemetry-semantic-conventions == 0.42b0.dev",
29+
"opentelemetry-instrumentation == 0.43b0.dev",
30+
"opentelemetry-semantic-conventions == 0.43b0.dev",
3131
]
3232

3333
[project.optional-dependencies]
@@ -36,7 +36,7 @@ instruments = [
3636
]
3737
test = [
3838
"opentelemetry-instrumentation-asyncpg[instruments]",
39-
"opentelemetry-test-utils == 0.42b0.dev",
39+
"opentelemetry-test-utils == 0.43b0.dev",
4040
]
4141

4242
[project.entry-points.opentelemetry_instrumentor]

‎instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/__init__.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,12 @@ def instrumentation_dependencies(self) -> Collection[str]:
107107

108108
def _instrument(self, **kwargs):
109109
tracer_provider = kwargs.get("tracer_provider")
110-
self._tracer = trace.get_tracer(__name__, __version__, tracer_provider)
110+
self._tracer = trace.get_tracer(
111+
__name__,
112+
__version__,
113+
tracer_provider,
114+
schema_url="https://opentelemetry.io/schemas/1.11.0",
115+
)
111116

112117
for method in [
113118
"Connection.execute",

‎instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.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.42b0.dev"
15+
__version__ = "0.43b0.dev"

‎instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ classifiers = [
2222
"Programming Language :: Python :: 3.8",
2323
]
2424
dependencies = [
25-
"opentelemetry-instrumentation == 0.42b0.dev",
25+
"opentelemetry-instrumentation == 0.43b0.dev",
2626
"opentelemetry-propagator-aws-xray == 1.0.1",
27-
"opentelemetry-semantic-conventions == 0.42b0.dev",
27+
"opentelemetry-semantic-conventions == 0.43b0.dev",
2828
]
2929

3030
[project.optional-dependencies]
3131
instruments = []
3232
test = [
33-
"opentelemetry-test-utils == 0.42b0.dev",
33+
"opentelemetry-test-utils == 0.43b0.dev",
3434
]
3535

3636
[project.urls]

‎instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,12 @@ def _instrumented_lambda_handler_call( # noqa pylint: disable=too-many-branches
321321
except (IndexError, KeyError, TypeError):
322322
span_kind = SpanKind.SERVER
323323

324-
tracer = get_tracer(__name__, __version__, tracer_provider)
324+
tracer = get_tracer(
325+
__name__,
326+
__version__,
327+
tracer_provider,
328+
schema_url="https://opentelemetry.io/schemas/1.11.0",
329+
)
325330

326331
with tracer.start_as_current_span(
327332
name=orig_handler_name,

‎instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.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.42b0.dev"
15+
__version__ = "0.43b0.dev"

‎instrumentation/opentelemetry-instrumentation-boto/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.42b0.dev",
30-
"opentelemetry-semantic-conventions == 0.42b0.dev",
29+
"opentelemetry-instrumentation == 0.43b0.dev",
30+
"opentelemetry-semantic-conventions == 0.43b0.dev",
3131
]
3232

3333
[project.optional-dependencies]
@@ -38,7 +38,7 @@ test = [
3838
"opentelemetry-instrumentation-boto[instruments]",
3939
"markupsafe==2.0.1",
4040
"moto~=2.0",
41-
"opentelemetry-test-utils == 0.42b0.dev",
41+
"opentelemetry-test-utils == 0.43b0.dev",
4242
]
4343

4444
[project.entry-points.opentelemetry_instrumentor]

‎instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/__init__.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,10 @@ def _instrument(self, **kwargs):
9191

9292
# pylint: disable=attribute-defined-outside-init
9393
self._tracer = get_tracer(
94-
__name__, __version__, kwargs.get("tracer_provider")
94+
__name__,
95+
__version__,
96+
kwargs.get("tracer_provider"),
97+
schema_url="https://opentelemetry.io/schemas/1.11.0",
9598
)
9699

97100
wrap_function_wrapper(

‎instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.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.42b0.dev"
15+
__version__ = "0.43b0.dev"

‎instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.42b0.dev",
30-
"opentelemetry-semantic-conventions == 0.42b0.dev",
29+
"opentelemetry-instrumentation == 0.43b0.dev",
30+
"opentelemetry-semantic-conventions == 0.43b0.dev",
3131
"wrapt >= 1.0.0, < 2.0.0",
3232
]
3333

@@ -37,7 +37,7 @@ instruments = [
3737
]
3838
test = [
3939
"opentelemetry-instrumentation-boto3sqs[instruments]",
40-
"opentelemetry-test-utils == 0.42b0.dev",
40+
"opentelemetry-test-utils == 0.43b0.dev",
4141
]
4242

4343
[project.entry-points.opentelemetry_instrumentor]

0 commit comments

Comments
 (0)