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.

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

Allow enabling sarama logging and disabling client pool #4103

Merged

Conversation

pierDipi
Copy link
Member

Add 3 new environment variables:

ENABLE_SARAMA_LOGGER       (default: false)
ENABLE_SARAMA_DEBUG_LOGGER (default: false)
ENABLE_SARAMA_CLIENT_POOL  (default: true)

I want to see if these help with giving more information to debug this issue: #4091

@knative-prow knative-prow bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. area/control-plane labels Sep 17, 2024
@pierDipi
Copy link
Member Author

/cherry-pick release-1.15

@knative-prow-robot
Copy link
Contributor

@pierDipi: once the present PR merges, I will cherry-pick it on top of release-1.15 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@pierDipi
Copy link
Member Author

/cherry-pick release-1.14

@knative-prow-robot
Copy link
Contributor

@pierDipi: once the present PR merges, I will cherry-pick it on top of release-1.14 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Copy link

codecov bot commented Sep 17, 2024

Codecov Report

Attention: Patch coverage is 44.15584% with 43 lines in your changes missing coverage. Please review.

Project coverage is 48.43%. Comparing base (8b4b0dd) to head (88d3021).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
control-plane/pkg/kafka/clientpool/clientpool.go 21.42% 11 Missing ⚠️
control-plane/cmd/kafka-controller/main.go 0.00% 6 Missing ⚠️
...ane/pkg/reconciler/broker/namespaced_controller.go 0.00% 5 Missing ⚠️
...l-plane/pkg/reconciler/consumergroup/controller.go 42.85% 2 Missing and 2 partials ⚠️
control-plane/pkg/reconciler/trigger/controller.go 42.85% 2 Missing and 2 partials ⚠️
...ne/pkg/reconciler/trigger/namespaced_controller.go 42.85% 2 Missing and 2 partials ⚠️
control-plane/pkg/reconciler/broker/controller.go 70.00% 1 Missing and 2 partials ⚠️
control-plane/pkg/reconciler/channel/controller.go 76.92% 1 Missing and 2 partials ⚠️
control-plane/pkg/reconciler/sink/controller.go 62.50% 1 Missing and 2 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4103      +/-   ##
==========================================
- Coverage   48.55%   48.43%   -0.12%     
==========================================
  Files         244      244              
  Lines       14827    14870      +43     
==========================================
+ Hits         7199     7203       +4     
- Misses       6913     6940      +27     
- Partials      715      727      +12     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Add 3 new environment variables:
```
ENABLE_SARAMA_LOGGER       (default: false)
ENABLE_SARAMA_DEBUG_LOGGER (default: false)
ENABLE_SARAMA_CLIENT_POOL  (default: true)
```

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
Copy link
Contributor

@matzew matzew left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@knative-prow knative-prow bot added the lgtm Indicates that a PR is ready to be merged. label Sep 19, 2024
Copy link

knative-prow bot commented Sep 19, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: matzew, pierDipi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@knative-prow knative-prow bot merged commit f29ebe2 into knative-extensions:main Sep 19, 2024
36 of 37 checks passed
Copy link
Contributor

@creydr creydr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@knative-prow-robot
Copy link
Contributor

@pierDipi: #4103 failed to apply on top of branch "release-1.15":

Applying: Allow enabling sarama logging and disabling client pool
Using index info to reconstruct a base tree...
M	control-plane/pkg/reconciler/broker/controller.go
M	control-plane/pkg/reconciler/broker/namespaced_controller.go
M	control-plane/pkg/reconciler/channel/controller.go
M	control-plane/pkg/reconciler/consumergroup/controller.go
M	control-plane/pkg/reconciler/sink/controller.go
Falling back to patching base and 3-way merge...
Auto-merging control-plane/pkg/reconciler/sink/controller.go
CONFLICT (content): Merge conflict in control-plane/pkg/reconciler/sink/controller.go
Auto-merging control-plane/pkg/reconciler/consumergroup/controller.go
CONFLICT (content): Merge conflict in control-plane/pkg/reconciler/consumergroup/controller.go
Auto-merging control-plane/pkg/reconciler/channel/controller.go
CONFLICT (content): Merge conflict in control-plane/pkg/reconciler/channel/controller.go
Auto-merging control-plane/pkg/reconciler/broker/namespaced_controller.go
Auto-merging control-plane/pkg/reconciler/broker/controller.go
CONFLICT (content): Merge conflict in control-plane/pkg/reconciler/broker/controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Allow enabling sarama logging and disabling client pool
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@knative-prow-robot
Copy link
Contributor

