[TT-9360] Changing Timeout from time.Duration to int #696
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mativm02
commented
Jul 31, 2023
| @@ -137,9 +142,21 @@ func (k *KafkaPump) Init(config interface{}) error { | |||
| k.log.WithField("SASL-Mechanism", k.kafkaConf.SASLMechanism).Warn("Tyk pump doesn't support this SASL mechanism.") | |||
| } | |||
|
|
|||
| // Timeout is an interface type to allow both time.Duration and float values | |||
There was a problem hiding this comment.
should we add a default value here? there wasn't a default one before this change
mativm02
commented
Jul 31, 2023
| @@ -90,6 +91,10 @@ func (k *KafkaPump) Init(config interface{}) error { | |||
| } | |||
|
|
|||
| processPumpEnvVars(k, k.log, k.kafkaConf, kafkaDefaultENV) | |||
| // This interface field is not reached by envconfig library, that's why we manually check it | |||
| if os.Getenv("TYK_PMP_PUMPS_KAFKA_META_TIMEOUT") != "" { | |||
There was a problem hiding this comment.
I'm not too fond of this way of getting the env var, but envconfig library isn't getting the env var if the data type is an interface
sredxny
requested changes
Jul 31, 2023
pumps/kafka.go
Outdated
Comment on lines
146
to
156
| var timeout time.Duration | ||
| switch k.kafkaConf.Timeout.(type) { | ||
| case string: | ||
| timeout, err = time.ParseDuration(k.kafkaConf.Timeout.(string)) | ||
| if err != nil { | ||
| k.log.Fatal("Failed to parse timeout: ", err) | ||
| } | ||
| case float64: | ||
| timeout = time.Duration(k.kafkaConf.Timeout.(float64)) * time.Second | ||
| } | ||
|
|
There was a problem hiding this comment.
if not string or float, it will default to 0s is that expected?
There was a problem hiding this comment.
@sredxny it was the previous behavior before this change. Just in case, 0s means no timeout from the Kafka library documentation
sredxny
approved these changes
Jul 31, 2023
|
/release to release-1.8 |
|
Working on it! Note that it can take a few minutes. |
tykbot bot
pushed a commit
that referenced
this pull request
Sep 7, 2023
* Updating storage to v1.0.7 * Changing Timeout from time.Duration to int * changing timeout type to interface * linting * handling numbers in format string (cherry picked from commit 91dd8a0)
|
@mativm02 Succesfully merged PR |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Changing Timeout from time.Duration to int
Related Issue
https://tyktech.atlassian.net/jira/software/c/projects/TT/boards/42?modal=detail&selectedIssue=TT-9360
Motivation and Context
How This Has Been Tested
Screenshots (if appropriate)
Types of changes
Checklist
fork, don't request your
master!masterbranch (left side). Also, you should startyour branch off our latest
master.go mod tidy && go mod vendorgo fmt -sgo vet