Resolve merge conflict

Author: whuffman36

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryOptions.java

@@ -41,7 +41,6 @@ public class BigQueryOptions extends ServiceOptions<BigQuery, BigQueryOptions> {
   private boolean setThrowNotFound;
   private boolean useInt64Timestamps;
   private JobCreationMode defaultJobCreationMode = JobCreationMode.JOB_CREATION_MODE_UNSPECIFIED;
-  private String queryPreviewEnabled = System.getenv("QUERY_PREVIEW_ENABLED");
   private boolean enableOpenTelemetryTracing;
   private Tracer openTelemetryTracer;
 

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

@@ -754,7 +754,7 @@ private static String getFieldAsString(Object field) {
   protected Attributes getOtelAttributes() {
     return Attributes.builder()
         .putAll(this.getDatasetId().getOtelAttributes())
-        .put("bq.dataset.lastModified", getFieldAsString(this.getLastModified()))
+        .put("bq.dataset.last_modified", getFieldAsString(this.getLastModified()))
         .put("bq.dataset.location", getFieldAsString(this.getLocation()))
         .build();
   }

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

@@ -487,8 +487,8 @@ private static String getFieldAsString(Object field) {
 
   public Attributes getOtelAttributes() {
     return Attributes.builder()
-        .put("table", getFieldAsString(this.getTable().getTable()))
-        .put("templateSuffix", getFieldAsString(this.getTemplateSuffix()))
+        .put("bq.insert_all.table", getFieldAsString(this.getTable().getTable()))
+        .put("bq.insert_all.template_suffix", getFieldAsString(this.getTemplateSuffix()))
         .build();
   }
 }