@pierDipi: #4103 failed to apply on top of branch "release-1.14":

Applying: Allow enabling sarama logging and disabling client pool
Using index info to reconstruct a base tree...
M	control-plane/pkg/reconciler/broker/controller.go
M	control-plane/pkg/reconciler/broker/namespaced_controller.go
M	control-plane/pkg/reconciler/channel/controller.go
M	control-plane/pkg/reconciler/consumergroup/controller.go
M	control-plane/pkg/reconciler/sink/controller.go
M	control-plane/pkg/reconciler/trigger/controller.go
M	control-plane/pkg/reconciler/trigger/namespaced_controller.go
Falling back to patching base and 3-way merge...
Auto-merging control-plane/pkg/reconciler/trigger/namespaced_controller.go
Auto-merging control-plane/pkg/reconciler/trigger/controller.go
Auto-merging control-plane/pkg/reconciler/sink/controller.go
CONFLICT (content): Merge conflict in control-plane/pkg/reconciler/sink/controller.go
Auto-merging control-plane/pkg/reconciler/consumergroup/controller.go
CONFLICT (content): Merge conflict in control-plane/pkg/reconciler/consumergroup/controller.go
Auto-merging control-plane/pkg/reconciler/channel/controller.go
CONFLICT (content): Merge conflict in control-plane/pkg/reconciler/channel/controller.go
Auto-merging control-plane/pkg/reconciler/broker/namespaced_controller.go
Auto-merging control-plane/pkg/reconciler/broker/controller.go
CONFLICT (content): Merge conflict in control-plane/pkg/reconciler/broker/controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Allow enabling sarama logging and disabling client pool
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@pierDipi pierDipi deleted the allow-enabling-debug-logging branch September 19, 2024 07:02
pierDipi added a commit to pierDipi/eventing-kafka-broker that referenced this pull request Sep 19, 2024
…nsions#4103)

Add 3 new environment variables:
```
ENABLE_SARAMA_LOGGER       (default: false)
ENABLE_SARAMA_DEBUG_LOGGER (default: false)
ENABLE_SARAMA_CLIENT_POOL  (default: true)
```

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
pierDipi added a commit to pierDipi/eventing-kafka-broker that referenced this pull request Sep 19, 2024
…nsions#4103)

Add 3 new environment variables:
```
ENABLE_SARAMA_LOGGER       (default: false)
ENABLE_SARAMA_DEBUG_LOGGER (default: false)
ENABLE_SARAMA_CLIENT_POOL  (default: true)
```

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
pierDipi added a commit to pierDipi/eventing-kafka-broker that referenced this pull request Sep 19, 2024
…nsions#4103)

Add 3 new environment variables:
```
ENABLE_SARAMA_LOGGER       (default: false)
ENABLE_SARAMA_DEBUG_LOGGER (default: false)
ENABLE_SARAMA_CLIENT_POOL  (default: true)
```

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
pierDipi added a commit to pierDipi/eventing-kafka-broker that referenced this pull request Sep 19, 2024
…nsions#4103)

Add 3 new environment variables:
```
ENABLE_SARAMA_LOGGER       (default: false)
ENABLE_SARAMA_DEBUG_LOGGER (default: false)
ENABLE_SARAMA_CLIENT_POOL  (default: true)
```

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
knative-prow bot pushed a commit that referenced this pull request Sep 20, 2024
Add 3 new environment variables:
```
ENABLE_SARAMA_LOGGER       (default: false)
ENABLE_SARAMA_DEBUG_LOGGER (default: false)
ENABLE_SARAMA_CLIENT_POOL  (default: true)
```

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
knative-prow bot pushed a commit that referenced this pull request Sep 20, 2024
#4103) (#4107)

