diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/wrappers.py b/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/wrappers.py index 8a3b6023bd..cb976e85c7 100644 --- a/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/wrappers.py +++ b/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/wrappers.py @@ -23,9 +23,6 @@ from opentelemetry import trace from opentelemetry.instrumentation.aiopg import trace_integration - from opentelemetry.trace import TracerProvider - - trace.set_tracer_provider(TracerProvider()) trace_integration(aiopg.connection, "_connect", "postgresql", "sql") diff --git a/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/__init__.py b/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/__init__.py index 3bef955d14..57a6fb16f7 100644 --- a/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/__init__.py @@ -26,15 +26,12 @@ .. code:: python - from opentelemetry import trace from opentelemetry.instrumentation.boto import BotoInstrumentor - from opentelemetry.sdk.trace import TracerProvider import boto - trace.set_tracer_provider(TracerProvider()) # Instrument Boto - BotoInstrumentor().instrument(tracer_provider=trace.get_tracer_provider()) + BotoInstrumentor().instrument() # This will create a span with Boto-specific attributes ec2 = boto.ec2.connect_to_region("us-west-2") diff --git a/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py b/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py index 1bbc6af13b..1dd1989c57 100644 --- a/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py @@ -27,17 +27,12 @@ .. code:: python - from opentelemetry import trace from opentelemetry.instrumentation.botocore import BotocoreInstrumentor - from opentelemetry.sdk.trace import TracerProvider import botocore - trace.set_tracer_provider(TracerProvider()) # Instrument Botocore - BotocoreInstrumentor().instrument( - tracer_provider=trace.get_tracer_provider() - ) + BotocoreInstrumentor().instrument() # This will create a span with Botocore-specific attributes session = botocore.session.get_session() diff --git a/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/__init__.py b/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/__init__.py index d225e6bd06..cdf5b00618 100644 --- a/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/__init__.py @@ -30,9 +30,6 @@ .. code:: python - from opentelemetry import trace - from opentelemetry.sdk.trace import TracerProvider - from opentelemetry.sdk.trace.export import BatchExportSpanProcessor from opentelemetry.instrumentation.celery import CeleryInstrumentor from celery import Celery @@ -40,9 +37,6 @@ @worker_process_init.connect(weak=False) def init_celery_tracing(*args, **kwargs): - trace.set_tracer_provider(TracerProvider()) - span_processor = BatchExportSpanProcessor(ConsoleSpanExporter()) - trace.get_tracer_provider().add_span_processor(span_processor) CeleryInstrumentor().instrument() app = Celery("tasks", broker="amqp://localhost") diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py b/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py index 39d7e3f361..5b120d3dec 100644 --- a/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py @@ -25,11 +25,8 @@ import mysql.connector import pyodbc - from opentelemetry import trace from opentelemetry.instrumentation.dbapi import trace_integration - from opentelemetry.trace import TracerProvider - trace.set_tracer_provider(TracerProvider()) # Ex: mysql.connector trace_integration(mysql.connector, "connect", "mysql", "sql") diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py index 2ed8c35750..5df7f6a807 100644 --- a/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py @@ -21,15 +21,12 @@ .. code-block:: python - from opentelemetry import trace from opentelemetry.instrumentation.elasticsearch import ElasticsearchInstrumentor - from opentelemetry.sdk.trace import TracerProvider import elasticsearch - trace.set_tracer_provider(TracerProvider()) # instrument elasticsearch - ElasticsearchInstrumentor().instrument(tracer_provider=trace.get_tracer_provider()) + ElasticsearchInstrumentor().instrument() # Using elasticsearch as normal now will automatically generate spans es = elasticsearch.Elasticsearch() @@ -46,7 +43,7 @@ .. code-block:: python - ElasticSearchInstrumentor("my-custom-prefix").instrument() + ElasticsearchInstrumentor("my-custom-prefix").instrument() """ import functools diff --git a/instrumentation/opentelemetry-instrumentation-jinja2/src/opentelemetry/instrumentation/jinja2/__init__.py b/instrumentation/opentelemetry-instrumentation-jinja2/src/opentelemetry/instrumentation/jinja2/__init__.py index 3419559319..14a5860707 100644 --- a/instrumentation/opentelemetry-instrumentation-jinja2/src/opentelemetry/instrumentation/jinja2/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-jinja2/src/opentelemetry/instrumentation/jinja2/__init__.py @@ -27,10 +27,7 @@ from jinja2 import Environment, FileSystemLoader from opentelemetry.instrumentation.jinja2 import Jinja2Instrumentor - from opentelemetry import trace - from opentelemetry.trace import TracerProvider - trace.set_tracer_provider(TracerProvider()) Jinja2Instrumentor().instrument() diff --git a/instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry/instrumentation/mysql/__init__.py b/instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry/instrumentation/mysql/__init__.py index 1cbd240cc5..7440ee8bc2 100644 --- a/instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry/instrumentation/mysql/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry/instrumentation/mysql/__init__.py @@ -24,12 +24,8 @@ .. code:: python import mysql.connector - from opentelemetry import trace - from opentelemetry.trace import TracerProvider from opentelemetry.instrumentation.mysql import MySQLInstrumentor - trace.set_tracer_provider(TracerProvider()) - MySQLInstrumentor().instrument() cnx = mysql.connector.connect(database="MySQL_Database") diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/__init__.py b/instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/__init__.py index 7782f6fe63..4b8799402e 100644 --- a/instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/__init__.py @@ -24,11 +24,8 @@ .. code-block:: python import psycopg2 - from opentelemetry import trace - from opentelemetry.sdk.trace import TracerProvider from opentelemetry.instrumentation.psycopg2 import Psycopg2Instrumentor - trace.set_tracer_provider(TracerProvider()) Psycopg2Instrumentor().instrument() diff --git a/instrumentation/opentelemetry-instrumentation-pymemcache/src/opentelemetry/instrumentation/pymemcache/__init__.py b/instrumentation/opentelemetry-instrumentation-pymemcache/src/opentelemetry/instrumentation/pymemcache/__init__.py index 1276f1ffd4..5fa9c04b9f 100644 --- a/instrumentation/opentelemetry-instrumentation-pymemcache/src/opentelemetry/instrumentation/pymemcache/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-pymemcache/src/opentelemetry/instrumentation/pymemcache/__init__.py @@ -24,11 +24,10 @@ .. code-block:: python - from opentelemetry import trace - from opentelemetry.sdk.trace import TracerProvider from opentelemetry.instrumentation.pymemcache import PymemcacheInstrumentor - trace.set_tracer_provider(TracerProvider()) + PymemcacheInstrumentor().instrument() + from pymemcache.client.base import Client client = Client(('localhost', 11211)) client.set('some_key', 'some_value') diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/__init__.py b/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/__init__.py index adc51b1c84..434984ec30 100644 --- a/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/__init__.py @@ -24,11 +24,8 @@ .. code:: python from pymongo import MongoClient - from opentelemetry import trace - from opentelemetry.trace import TracerProvider from opentelemetry.instrumentation.pymongo import PymongoInstrumentor - trace.set_tracer_provider(TracerProvider()) PymongoInstrumentor().instrument() client = MongoClient() diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/__init__.py b/instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/__init__.py index 5d299505d6..afceefafed 100644 --- a/instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/__init__.py @@ -24,11 +24,8 @@ .. code:: python import pymysql - from opentelemetry import trace from opentelemetry.instrumentation.pymysql import PyMySQLInstrumentor - from opentelemetry.sdk.trace import TracerProvider - trace.set_tracer_provider(TracerProvider()) PyMySQLInstrumentor().instrument() diff --git a/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/__init__.py b/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/__init__.py index e1c5db1e94..6cf59a4a02 100644 --- a/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/__init__.py @@ -27,15 +27,12 @@ .. code:: python - from opentelemetry import trace from opentelemetry.instrumentation.redis import RedisInstrumentor - from opentelemetry.sdk.trace import TracerProvider import redis - trace.set_tracer_provider(TracerProvider()) # Instrument redis - RedisInstrumentor().instrument(tracer_provider=trace.get_tracer_provider()) + RedisInstrumentor().instrument() # This will report a span with the default settings client = redis.StrictRedis(host="localhost", port=6379) diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/__init__.py b/instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/__init__.py index aad6dbfc07..befc4df73a 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/__init__.py @@ -28,12 +28,9 @@ from sqlalchemy import create_engine - from opentelemetry import trace from opentelemetry.instrumentation.sqlalchemy import SQLAlchemyInstrumentor - from opentelemetry.sdk.trace import TracerProvider import sqlalchemy - trace.set_tracer_provider(TracerProvider()) engine = create_engine("sqlite:///:memory:") SQLAlchemyInstrumentor().instrument( engine=engine, diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/__init__.py b/instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/__init__.py index 568e83f0d6..986b0c6210 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/__init__.py @@ -24,11 +24,8 @@ .. code:: python import sqlite3 - from opentelemetry import trace - from opentelemetry.trace import TracerProvider from opentelemetry.instrumentation.sqlite3 import SQLite3Instrumentor - trace.set_tracer_provider(TracerProvider()) SQLite3Instrumentor().instrument()