Skip to content

add query for consumer #13

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

Open
panawala wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add query for consumer #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1737a7b
add query for consumer
Aug 11, 2023
c539bc6
remove pullMode and meta
Aug 11, 2023
7ef0237
remove responseWithMeta
Aug 14, 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: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<dependency>
<groupId>com.aliyun.openservices</groupId>
<artifactId>aliyun-log</artifactId>
<version>0.6.75</version>
<version>0.6.87</version>
</dependency>
</dependencies>

Expand Down
13 changes: 11 additions & 2 deletions src/main/java/com/aliyun/openservices/loghub/client/LogHubClientAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
import com.aliyun.openservices.log.common.ConsumerGroupShardCheckPoint;
import com.aliyun.openservices.log.exception.LogException;
import com.aliyun.openservices.log.http.client.ClientConfiguration;
import com.aliyun.openservices.log.request.PullLogsRequest;
import com.aliyun.openservices.log.response.BatchGetLogResponse;
import com.aliyun.openservices.log.response.ConsumerGroupCheckPointResponse;
import com.aliyun.openservices.log.response.ListConsumerGroupResponse;
import com.aliyun.openservices.log.response.PullLogsResponse;
import com.aliyun.openservices.loghub.client.config.LogHubConfig;
import com.aliyun.openservices.loghub.client.config.LogHubCursorPosition;
import com.aliyun.openservices.loghub.client.exceptions.LogHubClientWorkerException;
Expand Down Expand Up @@ -248,10 +250,17 @@ public String GetCursor(final int shard, final long time) throws LogException {
}
}

public BatchGetLogResponse BatchGetLogs(final int shard, final int lines, final String cursor) throws LogException {
public PullLogsResponse PullLogs(final int shard, final String cursor, LogHubConfig config) throws LogException {
lock.readLock().lock();
try {
return client.BatchGetLog(project, logstore, shard, lines, cursor);
int lines = config.getMaxFetchLogGroupSize();
PullLogsRequest pullLogsRequest = new PullLogsRequest(project, logstore, shard, lines, cursor);
String query = config.getQuery();
if (query != null && !query.isEmpty()) {
pullLogsRequest.setQuery(query);
pullLogsRequest.setPullMode("scan_on_stream");
}
return client.pullLogs(pullLogsRequest);
} finally {
lock.readLock().unlock();
}
Expand Down
14 changes: 6 additions & 8 deletions src/main/java/com/aliyun/openservices/loghub/client/LogHubFetchTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

import com.aliyun.openservices.log.common.LogGroupData;
import com.aliyun.openservices.log.exception.LogException;
import com.aliyun.openservices.log.response.BatchGetLogResponse;
import com.aliyun.openservices.log.response.PullLogsResponse;
import com.aliyun.openservices.loghub.client.config.LogHubConfig;
import com.aliyun.openservices.loghub.client.throttle.ResourceBarrier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -32,17 +31,16 @@ public TaskResult call() {
Exception exception = null;
for (int attempt = 0; ; attempt++) {
try {
BatchGetLogResponse response = loghubClient.BatchGetLogs(
shardId, config.getMaxFetchLogGroupSize(), cursor);
List<LogGroupData> fetchedData = response.GetLogGroups();
PullLogsResponse response = loghubClient.PullLogs(shardId, cursor, config);
List<LogGroupData> fetchedData = response.getLogGroups();
LOG.debug("shard {}, cursor {}, next cursor {}, response size: {}", shardId, cursor,
response.GetNextCursor(), response.GetCount());
String nextCursor = response.GetNextCursor();
response.getNextCursor(), response.getCount());
String nextCursor = response.getNextCursor();
if (nextCursor.isEmpty()) {
LOG.info("Shard {} next cursor is empty, set to current cursor {}", shardId, cursor);
nextCursor = cursor;
}
return new FetchTaskResult(fetchedData, cursor, nextCursor, response.GetRawSize());
return new FetchTaskResult(fetchedData, cursor, nextCursor, response.getRawSize());
} catch (LogException lex) {
if (attempt == 0 && lex.GetErrorCode().toLowerCase().contains("invalidcursor")) {
// If checkpoint is invalid, such as expired cursor, will
Expand Down
23 changes: 23 additions & 0 deletions src/main/java/com/aliyun/openservices/loghub/client/config/LogHubConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public enum ConsumePosition {
private String endpoint;
private String project;
private String logstore;
private String query;
private String accessId;
private String accessKey;
private LogHubCursorPosition initialPosition;
Expand Down Expand Up @@ -74,6 +75,19 @@ public LogHubConfig(String consumerGroup,
this.initialPosition = convertPosition(position);
}

public LogHubConfig(String consumerGroup,
String consumer,
String endpoint,
String project,
String logstore,
String accessId,
String accessKey,
ConsumePosition position,
String query) {
this(consumerGroup, consumer, endpoint, project, logstore, accessId, accessKey, position);
this.setQuery(query);
}

private static LogHubCursorPosition convertPosition(ConsumePosition position) {
switch (position) {
case BEGIN_CURSOR:
Expand Down Expand Up @@ -329,6 +343,14 @@ public void setMaxInProgressingDataSizeInMB(int maxInProgressingDataSizeInMB) {
this.maxInProgressingDataSizeInMB = maxInProgressingDataSizeInMB;
}

public String getQuery() {
return query;
}

public void setQuery(String query) {
this.query = query;
}

@Override
public String toString() {
return "LogHubConfig{" +
Expand All @@ -337,6 +359,7 @@ public String toString() {
", endpoint='" + endpoint + '\'' +
", project='" + project + '\'' +
", logstore='" + logstore + '\'' +
", query ='" + query + '\'' +
", accessId='" + accessId + '\'' +
", initialPosition=" + initialPosition +
", startTimestamp=" + startTimestamp +
Expand Down