Add direct-query-core module for prometheus integration #3440
+3,171
−474
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
Co-authored-by: Megha Goyal <[email protected]> Signed-off-by: Joshua Li <[email protected]>
7 tasks
joshuali925
commented
Mar 18, 2025
| return dataSourceService.getDataSourceMetadata(dataSourceName).getConnector(); | ||
| } | ||
|
|
||
| private Object createClientForType(String dataSourceType, DataSourceMetadata metadata) |
There was a problem hiding this comment.
it might be better to create a base client interface instead of Object and generics. Currently it's not straightforward to find all data source client implementations
| switch (dataSourceType) { | ||
| case "PROMETHEUS": | ||
| return createPrometheusClient(metadata); | ||
| // Add cases for other data source types as needed |
|
|
||
| private PrometheusClient createPrometheusClient(DataSourceMetadata metadata) { | ||
| try { | ||
| // replace this with validate properties in PrometheusStorageFactory |
|
|
||
| package org.opensearch.sql.directquery.rest.model; | ||
|
|
||
| public enum QueryEntityType { |
| @Override | ||
| public ExecuteDirectQueryResponse executeDirectQuery(ExecuteDirectQueryRequest request) { | ||
| // TODO: Replace with the data source query id. | ||
| String queryId = UUID.randomUUID().toString(); |
| try { | ||
| return handler.executeQuery(client, request); | ||
| } catch (IOException e) { | ||
| return "{\"error\": \"Error executing query: " + e.getMessage() + "\"}"; |
There was a problem hiding this comment.
if prometheus returns an error, should the SQL request fail with non-200 response?
Comment on lines
+94
to
+101
| String queryString = | ||
| params.entrySet().stream() | ||
| .map( | ||
| entry -> | ||
| URLEncoder.encode(entry.getKey(), StandardCharsets.UTF_8) | ||
| + "=" | ||
| + URLEncoder.encode(entry.getValue(), StandardCharsets.UTF_8)) | ||
| .collect(Collectors.joining("&")); |
There was a problem hiding this comment.
Suggested change
| String queryString = | |
| params.entrySet().stream() | |
| .map( | |
| entry -> | |
| URLEncoder.encode(entry.getKey(), StandardCharsets.UTF_8) | |
| + "=" | |
| + URLEncoder.encode(entry.getValue(), StandardCharsets.UTF_8)) | |
| .collect(Collectors.joining("&")); | |
| String queryString = this.paramsToQueryString(params); |
| Response response = this.okHttpClient.newCall(request).execute(); | ||
|
|
||
| logger.info("Received Prometheus response for instant query: code={}", response); | ||
| // Return the full response object, not just the data field |
There was a problem hiding this comment.
what does the comment mean?
| URLEncoder.encode(entry.getKey(), StandardCharsets.UTF_8) | ||
| + "=" | ||
| + URLEncoder.encode(entry.getValue(), StandardCharsets.UTF_8)) | ||
| .collect(Collectors.joining("&")); |
There was a problem hiding this comment.
also reuse the paramsToQueryString here
| */ | ||
|
|
||
| package org.opensearch.sql.prometheus.exceptions; | ||
| package org.opensearch.sql.prometheus.exception; | ||
|
|
||
| import org.opensearch.sql.datasources.exceptions.DataSourceClientException; |
There was a problem hiding this comment.
this should be package org.opensearch.sql.datasource.client.exceptions.DataSourceClientException;? i think we should remove one of the two DataSourceClientException
any reason we need the datasource package under direct-query-core? or can we move it to datasource module?
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
This PR adds direct-query-core module to SQL. It implements the following changes
ExecuteDirectQueryandGetDirectQueryResourcesactionsprometheusThis PR does not expose the actions in SQL plugin at runtime. The follow up #3441 for
direct-querymodule will add the rest and transport actions to SQLQuery API owner: @goyamegh
Resources API owner: @joshuali925
It is currently in draft since some tests are not fixed yet
Related Issues
Resolves #[Issue number to be closed when this PR is merged]
Check List
--signoff.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.