Skip to content

fix: Updating span event strings #1539

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
jimit-j-shah merged 2 commits into from
Aug 6, 2024
Merged

fix: Updating span event strings #1539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d83142
fix: Fixing user-facing span names in line with go/firestore-client-t…
jimit-j-shah Aug 5, 2024
cbc47e5
fix: updating bom dependency version to fix https://github.com/google…
jimit-j-shah Aug 5, 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
2 changes: 1 addition & 1 deletion google-cloud-datastore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</parent>
<properties>
<site.installationModule>google-cloud-datastore</site.installationModule>
<opentelemetry.version>1.38.0</opentelemetry.version>
<opentelemetry.version>1.39.0</opentelemetry.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
8 changes: 4 additions & 4 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 @@ -302,9 +302,9 @@ com.google.datastore.v1.RunQueryResponse runQuery(
: TRANSACTION_OPERATION_EXCEPTION_HANDLER,
getOptions().getClock());
span.addEvent(
spanName,
spanName + " complete.",
new ImmutableMap.Builder<String, Object>()
.put("response_count", response.getBatch().getEntityResultsCount())
.put("doc_count", response.getBatch().getEntityResultsCount())
.put("transactional", isTransactional)
.put("read_consistency", readOptions.getReadConsistency().toString())
.put(
Expand Down Expand Up @@ -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<String, Object>()
.put("Received", response.getFoundCount())
.put("Missing", response.getMissingCount())
Expand Down Expand Up @@ -709,7 +709,7 @@ com.google.datastore.v1.CommitResponse commit(
: TRANSACTION_OPERATION_EXCEPTION_HANDLER,
getOptions().getClock());
span.addEvent(
spanName,
spanName + " complete.",
new ImmutableMap.Builder<String, Object>()
.put("doc_count", response.getMutationResultsCount())
.put("transactional", isTransactional)
Expand Down
23 changes: 12 additions & 11 deletions google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITTracingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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)
Expand Down