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

Commit e4e4047

Browse files
whuffman36whuffman36
committed
remove OtelHelper class
1 parent 55316f8 commit e4e4047

9 files changed

Lines changed: 147 additions & 180 deletions

File tree

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

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2240,6 +2240,10 @@ public com.google.api.services.bigquery.model.TestIamPermissionsResponse call()
22402240
return optionMap;
22412241
}
22422242

2243+
private static String getFieldAsString(Object field) {
2244+
return field == null ? "null" : field.toString();
2245+
}
2246+
22432247
private static Attributes otelAttributesFromOptions(Option... options) {
22442248
Attributes attributes = Attributes.builder().build();
22452249
for (Option option : options) {
@@ -2253,44 +2257,40 @@ private static Attributes otelAttributesFromOptions(Option... options) {
22532257

22542258
private static Attributes otelAttributesFromQueryRequest(QueryRequest request) {
22552259
return Attributes.builder()
2256-
.put("continuous", OpenTelemetryHelper.getFieldAsString(request.getContinuous()))
2257-
.put("createSession", OpenTelemetryHelper.getFieldAsString(request.getCreateSession()))
2258-
.put("defaultDataset", OpenTelemetryHelper.getFieldAsString(request.getDefaultDataset()))
2260+
.put("continuous", getFieldAsString(request.getContinuous()))
2261+
.put("createSession", getFieldAsString(request.getCreateSession()))
2262+
.put("defaultDataset", getFieldAsString(request.getDefaultDataset()))
22592263
.put(
22602264
"destinationEncryptionConfiguration",
2261-
OpenTelemetryHelper.getFieldAsString(request.getDestinationEncryptionConfiguration()))
2262-
.put("dryRun", OpenTelemetryHelper.getFieldAsString(request.getDryRun()))
2263-
.put("formatOptions", OpenTelemetryHelper.getFieldAsString(request.getFormatOptions()))
2264-
.put("jobCreationMode", OpenTelemetryHelper.getFieldAsString(request.getJobCreationMode()))
2265-
.put("jobTimeoutMs", OpenTelemetryHelper.getFieldAsString(request.getJobTimeoutMs()))
2266-
.put("kind", OpenTelemetryHelper.getFieldAsString(request.getKind()))
2267-
.put("labels", OpenTelemetryHelper.getFieldAsString(request.getLabels()))
2268-
.put("location", OpenTelemetryHelper.getFieldAsString(request.getLocation()))
2269-
.put("maxResults", OpenTelemetryHelper.getFieldAsString(request.getMaxResults()))
2270-
.put(
2271-
"maximumBytesBilled",
2272-
OpenTelemetryHelper.getFieldAsString(request.getMaximumBytesBilled()))
2273-
.put("parameterMode", OpenTelemetryHelper.getFieldAsString(request.getParameterMode()))
2274-
.put("preserveNulls", OpenTelemetryHelper.getFieldAsString(request.getPreserveNulls()))
2275-
.put("query", OpenTelemetryHelper.getFieldAsString(request.getQuery()))
2276-
.put("queryParameters", OpenTelemetryHelper.getFieldAsString(request.getQueryParameters()))
2277-
.put("requestId", OpenTelemetryHelper.getFieldAsString(request.getRequestId()))
2278-
.put("reservation", OpenTelemetryHelper.getFieldAsString(request.getReservation()))
2279-
.put("timeoutMs", OpenTelemetryHelper.getFieldAsString(request.getTimeoutMs()))
2280-
.put("useLegacySql", OpenTelemetryHelper.getFieldAsString(request.getUseLegacySql()))
2281-
.put("useQueryCache", OpenTelemetryHelper.getFieldAsString(request.getUseQueryCache()))
2282-
.put(
2283-
"writeIncrementalResults",
2284-
OpenTelemetryHelper.getFieldAsString(request.getWriteIncrementalResults()))
2265+
getFieldAsString(request.getDestinationEncryptionConfiguration()))
2266+
.put("dryRun", getFieldAsString(request.getDryRun()))
2267+
.put("formatOptions", getFieldAsString(request.getFormatOptions()))
2268+
.put("jobCreationMode", getFieldAsString(request.getJobCreationMode()))
2269+
.put("jobTimeoutMs", getFieldAsString(request.getJobTimeoutMs()))
2270+
.put("kind", getFieldAsString(request.getKind()))
2271+
.put("labels", getFieldAsString(request.getLabels()))
2272+
.put("location", getFieldAsString(request.getLocation()))
2273+
.put("maxResults", getFieldAsString(request.getMaxResults()))
2274+
.put("maximumBytesBilled", getFieldAsString(request.getMaximumBytesBilled()))
2275+
.put("parameterMode", getFieldAsString(request.getParameterMode()))
2276+
.put("preserveNulls", getFieldAsString(request.getPreserveNulls()))
2277+
.put("query", getFieldAsString(request.getQuery()))
2278+
.put("queryParameters", getFieldAsString(request.getQueryParameters()))
2279+
.put("requestId", getFieldAsString(request.getRequestId()))
2280+
.put("reservation", getFieldAsString(request.getReservation()))
2281+
.put("timeoutMs", getFieldAsString(request.getTimeoutMs()))
2282+
.put("useLegacySql", getFieldAsString(request.getUseLegacySql()))
2283+
.put("useQueryCache", getFieldAsString(request.getUseQueryCache()))
2284+
.put("writeIncrementalResults", getFieldAsString(request.getWriteIncrementalResults()))
22852285
.build();
22862286
}
22872287

22882288
private static Attributes otelAttributesFromPolicy(Policy policy) {
22892289
return Attributes.builder()
2290-
.put("version", OpenTelemetryHelper.getFieldAsString(policy.getVersion()))
2291-
.put("bindings", OpenTelemetryHelper.getFieldAsString(policy.getBindings()))
2292-
.put("bindingsList", OpenTelemetryHelper.getFieldAsString(policy.getBindingsList()))
2293-
.put("etag", OpenTelemetryHelper.getFieldAsString(policy.getEtag()))
2290+
.put("version", getFieldAsString(policy.getVersion()))
2291+
.put("bindings", getFieldAsString(policy.getBindings()))
2292+
.put("bindingsList", getFieldAsString(policy.getBindingsList()))
2293+
.put("etag", getFieldAsString(policy.getEtag()))
22942294
.build();
22952295
}
22962296

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

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -747,37 +747,33 @@ public static DatasetInfo of(String datasetId) {
747747
return newBuilder(datasetId).build();
748748
}
749749

750+
private static String getFieldAsString(Object field) {
751+
return field == null ? "null" : field.toString();
752+
}
753+
750754
public Attributes getOtelAttributes() {
751755
return Attributes.builder()
752-
.put("datasetId", OpenTelemetryHelper.getFieldAsString(this.getDatasetId().getDataset()))
753-
.put(
754-
"defaultTableLifetime",
755-
OpenTelemetryHelper.getFieldAsString(this.getDefaultTableLifetime()))
756-
.put("description", OpenTelemetryHelper.getFieldAsString(this.getDescription()))
757-
.put("etag", OpenTelemetryHelper.getFieldAsString(this.getEtag()))
758-
.put("friendlyName", OpenTelemetryHelper.getFieldAsString(this.getFriendlyName()))
759-
.put("generatedId", OpenTelemetryHelper.getFieldAsString(this.getGeneratedId()))
760-
.put("lastModified", OpenTelemetryHelper.getFieldAsString(this.getLastModified()))
761-
.put("location", OpenTelemetryHelper.getFieldAsString(this.getLocation()))
762-
.put("selfLink", OpenTelemetryHelper.getFieldAsString(this.getSelfLink()))
763-
.put("labels", OpenTelemetryHelper.getFieldAsString(this.getLabels()))
756+
.put("datasetId", getFieldAsString(this.getDatasetId().getDataset()))
757+
.put("defaultTableLifetime", getFieldAsString(this.getDefaultTableLifetime()))
758+
.put("description", getFieldAsString(this.getDescription()))
759+
.put("etag", getFieldAsString(this.getEtag()))
760+
.put("friendlyName", getFieldAsString(this.getFriendlyName()))
761+
.put("generatedId", getFieldAsString(this.getGeneratedId()))
762+
.put("lastModified", getFieldAsString(this.getLastModified()))
763+
.put("location", getFieldAsString(this.getLocation()))
764+
.put("selfLink", getFieldAsString(this.getSelfLink()))
765+
.put("labels", getFieldAsString(this.getLabels()))
764766
.put(
765767
"defaultEncryptionConfiguration",
766-
OpenTelemetryHelper.getFieldAsString(this.getDefaultEncryptionConfiguration()))
768+
getFieldAsString(this.getDefaultEncryptionConfiguration()))
767769
.put(
768770
"defaultPartitionExpirationMs",
769-
OpenTelemetryHelper.getFieldAsString(this.getDefaultPartitionExpirationMs()))
770-
.put("defaultCollation", OpenTelemetryHelper.getFieldAsString(this.getDefaultCollation()))
771-
.put(
772-
"externalDatasetReference",
773-
OpenTelemetryHelper.getFieldAsString(this.getExternalDatasetReference()))
774-
.put(
775-
"storageBillingModel",
776-
OpenTelemetryHelper.getFieldAsString(this.getStorageBillingModel()))
777-
.put(
778-
"maxTimeTravelHours",
779-
OpenTelemetryHelper.getFieldAsString(this.getMaxTimeTravelHours()))
780-
.put("resourceTags", OpenTelemetryHelper.getFieldAsString(this.getResourceTags()))
771+
getFieldAsString(this.getDefaultPartitionExpirationMs()))
772+
.put("defaultCollation", getFieldAsString(this.getDefaultCollation()))
773+
.put("externalDatasetReference", getFieldAsString(this.getExternalDatasetReference()))
774+
.put("storageBillingModel", getFieldAsString(this.getStorageBillingModel()))
775+
.put("maxTimeTravelHours", getFieldAsString(this.getMaxTimeTravelHours()))
776+
.put("resourceTags", getFieldAsString(this.getResourceTags()))
781777
.build();
782778
}
783779

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -481,14 +481,17 @@ public boolean equals(Object obj) {
481481
&& Objects.equals(templateSuffix, other.templateSuffix);
482482
}
483483