* Allow enabling sarama logging and disabling client pool (#4103)

Add 3 new environment variables:
```
ENABLE_SARAMA_LOGGER       (default: false)
ENABLE_SARAMA_DEBUG_LOGGER (default: false)
ENABLE_SARAMA_CLIENT_POOL  (default: true)
```

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Set GetKafkaClient

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

---------

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
pierDipi added a commit to pierDipi/eventing-kafka-broker that referenced this pull request Sep 24, 2024
…nsions#4103) (knative-extensions#4108)

Add 3 new environment variables:
```
ENABLE_SARAMA_LOGGER       (default: false)
ENABLE_SARAMA_DEBUG_LOGGER (default: false)
ENABLE_SARAMA_CLIENT_POOL  (default: true)
```

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
pierDipi added a commit to pierDipi/eventing-kafka-broker that referenced this pull request Sep 24, 2024
knative-extensions#4103) (knative-extensions#4107)

* Allow enabling sarama logging and disabling client pool (knative-extensions#4103)

Add 3 new environment variables:
```
ENABLE_SARAMA_LOGGER       (default: false)
ENABLE_SARAMA_DEBUG_LOGGER (default: false)
ENABLE_SARAMA_CLIENT_POOL  (default: true)
```

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Set GetKafkaClient

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

---------

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
pierDipi added a commit to pierDipi/eventing-kafka-broker that referenced this pull request Sep 25, 2024
knative-extensions#4103) (knative-extensions#4107)

* Allow enabling sarama logging and disabling client pool (knative-extensions#4103)

Add 3 new environment variables:
```
ENABLE_SARAMA_LOGGER       (default: false)
ENABLE_SARAMA_DEBUG_LOGGER (default: false)
ENABLE_SARAMA_CLIENT_POOL  (default: true)
```

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Set GetKafkaClient

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

---------

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
pierDipi added a commit to openshift-knative/eventing-kafka-broker that referenced this pull request Sep 25, 2024
…ol and Upgrade knative.dev/eventing to latest 1.14 (#1279)

* [release-1.14] Allow enabling sarama logging and disabling client pool (knative-extensions#4103) (knative-extensions#4107)

* Allow enabling sarama logging and disabling client pool (knative-extensions#4103)

Add 3 new environment variables:
```
ENABLE_SARAMA_LOGGER       (default: false)
ENABLE_SARAMA_DEBUG_LOGGER (default: false)
ENABLE_SARAMA_CLIENT_POOL  (default: true)
```

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Set GetKafkaClient

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

---------

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* [release-1.14] Upgrade knative.dev/eventing to latest 1.14  (knative-extensions#4113)

* Upgrade knative.dev/eventing to latest 1.14

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Pass PodLister as expected

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Migrate to library SchedulerFunc to use the new signature

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

---------

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Fix dispatcherPodLister and run make generate-release

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Clone the matching SO branch

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Add label selector to fix panic error

Error:
```
2024-09-25T10:41:51.023869929Z panic: Unable to fetch k8s.io/client-go/informers/core/v1.PodInformer with selector app.kubernetes.io/kind=kafka-dispatcher from context.
```

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

---------

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
pierDipi added a commit to openshift-knative/eventing-kafka-broker that referenced this pull request Sep 26, 2024
…ol and Upgrade knative.dev/eventing to latest 1.15 (#1278)

* Allow enabling sarama logging and disabling client pool (knative-extensions#4103) (knative-extensions#4108)

Add 3 new environment variables:
```
ENABLE_SARAMA_LOGGER       (default: false)
ENABLE_SARAMA_DEBUG_LOGGER (default: false)
ENABLE_SARAMA_CLIENT_POOL  (default: true)
```

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Upgrade knative.dev/eventing to latest 1.15 (knative-extensions#4112)

* Upgrade knative.dev/eventing to latest 1.15

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Pass PodLister as expected

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Migrate to library SchedulerFunc to use the new signature

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

---------

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

---------

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/control-plane lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants