Skip to content
This repository was archived by the owner on Mar 23, 2026. It is now read-only.

Commit a963641

Browse files
whuffman36whuffman36
committed
remove extraneous attributes
1 parent 8c52f6f commit a963641

9 files changed

Lines changed: 5 additions & 109 deletions

File tree

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java‎

Lines changed: 0 additions & 47 deletions
Large diffs are not rendered by default.

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatasetInfo.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -754,17 +754,8 @@ private static String getFieldAsString(Object field) {
754754
protected Attributes getOtelAttributes() {
755755
return Attributes.builder()
756756
.putAll(this.getDatasetId().getOtelAttributes())
757-
.put("defaultTableLifetime", getFieldAsString(this.getDefaultTableLifetime()))
758-
.put("friendlyName", getFieldAsString(this.getFriendlyName()))
759-
.put("generatedId", getFieldAsString(this.getGeneratedId()))
760757
.put("lastModified", getFieldAsString(this.getLastModified()))
761758
.put("location", getFieldAsString(this.getLocation()))
762-
.put("labels", getFieldAsString(this.getLabels()))
763-
.put(
764-
"defaultPartitionExpirationMs",
765-
getFieldAsString(this.getDefaultPartitionExpirationMs()))
766-
.put("maxTimeTravelHours", getFieldAsString(this.getMaxTimeTravelHours()))
767-
.put("resourceTags", getFieldAsString(this.getResourceTags()))
768759
.build();
769760
}
770761

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/InsertAllRequest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -488,10 +488,7 @@ private static String getFieldAsString(Object field) {
488488
public Attributes getOtelAttributes() {
489489
return Attributes.builder()
490490
.put("table", getFieldAsString(this.getTable().getTable()))
491-
.put("row", getFieldAsString(this.getRows()))
492491
.put("templateSuffix", getFieldAsString(this.getTemplateSuffix()))
493-
.put("ignoreUnknownValues", getFieldAsString(this.ignoreUnknownValues()))
494-
.put("skipInvalidRows", getFieldAsString(this.skipInvalidRows()))
495492
.build();
496493
}
497494
}

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobInfo.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -384,15 +384,10 @@ private static String getFieldAsString(Object field) {
384384
protected Attributes getOtelAttributes() {
385385
return Attributes.builder()
386386
.putAll(this.getJobId().getOtelAttributes())
387-
.put("generatedId", getFieldAsString(this.getGeneratedId()))
388-
.put("status", getFieldAsString(this.getStatus()))
389387
.put("creationTime", getFieldAsString(this.getStatistics().getCreationTime()))
390388
.put("startTime", getFieldAsString(this.getStatistics().getStartTime()))
391389
.put("endTime", getFieldAsString(this.getStatistics().getEndTime()))
392-
.put("parentJobId", getFieldAsString(this.getStatistics().getParentJobId()))
393-
.put("numChildJobs", getFieldAsString(this.getStatistics().getNumChildJobs()))
394390
.put("jobType", getFieldAsString(this.getConfiguration().getType()))
395-
.put("jobTimeoutMs", getFieldAsString(this.getConfiguration().toPb().getJobTimeoutMs()))
396391
.build();
397392
}
398393
}

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ModelInfo.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,11 +463,9 @@ protected Attributes getOtelAttributes() {
463463
return Attributes.builder()
464464
.putAll(this.getModelId().getOtelAttributes())
465465
.put("modelType", getFieldAsString(this.getModelType()))
466-
.put("friendlyName", getFieldAsString(this.getFriendlyName()))
467466
.put("creationTime", getFieldAsString(this.getCreationTime()))
468467
.put("lastModifiedTime", getFieldAsString(this.getLastModifiedTime()))
469468
.put("expirationTime", getFieldAsString(this.getExpirationTime()))
470-
.put("labels", getFieldAsString(this.getLabels()))
471469
.put("location", getFieldAsString(this.getLocation()))
472470
.build();
473471
}

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1222,17 +1222,8 @@ private static String getFieldAsString(Object field) {
12221222
public Attributes getOtelAttributes() {
12231223
return Attributes.builder()
12241224
.put("destinationTable", getFieldAsString(this.getDestinationTable()))
1225-
.put("defaultDataset", getFieldAsString(this.getDefaultDataset()))
1226-
.put("createSession", getFieldAsString(this.createSession()))
1227-
.put("flattenResults", getFieldAsString(this.flattenResults()))
1228-
.put("priority", getFieldAsString(this.getPriority()))
12291225
.put("useQueryCache", getFieldAsString(this.useQueryCache()))
12301226
.put("dryRun", getFieldAsString(this.dryRun()))
1231-
.put("jobTimeoutMs", getFieldAsString(this.getJobTimeoutMs()))
1232-
.put("labels", getFieldAsString(this.getLabels()))
1233-
.put("connectionProperties", getFieldAsString(this.getConnectionProperties()))
1234-
.put("jobCreationMode", getFieldAsString(this.getJobCreationMode()))
1235-
.put("reservation", getFieldAsString(this.getReservation()))
12361227
.build();
12371228
}
12381229
}

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/RoutineInfo.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -555,12 +555,7 @@ protected Attributes getOtelAttributes() {
555555
.putAll(this.getRoutineId().getOtelAttributes())
556556
.put("routineType", getFieldAsString(this.getRoutineType()))
557557
.put("creationTime", getFieldAsString(this.getCreationTime()))
558-
.put("determinismLevel", getFieldAsString(this.getDeterminismLevel()))
559558
.put("lastModifiedTime", getFieldAsString(this.getLastModifiedTime()))
560-
.put("language", getFieldAsString(this.getLanguage()))
561-
.put("argumentList", getFieldAsString(this.getArguments()))
562-
.put("returnType", getFieldAsString(this.getReturnType()))
563-
.put("returnableType", getFieldAsString(this.getReturnTableType()))
564559
.build();
565560
}
566561
}

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableInfo.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -772,17 +772,11 @@ private static String getFieldAsString(Object field) {
772772
protected Attributes getOtelAttributes() {
773773
return Attributes.builder()
774774
.putAll(this.getTableId().getOtelAttributes())
775-
.put("generatedId", getFieldAsString(this.getGeneratedId()))
776-
.put("friendlyName", getFieldAsString(this.getFriendlyName()))
777775
.put("creationTime", getFieldAsString(this.getCreationTime()))
778776
.put("expirationTime", getFieldAsString(this.getExpirationTime()))
779777
.put("lastModifiedTime", getFieldAsString(this.getLastModifiedTime()))
780778
.put("numBytes", getFieldAsString(this.getNumBytes()))
781779
.put("numRows", getFieldAsString(this.getNumRows()))
782-
.put("labels", getFieldAsString(this.getLabels()))
783-
.put("resourceTags", getFieldAsString(this.getResourceTags()))
784-
.put("requirePartitionFilter", getFieldAsString(this.getRequirePartitionFilter()))
785-
.put("tableConstraints", getFieldAsString(this.getTableConstraints()))
786780
.build();
787781
}
788782
}

