HiveTraum · HiveTraum · Aug 17, 2020 · Jun 22, 2020 · Jun 22, 2020 · Jun 22, 2020
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,9 +1,24 @@
 version: 2.1
 
 executors:
-  python38:
+  py38:
     docker:
       - image: circleci/python:3.8
+  py37:
+    docker:
+      - image: circleci/python:3.7
+  py36:
+    docker:
+      - image: circleci/python:3.6
+  py35:
+    docker:
+      - image: circleci/python:3.5
+  py34:
+    docker:
+      - image: circleci/python:3.4
+  pypy3:
+    docker:
+      - image: pypy:3
 
 commands:
   setup_tox:
@@ -31,27 +46,107 @@ commands:
           paths:
             - ".tox"
 
+  run_tox_scenario:
+    description: "Run scripts/run-tox-scenario with setup, caching and persistence"
+    parameters:
+      pattern:
+        type: string
+    steps:
+      - checkout
+      - setup_tox
+      - restore_tox_cache
+      - run:
+          name: "Run scripts/run-tox-scenario"
+          command: tox -f '<< parameters.pattern >>'
+      - save_tox_cache
+
 jobs:
   docs:
-    executor: python38
+    executor: py38
+    steps:
+      - run_tox_scenario:
+          pattern: docs
+
+  docker-tests:
+    machine:
+      image: ubuntu-1604:201903-01
     steps:
       - checkout
+      - run:
+          name: "Get pyenv list"
+          command: pyenv versions
+      - run:
+          name: "Set Python Version"
+          command: pyenv global 3.7.0
+      - run:
+          name: "Update pip"
+          command: pip install -U pip
       - setup_tox
       - restore_tox_cache
-      - run: tox -e docs
+      - run: tox -e docker-tests
       - save_tox_cache
 
   lint:
-    executor: python38
+    executor: py38
+    steps:
+      - run_tox_scenario:
+          pattern: lint
+
+  build-py38:
+    parameters:
+      package:
+        type: string
+    executor: py38
+    steps:
+      - run_tox_scenario:
+          pattern: py38-<< parameters.package >>
+
+  build-py34:
+    parameters:
+      package:
+        type: string
+        default: "core"
+    executor: py34
     steps:
       - checkout
-      - setup_tox
+      - run:
+          name: "Install tox"
+          command: sudo pip install -U tox virtualenv tox-factor
       - restore_tox_cache
-      - run: tox -e lint
+      - run:
+          name: "Run scripts/run-tox-scenario"
+          command: tox -f py34-<< parameters.package >>
       - save_tox_cache
 
+  build:
+    parameters:
+      version:
+        type: string
+        default: "py38"
+      package:
+        type: string
+        default: "core"
+    executor: << parameters.version >>
+    steps:
+      - run_tox_scenario:
+          pattern: << parameters.version >>-<< parameters.package >>
+
 workflows:
-  main:
+  circleci-build:
     jobs:
+      - build-py38:
+          matrix:
+            parameters:
+              package: ["core", "exporter", "instrumentation", "tracecontext", "mypy", "mypyinstalled"]
+      - build:
+          matrix:
+            parameters:
+              version: ["py38", "py37", "py36", "py35", "pypy3"]
+              package: ["core", "exporter", "instrumentation"]
+      - build-py34:
+          matrix:
+            parameters:
+              package: ["core", "exporter", "instrumentation"]
       - docs
       - lint
+      - docker-tests
diff --git a/.flake8 b/.flake8
@@ -16,8 +16,9 @@ exclude =
   venv*/
   target
   __pycache__
-  ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/
-  ext/opentelemetry-ext-jaeger/build/*
+  exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/
+  exporter/opentelemetry-exporter-jaeger/build/*
   docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/gen/
   docs/examples/opentelemetry-example-app/build/*
+  opentelemetry-proto/build/*
   opentelemetry-proto/src/opentelemetry/proto/
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# tells github that proto code is generated
+opentelemetry-proto/src/**/*_pb2*.py* linguist-generated=true
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,27 @@
+# Description
+
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+
+Fixes # (issue)
+
+## Type of change
+
+Please delete options that are not relevant.
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] This change requires a documentation update
+
+# How Has This Been Tested?
+
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
+
+- [ ] Test A
+
+# Checklist:
+
+- [ ] Followed the style guidelines of this project
+- [ ] Changelogs have been updated
+- [ ] Unit tests have been added
+- [ ] Documentation has been updated
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -6,6 +6,7 @@ on:
     - master
     paths:
     - 'docs/**'
+    - 'exporter/**'
     - 'ext/**'
     - 'opentelemetry-python/opentelemetry-api/src/opentelemetry/**'
     - 'opentelemetry-python/opentelemetry-sdk/src/opentelemetry/sdk/**'

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -25,8 +25,8 @@ jobs:
     # might have already been updated, this would be bad.
     - name: Publish to TestPyPI
       env:
