Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@ocelotl
ocelotl authored Dec 22, 2023
2 parents f4babd5 + 772063c commit 153a932
Show file tree
Hide file tree
Showing 105 changed files with 299 additions and 297 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'release/*'
pull_request:
env:
CORE_REPO_SHA: 35a021194787359324c46f5ca99d31802e4c92bd
CORE_REPO_SHA: 84c0e4f38d4fcdb8c13fd3988469fbb8cda28150

jobs:
build:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## Version 1.22.0/0.43b0 (2023-12-14)

### Added

- `opentelemetry-instrumentation` Added Otel semantic convention opt-in mechanism
Expand Down
2 changes: 1 addition & 1 deletion _template/version.py
View file
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.43b0.dev"
__version__ = "0.44b0.dev"
4 changes: 2 additions & 2 deletions eachdist.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sortfirst=
ext/*

[stable]
version=1.22.0.dev
version=1.23.0.dev

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

[prerelease]
version=0.43b0.dev
version=0.44b0.dev

packages=
all
Expand Down
2 changes: 1 addition & 1 deletion ...ter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/version.py
View file
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.43b0.dev"
__version__ = "0.44b0.dev"
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-richconsole/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ classifiers = [
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-sdk ~= 1.12",
"opentelemetry-semantic-conventions == 0.43b0.dev",
"opentelemetry-semantic-conventions == 0.44b0.dev",
"rich>=10.0.0",
]

Expand Down
2 changes: 1 addition & 1 deletion ...rter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.py
View file
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.43b0.dev"
__version__ = "0.44b0.dev"
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ instruments = [
]
test = [
"opentelemetry-instrumentation-aio-pika[instruments]",
"opentelemetry-test-utils == 0.43b0.dev",
"opentelemetry-test-utils == 0.44b0.dev",
"pytest",
"wrapt >= 1.0.0, < 2.0.0",
]
Expand Down
2 changes: 1 addition & 1 deletion ...ntelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/version.py
View file
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.43b0.dev"
__version__ = "0.44b0.dev"
6 changes: 3 additions & 3 deletions instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.43b0.dev",
"opentelemetry-semantic-conventions == 0.43b0.dev",
"opentelemetry-util-http == 0.43b0.dev",
"opentelemetry-instrumentation == 0.44b0.dev",
"opentelemetry-semantic-conventions == 0.44b0.dev",
"opentelemetry-util-http == 0.44b0.dev",
"wrapt >= 1.0.0, < 2.0.0",
]

Expand Down
2 changes: 1 addition & 1 deletion ...nstrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py
View file
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.43b0.dev"
__version__ = "0.44b0.dev"
6 changes: 3 additions & 3 deletions instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.43b0.dev",
"opentelemetry-semantic-conventions == 0.43b0.dev",
"opentelemetry-util-http == 0.43b0.dev",
"opentelemetry-instrumentation == 0.44b0.dev",
"opentelemetry-semantic-conventions == 0.44b0.dev",
"opentelemetry-util-http == 0.44b0.dev",
"wrapt >= 1.0.0, < 2.0.0",
]

Expand Down
2 changes: 1 addition & 1 deletion ...nstrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/version.py
View file
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.43b0.dev"
__version__ = "0.44b0.dev"
8 changes: 4 additions & 4 deletions instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.43b0.dev",
"opentelemetry-instrumentation-dbapi == 0.43b0.dev",
"opentelemetry-instrumentation == 0.44b0.dev",
"opentelemetry-instrumentation-dbapi == 0.44b0.dev",
"wrapt >= 1.0.0, < 2.0.0",
]

Expand All @@ -37,8 +37,8 @@ instruments = [
]
test = [
"opentelemetry-instrumentation-aiopg[instruments]",
"opentelemetry-semantic-conventions == 0.43b0.dev",
"opentelemetry-test-utils == 0.43b0.dev",
"opentelemetry-semantic-conventions == 0.44b0.dev",
"opentelemetry-test-utils == 0.44b0.dev",
]

[project.entry-points.opentelemetry_instrumentor]
Expand Down
2 changes: 1 addition & 1 deletion ...on/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py
View file
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.43b0.dev"
__version__ = "0.44b0.dev"
8 changes: 4 additions & 4 deletions instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ classifiers = [
dependencies = [
"asgiref ~= 3.0",
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.43b0.dev",
"opentelemetry-semantic-conventions == 0.43b0.dev",
"opentelemetry-util-http == 0.43b0.dev",
"opentelemetry-instrumentation == 0.44b0.dev",
"opentelemetry-semantic-conventions == 0.44b0.dev",
"opentelemetry-util-http == 0.44b0.dev",
]

[project.optional-dependencies]
Expand All @@ -38,7 +38,7 @@ instruments = [
]
test = [
"opentelemetry-instrumentation-asgi[instruments]",
"opentelemetry-test-utils == 0.43b0.dev",
"opentelemetry-test-utils == 0.44b0.dev",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion ...tion/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py
View file
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.43b0.dev"
__version__ = "0.44b0.dev"
6 changes: 3 additions & 3 deletions instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.43b0.dev",
"opentelemetry-semantic-conventions == 0.43b0.dev",
"opentelemetry-instrumentation == 0.44b0.dev",
"opentelemetry-semantic-conventions == 0.44b0.dev",
]

[project.optional-dependencies]
Expand All @@ -36,7 +36,7 @@ instruments = [
]
test = [
"opentelemetry-instrumentation-asyncpg[instruments]",
"opentelemetry-test-utils == 0.43b0.dev",
"opentelemetry-test-utils == 0.44b0.dev",
]

[project.entry-points.opentelemetry_instrumentor]
Expand Down
2 changes: 1 addition & 1 deletion ...pentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py
View file
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.43b0.dev"
__version__ = "0.44b0.dev"
6 changes: 3 additions & 3 deletions instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ classifiers = [
"Programming Language :: Python :: 3.8",
]
dependencies = [
"opentelemetry-instrumentation == 0.43b0.dev",
"opentelemetry-instrumentation == 0.44b0.dev",
"opentelemetry-propagator-aws-xray == 1.0.1",
"opentelemetry-semantic-conventions == 0.43b0.dev",
"opentelemetry-semantic-conventions == 0.44b0.dev",
]

[project.optional-dependencies]
instruments = []
test = [
"opentelemetry-test-utils == 0.43b0.dev",
"opentelemetry-test-utils == 0.44b0.dev",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion ...emetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py
View file
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.43b0.dev"
__version__ = "0.44b0.dev"
6 changes: 3 additions & 3 deletions instrumentation/opentelemetry-instrumentation-boto/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.43b0.dev",
"opentelemetry-semantic-conventions == 0.43b0.dev",
"opentelemetry-instrumentation == 0.44b0.dev",
"opentelemetry-semantic-conventions == 0.44b0.dev",
]

[project.optional-dependencies]
Expand All @@ -38,7 +38,7 @@ test = [
"opentelemetry-instrumentation-boto[instruments]",
"markupsafe==2.0.1",
"moto~=2.0",
"opentelemetry-test-utils == 0.43b0.dev",
"opentelemetry-test-utils == 0.44b0.dev",
]

[project.entry-points.opentelemetry_instrumentor]
Expand Down
2 changes: 1 addition & 1 deletion ...tion/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py
View file
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.43b0.dev"
__version__ = "0.44b0.dev"
6 changes: 3 additions & 3 deletions instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.43b0.dev",
"opentelemetry-semantic-conventions == 0.43b0.dev",
"opentelemetry-instrumentation == 0.44b0.dev",
"opentelemetry-semantic-conventions == 0.44b0.dev",
"wrapt >= 1.0.0, < 2.0.0",
]

Expand All @@ -37,7 +37,7 @@ instruments = [
]
test = [
"opentelemetry-instrumentation-boto3sqs[instruments]",
"opentelemetry-test-utils == 0.43b0.dev",
"opentelemetry-test-utils == 0.44b0.dev",
]

[project.entry-points.opentelemetry_instrumentor]
Expand Down
2 changes: 1 addition & 1 deletion ...ntelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/version.py
View file
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.43b0.dev"
__version__ = "0.44b0.dev"
6 changes: 3 additions & 3 deletions instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.43b0.dev",
"opentelemetry-semantic-conventions == 0.43b0.dev",
"opentelemetry-instrumentation == 0.44b0.dev",
"opentelemetry-semantic-conventions == 0.44b0.dev",
"opentelemetry-propagator-aws-xray == 1.0.1",
]

Expand All @@ -40,7 +40,7 @@ test = [
"markupsafe==2.0.1",
"botocore ~= 1.0, < 1.31.81",
"moto[all] ~= 2.2.6",
"opentelemetry-test-utils == 0.43b0.dev",
"opentelemetry-test-utils == 0.44b0.dev",
]

[project.entry-points.opentelemetry_instrumentor]
Expand Down
2 changes: 1 addition & 1 deletion ...ntelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py
View file
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.43b0.dev"
__version__ = "0.44b0.dev"
6 changes: 3 additions & 3 deletions instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.43b0.dev",
"opentelemetry-semantic-conventions == 0.43b0.dev",
"opentelemetry-instrumentation == 0.44b0.dev",
"opentelemetry-semantic-conventions == 0.44b0.dev",
"wrapt >= 1.0.0, < 2.0.0",
]

Expand All @@ -38,7 +38,7 @@ instruments = [
]
test = [
"opentelemetry-instrumentation-cassandra[instruments]",
"opentelemetry-test-utils == 0.43b0.dev",
"opentelemetry-test-utils == 0.44b0.dev",
]

[project.entry-points.opentelemetry_instrumentor]
Expand Down
2 changes: 1 addition & 1 deletion ...elemetry-instrumentation-cassandra/src/opentelemetry/instrumentation/cassandra/version.py
View file
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.43b0.dev"
__version__ = "0.44b0.dev"
6 changes: 3 additions & 3 deletions instrumentation/opentelemetry-instrumentation-celery/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.43b0.dev",
"opentelemetry-semantic-conventions == 0.43b0.dev",
"opentelemetry-instrumentation == 0.44b0.dev",
"opentelemetry-semantic-conventions == 0.44b0.dev",
]

[project.optional-dependencies]
Expand All @@ -36,7 +36,7 @@ instruments = [
]
test = [
"opentelemetry-instrumentation-celery[instruments]",
"opentelemetry-test-utils == 0.43b0.dev",
"opentelemetry-test-utils == 0.44b0.dev",
"pytest",
]

Expand Down
2 changes: 1 addition & 1 deletion .../opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py
View file
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.43b0.dev"
__version__ = "0.44b0.dev"
2 changes: 1 addition & 1 deletion ...trumentation-confluent-kafka/src/opentelemetry/instrumentation/confluent_kafka/version.py
View file
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.43b0.dev"
__version__ = "0.44b0.dev"
6 changes: 3 additions & 3 deletions instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.43b0.dev",
"opentelemetry-semantic-conventions == 0.43b0.dev",
"opentelemetry-instrumentation == 0.44b0.dev",
"opentelemetry-semantic-conventions == 0.44b0.dev",
"wrapt >= 1.0.0, < 2.0.0",
]

[project.optional-dependencies]
instruments = []
test = [
"opentelemetry-test-utils == 0.43b0.dev",
"opentelemetry-test-utils == 0.44b0.dev",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion ...on/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.43b0.dev"
__version__ = "0.44b0.dev"

_instruments = tuple()
Loading

0 comments on commit 153a932

Please sign in to comment.