Skip to content

Commit

Permalink
Hotfix for previous release (#347)
Browse files Browse the repository at this point in the history
  • Loading branch information
lzchen authored Feb 19, 2021
1 parent f7ba3ba commit 7ab0aa7
Show file tree
Hide file tree
Showing 56 changed files with 68 additions and 62 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'release/*'
pull_request:
env:
CORE_REPO_SHA: 39a1f1e81dee33eba60a90463a1452e1c4ea03c7
CORE_REPO_SHA: cc325eb44f7839a00c55f6bcd916f04ecbe5c2fc

jobs:
build:
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ 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
Bump version dependencies for `opentelemetry-instrumentation`
([#347](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/347))

## [0.18b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.18b0) - 2021-02-16

Expand Down
2 changes: 1 addition & 1 deletion _template/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
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__)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ package_dir=
packages=find_namespace:
install_requires =
opentelemetry-api == 1.0.0rc1
opentelemetry-instrumentation-dbapi == 0.18b0
opentelemetry-instrumentation-dbapi == 0.18b1
opentelemetry-instrumentation == 0.18b0
aiopg >= 0.13.0
wrapt >= 1.0.0, < 2.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ install_requires =
boto ~= 2.0
opentelemetry-api == 1.0.0rc1
opentelemetry-instrumentation == 0.18b0
opentelemetry-instrumentation-botocore == 0.18b0
opentelemetry-instrumentation-botocore == 0.18b1

[options.extras_require]
test =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ package_dir=
packages=find_namespace:
install_requires =
django >= 1.10
opentelemetry-util-http == 0.18b0
opentelemetry-instrumentation-wsgi == 0.18b0
opentelemetry-util-http == 0.18b1
opentelemetry-instrumentation-wsgi == 0.18b1
opentelemetry-instrumentation == 0.18b0
opentelemetry-api == 1.0.0rc1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ package_dir=
packages=find_namespace:
install_requires =
falcon ~= 2.0
opentelemetry-instrumentation-wsgi == 0.18b0
opentelemetry-util-http == 0.18b0
opentelemetry-instrumentation-wsgi == 0.18b1
opentelemetry-util-http == 0.18b1
opentelemetry-instrumentation == 0.18b0
opentelemetry-api == 1.0.0rc1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ def on_get(self, req, resp):
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__)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ package_dir=
packages=find_namespace:
install_requires =
opentelemetry-api == 1.0.0rc1
opentelemetry-instrumentation-asgi == 0.18b0
opentelemetry-util-http == 0.18b0
opentelemetry-instrumentation-asgi == 0.18b1
opentelemetry-util-http == 0.18b1

[options.entry_points]
opentelemetry_instrumentor =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-flask/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ package_dir=
packages=find_namespace:
install_requires =
flask ~= 1.0
opentelemetry-util-http == 0.18b0
opentelemetry-util-http == 0.18b1
opentelemetry-instrumentation == 0.18b0
opentelemetry-instrumentation-wsgi == 0.18b0
opentelemetry-instrumentation-wsgi == 0.18b1
opentelemetry-api == 1.0.0rc1

[options.extras_require]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ def hello():
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__)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ package_dir=
packages=find_namespace:
install_requires =
opentelemetry-api == 1.0.0rc1
opentelemetry-instrumentation-dbapi == 0.18b0
opentelemetry-instrumentation-dbapi == 0.18b1
opentelemetry-instrumentation == 0.18b0
mysql-connector-python ~= 8.0
wrapt >= 1.0.0, < 2.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ package_dir=
packages=find_namespace:
install_requires =
opentelemetry-api == 1.0.0rc1
opentelemetry-instrumentation-dbapi == 0.18b0
opentelemetry-instrumentation-dbapi == 0.18b1
opentelemetry-instrumentation == 0.18b0
psycopg2-binary >= 2.7.3.1
wrapt >= 1.0.0, < 2.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ package_dir=
packages=find_namespace:
install_requires =
opentelemetry-api == 1.0.0rc1
opentelemetry-instrumentation-dbapi == 0.18b0
opentelemetry-instrumentation-dbapi == 0.18b1
opentelemetry-instrumentation == 0.18b0
PyMySQL ~= 0.10.1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ install_requires =
pyramid >= 1.7
opentelemetry-instrumentation == 0.18b0
opentelemetry-api == 1.0.0rc1
opentelemetry-instrumentation-wsgi == 0.18b0
opentelemetry-util-http == 0.18b0
opentelemetry-instrumentation-wsgi == 0.18b1
opentelemetry-util-http == 0.18b1
wrapt >= 1.0.0, < 2.0.0

[options.extras_require]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ package_dir=
packages=find_namespace:
install_requires =
opentelemetry-api == 1.0.0rc1
opentelemetry-instrumentation-dbapi == 0.18b0
opentelemetry-instrumentation-dbapi == 0.18b1
opentelemetry-instrumentation == 0.18b0
wrapt >= 1.0.0, < 2.0.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ package_dir=
packages=find_namespace:
install_requires =
opentelemetry-api == 1.0.0rc1
opentelemetry-instrumentation-asgi == 0.18b0
opentelemetry-util-http == 0.18b0
opentelemetry-instrumentation-asgi == 0.18b1
opentelemetry-util-http == 0.18b1

[options.entry_points]
opentelemetry_instrumentor =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ install_requires =
tornado >= 6.0
opentelemetry-instrumentation == 0.18b0
opentelemetry-api == 1.0.0rc1
opentelemetry-util-http == 0.18b0
opentelemetry-util-http == 0.18b1

[options.extras_require]
test =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ def get(self):
)
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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from opentelemetry import propagators, trace
from opentelemetry.instrumentation.utils import http_status_to_status_code
from opentelemetry.trace.status import Status
from opentelemetry.util.providers import time_ns
from opentelemetry.util import time_ns


def _normalize_request(args, kwargs):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.18b0"
__version__ = "0.18b1"
Loading

0 comments on commit 7ab0aa7

Please sign in to comment.