484+
private static String getFieldAsString(Object field) {
485+
return field == null ? "null" : field.toString();
486+
}
487+
484488
public Attributes getOtelAttributes() {
485489
return Attributes.builder()
486-
.put("table", OpenTelemetryHelper.getFieldAsString(this.getTable().getTable()))
487-
.put("row", OpenTelemetryHelper.getFieldAsString(this.getRows()))
488-
.put("templateSuffix", OpenTelemetryHelper.getFieldAsString(this.getTemplateSuffix()))
489-
.put(
490-
"ignoreUnknownValues", OpenTelemetryHelper.getFieldAsString(this.ignoreUnknownValues()))
491-
.put("skipInvalidRows", OpenTelemetryHelper.getFieldAsString(this.skipInvalidRows()))
490+
.put("table", getFieldAsString(this.getTable().getTable()))
491+
.put("row", getFieldAsString(this.getRows()))
492+
.put("templateSuffix", getFieldAsString(this.getTemplateSuffix()))
493+
.put("ignoreUnknownValues", getFieldAsString(this.ignoreUnknownValues()))
494+
.put("skipInvalidRows", getFieldAsString(this.skipInvalidRows()))
492495
.build();
493496
}
494497
}

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,15 @@ static JobId fromPb(JobReference jobRef) {
125125
.build();
126126
}
127127

