Merge branch 'main' into main

open-telemetry · Sep 7, 2022 · b4482ca · b4482ca
2 parents 5049322 + b00701d
commit b4482ca
Show file tree

Hide file tree

Showing 28 changed files with 264 additions and 416 deletions.
diff --git a/_template/pyproject.toml b/_template/pyproject.toml
@@ -0,0 +1,62 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+# opentelemetry-instrumentation plus the name of the library being instrument e.g
+# name = "opentelemetry-instrumentation-sqlalchemy"
+name = "<REPLACE ME>"
+dynamic = ["version"]
+# a description of the instrumentation e.g
+# description = "SQLAlchemy tracing for OpenTelemetry"
+description = "<REPLACE ME>"
+readme = "README.rst"
+license = "Apache-2.0"
+requires-python = ">=3.7"
+authors = [
+  { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" },
+]
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Intended Audience :: Developers",
+  "License :: OSI Approved :: Apache Software License",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.7",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+]
+dependencies = [
+  "opentelemetry-api ~= 1.12",
+]
+
+[project.optional-dependencies]
+test = [
+  # add any test dependencies here
+  "<REPLACE ME>",
+]
+
+[project.entry-points.opentelemetry_instrumentor]
+# REPLACE ME: the entrypoint for the instrumentor e.g
+# sqlalchemy = "opentelemetry.instrumentation.sqlalchemy:SQLAlchemyInstrumentor"
+<REPLACE ME> = "opentelemetry.instrumentation.<REPLACE>"
+
+[project.urls]
+# url of the instrumentation e.g
+# Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-sqlalchemy"
+Homepage = "<REPLACE ME>"
+
+[tool.hatch.version]
+# REPLACE ME: the path to the version file e.g
+# "src/opentelemetry/instrumentation/sqlalchemy/version.py"
+path = "src/opentelemetry/instrumentation/<REPLACE ME>/version.py"
+
+[tool.hatch.build.targets.sdist]
+include = [
+  "/src",
+  "/tests",
+]
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/opentelemetry"]
diff --git a/_template/setup.cfg b/_template/setup.cfg
diff --git a/_template/setup.py b/_template/setup.py
diff --git a/exporter/opentelemetry-exporter-datadog/setup.cfg b/exporter/opentelemetry-exporter-datadog/setup.cfg
@@ -19,7 +19,7 @@ long_description = file: README.rst
 long_description_content_type = text/x-rst
 author = OpenTelemetry Authors
 author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python-contrib/exporter/opentelemetry-exporter-datadog
+url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/exporter/opentelemetry-exporter-datadog
 platforms = any
 license = Apache-2.0
 classifiers =

diff --git a/exporter/opentelemetry-exporter-richconsole/setup.cfg b/exporter/opentelemetry-exporter-richconsole/setup.cfg
@@ -19,7 +19,7 @@ long_description = file: README.rst
 long_description_content_type = text/x-rst
 author = OpenTelemetry Authors
 author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python-contrib/exporter/opentelemetry-exporter-richconsole
+url = https://github.com/open-telemetry/opentelemetry-python/tree/main/docs/examples/datadog_exporter
 platforms = any
 license = Apache-2.0
 classifiers =

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/setup.cfg b/instrumentation/opentelemetry-instrumentation-aio-pika/setup.cfg
@@ -19,7 +19,7 @@ long_description = file: README.rst
 long_description_content_type = text/x-rst
 author = OpenTelemetry Authors
 author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-aio-pika
+url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-aio-pika
 platforms = any
 license = Apache-2.0
 classifiers =

diff --git a/instrumentation/opentelemetry-instrumentation-boto3sqs/setup.cfg b/instrumentation/opentelemetry-instrumentation-boto3sqs/setup.cfg
@@ -24,7 +24,7 @@ long_description_content_type = text/x-rst
 author = OpenTelemetry Authors
 author_email = cncf-opentelemetry-contributors@lists.cncf.io
 # url of the instrumentation e.g
-url = https://github.com/open-telemetry/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-boto3sqs
+url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-boto3sqs
 platforms = any
 license = Apache-2.0
 classifiers =

diff --git a/...tion/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_server.py b/...tion/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_server.py
@@ -23,6 +23,7 @@
 
 import logging
 from contextlib import contextmanager
+from urllib.parse import unquote
 
 import grpc
 
@@ -237,6 +238,7 @@ def _start_span(
             ip, port = (
                 context.peer().split(",")[0].split(":", 1)[1].rsplit(":", 1)
             )
+            ip = unquote(ip)
             attributes.update(
                 {
                     SpanAttributes.NET_PEER_IP: ip,

diff --git a/instrumentation/opentelemetry-instrumentation-kafka-python/setup.cfg b/instrumentation/opentelemetry-instrumentation-kafka-python/setup.cfg
@@ -19,7 +19,7 @@ long_description = file: README.rst
 long_description_content_type = text/x-rst
 author = OpenTelemetry Authors
 author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation/opentelemetry-instrumentation-kafka-python
+url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-kafka-python
 platforms = any
 license = Apache-2.0
 classifiers =

diff --git a/instrumentation/opentelemetry-instrumentation-logging/setup.cfg b/instrumentation/opentelemetry-instrumentation-logging/setup.cfg
@@ -19,7 +19,7 @@ long_description = file: README.rst
 long_description_content_type = text/x-rst
 author = OpenTelemetry Authors
 author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation/opentelemetry-instrumentation-logging
+url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-logging
 platforms = any
 license = Apache-2.0
 classifiers =

diff --git a/instrumentation/opentelemetry-instrumentation-pika/setup.cfg b/instrumentation/opentelemetry-instrumentation-pika/setup.cfg
@@ -19,7 +19,7 @@ long_description = file: README.rst
 long_description_content_type = text/x-rst
 author = OpenTelemetry Authors
 author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-pika
+url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-pika
 platforms = any
 license = Apache-2.0
 classifiers =

diff --git a/...n/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/__init__.py b/...n/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/__init__.py
@@ -123,7 +123,7 @@ def response_hook(span, instance, response):
     import redis.asyncio
 
 _REDIS_CLUSTER_VERSION = (4, 1, 0)
-_REDIS_ASYNCIO_CLUSTER_VERSION = (4, 3, 0)
+_REDIS_ASYNCIO_CLUSTER_VERSION = (4, 3, 2)
 
 
 def _set_connection_attributes(span, conn):

diff --git a/opentelemetry-contrib-instrumentations/setup.cfg b/opentelemetry-contrib-instrumentations/setup.cfg
@@ -5,7 +5,7 @@ long_description = file: README.rst
 long_description_content_type = text/x-rst
 author = OpenTelemetry Authors
 author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-contrib-instrumentations
+url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-contrib-instrumentations
 platforms = any
 license = Apache-2.0
 classifiers = 

diff --git a/opentelemetry-distro/setup.cfg b/opentelemetry-distro/setup.cfg
@@ -19,7 +19,7 @@ long_description = file: README.rst
 long_description_content_type = text/x-rst
 author = OpenTelemetry Authors
 author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-distro
+url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-distro
 platforms = any
 license = Apache-2.0
 classifiers =

diff --git a/opentelemetry-instrumentation/setup.cfg b/opentelemetry-instrumentation/setup.cfg
@@ -19,7 +19,7 @@ long_description = file: README.rst
 long_description_content_type = text/x-rst
 author = OpenTelemetry Authors
 author_email = cncf-opentelemetry-contributors@lists.cncf.io
-url = https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-instrumentation
+url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation
 platforms = any
 license = Apache-2.0
 classifiers =

diff --git a/propagator/opentelemetry-propagator-aws-xray/pyproject.toml b/propagator/opentelemetry-propagator-aws-xray/pyproject.toml
@@ -0,0 +1,49 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "opentelemetry-propagator-aws-xray"
+dynamic = ["version"]
+description = "AWS X-Ray Propagator for OpenTelemetry"
+readme = "README.rst"
+license = "Apache-2.0"
+requires-python = ">=3.7"
+authors = [
+  { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" },
+]
+classifiers = [
+  "Development Status :: 5 - Production/Stable",
+  "Intended Audience :: Developers",
+  "License :: OSI Approved :: Apache Software License",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.7",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+]
+dependencies = [
+  "opentelemetry-api ~= 1.12",
+]
+
+[project.optional-dependencies]
+test = []
+
+[project.entry-points.opentelemetry_propagator]
+xray = "opentelemetry.propagators.aws:AwsXRayPropagator"
+
+[project.urls]
+Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/propagator/opentelemetry-propagator-aws-xray"
+
+[tool.hatch.version]
+path = "src/opentelemetry/propagators/aws/version.py"
+
+[tool.hatch.build.targets.sdist]
+include = [
+  "/src",
+  "/tests",
+]
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/opentelemetry"]
diff --git a/propagator/opentelemetry-propagator-aws-xray/setup.cfg b/propagator/opentelemetry-propagator-aws-xray/setup.cfg