From 01075d5eeb68ddcbe3ea5da75b8a17d9f557ecf3 Mon Sep 17 00:00:00 2001
From: Leighton Chen <lechen@microsoft.com>
Date: Fri, 19 Feb 2021 09:27:58 -0800
Subject: [PATCH] hotfix

---
 CHANGELOG.md                                               | 7 ++++++-
 .../src/opentelemetry/exporter/datadog/spanprocessor.py    | 2 +-
 .../src/opentelemetry/instrumentation/falcon/__init__.py   | 2 +-
 .../src/opentelemetry/instrumentation/flask/__init__.py    | 3 +--
 .../src/opentelemetry/instrumentation/pyramid/callbacks.py | 2 +-
 .../src/opentelemetry/instrumentation/tornado/__init__.py  | 2 +-
 .../src/opentelemetry/instrumentation/tornado/client.py    | 2 +-
 scripts/build.sh                                           | 2 +-
 8 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f18214cc..3d8c04dbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/open-telemetry/opentelemetry-python-contrib/compare/v0.18b0...HEAD)
+## [Unreleased](https://github.com/open-telemetry/opentelemetry-python-contrib/compare/v0.18b1...HEAD)
+
+## [0.18b1](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.18b1) - 2021-02-19
+
+- Hotfix for https://github.com/open-telemetry/opentelemetry-python-contrib/issues/346
+    ([#301](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/301))
 
 ## [0.18b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.18b0) - 2021-02-16
 
diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py
index 913990066..3a1188e0b 100644
--- a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py
+++ b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py
@@ -21,7 +21,7 @@ from opentelemetry.context import Context, attach, detach, set_value
 from opentelemetry.sdk.trace import Span, SpanProcessor
 from opentelemetry.sdk.trace.export import SpanExporter
 from opentelemetry.trace import INVALID_TRACE_ID
-from opentelemetry.util.providers import time_ns
+from opentelemetry.util import time_ns
 
 logger = logging.getLogger(__name__)
 
diff --git a/instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/__init__.py b/instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/__init__.py
index 70d938ac8..19b238fe1 100644
--- a/instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/__init__.py
+++ b/instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/__init__.py
@@ -57,8 +57,8 @@ from opentelemetry.instrumentation.utils import (
     http_status_to_status_code,
 )
 from opentelemetry.trace.status import Status
+from opentelemetry.util import time_ns
 from opentelemetry.util.http import get_excluded_urls, get_traced_request_attrs
-from opentelemetry.util.providers import time_ns
 
 _logger = getLogger(__name__)
 
diff --git a/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py b/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py
index 43ffb80d4..4ccea0952 100644
--- a/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py
+++ b/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py
@@ -55,9 +55,8 @@ import opentelemetry.instrumentation.wsgi as otel_wsgi
 from opentelemetry import context, propagators, trace
 from opentelemetry.instrumentation.flask.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.util import time_ns
 from opentelemetry.util.http import get_excluded_urls
-from opentelemetry.util.providers import time_ns
-
 _logger = getLogger(__name__)
 
 _ENVIRON_STARTTIME_KEY = "opentelemetry-flask.starttime_key"
diff --git a/instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/callbacks.py b/instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/callbacks.py
index 69b07e55b..66c3acd8c 100644
--- a/instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/callbacks.py
+++ b/instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/callbacks.py
@@ -8,8 +8,8 @@ from pyramid.tweens import EXCVIEW
 import opentelemetry.instrumentation.wsgi as otel_wsgi
 from opentelemetry import context, propagators, trace
 from opentelemetry.instrumentation.pyramid.version import __version__
+from opentelemetry.util import time_ns
 from opentelemetry.util.http import get_excluded_urls
-from opentelemetry.util.providers import time_ns
 
 TWEEN_NAME = "opentelemetry.instrumentation.pyramid.trace_tween_factory"
 SETTING_TRACE_ENABLED = "opentelemetry-pyramid.trace_enabled"
diff --git a/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py b/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py
index 3eaf47e62..f030c6580 100644
--- a/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py
+++ b/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py
@@ -53,8 +53,8 @@ from opentelemetry.instrumentation.utils import (
 )
 from opentelemetry.trace.propagation.textmap import DictGetter
 from opentelemetry.trace.status import Status
+from opentelemetry.util import time_ns
 from opentelemetry.util.http import get_excluded_urls, get_traced_request_attrs
-from opentelemetry.util.providers import time_ns
 
 from .client import fetch_async  # pylint: disable=E0401
 
diff --git a/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/client.py b/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/client.py
index 9df00bce3..cf4369e0d 100644
--- a/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/client.py
+++ b/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/client.py
@@ -4,8 +4,8 @@ from tornado.httpclient import HTTPError, HTTPRequest
 
 from opentelemetry import propagators, trace
 from opentelemetry.instrumentation.utils import http_status_to_status_code
+from opentelemetry.util import time_ns
 from opentelemetry.trace.status import Status
-from opentelemetry.util.providers import time_ns
 
 
 def _normalize_request(args, kwargs):
diff --git a/scripts/build.sh b/scripts/build.sh
index a7fafe7f8..3db55c25d 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -16,7 +16,7 @@ DISTDIR=dist
   mkdir -p $DISTDIR
   rm -rf $DISTDIR/*
 
- for d in exporter/*/ instrumentation/*/ sdk-extension/*/ ; do
+ for d in exporter/*/ instrumentation/*/ sdk-extension/*/ util/*/ ; do
    (
      echo "building $d"
      cd "$d"