Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Back to develop after 1.4.0 release #1985

Merged
merged 6 commits into from
Jul 27, 2021
+70 −70
Merged

Back to develop after 1.4.0 release #1985

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
66472d0
Back to develop after 1.4.0 release
srikanthccv Jul 26, 2021
1db4dbf
update
srikanthccv Jul 26, 2021
a0b7162
Update SHA
srikanthccv Jul 26, 2021
203bc38
Update missed files
srikanthccv Jul 26, 2021
1c8449d
Update distro version
srikanthccv Jul 26, 2021
034d5bd
Fix merge conflicts
srikanthccv Jul 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
# Otherwise, set variable to the commit of your branch on
# opentelemetry-python-contrib which is compatible with these Core repo
# changes.
CONTRIB_REPO_SHA: 79cac1d0395f1d5cc920bfeaeb8cf04ee2a39872
CONTRIB_REPO_SHA: 64996996451f9fab16548febe4707883935428d1

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions eachdist.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ sortfirst=
exporter/*

[stable]
version=1.4.0
version=1.5.0.dev0

packages=
opentelemetry-sdk
Expand All @@ -32,7 +32,7 @@ packages=
opentelemetry-api

[prerelease]
version=0.23b0
version=0.24.dev0

packages=
opentelemetry-opentracing-shim
Expand Down
2 changes: 1 addition & 1 deletion ...emetry-exporter-jaeger-proto-grpc/src/opentelemetry/exporter/jaeger/proto/grpc/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.4.0"
__version__ = "1.5.0.dev0"
2 changes: 1 addition & 1 deletion .../opentelemetry-exporter-jaeger-thrift/src/opentelemetry/exporter/jaeger/thrift/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.4.0"
__version__ = "1.5.0.dev0"
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-jaeger/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ python_requires = >=3.6

packages=find_namespace:
install_requires =
opentelemetry-exporter-jaeger-proto-grpc == 1.4.0
opentelemetry-exporter-jaeger-thrift == 1.4.0
opentelemetry-exporter-jaeger-proto-grpc == 1.5.0.dev0
opentelemetry-exporter-jaeger-thrift == 1.5.0.dev0

[options.extras_require]
test =
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.4.0"
__version__ = "1.5.0.dev0"
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py
View file
Open in desktop
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.23b0"
__version__ = "0.24.dev0"
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ install_requires =
googleapis-common-protos ~= 1.52
opentelemetry-api ~= 1.3
opentelemetry-sdk ~= 1.3
opentelemetry-proto == 1.4.0
opentelemetry-proto == 1.5.0.dev0
backoff ~= 1.10.0

[options.extras_require]
Expand Down
2 changes: 1 addition & 1 deletion ...ntelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version.py
View file
Open in desktop
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__ = "1.4.0"
__version__ = "1.5.0.dev0"
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-otlp/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ classifiers =
python_requires = >=3.6
packages=find_namespace:
install_requires =
opentelemetry-exporter-otlp-proto-grpc == 1.4.0
opentelemetry-exporter-otlp-proto-grpc == 1.5.0.dev0
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version.py
View file
Open in desktop
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__ = "1.4.0"
__version__ = "1.5.0.dev0"
2 changes: 1 addition & 1 deletion ...rter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version.py
View file
Open in desktop
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__ = "1.4.0"
__version__ = "1.5.0.dev0"
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ install_requires =
requests ~= 2.7
opentelemetry-api ~= 1.3
opentelemetry-sdk ~= 1.3
opentelemetry-exporter-zipkin-json == 1.4.0
opentelemetry-exporter-zipkin-json == 1.5.0.dev0

[options.packages.find]
where = src
Expand Down
2 changes: 1 addition & 1 deletion ...emetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version.py
View file
Open in desktop
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__ = "1.4.0"
__version__ = "1.5.0.dev0"
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-zipkin/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ classifiers =
python_requires = >=3.6
packages=find_namespace:
install_requires =
opentelemetry-exporter-zipkin-json == 1.4.0
opentelemetry-exporter-zipkin-proto-http == 1.4.0
opentelemetry-exporter-zipkin-json == 1.5.0.dev0
opentelemetry-exporter-zipkin-proto-http == 1.5.0.dev0

[options.extras_require]
test =
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version.py
View file
Open in desktop
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__ = "1.4.0"
__version__ = "1.5.0.dev0"
2 changes: 1 addition & 1 deletion opentelemetry-api/src/opentelemetry/version.py
View file
Open in desktop
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__ = "1.4.0"
__version__ = "1.5.0.dev0"
6 changes: 3 additions & 3 deletions opentelemetry-distro/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ zip_safe = False
include_package_data = True
install_requires =
opentelemetry-api ~= 1.3
opentelemetry-instrumentation == 0.23b0
opentelemetry-sdk == 1.4.0
opentelemetry-instrumentation == 0.24.dev0
opentelemetry-sdk == 1.5.0.dev0

[options.packages.find]
where = src
Expand All @@ -57,4 +57,4 @@ opentelemetry_configurator =
[options.extras_require]
test =
otlp =
opentelemetry-exporter-otlp == 1.4.0
opentelemetry-exporter-otlp == 1.5.0.dev0
2 changes: 1 addition & 1 deletion opentelemetry-distro/src/opentelemetry/distro/version.py
View file
Open in desktop
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.23b0"
__version__ = "0.24.dev0"
2 changes: 1 addition & 1 deletion opentelemetry-instrumentation/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ packages=find_namespace:
zip_safe = False
include_package_data = True
install_requires =
opentelemetry-api == 1.4.0
opentelemetry-api == 1.5.0.dev0
wrapt >= 1.0.0, < 2.0.0

[options.packages.find]
Expand Down
66 changes: 33 additions & 33 deletions opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,121 +18,121 @@
libraries = {
"aiohttp": {
"library": "aiohttp ~= 3.0",
"instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.24.dev0",
},
"aiopg": {
"library": "aiopg >= 0.13.0, < 1.3.0",
"instrumentation": "opentelemetry-instrumentation-aiopg==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-aiopg==0.24.dev0",
},
"asgiref": {
"library": "asgiref ~= 3.0",
"instrumentation": "opentelemetry-instrumentation-asgi==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-asgi==0.24.dev0",
},
"asyncpg": {
"library": "asyncpg >= 0.12.0",
"instrumentation": "opentelemetry-instrumentation-asyncpg==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-asyncpg==0.24.dev0",
},
"boto": {
"library": "boto~=2.0",
"instrumentation": "opentelemetry-instrumentation-boto==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-boto==0.24.dev0",
},
"botocore": {
"library": "botocore ~= 1.0",
"instrumentation": "opentelemetry-instrumentation-botocore==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-botocore==0.24.dev0",
},
"celery": {
"library": "celery >= 4.0, < 6.0",
"instrumentation": "opentelemetry-instrumentation-celery==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-celery==0.24.dev0",
},
"django": {
"library": "django >= 1.10",
"instrumentation": "opentelemetry-instrumentation-django==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-django==0.24.dev0",
},
"elasticsearch": {
"library": "elasticsearch >= 2.0",
"instrumentation": "opentelemetry-instrumentation-elasticsearch==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-elasticsearch==0.24.dev0",
},
"falcon": {
"library": "falcon ~= 2.0",
"instrumentation": "opentelemetry-instrumentation-falcon==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-falcon==0.24.dev0",
},
"fastapi": {
"library": "fastapi ~= 0.58.1",
"instrumentation": "opentelemetry-instrumentation-fastapi==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-fastapi==0.24.dev0",
},
"flask": {
"library": "flask >= 1.0, < 3.0",
"instrumentation": "opentelemetry-instrumentation-flask==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-flask==0.24.dev0",
},
"grpcio": {
"library": "grpcio ~= 1.27",
"instrumentation": "opentelemetry-instrumentation-grpc==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-grpc==0.24.dev0",
},
"httpx": {
"library": "httpx >= 0.18.0, < 0.19.0",
"instrumentation": "opentelemetry-instrumentation-httpx==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-httpx==0.24.dev0",
},
"jinja2": {
"library": "jinja2~=2.7",
"instrumentation": "opentelemetry-instrumentation-jinja2==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-jinja2==0.24.dev0",
},
"mysql-connector-python": {
"library": "mysql-connector-python ~= 8.0",
"instrumentation": "opentelemetry-instrumentation-mysql==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-mysql==0.24.dev0",
},
"psycopg2": {
"library": "psycopg2 >= 2.7.3.1",
"instrumentation": "opentelemetry-instrumentation-psycopg2==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-psycopg2==0.24.dev0",
},
"pymemcache": {
"library": "pymemcache ~= 1.3",
"instrumentation": "opentelemetry-instrumentation-pymemcache==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-pymemcache==0.24.dev0",
},
"pymongo": {
"library": "pymongo ~= 3.1",
"instrumentation": "opentelemetry-instrumentation-pymongo==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-pymongo==0.24.dev0",
},
"PyMySQL": {
"library": "PyMySQL ~= 0.10.1",
"instrumentation": "opentelemetry-instrumentation-pymysql==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-pymysql==0.24.dev0",
},
"pyramid": {
"library": "pyramid >= 1.7",
"instrumentation": "opentelemetry-instrumentation-pyramid==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-pyramid==0.24.dev0",
},
"redis": {
"library": "redis >= 2.6",
"instrumentation": "opentelemetry-instrumentation-redis==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-redis==0.24.dev0",
},
"requests": {
"library": "requests ~= 2.0",
"instrumentation": "opentelemetry-instrumentation-requests==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-requests==0.24.dev0",
},
"scikit-learn": {
"library": "scikit-learn ~= 0.24.0",
"instrumentation": "opentelemetry-instrumentation-sklearn==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-sklearn==0.24.dev0",
},
"sqlalchemy": {
"library": "sqlalchemy",
"instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.24.dev0",
},
"starlette": {
"library": "starlette ~= 0.13.0",
"instrumentation": "opentelemetry-instrumentation-starlette==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-starlette==0.24.dev0",
},
"tornado": {
"library": "tornado >= 6.0",
"instrumentation": "opentelemetry-instrumentation-tornado==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-tornado==0.24.dev0",
},
"urllib3": {
"library": "urllib3 >= 1.0.0, < 2.0.0",
"instrumentation": "opentelemetry-instrumentation-urllib3==0.23.dev0",
"instrumentation": "opentelemetry-instrumentation-urllib3==0.24.dev0",
},
}
default_instrumentations = [
"opentelemetry-instrumentation-dbapi==0.23.dev0",
"opentelemetry-instrumentation-logging==0.23.dev0",
"opentelemetry-instrumentation-sqlite3==0.23.dev0",
"opentelemetry-instrumentation-urllib==0.23.dev0",
"opentelemetry-instrumentation-wsgi==0.23.dev0",
"opentelemetry-instrumentation-dbapi==0.24.dev0",
"opentelemetry-instrumentation-logging==0.24.dev0",
"opentelemetry-instrumentation-sqlite3==0.24.dev0",
"opentelemetry-instrumentation-urllib==0.24.dev0",
"opentelemetry-instrumentation-wsgi==0.24.dev0",
]
2 changes: 1 addition & 1 deletion opentelemetry-instrumentation/src/opentelemetry/instrumentation/version.py
View file
Open in desktop
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.23b0"
__version__ = "0.24.dev0"
2 changes: 1 addition & 1 deletion opentelemetry-proto/src/opentelemetry/proto/version.py
View file
Open in desktop
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__ = "1.4.0"
__version__ = "1.5.0.dev0"
6 changes: 3 additions & 3 deletions opentelemetry-sdk/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ packages=find_namespace:
zip_safe = False
include_package_data = True
install_requires =
opentelemetry-api == 1.4.0
opentelemetry-semantic-conventions == 0.23b0
opentelemetry-instrumentation == 0.23b0
opentelemetry-api == 1.5.0.dev0
opentelemetry-semantic-conventions == 0.24.dev0
opentelemetry-instrumentation == 0.24.dev0

[options.packages.find]
where = src
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-sdk/src/opentelemetry/sdk/version.py
View file
Open in desktop
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__ = "1.4.0"
__version__ = "1.5.0.dev0"
2 changes: 1 addition & 1 deletion opentelemetry-semantic-conventions/src/opentelemetry/semconv/version.py
View file
Open in desktop
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.23b0"
__version__ = "0.24.dev0"
2 changes: 1 addition & 1 deletion propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version.py
View file
Open in desktop
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__ = "1.4.0"
__version__ = "1.5.0.dev0"
2 changes: 1 addition & 1 deletion propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version.py
View file
Open in desktop
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__ = "1.4.0"
__version__ = "1.5.0.dev0"
2 changes: 1 addition & 1 deletion shim/opentelemetry-opentracing-shim/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ install_requires =

[options.extras_require]
test =
opentelemetry-test == 0.23b0
opentelemetry-test == 0.24.dev0
opentracing ~= 2.2.0

[options.packages.find]
Expand Down
2 changes: 1 addition & 1 deletion shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version.py
View file
Open in desktop
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.23b0"
__version__ = "0.24.dev0"
2 changes: 1 addition & 1 deletion tests/util/src/opentelemetry/test/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.23b0"
__version__ = "0.24.dev0"