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

Jump to bottom

Add support for confluent_kafka until 2.1.1 version #1815

Merged
merged 9 commits into from
Jun 18, 2023
Merged

Add support for confluent_kafka until 2.1.1 version #1815

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3c89e02
Add support for confulent_kafka until 2.1.1 version
davidgonor1408 May 11, 2023
df43526
Include 2.1.1 version
davidgonor1408 May 11, 2023
b93a507
update CHANGELOG.md
davidgonor1408 May 11, 2023
8620661
run: 'tox -e generate'
davidgonor1408 May 11, 2023
75b62a9
Merge branch 'main' into HLS-3903
davidgonor1408 May 22, 2023
1515b47
Merge branch 'main' into HLS-3903
nozik Jun 1, 2023
f45fcd2
resolve comments
davidgonor1408 Jun 1, 2023
dcbd72f
update top version to 2.2.0
davidgonor1408 Jun 18, 2023
9ef0cac
Merge branch 'main' into HLS-3903
davidgonor1408 Jun 18, 2023
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: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#1706](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1706))
- `opentelemetry-instrumentation-pymemcache` Update instrumentation to support pymemcache >4
([#1764](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1764))
- `opentelemetry-instrumentation-confluent-kafka` Add support for higher versions of confluent_kafka
([#15](https://github.com/helios/opentelemetry-python-contrib/pull/15))
davidgonor1408 marked this conversation as resolved.
Show resolved Hide resolved

### Added

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
| [opentelemetry-instrumentation-boto3sqs](./opentelemetry-instrumentation-boto3sqs) | boto3 ~= 1.0 | No
| [opentelemetry-instrumentation-botocore](./opentelemetry-instrumentation-botocore) | botocore ~= 1.0 | No
| [opentelemetry-instrumentation-celery](./opentelemetry-instrumentation-celery) | celery >= 4.0, < 6.0 | No
| [opentelemetry-instrumentation-confluent-kafka](./opentelemetry-instrumentation-confluent-kafka) | confluent-kafka >= 1.8.2, < 2.0.0 | No
| [opentelemetry-instrumentation-confluent-kafka](./opentelemetry-instrumentation-confluent-kafka) | confluent-kafka >= 1.8.2, <= 2.1.1 | No
davidgonor1408 marked this conversation as resolved.
Show resolved Hide resolved
| [opentelemetry-instrumentation-dbapi](./opentelemetry-instrumentation-dbapi) | dbapi | No
| [opentelemetry-instrumentation-django](./opentelemetry-instrumentation-django) | django >= 1.10 | Yes
| [opentelemetry-instrumentation-elasticsearch](./opentelemetry-instrumentation-elasticsearch) | elasticsearch >= 2.0 | No
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies = [

[project.optional-dependencies]
instruments = [
"confluent-kafka >= 1.8.2, < 2.0.0",
"confluent-kafka >= 1.8.2, <= 2.1.1",
]
test = [
"opentelemetry-instrumentation-confluent-kafka[instruments]",
Expand Down
2 changes: 1 addition & 1 deletion ...trumentation-confluent-kafka/src/opentelemetry/instrumentation/confluent_kafka/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# limitations under the License.


_instruments = ("confluent-kafka >= 1.8.2, < 2.0.0",)
_instruments = ("confluent-kafka >= 1.8.2, <= 2.1.1",)
4 changes: 2 additions & 2 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 @@ -53,8 +53,8 @@
"instrumentation": "opentelemetry-instrumentation-celery==0.40b0.dev",
},
"confluent-kafka": {
"library": "confluent-kafka >= 1.8.2, < 2.0.0",
"instrumentation": "opentelemetry-instrumentation-confluent-kafka==0.40b0.dev",
"library": "confluent-kafka >= 1.8.2, <= 2.1.1",
"instrumentation": "opentelemetry-instrumentation-confluent-kafka==0.39b0.dev",
davidgonor1408 marked this conversation as resolved.
Show resolved Hide resolved
},
"django": {
"library": "django >= 1.10",
Expand Down