‎google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java‎

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7587,16 +7587,14 @@ public void testOpenTelemetryTracingDatasets() {
75877587
parentSpan.end();
75887588
Map<AttributeKey<?>, Object> createMap =
75897589
OTEL_ATTRIBUTES.get("com.google.cloud.bigquery.BigQuery.createDataset");
7590-
assertEquals(createMap.get(AttributeKey.stringKey("maxTimeTravelHours")), "72");
7591-
assertEquals(createMap.get(AttributeKey.stringKey("friendlyName")), "null");
7590+
assertEquals(createMap.get(AttributeKey.stringKey("location")), "null");
75927591

75937592
Map<AttributeKey<?>, Object> getMap =
75947593
OTEL_ATTRIBUTES.get("com.google.cloud.bigquery.BigQuery.getDataset");
75957594
assertEquals(getMap.get(AttributeKey.stringKey("dataset")), billingModelDataset);
75967595

75977596
Map<AttributeKey<?>, Object> updateMap =
75987597
OTEL_ATTRIBUTES.get("com.google.cloud.bigquery.BigQuery.updateDataset");
7599-
assertEquals(updateMap.get(AttributeKey.stringKey("maxTimeTravelHours")), "96");
76007598
assertEquals(updateMap.get(AttributeKey.stringKey("ACCESS_POLICY_VERSION")), "2");
76017599

76027600
Map<AttributeKey<?>, Object> deleteMap =
@@ -7636,12 +7634,9 @@ public void testOpenTelemetryTracingTables() {
76367634
TableInfo tableInfo =
76377635
TableInfo.newBuilder(TableId.of(DATASET, tableName), tableDefinition)
76387636
.setDescription("Some Description")
7639-
.setFriendlyName("friendly name")
7640-
.setLabels(Collections.singletonMap("a", "b"))
76417637
.build();
76427638
Table createdTable = bigquery.create(tableInfo);
76437639
assertThat(createdTable.getDescription()).isEqualTo("Some Description");
7644-
assertThat(createdTable.getLabels()).containsExactly("a", "b");
76457640

76467641
assertEquals(
76477642
OTEL_PARENT_SPAN_IDS.get("com.google.cloud.bigquery.BigQuery.createTable"),
@@ -7654,30 +7649,17 @@ public void testOpenTelemetryTracingTables() {
76547649
assertEquals(
76557650
OTEL_ATTRIBUTES
76567651
.get("com.google.cloud.bigquery.BigQuery.createTable")
7657-
.get(AttributeKey.stringKey("friendlyName")),
7658-
"friendly name");
7652+
.get(AttributeKey.stringKey("creationTime")),
7653+
"null");
76597654

7660-
Map<String, String> updateLabels = new HashMap<>();
7661-
updateLabels.put("x", "y");
7662-
updateLabels.put("a", null);
76637655
Table updatedTable =
7664-
bigquery.update(
7665-
createdTable.toBuilder()
7666-
.setDescription("Updated Description")
7667-
.setFriendlyName("updated friendly name")
7668-
.setLabels(updateLabels)
7669-
.build());
7656+
bigquery.update(createdTable.toBuilder().setDescription("Updated Description").build());
76707657
assertThat(updatedTable.getDescription()).isEqualTo("Updated Description");
7671-
assertThat(updatedTable.getLabels()).containsExactly("x", "y");
76727658

7659+
assertNotNull(OTEL_ATTRIBUTES.get("com.google.cloud.bigquery.BigQuery.updateTable"));
76737660
assertEquals(
76747661
OTEL_PARENT_SPAN_IDS.get("com.google.cloud.bigquery.BigQuery.updateTable"),
76757662
OTEL_PARENT_SPAN_ID);
7676-
assertEquals(
7677-
OTEL_ATTRIBUTES
7678-
.get("com.google.cloud.bigquery.BigQuery.updateTable")
7679-
.get(AttributeKey.stringKey("friendlyName")),
7680-
"updated friendly name");
76817663
}
76827664

76837665
@Test

0 commit comments

Comments
 (0)