128+
private static String getFieldAsString(Object field) {
129+
return field == null ? "null" : field.toString();
130+
}
131+
128132
public Attributes getOtelAttributes() {
129133
return Attributes.builder()
130-
.put("job", OpenTelemetryHelper.getFieldAsString(this.getJob()))
131-
.put("location", OpenTelemetryHelper.getFieldAsString(this.getLocation()))
132-
.put("project", OpenTelemetryHelper.getFieldAsString(this.getProject()))
134+
.put("job", getFieldAsString(this.getJob()))
135+
.put("location", getFieldAsString(this.getLocation()))
136+
.put("project", getFieldAsString(this.getProject()))
133137
.build();
134138
}
135139
}

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -377,16 +377,20 @@ static JobInfo fromPb(Job jobPb) {
377377
return new BuilderImpl(jobPb).build();
378378
}
379379

380+
private static String getFieldAsString(Object field) {
381+
return field == null ? "null" : field.toString();
382+
}
383+
380384
public Attributes getOtelAttributes() {
381385
return Attributes.builder()
382-
.put("etag", OpenTelemetryHelper.getFieldAsString(this.getEtag()))
383-
.put("generatedId", OpenTelemetryHelper.getFieldAsString(this.getGeneratedId()))
384-
.put("jobId", OpenTelemetryHelper.getFieldAsString(this.getJobId().getJob()))
385-
.put("selfLink", OpenTelemetryHelper.getFieldAsString(this.getSelfLink()))
386-
.put("status", OpenTelemetryHelper.getFieldAsString(this.getStatus()))
387-
.put("statistics", OpenTelemetryHelper.getFieldAsString(this.getStatistics()))
388-
.put("userEmail", OpenTelemetryHelper.getFieldAsString(this.getUserEmail()))
389-
.put("configuration", OpenTelemetryHelper.getFieldAsString(this.getConfiguration()))
386+
.put("etag", getFieldAsString(this.getEtag()))
387+
.put("generatedId", getFieldAsString(this.getGeneratedId()))
388+
.put("jobId", getFieldAsString(this.getJobId().getJob()))
389+
.put("selfLink", getFieldAsString(this.getSelfLink()))
390+
.put("status", getFieldAsString(this.getStatus()))
391+
.put("statistics", getFieldAsString(this.getStatistics()))
392+
.put("userEmail", getFieldAsString(this.getUserEmail()))
393+
.put("configuration", getFieldAsString(this.getConfiguration()))
390394
.build();
391395
}
392396
}

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

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -455,24 +455,26 @@ static ModelInfo fromPb(Model modelPb) {
455455
return new BuilderImpl(modelPb).build();
456456
}
457457

