Skip to content

Commit b4482ca

Browse files
amitsettyamitsetty
authored
Merge branch 'main' into main
2 parents 5049322 + b00701d commit b4482ca

File tree

28 files changed

+264
-416
lines changed

28 files changed

+264
-416
lines changed

Diff for: ‎_template/pyproject.toml

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
[build-system]
2+
requires = ["hatchling"]
3+
build-backend = "hatchling.build"
4+
5+
[project]
6+
# opentelemetry-instrumentation plus the name of the library being instrument e.g
7+
# name = "opentelemetry-instrumentation-sqlalchemy"
8+
name = "<REPLACE ME>"
9+
dynamic = ["version"]
10+
# a description of the instrumentation e.g
11+
# description = "SQLAlchemy tracing for OpenTelemetry"
12+
description = "<REPLACE ME>"
13+
readme = "README.rst"
14+
license = "Apache-2.0"
15+
requires-python = ">=3.7"
16+
authors = [
17+
{ name = "OpenTelemetry Authors", email = "[email protected]" },
18+
]
19+
classifiers = [
20+
"Development Status :: 4 - Beta",
21+
"Intended Audience :: Developers",
22+
"License :: OSI Approved :: Apache Software License",
23+
"Programming Language :: Python",
24+
"Programming Language :: Python :: 3",
25+
"Programming Language :: Python :: 3.7",
26+
"Programming Language :: Python :: 3.8",
27+
"Programming Language :: Python :: 3.9",
28+
"Programming Language :: Python :: 3.10",
29+
]
30+
dependencies = [
31+
"opentelemetry-api ~= 1.12",
32+
]
33+
34+
[project.optional-dependencies]
35+
test = [
36+
# add any test dependencies here
37+
"<REPLACE ME>",
38+
]
39+
40+
[project.entry-points.opentelemetry_instrumentor]
41+
# REPLACE ME: the entrypoint for the instrumentor e.g
42+
# sqlalchemy = "opentelemetry.instrumentation.sqlalchemy:SQLAlchemyInstrumentor"
43+
<REPLACE ME> = "opentelemetry.instrumentation.<REPLACE>"
44+
45+
[project.urls]
46+
# url of the instrumentation e.g
47+
# Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-sqlalchemy"
48+
Homepage = "<REPLACE ME>"
49+
50+
[tool.hatch.version]
51+
# REPLACE ME: the path to the version file e.g
52+
# "src/opentelemetry/instrumentation/sqlalchemy/version.py"
53+
path = "src/opentelemetry/instrumentation/<REPLACE ME>/version.py"
54+
55+
[tool.hatch.build.targets.sdist]
56+
include = [
57+
"/src",
58+
"/tests",
59+
]
60+
61+
[tool.hatch.build.targets.wheel]
62+
packages = ["src/opentelemetry"]

Diff for: ‎_template/setup.cfg

-58
This file was deleted.

Diff for: ‎_template/setup.py

-42
This file was deleted.

Diff for: ‎exporter/opentelemetry-exporter-datadog/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/exporter/opentelemetry-exporter-datadog
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/exporter/opentelemetry-exporter-datadog
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

Diff for: ‎exporter/opentelemetry-exporter-richconsole/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/exporter/opentelemetry-exporter-richconsole
22+
url = https://github.com/open-telemetry/opentelemetry-python/tree/main/docs/examples/datadog_exporter
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

Diff for: ‎instrumentation/opentelemetry-instrumentation-aio-pika/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-aio-pika
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-aio-pika
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

Diff for: ‎instrumentation/opentelemetry-instrumentation-boto3sqs/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ long_description_content_type = text/x-rst
2424
author = OpenTelemetry Authors
2525
author_email = [email protected]
2626
# url of the instrumentation e.g
27-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-boto3sqs
27+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-boto3sqs
2828
platforms = any
2929
license = Apache-2.0
3030
classifiers =

Diff for: ‎instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_server.py

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import logging
2525
from contextlib import contextmanager
26+
from urllib.parse import unquote
2627

