Skip to content

Commit

Permalink
Merge branch 'main' into less-spammy-eks-detector
Browse files Browse the repository at this point in the history
  • Loading branch information
emdneto authored Dec 12, 2024
2 parents 4b20aeb + 490580d commit 4d19940
Show file tree
Hide file tree
Showing 127 changed files with 404 additions and 302 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased

## Version 1.29.0/0.50b0 (2024-12-11)

### Added

- `opentelemetry-instrumentation-starlette` Add type hints to the instrumentation
Expand Down Expand Up @@ -50,6 +52,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#2816](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2816))
- `opentelemetry-instrumentation-sqlalchemy`: Fix a remaining memory leak in EngineTracer
([#3053](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3053))
- `opentelemetry-instrumentation-sqlite3`: Update documentation on explicit cursor support of tracing
([#3088](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3088))

### Breaking changes

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.50b0.dev"
__version__ = "0.51b0.dev"
4 changes: 2 additions & 2 deletions eachdist.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sortfirst=
ext/*

[stable]
version=1.29.0.dev
version=1.30.0.dev

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

[prerelease]
version=0.50b0.dev
version=0.51b0.dev

packages=
all
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.50b0.dev"
__version__ = "0.51b0.dev"
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-richconsole/pyproject.toml
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.50b0.dev",
"opentelemetry-semantic-conventions == 0.51b0.dev",
"rich>=10.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.50b0.dev"
__version__ = "0.51b0.dev"
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.5",
"opentelemetry-instrumentation == 0.50b0.dev",
"opentelemetry-instrumentation == 0.51b0.dev",
"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.50b0.dev"
__version__ = "0.51b0.dev"
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.50b0.dev",
"opentelemetry-semantic-conventions == 0.50b0.dev",
"opentelemetry-util-http == 0.50b0.dev",
"opentelemetry-instrumentation == 0.51b0.dev",
"opentelemetry-semantic-conventions == 0.51b0.dev",
"opentelemetry-util-http == 0.51b0.dev",
"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.50b0.dev"
__version__ = "0.51b0.dev"
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ requests==2.32.3
tomli==2.0.1
typing_extensions==4.12.2
urllib3==2.2.2
Werkzeug==3.0.3
Werkzeug==3.0.6
wrapt==1.16.0
yarl==1.9.4
zipp==3.19.2
Expand Down
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.50b0.dev",
"opentelemetry-semantic-conventions == 0.50b0.dev",
"opentelemetry-util-http == 0.50b0.dev",
"opentelemetry-instrumentation == 0.51b0.dev",
"opentelemetry-semantic-conventions == 0.51b0.dev",
"opentelemetry-util-http == 0.51b0.dev",
"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.50b0.dev"
__version__ = "0.51b0.dev"
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.27",
"opentelemetry-instrumentation == 0.50b0.dev",
"opentelemetry-semantic-conventions == 0.50b0.dev",
"opentelemetry-instrumentation == 0.51b0.dev",
"opentelemetry-semantic-conventions == 0.51b0.dev",
]

[project.optional-dependencies]
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.50b0.dev"
__version__ = "0.51b0.dev"
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.50b0.dev",
"opentelemetry-instrumentation-dbapi == 0.50b0.dev",
"opentelemetry-instrumentation == 0.51b0.dev",
"opentelemetry-instrumentation-dbapi == 0.51b0.dev",
"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.50b0.dev"
__version__ = "0.51b0.dev"
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.50b0.dev",
"opentelemetry-semantic-conventions == 0.50b0.dev",
"opentelemetry-util-http == 0.50b0.dev",
"opentelemetry-instrumentation == 0.51b0.dev",
"opentelemetry-semantic-conventions == 0.51b0.dev",
"opentelemetry-util-http == 0.51b0.dev",
]

[project.optional-dependencies]
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.50b0.dev"
__version__ = "0.51b0.dev"
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.14",
"opentelemetry-instrumentation == 0.50b0.dev",
"opentelemetry-semantic-conventions == 0.50b0.dev",
"opentelemetry-instrumentation == 0.51b0.dev",
"opentelemetry-semantic-conventions == 0.51b0.dev",
"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.50b0.dev"
__version__ = "0.51b0.dev"
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.50b0.dev",
"opentelemetry-semantic-conventions == 0.50b0.dev",
"opentelemetry-instrumentation == 0.51b0.dev",
"opentelemetry-semantic-conventions == 0.51b0.dev",
]

[project.optional-dependencies]
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.50b0.dev"
__version__ = "0.51b0.dev"
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ classifiers = [
"Programming Language :: Python :: 3.12",
]
dependencies = [
"opentelemetry-instrumentation == 0.50b0.dev",
"opentelemetry-semantic-conventions == 0.50b0.dev",
"opentelemetry-instrumentation == 0.51b0.dev",
"opentelemetry-semantic-conventions == 0.51b0.dev",
"opentelemetry-propagator-aws-xray ~= 1.0",
]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
# Enable instrumentation
BotocoreInstrumentor().instrument()
AwsLambdaInstrumentor().instrument()
# Lambda function
def lambda_handler(event, context):
Expand All @@ -39,6 +38,8 @@ def lambda_handler(event, context):
return "200 OK"
AwsLambdaInstrumentor().instrument()
API
---
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.50b0.dev"
__version__ = "0.51b0.dev"
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.50b0.dev",
"opentelemetry-semantic-conventions == 0.50b0.dev",
"opentelemetry-instrumentation == 0.51b0.dev",
"opentelemetry-semantic-conventions == 0.51b0.dev",
]

[project.optional-dependencies]
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.50b0.dev"
__version__ = "0.51b0.dev"
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.50b0.dev",
"opentelemetry-semantic-conventions == 0.50b0.dev",
"opentelemetry-instrumentation == 0.51b0.dev",
"opentelemetry-semantic-conventions == 0.51b0.dev",
"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.50b0.dev"
__version__ = "0.51b0.dev"
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.50b0.dev",
"opentelemetry-semantic-conventions == 0.50b0.dev",
"opentelemetry-instrumentation == 0.51b0.dev",
"opentelemetry-semantic-conventions == 0.51b0.dev",
"opentelemetry-propagator-aws-xray ~= 1.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.50b0.dev"
__version__ = "0.51b0.dev"
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ six==1.16.0
tomli==2.0.1
typing_extensions==4.12.2
urllib3==1.26.19
Werkzeug==3.0.3
Werkzeug==3.0.6
wrapt==1.16.0
xmltodict==0.13.0
zipp==3.19.2
Expand Down
Loading

0 comments on commit 4d19940

Please sign in to comment.