458+
private static String getFieldAsString(Object field) {
459+
return field == null ? "null" : field.toString();
460+
}
461+
458462
public Attributes getOtelAttributes() {
459463
return Attributes.builder()
460-
.put("etag", OpenTelemetryHelper.getFieldAsString(this.getEtag()))
461-
.put("modelId", OpenTelemetryHelper.getFieldAsString(this.getModelId().getModel()))
462-
.put("description", OpenTelemetryHelper.getFieldAsString(this.getDescription()))
463-
.put("modelType", OpenTelemetryHelper.getFieldAsString(this.getModelType()))
464-
.put("friendlyName", OpenTelemetryHelper.getFieldAsString(this.getFriendlyName()))
465-
.put("creationTime", OpenTelemetryHelper.getFieldAsString(this.getCreationTime()))
466-
.put("lastModifiedTime", OpenTelemetryHelper.getFieldAsString(this.getLastModifiedTime()))
467-
.put("expirationTime", OpenTelemetryHelper.getFieldAsString(this.getExpirationTime()))
468-
.put("labels", OpenTelemetryHelper.getFieldAsString(this.getLabels()))
469-
.put("location", OpenTelemetryHelper.getFieldAsString(this.getLocation()))
470-
.put("trainingRunList", OpenTelemetryHelper.getFieldAsString(this.getTrainingRuns()))
471-
.put("featureColumnList", OpenTelemetryHelper.getFieldAsString(this.getFeatureColumns()))
472-
.put("labelColumnList", OpenTelemetryHelper.getFieldAsString(this.getLabelColumns()))
473-
.put(
474-
"encryptionConfiguration",
475-
OpenTelemetryHelper.getFieldAsString(this.getEncryptionConfiguration()))
464+
.put("etag", getFieldAsString(this.getEtag()))
465+
.put("modelId", getFieldAsString(this.getModelId().getModel()))
466+
.put("description", getFieldAsString(this.getDescription()))
467+
.put("modelType", getFieldAsString(this.getModelType()))
468+
.put("friendlyName", getFieldAsString(this.getFriendlyName()))
469+
.put("creationTime", getFieldAsString(this.getCreationTime()))
470+
.put("lastModifiedTime", getFieldAsString(this.getLastModifiedTime()))
471+
.put("expirationTime", getFieldAsString(this.getExpirationTime()))
472+
.put("labels", getFieldAsString(this.getLabels()))
473+
.put("location", getFieldAsString(this.getLocation()))
474+
.put("trainingRunList", getFieldAsString(this.getTrainingRuns()))
475+
.put("featureColumnList", getFieldAsString(this.getFeatureColumns()))
476+
.put("labelColumnList", getFieldAsString(this.getLabelColumns()))
477+
.put("encryptionConfiguration", getFieldAsString(this.getEncryptionConfiguration()))
476478
.build();
477479
}
478480
}

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

