diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e440caaf9..d58746cd9 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -16,7 +16,7 @@
google-cloud-datastore
- 1.38.0
+ 1.39.0
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java
index 3e9081d66..e4db9620b 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java
@@ -302,9 +302,9 @@ com.google.datastore.v1.RunQueryResponse runQuery(
: TRANSACTION_OPERATION_EXCEPTION_HANDLER,
getOptions().getClock());
span.addEvent(
- spanName,
+ spanName + " complete.",
new ImmutableMap.Builder()
- .put("response_count", response.getBatch().getEntityResultsCount())
+ .put("doc_count", response.getBatch().getEntityResultsCount())
.put("transactional", isTransactional)
.put("read_consistency", readOptions.getReadConsistency().toString())
.put(
@@ -535,7 +535,7 @@ com.google.datastore.v1.LookupResponse lookup(
() -> {
com.google.datastore.v1.LookupResponse response = datastoreRpc.lookup(requestPb);
span.addEvent(
- spanName,
+ spanName + " complete.",
new ImmutableMap.Builder()
.put("Received", response.getFoundCount())
.put("Missing", response.getMissingCount())
@@ -709,7 +709,7 @@ com.google.datastore.v1.CommitResponse commit(
: TRANSACTION_OPERATION_EXCEPTION_HANDLER,
getOptions().getClock());
span.addEvent(
- spanName,
+ spanName + " complete.",
new ImmutableMap.Builder()
.put("doc_count", response.getMutationResultsCount())
.put("transactional", isTransactional)
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITTracingTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITTracingTest.java
index 485f3272e..85ff4758b 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITTracingTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITTracingTest.java
@@ -403,12 +403,13 @@ public void lookupTraceTest() throws Exception {
assertTrue(
hasEvent(
span,
- SPAN_NAME_LOOKUP,
+ SPAN_NAME_LOOKUP + " complete.",
Attributes.builder()
.put("Received", 0)
.put("Missing", 1)
.put("Deferred", 0)
.put("transactional", false)
+ .put("transaction_id", "")
.build()));
}
@@ -486,7 +487,7 @@ public void updateTraceTest() throws Exception {
assertTrue(
hasEvent(
spanData,
- SPAN_NAME_COMMIT,
+ SPAN_NAME_COMMIT + " complete.",
Attributes.builder()
.put("doc_count", response.size())
.put("transactional", false)
@@ -521,7 +522,7 @@ public void deleteTraceTest() throws Exception {
assertTrue(
hasEvent(
spanData,
- SPAN_NAME_COMMIT,
+ SPAN_NAME_COMMIT + " complete.",
Attributes.builder()
.put("doc_count", 1)
.put("transactional", false)
@@ -543,7 +544,7 @@ public void deleteTraceTest() throws Exception {
assertTrue(
hasEvent(
spanData,
- SPAN_NAME_COMMIT,
+ SPAN_NAME_COMMIT + " complete.",
Attributes.builder()
.put("doc_count", 1)
.put("transactional", false)
@@ -583,9 +584,9 @@ public void runQueryTraceTest() throws Exception {
assertTrue(
hasEvent(
span,
- SPAN_NAME_RUN_QUERY,
+ SPAN_NAME_RUN_QUERY + " complete.",
Attributes.builder()
- .put("response_count", 1)
+ .put("doc_count", 1)
.put("transactional", false)
.put("read_consistency", "READ_CONSISTENCY_UNSPECIFIED")
.put("more_results", "NO_MORE_RESULTS")
@@ -674,7 +675,7 @@ public void newTransactionReadWriteTraceTest() throws Exception {
assertTrue(
hasEvent(
span,
- SPAN_NAME_TRANSACTION_LOOKUP,
+ SPAN_NAME_TRANSACTION_LOOKUP + " complete.",
Attributes.builder()
.put("Deferred", 0)
.put("Missing", 1)
@@ -688,7 +689,7 @@ public void newTransactionReadWriteTraceTest() throws Exception {
assertTrue(
hasEvent(
span,
- SPAN_NAME_TRANSACTION_COMMIT,
+ SPAN_NAME_TRANSACTION_COMMIT + " complete.",
Attributes.builder()
.put("doc_count", 1)
.put("transactional", true)
@@ -732,9 +733,9 @@ public void newTransactionQueryTest() throws Exception {
assertTrue(
hasEvent(
span,
- SPAN_NAME_TRANSACTION_RUN_QUERY,
+ SPAN_NAME_TRANSACTION_RUN_QUERY + " complete.",
Attributes.builder()
- .put("response_count", 1)
+ .put("doc_count", 1)
.put("transactional", true)
.put("read_consistency", "READ_CONSISTENCY_UNSPECIFIED")
.put("more_results", "NO_MORE_RESULTS")
@@ -786,7 +787,7 @@ public void newTransactionRollbackTest() throws Exception {
assertTrue(
hasEvent(
span,
- SPAN_NAME_TRANSACTION_LOOKUP,
+ SPAN_NAME_TRANSACTION_LOOKUP + " complete.",
Attributes.builder()
.put("Deferred", 0)
.put("Missing", 0)