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.

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

Indexing Tracing instrumentation : auto-create indices and threadool queue waiting #11084

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Indexing Tracing instrumentation : auto-create indices and threadool queue waiting #11084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 0 deletions server/src/main/java/org/opensearch/action/bulk/TransportBulkAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,15 +325,19 @@ protected void doInternalExecute(Task task, BulkRequest bulkRequest, String exec
executeBulk(task, bulkRequest, startTime, listener, responses, indicesThatCannotBeCreated);
} else {
final AtomicInteger counter = new AtomicInteger(autoCreateIndices.size());
Span span = tracer.startSpan(SpanBuilder.from("autoCreateIndex", autoCreateIndices.size()));
SpanScope spanScope = tracer.withSpanInScope(span);
for (String index : autoCreateIndices) {
createIndex(index, bulkRequest.timeout(), minNodeVersion, new ActionListener<CreateIndexResponse>() {
@Override
public void onResponse(CreateIndexResponse result) {
if (counter.decrementAndGet() == 0) {
span.endSpan();
threadPool.executor(executorName).execute(new ActionRunnable<BulkResponse>(listener) {

@Override
protected void doRun() {
spanScope.close();
executeBulk(task, bulkRequest, startTime, listener, responses, indicesThatCannotBeCreated);
}
});
Expand All @@ -352,13 +356,15 @@ public void onFailure(Exception e) {
}
}
if (counter.decrementAndGet() == 0) {
span.endSpan();
final ActionListener<BulkResponse> wrappedListener = ActionListener.wrap(listener::onResponse, inner -> {
inner.addSuppressed(e);
listener.onFailure(inner);
});
threadPool.executor(executorName).execute(new ActionRunnable<BulkResponse>(wrappedListener) {
@Override
protected void doRun() {
spanScope.close();
executeBulk(task, bulkRequest, startTime, wrappedListener, responses, indicesThatCannotBeCreated);
}

Expand Down
97 changes: 69 additions & 28 deletions server/src/main/java/org/opensearch/action/support/replication/TransportWriteAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,22 +265,43 @@ protected void shardOperationOnPrimary(
ActionListener<PrimaryResult<ReplicaRequest, Response>> listener
) {
final String executor = executorFunction.apply(primary);
threadPool.executor(executor).execute(new ActionRunnable<PrimaryResult<ReplicaRequest, Response>>(listener) {
@Override
protected void doRun() {
Span span = tracer.startSpan(
SpanBuilder.from("dispatchedShardOperationOnPrimary", clusterService.localNode().getId(), request)
);
try (SpanScope spanScope = tracer.withSpanInScope(span)) {
dispatchedShardOperationOnPrimary(request, primary, TraceableActionListener.create(listener, span, tracer));
Span queueTimeSpan = tracer.startSpan(
SpanBuilder.from("dispatchedShardOperationOnPrimaryQueued", clusterService.localNode().getId(), request)
);

try (SpanScope spanScope = tracer.withSpanInScope(queueTimeSpan)) {
threadPool.executor(executor).execute(new ActionRunnable<PrimaryResult<ReplicaRequest, Response>>(listener) {
@Override
public void onFailure(Exception e) {
queueTimeSpan.setError(e);
queueTimeSpan.endSpan();
super.onFailure(e);
}
}

@Override
public boolean isForceExecution() {
return force(request);
}
});
@Override
public void onRejection(Exception e) {
queueTimeSpan.setError(e);
queueTimeSpan.endSpan();
super.onRejection(e);
}

@Override
protected void doRun() {
queueTimeSpan.endSpan();
Span span = tracer.startSpan(
SpanBuilder.from("dispatchedShardOperationOnPrimary", clusterService.localNode().getId(), request)
);
try (SpanScope spanScope = tracer.withSpanInScope(span)) {
dispatchedShardOperationOnPrimary(request, primary, TraceableActionListener.create(listener, span, tracer));
}
}

@Override
public boolean isForceExecution() {
return force(request);
}
});
}
}

protected abstract void dispatchedShardOperationOnPrimary(
Expand All @@ -298,22 +319,42 @@ protected abstract void dispatchedShardOperationOnPrimary(
*/
@Override
protected void shardOperationOnReplica(ReplicaRequest request, IndexShard replica, ActionListener<ReplicaResult> listener) {
threadPool.executor(executorFunction.apply(replica)).execute(new ActionRunnable<ReplicaResult>(listener) {
@Override
protected void doRun() {
Span span = tracer.startSpan(
SpanBuilder.from("dispatchedShardOperationOnReplica", clusterService.localNode().getId(), request)
);
try (SpanScope spanScope = tracer.withSpanInScope(span)) {
dispatchedShardOperationOnReplica(request, replica, TraceableActionListener.create(listener, span, tracer));
Span queueTimeSpan = tracer.startSpan(
SpanBuilder.from("dispatchedShardOperationOnReplicaQueued", clusterService.localNode().getId(), request)
);
try (SpanScope spanScope = tracer.withSpanInScope(queueTimeSpan)) {
threadPool.executor(executorFunction.apply(replica)).execute(new ActionRunnable<ReplicaResult>(listener) {
@Override
public void onFailure(Exception e) {
queueTimeSpan.setError(e);
queueTimeSpan.endSpan();
super.onFailure(e);
}
}

@Override
public boolean isForceExecution() {
return true;
}
});
@Override
public void onRejection(Exception e) {
queueTimeSpan.setError(e);
queueTimeSpan.endSpan();
super.onRejection(e);
}

@Override
protected void doRun() {
queueTimeSpan.endSpan();
Span span = tracer.startSpan(
SpanBuilder.from("dispatchedShardOperationOnReplica", clusterService.localNode().getId(), request)
);
try (SpanScope spanScope = tracer.withSpanInScope(span)) {
dispatchedShardOperationOnReplica(request, replica, TraceableActionListener.create(listener, span, tracer));
}
}

@Override
public boolean isForceExecution() {
return true;
}
});
}
}

protected abstract void dispatchedShardOperationOnReplica(
Expand Down
5 changes: 5 additions & 0 deletions server/src/main/java/org/opensearch/telemetry/tracing/AttributeNames.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,9 @@ private AttributeNames() {
* Search Response Total Hits
*/
public static final String TOTAL_HITS = "total_hits";

/**
* Number of Indices
*/
public static final String NUM_INDICES = "num_indices";
}
6 changes: 6 additions & 0 deletions server/src/main/java/org/opensearch/telemetry/tracing/SpanBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ public static SpanCreationContext from(String spanName, String nodeId, Replicate
return SpanCreationContext.server().name(spanName).attributes(buildSpanAttributes(nodeId, request));
}

public static SpanCreationContext from(String spanName, int numIndices) {
return SpanCreationContext.server()
.name(spanName)
.attributes(Attributes.create().addAttribute(AttributeNames.NUM_INDICES, numIndices));
}

private static String createSpanName(HttpRequest httpRequest) {
Tuple<String, String> uriParts = splitUri(httpRequest.uri());
String path = uriParts.v1();
Expand Down
Loading