Clean up attribute values

whuffman36 · whuffman36 · commit c988c2edf6e3 · 2025-05-08T14:16:28.000-07:00
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryOptions.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryOptions.java
@@ -16,6 +16,7 @@
 
 package com.google.cloud.bigquery;
 
+import com.google.api.core.BetaApi;
 import com.google.cloud.ServiceDefaults;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.ServiceRpc;
@@ -95,11 +96,23 @@ public Builder setUseInt64Timestamps(boolean useInt64Timestamps) {
       return this;
     }
 
+    /**
+     * Enables OpenTelemetry tracing functionality for this BigQuery instance
+     *
+     * @param enableOpenTelemetryTracing enables OpenTelemetry tracing if true
+     */
+    @BetaApi
     public Builder setEnableOpenTelemetryTracing(boolean enableOpenTelemetryTracing) {
       this.enableOpenTelemetryTracing = enableOpenTelemetryTracing;
       return this;
     }
 
+    /**
+     * Sets the OpenTelemetry tracer for this BigQuery instance to be tracer.
+     *
+     * @param tracer OpenTelemetry tracer to be used
+     */
+    @BetaApi
     public Builder setOpenTelemetryTracer(Tracer tracer) {
       this.openTelemetryTracer = tracer;
       return this;
@@ -181,10 +194,22 @@ public boolean getUseInt64Timestamps() {
     return useInt64Timestamps;
   }
 
+  /**
+   * Returns whether this BigQuery instance has OpenTelemetry tracing enabled
+   *
+   * @return true if tracing is enabled, false if not
+   */
+  @BetaApi
   public boolean isOpenTelemetryTracingEnabled() {
     return enableOpenTelemetryTracing;
   }
 
+  /**
+   * Returns the OpenTelemetry tracer used by this BigQuery instance
+   *
+   * @return OpenTelemetry tracer object or {@code null} if not set
+   */
+  @BetaApi
   public Tracer getOpenTelemetryTracer() {
     return openTelemetryTracer;
   }
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatasetId.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatasetId.java
@@ -86,10 +86,11 @@ static DatasetId fromPb(DatasetReference datasetRef) {
     return new DatasetId(datasetRef.getProjectId(), datasetRef.getDatasetId());
   }
 
-  public Attributes getOtelAttributes() {
+  protected Attributes getOtelAttributes() {
     return Attributes.builder()
         .put("project", this.getProject())
         .put("dataset", this.getDataset())
+        .put("db.name", this.getDataset())
         .build();
   }
 }
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatasetInfo.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatasetInfo.java
@@ -751,27 +751,18 @@ private static String getFieldAsString(Object field) {
     return field == null ? "null" : field.toString();
   }
 
-  public Attributes getOtelAttributes() {
+  protected Attributes getOtelAttributes() {
     return Attributes.builder()
-        .put("datasetId", getFieldAsString(this.getDatasetId().getDataset()))
+        .putAll(this.getDatasetId().getOtelAttributes())
         .put("defaultTableLifetime", getFieldAsString(this.getDefaultTableLifetime()))
-        .put("description", getFieldAsString(this.getDescription()))
-        .put("etag", getFieldAsString(this.getEtag()))
         .put("friendlyName", getFieldAsString(this.getFriendlyName()))
         .put("generatedId", getFieldAsString(this.getGeneratedId()))
         .put("lastModified", getFieldAsString(this.getLastModified()))
         .put("location", getFieldAsString(this.getLocation()))
-        .put("selfLink", getFieldAsString(this.getSelfLink()))
         .put("labels", getFieldAsString(this.getLabels()))
-        .put(
-            "defaultEncryptionConfiguration",
-            getFieldAsString(this.getDefaultEncryptionConfiguration()))
         .put(
             "defaultPartitionExpirationMs",
             getFieldAsString(this.getDefaultPartitionExpirationMs()))
-        .put("defaultCollation", getFieldAsString(this.getDefaultCollation()))
-        .put("externalDatasetReference", getFieldAsString(this.getExternalDatasetReference()))
-        .put("storageBillingModel", getFieldAsString(this.getStorageBillingModel()))
         .put("maxTimeTravelHours", getFieldAsString(this.getMaxTimeTravelHours()))
         .put("resourceTags", getFieldAsString(this.getResourceTags()))
         .build();
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobId.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobId.java
@@ -129,7 +129,7 @@ private static String getFieldAsString(Object field) {
     return field == null ? "null" : field.toString();
   }
 
-  public Attributes getOtelAttributes() {
+  protected Attributes getOtelAttributes() {
     return Attributes.builder()
         .put("job", getFieldAsString(this.getJob()))
         .put("location", getFieldAsString(this.getLocation()))
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobInfo.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobInfo.java
@@ -381,16 +381,18 @@ private static String getFieldAsString(Object field) {
     return field == null ? "null" : field.toString();
   }
 
-  public Attributes getOtelAttributes() {
+  protected Attributes getOtelAttributes() {
     return Attributes.builder()
-        .put("etag", getFieldAsString(this.getEtag()))
+        .putAll(this.getJobId().getOtelAttributes())
         .put("generatedId", getFieldAsString(this.getGeneratedId()))
-        .put("jobId", getFieldAsString(this.getJobId().getJob()))
-        .put("selfLink", getFieldAsString(this.getSelfLink()))
         .put("status", getFieldAsString(this.getStatus()))
-        .put("statistics", getFieldAsString(this.getStatistics()))
-        .put("userEmail", getFieldAsString(this.getUserEmail()))
-        .put("configuration", getFieldAsString(this.getConfiguration()))
+        .put("creationTime", getFieldAsString(this.getStatistics().getCreationTime()))
+        .put("startTime", getFieldAsString(this.getStatistics().getStartTime()))
+        .put("endTime", getFieldAsString(this.getStatistics().getEndTime()))
+        .put("parentJobId", getFieldAsString(this.getStatistics().getParentJobId()))
+        .put("numChildJobs", getFieldAsString(this.getStatistics().getNumChildJobs()))
+        .put("jobType", getFieldAsString(this.getConfiguration().getType()))
+        .put("jobTimeoutMs", getFieldAsString(this.getConfiguration().toPb().getJobTimeoutMs()))
         .build();
   }
 }
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ModelId.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ModelId.java
@@ -107,10 +107,11 @@ static ModelId fromPb(ModelReference modelRef) {
     return new ModelId(modelRef.getProjectId(), modelRef.getDatasetId(), modelRef.getModelId());
   }
 
-  public Attributes getOtelAttributes() {
+  protected Attributes getOtelAttributes() {
     return Attributes.builder()
         .put("project", this.getProject())
         .put("dataset", this.getDataset())
+        .put("db.name", this.getDataset())
         .put("model", this.getModel())
         .build();
   }
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ModelInfo.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ModelInfo.java
@@ -459,22 +459,16 @@ private static String getFieldAsString(Object field) {
     return field == null ? "null" : field.toString();
   }
 
-  public Attributes getOtelAttributes() {
+  protected Attributes getOtelAttributes() {
     return Attributes.builder()
-        .put("etag", getFieldAsString(this.getEtag()))
-        .put("modelId", getFieldAsString(this.getModelId().getModel()))
-        .put("description", getFieldAsString(this.getDescription()))
+        .putAll(this.getModelId().getOtelAttributes())
         .put("modelType", getFieldAsString(this.getModelType()))
         .put("friendlyName", getFieldAsString(this.getFriendlyName()))
         .put("creationTime", getFieldAsString(this.getCreationTime()))
         .put("lastModifiedTime", getFieldAsString(this.getLastModifiedTime()))
         .put("expirationTime", getFieldAsString(this.getExpirationTime()))
         .put("labels", getFieldAsString(this.getLabels()))
         .put("location", getFieldAsString(this.getLocation()))
-        .put("trainingRunList", getFieldAsString(this.getTrainingRuns()))
-        .put("featureColumnList", getFieldAsString(this.getFeatureColumns()))
-        .put("labelColumnList", getFieldAsString(this.getLabelColumns()))
-        .put("encryptionConfiguration", getFieldAsString(this.getEncryptionConfiguration()))
         .build();
   }
 }
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/RoutineId.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/RoutineId.java
@@ -110,10 +110,11 @@ static RoutineId fromPb(RoutineReference routineRef) {
         routineRef.getProjectId(), routineRef.getDatasetId(), routineRef.getRoutineId());
   }
 
-  public Attributes getOtelAttributes() {
+  protected Attributes getOtelAttributes() {
     return Attributes.builder()
         .put("project", this.getProject())
         .put("dataset", this.getDataset())
+        .put("db.name", this.getDataset())
         .put("routine", this.getRoutine())
         .build();
   }
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/RoutineInfo.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/RoutineInfo.java
@@ -550,23 +550,17 @@ private static String getFieldAsString(Object field) {
     return field == null ? "null" : field.toString();
   }
 
-  public Attributes getOtelAttributes() {
+  protected Attributes getOtelAttributes() {
     return Attributes.builder()
-        .put("routineId", getFieldAsString(this.getRoutineId().getRoutine()))
-        .put("etag", getFieldAsString(this.getEtag()))
+        .putAll(this.getRoutineId().getOtelAttributes())
         .put("routineType", getFieldAsString(this.getRoutineType()))
         .put("creationTime", getFieldAsString(this.getCreationTime()))
-        .put("description", getFieldAsString(this.getDescription()))
         .put("determinismLevel", getFieldAsString(this.getDeterminismLevel()))
         .put("lastModifiedTime", getFieldAsString(this.getLastModifiedTime()))
         .put("language", getFieldAsString(this.getLanguage()))
         .put("argumentList", getFieldAsString(this.getArguments()))
         .put("returnType", getFieldAsString(this.getReturnType()))
         .put("returnableType", getFieldAsString(this.getReturnTableType()))
-        .put("importedLibrariesList", getFieldAsString(this.getImportedLibraries()))
-        .put("body", getFieldAsString(this.getBody()))
-        .put("remoteFunctionOptions", getFieldAsString(this.getRemoteFunctionOptions()))
-        .put("dataGovernanceTyoe", getFieldAsString(this.getDataGovernanceType()))
         .build();
   }
 }
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableId.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableId.java
@@ -116,10 +116,11 @@ static TableId fromPb(TableReference tableRef) {
     return new TableId(tableRef.getProjectId(), tableRef.getDatasetId(), tableRef.getTableId());
   }
 
-  public Attributes getOtelAttributes() {
+  protected Attributes getOtelAttributes() {
     return Attributes.builder()
         .put("project", this.getProject())
         .put("dataset", this.getDataset())
+        .put("db.name", this.getDataset())
         .put("table", this.getTable())
         .build();
   }
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableInfo.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableInfo.java
@@ -769,34 +769,19 @@ private static String getFieldAsString(Object field) {
     return field == null ? "null" : field.toString();
   }
 
-  public Attributes getOtelAttributes() {
+  protected Attributes getOtelAttributes() {
     return Attributes.builder()
-        .put("etag", getFieldAsString(this.getEtag()))
+        .putAll(this.getTableId().getOtelAttributes())
         .put("generatedId", getFieldAsString(this.getGeneratedId()))
-        .put("selfLink", getFieldAsString(this.getSelfLink()))
-        .put("tableId", this.getTableId().getTable())
         .put("friendlyName", getFieldAsString(this.getFriendlyName()))
-        .put("description", getFieldAsString(this.getDescription()))
         .put("creationTime", getFieldAsString(this.getCreationTime()))
         .put("expirationTime", getFieldAsString(this.getExpirationTime()))
         .put("lastModifiedTime", getFieldAsString(this.getLastModifiedTime()))
         .put("numBytes", getFieldAsString(this.getNumBytes()))
-        .put("numLongTermBytes", getFieldAsString(this.getNumLongTermBytes()))
-        .put("numTimeTravelPhysicalBytes", getFieldAsString(this.getNumTimeTravelPhysicalBytes()))
-        .put("numTotalLogicalBytes", getFieldAsString(this.getNumTotalLogicalBytes()))
-        .put("numActiveLogicalBytes", getFieldAsString(this.getNumActiveLogicalBytes()))
-        .put("numLongTermLogicalBytes", getFieldAsString(this.getNumLongTermLogicalBytes()))
-        .put("numTotalPhysicalBytes", getFieldAsString(this.getNumTotalPhysicalBytes()))
-        .put("numActivePhysicalBytes", getFieldAsString(this.getNumActivePhysicalBytes()))
-        .put("numLongTermPhysicalBytes", getFieldAsString(this.getNumLongTermPhysicalBytes()))
         .put("numRows", getFieldAsString(this.getNumRows()))
-        .put("definition", getFieldAsString(this.getDefinition()))
-        .put("encryptionConfiguration", getFieldAsString(this.getEncryptionConfiguration()))
         .put("labels", getFieldAsString(this.getLabels()))
         .put("resourceTags", getFieldAsString(this.getResourceTags()))
         .put("requirePartitionFilter", getFieldAsString(this.getRequirePartitionFilter()))
-        .put("defaultCollation", getFieldAsString(this.getDefaultCollation()))
-        .put("cloneDefinition", getFieldAsString(this.getCloneDefinition()))
         .put("tableConstraints", getFieldAsString(this.getTableConstraints()))
         .build();
   }
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java

Original file line number	Diff line number	Diff line change
`@@ -86,10 +86,11 @@ static DatasetId fromPb(DatasetReference datasetRef) {`
`86`	`86`	`return new DatasetId(datasetRef.getProjectId(), datasetRef.getDatasetId());`
`87`	`87`	`}`
`88`	`88`
`89`		`- public Attributes getOtelAttributes() {`
	`89`	`+ protected Attributes getOtelAttributes() {`
`90`	`90`	`return Attributes.builder()`
`91`	`91`	`.put("project", this.getProject())`
`92`	`92`	`.put("dataset", this.getDataset())`
	`93`	`+ .put("db.name", this.getDataset())`
`93`	`94`	`.build();`
`94`	`95`	`}`
`95`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ private static String getFieldAsString(Object field) {`
`129`	`129`	`return field == null ? "null" : field.toString();`
`130`	`130`	`}`
`131`	`131`
`132`		`- public Attributes getOtelAttributes() {`
	`132`	`+ protected Attributes getOtelAttributes() {`
`133`	`133`	`return Attributes.builder()`
`134`	`134`	`.put("job", getFieldAsString(this.getJob()))`
`135`	`135`	`.put("location", getFieldAsString(this.getLocation()))`
Original file line number	Diff line number	Diff line change
`@@ -107,10 +107,11 @@ static ModelId fromPb(ModelReference modelRef) {`
`107`	`107`	`return new ModelId(modelRef.getProjectId(), modelRef.getDatasetId(), modelRef.getModelId());`
`108`	`108`	`}`
`109`	`109`
`110`		`- public Attributes getOtelAttributes() {`
	`110`	`+ protected Attributes getOtelAttributes() {`
`111`	`111`	`return Attributes.builder()`
`112`	`112`	`.put("project", this.getProject())`
`113`	`113`	`.put("dataset", this.getDataset())`
	`114`	`+ .put("db.name", this.getDataset())`
`114`	`115`	`.put("model", this.getModel())`
`115`	`116`	`.build();`
`116`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,10 +110,11 @@ static RoutineId fromPb(RoutineReference routineRef) {`
`110`	`110`	`routineRef.getProjectId(), routineRef.getDatasetId(), routineRef.getRoutineId());`
`111`	`111`	`}`
`112`	`112`
`113`		`- public Attributes getOtelAttributes() {`
	`113`	`+ protected Attributes getOtelAttributes() {`
`114`	`114`	`return Attributes.builder()`
`115`	`115`	`.put("project", this.getProject())`
`116`	`116`	`.put("dataset", this.getDataset())`
	`117`	`+ .put("db.name", this.getDataset())`
`117`	`118`	`.put("routine", this.getRoutine())`
`118`	`119`	`.build();`
`119`	`120`	`}`