Lines changed: 0 additions & 26 deletions
This file was deleted.

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

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -546,29 +546,27 @@ static RoutineInfo fromPb(Routine routinePb) {
546546
return new BuilderImpl(routinePb).build();
547547
}
548548

549+
private static String getFieldAsString(Object field) {
550+
return field == null ? "null" : field.toString();
551+
}
552+
549553
public Attributes getOtelAttributes() {
550554
return Attributes.builder()
551-
.put("routineId", OpenTelemetryHelper.getFieldAsString(this.getRoutineId().getRoutine()))
552-
.put("etag", OpenTelemetryHelper.getFieldAsString(this.getEtag()))
553-
.put("routineType", OpenTelemetryHelper.getFieldAsString(this.getRoutineType()))
554-
.put("creationTime", OpenTelemetryHelper.getFieldAsString(this.getCreationTime()))
555-
.put("description", OpenTelemetryHelper.getFieldAsString(this.getDescription()))
556-
.put("determinismLevel", OpenTelemetryHelper.getFieldAsString(this.getDeterminismLevel()))
557-
.put("lastModifiedTime", OpenTelemetryHelper.getFieldAsString(this.getLastModifiedTime()))
558-
.put("language", OpenTelemetryHelper.getFieldAsString(this.getLanguage()))
559-
.put("argumentList", OpenTelemetryHelper.getFieldAsString(this.getArguments()))
560-
.put("returnType", OpenTelemetryHelper.getFieldAsString(this.getReturnType()))
561-
.put("returnableType", OpenTelemetryHelper.getFieldAsString(this.getReturnTableType()))
562-
.put(
563-
"importedLibrariesList",
564-
OpenTelemetryHelper.getFieldAsString(this.getImportedLibraries()))
565-
.put("body", OpenTelemetryHelper.getFieldAsString(this.getBody()))
566-
.put(
567-
"remoteFunctionOptions",
568-
OpenTelemetryHelper.getFieldAsString(this.getRemoteFunctionOptions()))
569-
.put(
570-
"dataGovernanceTyoe",
571-
OpenTelemetryHelper.getFieldAsString(this.getDataGovernanceType()))
555+
.put("routineId", getFieldAsString(this.getRoutineId().getRoutine()))
556+
.put("etag", getFieldAsString(this.getEtag()))
557+
.put("routineType", getFieldAsString(this.getRoutineType()))
558+
.put("creationTime", getFieldAsString(this.getCreationTime()))
559+
.put("description", getFieldAsString(this.getDescription()))
560+
.put("determinismLevel", getFieldAsString(this.getDeterminismLevel()))
561+
.put("lastModifiedTime", getFieldAsString(this.getLastModifiedTime()))
562+
.put("language", getFieldAsString(this.getLanguage()))
563+
.put("argumentList", getFieldAsString(this.getArguments()))
564+
.put("returnType", getFieldAsString(this.getReturnType()))
565+
.put("returnableType", getFieldAsString(this.getReturnTableType()))
566+
.put("importedLibrariesList", getFieldAsString(this.getImportedLibraries()))
567+
.put("body", getFieldAsString(this.getBody()))
568+
.put("remoteFunctionOptions", getFieldAsString(this.getRemoteFunctionOptions()))
569+
.put("dataGovernanceTyoe", getFieldAsString(this.getDataGovernanceType()))
572570
.build();
573571
}
574572
}

0 commit comments

Comments
 (0)