Rename web framework packages from "ext" to "instrumentation" (#961)

Author: lzchen

docs-requirements.txt

@@ -8,6 +8,7 @@ asyncpg>=0.12.0
 ddtrace>=0.34.0
 aiohttp~= 3.0
 aiopg>=0.13.0
+grpcio~=1.27
 Deprecated>=1.2.6
 django>=2.2
 PyMySQL~=0.9.3
@@ -29,5 +30,3 @@ boto~=2.0
 botocore~=1.0
 starlette~=0.13
 fastapi~=0.58.1
-opentelemetry-exporter-cloud-trace==0.10b0
-opentelemetry-exporter-cloud-monitoring==0.10b0

docs/conf.py

@@ -43,7 +43,15 @@
     for f in listdir(ext)
     if isdir(join(ext, f))
 ]
-sys.path[:0] = source_dirs + exp_dirs + ext_dirs
+
+instr = "../instrumentation"
+instr_dirs = [
+    os.path.abspath("/".join(["../instrumentation", f, "src"]))
+    for f in listdir(instr)
+    if isdir(join(instr, f))
+]
+
+sys.path[:0] = source_dirs + exp_dirs + ext_dirs + instr_dirs
 
 # -- Project information -----------------------------------------------------
 

docs/examples/auto-instrumentation/README.rst

@@ -73,7 +73,7 @@ Installation
 
     $ pip install opentelemetry-sdk
     $ pip install opentelemetry-instrumentation
-    $ pip install opentelemetry-ext-flask
+    $ pip install opentelemetry-instrumentation-flask
     $ pip install requests
 
 Execution

docs/examples/auto-instrumentation/server_instrumented.py

@@ -15,7 +15,7 @@
 from flask import Flask, request
 
 from opentelemetry import propagators, trace
-from opentelemetry.ext.wsgi import collect_request_attributes
+from opentelemetry.instrumentation.wsgi import collect_request_attributes
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import (
     ConsoleSpanExporter,

docs/examples/datadog_exporter/README.rst

@@ -50,7 +50,7 @@ Distributed Example
     pip install opentelemetry-sdk
     pip install opentelemetry-exporter-datadog
     pip install opentelemetry-instrumentation
-    pip install opentelemetry-ext-flask
+    pip install opentelemetry-instrumentation-flask
     pip install flask
     pip install requests
 

docs/examples/django/README.rst

@@ -1,7 +1,7 @@
 OpenTelemetry Django Instrumentation Example
 ============================================
 
-This shows how to use ``opentelemetry-ext-django`` to automatically instrument a
+This shows how to use ``opentelemetry-instrumentation-django`` to automatically instrument a
 Django app.
 
 For more user convenience, a Django app is already provided in this directory.
@@ -24,7 +24,7 @@ Installation
 .. code-block::
 
     $ pip install opentelemetry-sdk
-    $ pip install opentelemetry-ext-django
+    $ pip install opentelemetry-instrumentation-django
     $ pip install requests
 
 
@@ -40,7 +40,7 @@ Set these environment variables first:
 #. ``export DJANGO_SETTINGS_MODULE=instrumentation_example.settings``
 
 The way to achieve OpenTelemetry instrumentation for your Django app is to use
-an ``opentelemetry.ext.django.DjangoInstrumentor`` to instrument the app.
+an ``opentelemetry.instrumentation.django.DjangoInstrumentor`` to instrument the app.
 
 Clone the ``opentelemetry-python`` repository and go to ``opentelemetry-python/docs/examples/django``.
 
@@ -105,4 +105,4 @@ References
 
 * `Django <https://djangoproject.com/>`_
 * `OpenTelemetry Project <https://opentelemetry.io/>`_
-* `OpenTelemetry Django extension <https://github.com/open-telemetry/opentelemetry-python/tree/master/ext/opentelemetry-ext-django>`_
+* `OpenTelemetry Django extension <https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-django>`_

docs/examples/django/manage.py

@@ -17,7 +17,7 @@
 import os
 import sys
 
-from opentelemetry.ext.django import DjangoInstrumentor
+from opentelemetry.instrumentation.django import DjangoInstrumentor
 
 
 def main():

docs/examples/opentelemetry-example-app/setup.cfg

@@ -45,8 +45,8 @@ install_requires =
     typing; python_version<'3.5'
     opentelemetry-api == 0.12.dev0
     opentelemetry-sdk == 0.12.dev0
-    opentelemetry-ext-requests == 0.12.dev0
-    opentelemetry-ext-flask == 0.12.dev0
+    opentelemetry-instrumentation-requests == 0.12.dev0
+    opentelemetry-instrumentation-flask == 0.12.dev0
     flask
     requests
     protobuf~=3.11

docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/flask_example.py

@@ -19,9 +19,9 @@
 import flask
 import requests
 
-import opentelemetry.ext.requests
+import opentelemetry.instrumentation.requests
 from opentelemetry import trace
-from opentelemetry.ext.flask import FlaskInstrumentor
+from opentelemetry.instrumentation.flask import FlaskInstrumentor
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import (
     ConsoleSpanExporter,
@@ -33,7 +33,7 @@
 # It must be done before instrumenting any library
 trace.set_tracer_provider(TracerProvider())
 
-opentelemetry.ext.requests.RequestsInstrumentor().instrument()
+opentelemetry.instrumentation.requests.RequestsInstrumentor().instrument()
 
 trace.get_tracer_provider().add_span_processor(
     SimpleExportSpanProcessor(ConsoleSpanExporter())