-        TWINE_USERNAME: ${{ secrets.test_pypi_username }}
-        TWINE_PASSWORD: ${{ secrets.test_pypi_password }}
+        TWINE_USERNAME: '__token__'
+        TWINE_PASSWORD: ${{ secrets.test_pypi_token }}
       run: |
         twine upload --repository testpypi --skip-existing --verbose dist/*
     - name: Publish to PyPI

diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -20,8 +20,8 @@
     <img alt="license" src="https://img.shields.io/badge/license-Apache_2.0-green.svg?style=for-the-badge">
   </a>
   <br/>
-  <a href="https://travis-ci.org/open-telemetry/opentelemetry-python">
-    <img alt="Build Status" src="https://travis-ci.org/open-telemetry/opentelemetry-python.svg?branch=master">
+  <a href="https://circleci.com/gh/open-telemetry/opentelemetry-python">
+    <img alt="Build Status" src="https://circleci.com/gh/open-telemetry/opentelemetry-python.svg?style=shield">
   </a>
   <img alt="Beta" src="https://img.shields.io/badge/status-beta-informational?logo=data:image/png;base64,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">
 </p>
@@ -63,12 +63,19 @@ pip install opentelemetry-sdk
 ```
 
 The
-[`ext/`](https://github.com/open-telemetry/opentelemetry-python/tree/master/ext)
-directory includes OpenTelemetry integration packages, which can be installed
-separately as:
+[`instrumentation/`](https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation)
+directory includes OpenTelemetry instrumentation packages, which can be installed separately as:
 
 ```sh
-pip install opentelemetry-ext-{integration}
+pip install opentelemetry-instrumentation-{instrumentation}
+```
+
+The
+[`exporter/`](https://github.com/open-telemetry/opentelemetry-python/tree/master/exporter)
+directory includes OpenTelemetry exporter packages, which can be installed separately as:
+
+```sh
+pip install opentelemetry-exporter-{exporter}
 ```
 
 To install the development versions of these packages instead, clone or fork
@@ -78,7 +85,7 @@ install](https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs)
 ```sh
 pip install -e ./opentelemetry-api
 pip install -e ./opentelemetry-sdk
-pip install -e ./ext/opentelemetry-ext-{integration}
+pip install -e ./ext/opentelemetry-instrumentation-{instrumentation}
 ```
 
 ## Documentation
@@ -103,21 +110,21 @@ Meeting notes are available as a public [Google doc](https://docs.google.com/doc
 
 Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telemetry/teams/python-approvers)):
 
+- [Aaron Abbott](https://github.com/aabmass), Google
 - [Carlos Alberto Cortez](https://github.com/carlosalberto), Lightstep
 - [Tahir H. Butt](https://github.com/majorgreys) DataDog
 - [Chris Kleinknecht](https://github.com/c24t), Google
 - [Diego Hurtado](https://github.com/ocelotl)
 - [Hector Hernandez](https://github.com/hectorhdzg), Microsoft
-- [Mauricio Vásquez](https://github.com/mauriciovasquezbernal), Kinvolk
 - [Reiley Yang](https://github.com/reyang), Microsoft
+- [Yusuke Tsutsumi](https://github.com/toumorokoshi), Google
 
 *Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver).*
 
 Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-telemetry/teams/python-maintainers)):
 
 - [Alex Boten](https://github.com/codeboten), Lightstep
 - [Leighton Chen](https://github.com/lzchen), Microsoft
-- [Yusuke Tsutsumi](https://github.com/toumorokoshi), Zillow Group
 
 *Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer).*
 

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -9,3 +9,6 @@ sphinx-autodoc-typehints~=1.10.2
 pytest!=5.2.3
 pytest-cov>=2.8
 readme-renderer~=24.0
+grpcio-tools==1.29.0
+mypy-protobuf==1.21
+protobuf==3.12.2
diff --git a/docs-requirements.txt b/docs-requirements.txt
@@ -7,6 +7,8 @@ asgiref~=3.0
 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
@@ -25,7 +27,6 @@ wrapt>=1.0.0,<2.0.0
 celery>=4.0
 psutil~=5.7.0
 boto~=2.0
-google-cloud-trace >=0.23.0
-google-cloud-monitoring>=0.36.0
 botocore~=1.0
 starlette~=0.13
+fastapi~=0.58.1
diff --git a/docs/api/trace.sampling.rst b/docs/api/trace.sampling.rst
@@ -1,5 +1,5 @@
-opentelemetry.trace.sampling
-============================
+Sampling Traces
+===============
 
 .. automodule:: opentelemetry.trace.sampling
     :members:

diff --git a/docs/conf.py b/docs/conf.py
@@ -30,13 +30,21 @@
     os.path.abspath("../opentelemetry-instrumentation/src/"),
 ]
 
-ext = "../ext"
-ext_dirs = [
-    os.path.abspath("/".join(["../ext", f, "src"]))
-    for f in listdir(ext)
-    if isdir(join(ext, f))
+exp = "../exporter"
+exp_dirs = [
+    os.path.abspath("/".join(["../exporter", f, "src"]))
+    for f in listdir(exp)
+    if isdir(join(exp, f))
 ]
-sys.path[:0] = source_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 + instr_dirs
 
 # -- Project information -----------------------------------------------------
 

diff --git a/docs/examples/auto-instrumentation/README.rst b/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

diff --git a/docs/examples/auto-instrumentation/server_instrumented.py b/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,

diff --git a/docs/examples/basic_meter/README.rst b/docs/examples/basic_meter/README.rst
@@ -5,7 +5,7 @@ These examples show how to use OpenTelemetry to capture and report metrics.
 
 There are three different examples:
 
-* basic_metrics: Shows to how create a metric instrument, how to configure an
+* basic_metrics: Shows how to create a metric instrument, how to configure an
   exporter and a controller and also how to capture data by using the direct
   calling convention.