Skip to content

chore: assert long lasting requests on the ingestion api #4615

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

Merged
merged 12 commits into from
Apr 1, 2025
Merged

chore: assert long lasting requests on the ingestion api #4615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
54967c2
chore: assert long lasting requests on the ingestion api
shortcuts Mar 18, 2025
f1441c8
chore: OK
shortcuts Mar 18, 2025
15637c6
chore: hop
shortcuts Mar 18, 2025
5b803d7
Merge branch 'main' into chore/assert-long-lasting-requests
shortcuts Mar 18, 2025
8934025
Merge branch 'main' into chore/assert-long-lasting-requests
shortcuts Mar 31, 2025
856af86
chore: js longer tests
shortcuts Mar 31, 2025
0b4332b
chore: lock conflicts
shortcuts Mar 31, 2025
10145f9
chore: ruby timeouts
shortcuts Apr 1, 2025
c3afce9
chore /4
shortcuts Apr 1, 2025
5874685
chore: noputs
shortcuts Apr 1, 2025
e6a671d
Merge branch 'main' into chore/assert-long-lasting-requests
shortcuts Apr 1, 2025
6e10aad
Merge branch 'main' into chore/assert-long-lasting-requests
shortcuts Apr 1, 2025
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
6 changes: 3 additions & 3 deletions clients/algoliasearch-client-ruby/lib/algolia/configuration.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ def initialize(app_id, api_key, hosts, client_name, opts = {})
@app_id = app_id
@api_key = api_key
@client_side_validation = opts[:client_side_validation].nil? ? true : opts[:client_side_validation]
@connect_timeout = opts[:connect_timeout] || 2_000
@read_timeout = opts[:read_timeout] || 5_000
@write_timeout = opts[:write_timeout] || 30_000
@connect_timeout = opts[:connect_timeout]
@read_timeout = opts[:read_timeout]
@write_timeout = opts[:write_timeout]
@compression_type = opts[:compression_type] || "none"
@requester = opts[:requester]

Expand Down
6 changes: 6 additions & 0 deletions scripts/cts/testServer/timeout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,12 @@ function addRoutes(app: express.Express): void {
res.setHeader('Content-Type', 'text/html');
res.status(429).send('<html><body>429 Too Many Requests</body></html>');
});

app.get('/1/long-wait', (req, res) => {
setTimeout(() => {
res.json({ message: 'OK' });
}, 8000);
});
}

export function timeoutServer(): Promise<Server> {
Expand Down
2 changes: 1 addition & 1 deletion templates/javascript/tests/client/tests.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe('{{testType}}', () => {
}
{{/times}}
{{/steps}}
}, 15000);
}, 25000);

{{/tests}}
});
24 changes: 12 additions & 12 deletions templates/ruby/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,6 @@ module {{moduleName}}
region = nil
end

if opts.nil? || opts[:connect_timeout].nil?
opts[:connect_timeout] = {{x-timeouts.server.connect}}
end

if opts.nil? || opts[:read_timeout].nil?
opts[:read_timeout] = {{x-timeouts.server.read}}
end

if opts.nil? || opts[:write_timeout].nil?
opts[:write_timeout] = {{x-timeouts.server.write}}
end

{{^fallbackToAliasHost}}
raise "`region` is required and must be one of the following: #{regions.join(', ')}" if region.nil? || !region.is_a?(String) || !regions.include?(region)
{{/fallbackToAliasHost}}
Expand Down Expand Up @@ -70,6 +58,18 @@ module {{moduleName}}
end

def self.create_with_config(config)
if config.connect_timeout.nil? ||config.connect_timeout.empty?
config.connect_timeout = {{x-timeouts.server.connect}}
end

if config.read_timeout.nil? || config.read_timeout.empty?
config.read_timeout = {{x-timeouts.server.read}}
end

if config.write_timeout.nil? || config.write_timeout.empty?
config.write_timeout = {{x-timeouts.server.write}}
end

new(config)
end

Expand Down
30 changes: 30 additions & 0 deletions tests/CTS/client/ingestion/api.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,36 @@
}
]
},
{
"testName": "can leave call opened for a long time",
"autoCreateClient": false,
"steps": [
{
"type": "createClient",
"parameters": {
"appId": "test-app-id",
"apiKey": "test-api-key",
"region": "us",
"customHosts": [
{
"port": 6676
}
]
}
},
{
"type": "method",
"method": "customGet",
"parameters": {
"path": "1/long-wait"
},
"expected": {
"type": "response",
"match": {"message":"OK"}
}
}
]
},
{
"testName": "endpoint level timeout",
"steps": [
Expand Down
Loading