2728
import grpc
2829

@@ -237,6 +238,7 @@ def _start_span(
237238
ip, port = (
238239
context.peer().split(",")[0].split(":", 1)[1].rsplit(":", 1)
239240
)
241+
ip = unquote(ip)
240242
attributes.update(
241243
{
242244
SpanAttributes.NET_PEER_IP: ip,

Diff for: ‎instrumentation/opentelemetry-instrumentation-kafka-python/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation/opentelemetry-instrumentation-kafka-python
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-kafka-python
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

Diff for: ‎instrumentation/opentelemetry-instrumentation-logging/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation/opentelemetry-instrumentation-logging
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-logging
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

Diff for: ‎instrumentation/opentelemetry-instrumentation-pika/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-pika
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-pika
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

Diff for: ‎instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def response_hook(span, instance, response):
123123
import redis.asyncio
124124

125125
_REDIS_CLUSTER_VERSION = (4, 1, 0)
126-
_REDIS_ASYNCIO_CLUSTER_VERSION = (4, 3, 0)
126+
_REDIS_ASYNCIO_CLUSTER_VERSION = (4, 3, 2)
127127

128128

129129
def _set_connection_attributes(span, conn):

Diff for: ‎opentelemetry-contrib-instrumentations/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ long_description = file: README.rst
55
long_description_content_type = text/x-rst
66
author = OpenTelemetry Authors
77
author_email = [email protected]
8-
url = https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-contrib-instrumentations
8+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-contrib-instrumentations
99
platforms = any
1010
license = Apache-2.0
1111
classifiers =

Diff for: ‎opentelemetry-distro/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-distro
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-distro
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

Diff for: ‎opentelemetry-instrumentation/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ long_description = file: README.rst
1919
long_description_content_type = text/x-rst
2020
author = OpenTelemetry Authors
2121
author_email = [email protected]
22-
url = https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-instrumentation
22+
url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation
2323
platforms = any
2424
license = Apache-2.0
2525
classifiers =

Diff for: ‎propagator/opentelemetry-propagator-aws-xray/pyproject.toml

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
[build-system]
2+
requires = ["hatchling"]
3+
build-backend = "hatchling.build"
4+
5+
[project]
6+
name = "opentelemetry-propagator-aws-xray"
7+
dynamic = ["version"]
8+
description = "AWS X-Ray Propagator for OpenTelemetry"
9+
readme = "README.rst"
10+
license = "Apache-2.0"
11+
requires-python = ">=3.7"
12+
authors = [
13+
{ name = "OpenTelemetry Authors", email = "[email protected]" },
14+
]
15+
classifiers = [
16+
"Development Status :: 5 - Production/Stable",
17+
"Intended Audience :: Developers",
18+
"License :: OSI Approved :: Apache Software License",
19+
"Programming Language :: Python",
20+
"Programming Language :: Python :: 3",
21+
"Programming Language :: Python :: 3.7",
22+
"Programming Language :: Python :: 3.8",
23+
"Programming Language :: Python :: 3.9",
24+
"Programming Language :: Python :: 3.10",
25+
]
26+
dependencies = [
27+
"opentelemetry-api ~= 1.12",
28+
]
29+
30+
[project.optional-dependencies]
31+
test = []
32+
33+
[project.entry-points.opentelemetry_propagator]
34+
xray = "opentelemetry.propagators.aws:AwsXRayPropagator"
35+
36+
[project.urls]
37+
Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/propagator/opentelemetry-propagator-aws-xray"
38+
39+
[tool.hatch.version]
40+
path = "src/opentelemetry/propagators/aws/version.py"
41+
42+
[tool.hatch.build.targets.sdist]
43+
include = [
44+
"/src",
45+
"/tests",
46+
]
47+
48+
[tool.hatch.build.targets.wheel]
49+
packages = ["src/opentelemetry"]

Diff for: ‎propagator/opentelemetry-propagator-aws-xray/setup.cfg

-52
This file was deleted.

0 commit comments

Comments
 (0)