Skip to content

test: Additional Transaction tests and AggregationQuery test #1518

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 3 commits into from
Jul 19, 2024
Merged

test: Additional Transaction tests and AggregationQuery test #1518

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
e77eb9f
test: ReadWrite Transaction test
jimit-j-shah Jul 10, 2024
a88fd79
test: Added test for Transactional RunQuery and Transaction Rollback
jimit-j-shah Jul 10, 2024
ebdca43
test: runInTransaction API tracing test
jimit-j-shah Jul 10, 2024
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
12 changes: 10 additions & 2 deletions google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ private io.opentelemetry.api.trace.Span startSpanWithParentContext(
.with(
io.opentelemetry.api.trace.Span.wrap(
parentSpanContext.getSpanContext())));
return spanBuilder.startSpan();
return otelTraceUtil.addSettingsAttributesToCurrentSpan(spanBuilder).startSpan();
}

@Override
Expand Down Expand Up @@ -540,7 +540,10 @@ com.google.datastore.v1.LookupResponse lookup(
.put("Received", response.getFoundCount())
.put("Missing", response.getMissingCount())
.put("Deferred", response.getDeferredCount())
.put("isTransactional", isTransactional)
.put("transactional", isTransactional)
.put(
"transaction_id",
isTransactional ? readOptions.getTransaction().toStringUtf8() : "")
.build());
return response;
},
Expand Down Expand Up @@ -772,6 +775,11 @@ public Void call() throws DatastoreException {
retrySettings,
EXCEPTION_HANDLER,
getOptions().getClock());
span.addEvent(
com.google.cloud.datastore.telemetry.TraceUtil.SPAN_NAME_ROLLBACK,
new ImmutableMap.Builder<String, Object>()
.put("transaction_id", requestPb.getTransaction().toStringUtf8())
.build());
} catch (RetryHelperException e) {
span.end(e);
throw DatastoreException.translateAndThrow(e);
Expand Down
5 changes: 5 additions & 0 deletions ...cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/DisabledTraceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.google.cloud.datastore.telemetry.TraceUtil.SpanContext;
import io.grpc.ManagedChannelBuilder;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanBuilder;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.api.trace.TracerProvider;
import java.util.Map;
Expand Down Expand Up @@ -115,6 +116,10 @@ public TraceUtil.Span startSpan(String spanName, TraceUtil.SpanContext parentSpa
return new Span();
}

public SpanBuilder addSettingsAttributesToCurrentSpan(SpanBuilder spanBuilder) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Add @Override as EnabledTraceUtil.java

return getTracer().spanBuilder("TRACING_DISABLED_NO_OP");
}

@Nonnull
@Override
public TraceUtil.Span getCurrentSpan() {
Expand Down
3 changes: 2 additions & 1 deletion ...-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,8 @@ public Scope makeCurrent() {
}

/** Applies the current Datastore instance settings as attributes to the current Span */
private SpanBuilder addSettingsAttributesToCurrentSpan(SpanBuilder spanBuilder) {
@Override
public SpanBuilder addSettingsAttributesToCurrentSpan(SpanBuilder spanBuilder) {
spanBuilder =
spanBuilder.setAllAttributes(
Attributes.builder()
Expand Down
7 changes: 7 additions & 0 deletions google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/TraceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.google.cloud.datastore.DatastoreOptions;
import io.grpc.ManagedChannelBuilder;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanBuilder;
import io.opentelemetry.api.trace.Tracer;
import java.util.Map;
import javax.annotation.Nonnull;
Expand Down Expand Up @@ -144,6 +145,12 @@ interface Scope extends AutoCloseable {
*/
Span startSpan(String spanName, SpanContext parentSpanContext);

/**
* Adds common SpanAttributes to the current span, useful when hand-creating a new Span without
* using the TraceUtil.Span interface.
*/
SpanBuilder addSettingsAttributesToCurrentSpan(SpanBuilder spanBuilder);

/** Returns the current span. */
@Nonnull
Span getCurrentSpan();
Expand Down
Loading