opentelemetry-instrumentation 0.47b0__tar.gz → 0.48b0__tar.gz

{opentelemetry_instrumentation-0.47b0 → opentelemetry_instrumentation-0.48b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: opentelemetry-instrumentation
-Version: 0.47b0
+Version: 0.48b0
 Summary: Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python
 Project-URL: Homepage, https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation
 Author-email: OpenTelemetry Authors <cncf-opentelemetry-contributors@lists.cncf.io>

{opentelemetry_instrumentation-0.47b0 → opentelemetry_instrumentation-0.48b0}/src/opentelemetry/instrumentation/_semconv.py

@@ -252,16 +252,32 @@ def _set_http_scheme(result, scheme, sem_conv_opt_in_mode):
         set_string_attribute(result, URL_SCHEME, scheme)
 
 
-def _set_http_host(result, host, sem_conv_opt_in_mode):
+def _set_http_flavor_version(result, version, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_string_attribute(result, SpanAttributes.HTTP_HOST, host)
+        set_string_attribute(result, SpanAttributes.HTTP_FLAVOR, version)
     if _report_new(sem_conv_opt_in_mode):
-        set_string_attribute(result, SERVER_ADDRESS, host)
+        set_string_attribute(result, NETWORK_PROTOCOL_VERSION, version)
+
+
+def _set_http_user_agent(result, user_agent, sem_conv_opt_in_mode):
+    if _report_old(sem_conv_opt_in_mode):
+        set_string_attribute(
+            result, SpanAttributes.HTTP_USER_AGENT, user_agent
+        )
+    if _report_new(sem_conv_opt_in_mode):
+        set_string_attribute(result, USER_AGENT_ORIGINAL, user_agent)
 
 
 # Client
 
 
+def _set_http_host_client(result, host, sem_conv_opt_in_mode):
+    if _report_old(sem_conv_opt_in_mode):
+        set_string_attribute(result, SpanAttributes.HTTP_HOST, host)
+    if _report_new(sem_conv_opt_in_mode):
+        set_string_attribute(result, SERVER_ADDRESS, host)
+
+
 def _set_http_net_peer_name_client(result, peer_name, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
         set_string_attribute(result, SpanAttributes.NET_PEER_NAME, peer_name)
@@ -310,27 +326,32 @@ def _set_http_target(result, target, path, query, sem_conv_opt_in_mode):
             set_string_attribute(result, URL_QUERY, query)
 
 
-def _set_http_peer_ip(result, ip, sem_conv_opt_in_mode):
+def _set_http_host_server(result, host, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_string_attribute(result, SpanAttributes.NET_PEER_IP, ip)
+        set_string_attribute(result, SpanAttributes.HTTP_HOST, host)
     if _report_new(sem_conv_opt_in_mode):
-        set_string_attribute(result, CLIENT_ADDRESS, ip)
+        set_string_attribute(result, CLIENT_ADDRESS, host)
 
 
-def _set_http_peer_port_server(result, port, sem_conv_opt_in_mode):
+# net.peer.ip -> net.sock.peer.addr
+# https://github.com/open-telemetry/semantic-conventions/blob/40db676ca0e735aa84f242b5a0fb14e49438b69b/schemas/1.15.0#L18
+# net.sock.peer.addr -> client.socket.address for server spans (TODO) AND client.address if missing
+# https://github.com/open-telemetry/semantic-conventions/blob/v1.21.0/CHANGELOG.md#v1210-2023-07-13
+# https://github.com/open-telemetry/semantic-conventions/blob/main/docs/non-normative/http-migration.md#common-attributes-across-http-client-and-server-spans
+def _set_http_peer_ip_server(result, ip, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_int_attribute(result, SpanAttributes.NET_PEER_PORT, port)
+        set_string_attribute(result, SpanAttributes.NET_PEER_IP, ip)
     if _report_new(sem_conv_opt_in_mode):
-        set_int_attribute(result, CLIENT_PORT, port)
+        # Only populate if not already populated
+        if not result.get(CLIENT_ADDRESS):
+            set_string_attribute(result, CLIENT_ADDRESS, ip)
 
 
-def _set_http_user_agent(result, user_agent, sem_conv_opt_in_mode):
+def _set_http_peer_port_server(result, port, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_string_attribute(
-            result, SpanAttributes.HTTP_USER_AGENT, user_agent
-        )
+        set_int_attribute(result, SpanAttributes.NET_PEER_PORT, port)
     if _report_new(sem_conv_opt_in_mode):
-        set_string_attribute(result, USER_AGENT_ORIGINAL, user_agent)
+        set_int_attribute(result, CLIENT_PORT, port)
 
 
 def _set_http_net_peer_name_server(result, name, sem_conv_opt_in_mode):
@@ -340,13 +361,6 @@ def _set_http_net_peer_name_server(result, name, sem_conv_opt_in_mode):
         set_string_attribute(result, CLIENT_ADDRESS, name)
 
 
-def _set_http_flavor_version(result, version, sem_conv_opt_in_mode):
-    if _report_old(sem_conv_opt_in_mode):
-        set_string_attribute(result, SpanAttributes.HTTP_FLAVOR, version)
-    if _report_new(sem_conv_opt_in_mode):
-        set_string_attribute(result, NETWORK_PROTOCOL_VERSION, version)
-
-
 def _set_status(
     span,
     metrics_attributes: dict,

{opentelemetry_instrumentation-0.47b0 → opentelemetry_instrumentation-0.48b0}/src/opentelemetry/instrumentation/bootstrap.py

@@ -119,7 +119,7 @@ def _find_installed_libraries():
 
 def _run_requirements():
     logger.setLevel(logging.ERROR)
-    print("\n".join(_find_installed_libraries()), end="")
+    print("\n".join(_find_installed_libraries()))
 
 
 def _run_install():

{opentelemetry_instrumentation-0.47b0 → opentelemetry_instrumentation-0.48b0}/src/opentelemetry/instrumentation/bootstrap_gen.py

@@ -18,180 +18,179 @@
 libraries = [
     {
         "library": "aio_pika >= 7.2.0, < 10.0.0",
-        "instrumentation": "opentelemetry-instrumentation-aio-pika==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-aio-pika==0.48b0",
     },
     {
         "library": "aiohttp ~= 3.0",
-        "instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.48b0",
     },
     {
         "library": "aiohttp ~= 3.0",
-        "instrumentation": "opentelemetry-instrumentation-aiohttp-server==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-aiohttp-server==0.48b0",
     },
     {
         "library": "aiopg >= 0.13.0, < 2.0.0",
-        "instrumentation": "opentelemetry-instrumentation-aiopg==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-aiopg==0.48b0",
     },
     {
         "library": "asgiref ~= 3.0",
-        "instrumentation": "opentelemetry-instrumentation-asgi==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-asgi==0.48b0",
     },
     {
         "library": "asyncpg >= 0.12.0",
-        "instrumentation": "opentelemetry-instrumentation-asyncpg==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-asyncpg==0.48b0",
     },
     {
         "library": "boto~=2.0",
-        "instrumentation": "opentelemetry-instrumentation-boto==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-boto==0.48b0",
     },
     {
         "library": "boto3 ~= 1.0",
-        "instrumentation": "opentelemetry-instrumentation-boto3sqs==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-boto3sqs==0.48b0",
     },
     {
         "library": "botocore ~= 1.0",
-        "instrumentation": "opentelemetry-instrumentation-botocore==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-botocore==0.48b0",
     },
     {
         "library": "cassandra-driver ~= 3.25",
-        "instrumentation": "opentelemetry-instrumentation-cassandra==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-cassandra==0.48b0",
     },
     {
         "library": "scylla-driver ~= 3.25",
-        "instrumentation": "opentelemetry-instrumentation-cassandra==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-cassandra==0.48b0",
     },
     {
         "library": "celery >= 4.0, < 6.0",
-        "instrumentation": "opentelemetry-instrumentation-celery==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-celery==0.48b0",
     },
     {
         "library": "confluent-kafka >= 1.8.2, <= 2.4.0",
-        "instrumentation": "opentelemetry-instrumentation-confluent-kafka==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-confluent-kafka==0.48b0",
     },
     {
         "library": "django >= 1.10",
-        "instrumentation": "opentelemetry-instrumentation-django==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-django==0.48b0",
     },
     {
         "library": "elasticsearch >= 6.0",
-        "instrumentation": "opentelemetry-instrumentation-elasticsearch==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-elasticsearch==0.48b0",
     },
     {
         "library": "falcon >= 1.4.1, < 3.1.2",
-        "instrumentation": "opentelemetry-instrumentation-falcon==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-falcon==0.48b0",
     },
     {
         "library": "fastapi ~= 0.58",
-        "instrumentation": "opentelemetry-instrumentation-fastapi==0.47b0",
-    },
-    {
-        "library": "fastapi-slim ~= 0.111.0",
-        "instrumentation": "opentelemetry-instrumentation-fastapi==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-fastapi==0.48b0",
     },
     {
         "library": "flask >= 1.0",
-        "instrumentation": "opentelemetry-instrumentation-flask==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-flask==0.48b0",
     },
     {
         "library": "grpcio ~= 1.27",
-        "instrumentation": "opentelemetry-instrumentation-grpc==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-grpc==0.48b0",
     },
     {
         "library": "httpx >= 0.18.0",
-        "instrumentation": "opentelemetry-instrumentation-httpx==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-httpx==0.48b0",
     },
     {
         "library": "jinja2 >= 2.7, < 4.0",
-        "instrumentation": "opentelemetry-instrumentation-jinja2==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-jinja2==0.48b0",
+    },
+    {
+        "library": "kafka-python >= 2.0, < 3.0",
+        "instrumentation": "opentelemetry-instrumentation-kafka-python==0.48b0",
     },
     {
-        "library": "kafka-python >= 2.0",
-        "instrumentation": "opentelemetry-instrumentation-kafka-python==0.47b0",
+        "library": "kafka-python-ng >= 2.0, < 3.0",
+        "instrumentation": "opentelemetry-instrumentation-kafka-python==0.48b0",
     },
     {
-        "library": "mysql-connector-python ~= 8.0",
-        "instrumentation": "opentelemetry-instrumentation-mysql==0.47b0",
+        "library": "mysql-connector-python >= 8.0, < 10.0",
+        "instrumentation": "opentelemetry-instrumentation-mysql==0.48b0",
     },
     {
         "library": "mysqlclient < 3",
-        "instrumentation": "opentelemetry-instrumentation-mysqlclient==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-mysqlclient==0.48b0",
     },
     {
         "library": "pika >= 0.12.0",
-        "instrumentation": "opentelemetry-instrumentation-pika==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-pika==0.48b0",
     },
     {
         "library": "psycopg >= 3.1.0",
-        "instrumentation": "opentelemetry-instrumentation-psycopg==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-psycopg==0.48b0",
     },
     {
         "library": "psycopg2 >= 2.7.3.1",
-        "instrumentation": "opentelemetry-instrumentation-psycopg2==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-psycopg2==0.48b0",
     },
     {
         "library": "pymemcache >= 1.3.5, < 5",
-        "instrumentation": "opentelemetry-instrumentation-pymemcache==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-pymemcache==0.48b0",
     },
     {
         "library": "pymongo >= 3.1, < 5.0",
-        "instrumentation": "opentelemetry-instrumentation-pymongo==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-pymongo==0.48b0",
     },
     {
         "library": "PyMySQL < 2",
-        "instrumentation": "opentelemetry-instrumentation-pymysql==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-pymysql==0.48b0",
     },
     {
         "library": "pyramid >= 1.7",
-        "instrumentation": "opentelemetry-instrumentation-pyramid==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-pyramid==0.48b0",
     },
     {
         "library": "redis >= 2.6",
-        "instrumentation": "opentelemetry-instrumentation-redis==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-redis==0.48b0",
     },
     {
         "library": "remoulade >= 0.50",
-        "instrumentation": "opentelemetry-instrumentation-remoulade==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-remoulade==0.48b0",
     },
     {
         "library": "requests ~= 2.0",
-        "instrumentation": "opentelemetry-instrumentation-requests==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-requests==0.48b0",
     },
     {
         "library": "sqlalchemy",
-        "instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.48b0",
     },
     {
         "library": "starlette ~= 0.13.0",
-        "instrumentation": "opentelemetry-instrumentation-starlette==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-starlette==0.48b0",
     },
     {
         "library": "psutil >= 5",
-        "instrumentation": "opentelemetry-instrumentation-system-metrics==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-system-metrics==0.48b0",
     },
     {
         "library": "tornado >= 5.1.1",
-        "instrumentation": "opentelemetry-instrumentation-tornado==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-tornado==0.48b0",
     },
     {
         "library": "tortoise-orm >= 0.17.0",
-        "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.48b0",
     },
     {
         "library": "pydantic >= 1.10.2",
-        "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.48b0",
     },
     {
         "library": "urllib3 >= 1.0.0, < 3.0.0",
-        "instrumentation": "opentelemetry-instrumentation-urllib3==0.47b0",
+        "instrumentation": "opentelemetry-instrumentation-urllib3==0.48b0",
     },
 ]
 default_instrumentations = [
-    "opentelemetry-instrumentation-asyncio==0.47b0",
-    "opentelemetry-instrumentation-aws-lambda==0.47b0",
-    "opentelemetry-instrumentation-dbapi==0.47b0",
-    "opentelemetry-instrumentation-logging==0.47b0",
-    "opentelemetry-instrumentation-sqlite3==0.47b0",
-    "opentelemetry-instrumentation-threading==0.47b0",
-    "opentelemetry-instrumentation-urllib==0.47b0",
-    "opentelemetry-instrumentation-wsgi==0.47b0",
+    "opentelemetry-instrumentation-asyncio==0.48b0",
+    "opentelemetry-instrumentation-dbapi==0.48b0",
+    "opentelemetry-instrumentation-logging==0.48b0",
+    "opentelemetry-instrumentation-sqlite3==0.48b0",
+    "opentelemetry-instrumentation-threading==0.48b0",
+    "opentelemetry-instrumentation-urllib==0.48b0",
+    "opentelemetry-instrumentation-wsgi==0.48b0",
 ]

{opentelemetry_instrumentation-0.47b0 → opentelemetry_instrumentation-0.48b0}/src/opentelemetry/instrumentation/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.47b0"
+__version__ = "0.48b0"

{opentelemetry_instrumentation-0.47b0 → opentelemetry_instrumentation-0.48b0}/tests/test_bootstrap.py

@@ -77,7 +77,7 @@ class TestBootstrap(TestCase):
             bootstrap.run()
             self.assertEqual(
                 fake_out.getvalue(),
-                "\n".join(self.installed_libraries),
+                "\n".join(self.installed_libraries) + "\n",
             )
 
     @patch("sys.argv", ["bootstrap", "-a", "install"])