Skip to content

feat: adding gcp resource name span attribute #2260

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
gcf-merge-on-green merged 3 commits into from
Dec 18, 2025
Merged

feat: adding gcp resource name span attribute #2260

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
16d59ac
feat: adding gcp resource name span attribute
Gautam04 Nov 30, 2025
afa6d27
Merge branch 'main' into aco_trace
MarkDuckworth Dec 9, 2025
d221a70
Merge branch 'googleapis:main' into aco_trace
Gautam04 Dec 17, 2025
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 ...-cloud-firestore/src/main/java/com/google/cloud/firestore/telemetry/EnabledTraceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,12 @@ private SpanBuilder addSettingsAttributesToCurrentSpan(SpanBuilder spanBuilder)
spanBuilder =
spanBuilder.setAllAttributes(
Attributes.builder()
.put(
ATTRIBUTE_GCP_RESOURCE_NAME,
String.format(
ATTRIBUTE_GCP_RESOURCE_NAME_FORMAT,
firestoreOptions.getProjectId(),
firestoreOptions.getDatabaseId()))
.put(
ATTRIBUTE_SERVICE_PREFIX + "settings.project_id",
firestoreOptions.getProjectId())
Expand Down
2 changes: 2 additions & 0 deletions google-cloud-firestore/src/main/java/com/google/cloud/firestore/telemetry/TraceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ public interface TraceUtil {
String ATTRIBUTE_KEY_TRANSACTION_TYPE = "transaction_type";
String ATTRIBUTE_KEY_ATTEMPTS_ALLOWED = "attempts_allowed";
String ATTRIBUTE_KEY_ATTEMPTS_REMAINING = "attempts_remaining";
String ATTRIBUTE_GCP_RESOURCE_NAME = "gcp.resource.name";
String ATTRIBUTE_GCP_RESOURCE_NAME_FORMAT = "//firestore.googleapis.com/projects/%s/databases/%s";

String ENABLE_TRACING_ENV_VAR = "FIRESTORE_ENABLE_TRACING";
String LIBRARY_NAME = "com.google.cloud.firestore";
Expand Down
1 change: 1 addition & 0 deletions google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITTracingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ void assertHasExpectedAttributes(SpanData spanData, String... additionalExpected
// All Firestore-generated spans have the settings attributes.
List<String> expectedAttributes =
Arrays.asList(
"gcp.resource.name",
"gcp.firestore.memory_utilization",
"gcp.firestore.settings.host",
"gcp.firestore.settings.project_id",
Expand Down