Revert "HBASE-26473 Introduce db.hbase.container_operations span at…

…tribute"

This reverts commit 4748707.

hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java

@@ -30,7 +30,6 @@
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanKind;
-import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.context.Scope;
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -407,8 +406,7 @@ protected Result rpcCall() throws Exception {
   public Result[] get(List<Get> gets) throws IOException {
     final Supplier<Span> supplier = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
-      .setOperation(HBaseSemanticAttributes.Operation.BATCH)
-      .setContainerOperations(gets);
+      .setOperation(HBaseSemanticAttributes.Operation.BATCH);
     return TraceUtil.trace(() -> {
       if (gets.size() == 1) {
         return new Result[] { get(gets.get(0)) };
@@ -435,8 +433,7 @@ public void batch(final List<? extends Row> actions, final Object[] results)
       throws InterruptedException, IOException {
     final Supplier<Span> supplier = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
-      .setOperation(HBaseSemanticAttributes.Operation.BATCH)
-      .setContainerOperations(actions);
+      .setOperation(HBaseSemanticAttributes.Operation.BATCH);
     TraceUtil.traceWithIOException(() -> {
       int rpcTimeout = writeRpcTimeoutMs;
       boolean hasRead = false;
@@ -476,7 +473,6 @@ public void batch(final List<? extends Row> actions, final Object[] results, int
     final Span span = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
       .setOperation(HBaseSemanticAttributes.Operation.BATCH)
-      .setContainerOperations(actions)
       .build();
     try (Scope ignored = span.makeCurrent()) {
       AsyncRequestFuture ars = multiAp.submit(task);
@@ -485,7 +481,6 @@ public void batch(final List<? extends Row> actions, final Object[] results, int
         TraceUtil.setError(span, ars.getErrors());
         throw ars.getErrors();
       }
-      span.setStatus(StatusCode.OK);
     } finally {
       span.end();
     }
@@ -517,7 +512,6 @@ public static <R> void doBatchWithCallback(List<? extends Row> actions, Object[]
     final Span span = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
       .setOperation(HBaseSemanticAttributes.Operation.BATCH)
-      .setContainerOperations(actions)
       .build();
     try (Scope ignored = span.makeCurrent()) {
       AsyncRequestFuture ars = connection.getAsyncProcess().submit(task);
@@ -557,8 +551,7 @@ protected Void rpcCall() throws Exception {
   public void delete(final List<Delete> deletes) throws IOException {
     final Supplier<Span> supplier = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
-      .setOperation(HBaseSemanticAttributes.Operation.BATCH)
-      .setContainerOperations(deletes);
+      .setOperation(HBaseSemanticAttributes.Operation.BATCH);
     TraceUtil.traceWithIOException(() -> {
       Object[] results = new Object[deletes.size()];
       try {
@@ -607,8 +600,7 @@ protected Void rpcCall() throws Exception {
   public void put(final List<Put> puts) throws IOException {
     final Supplier<Span> supplier = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
-      .setOperation(HBaseSemanticAttributes.Operation.BATCH)
-      .setContainerOperations(puts);
+      .setOperation(HBaseSemanticAttributes.Operation.BATCH);
     TraceUtil.traceWithIOException(() -> {
       for (Put put : puts) {
         validatePut(put);
@@ -626,8 +618,7 @@ public void put(final List<Put> puts) throws IOException {
   public Result mutateRow(final RowMutations rm) throws IOException {
     final Supplier<Span> supplier = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
-      .setOperation(HBaseSemanticAttributes.Operation.BATCH)
-      .setContainerOperations(rm);
+      .setOperation(HBaseSemanticAttributes.Operation.BATCH);
     return TraceUtil.trace(() -> {
       long nonceGroup = getNonceGroup();
       long nonce = getNonce();
@@ -782,8 +773,7 @@ public boolean checkAndPut(final byte [] row, final byte [] family, final byte [
       final byte [] value, final Put put) throws IOException {
     final Supplier<Span> supplier = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
-      .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE)
-      .setContainerOperations(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE, HBaseSemanticAttributes.Operation.PUT);
+      .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
     return TraceUtil.trace(
       () -> doCheckAndMutate(row, family, qualifier, CompareOperator.EQUAL, value, null, null, put)
         .isSuccess(),
@@ -796,8 +786,7 @@ public boolean checkAndPut(final byte [] row, final byte [] family, final byte [
       final CompareOp compareOp, final byte [] value, final Put put) throws IOException {
     final Supplier<Span> supplier = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
-      .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE)
-      .setContainerOperations(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE, HBaseSemanticAttributes.Operation.PUT);
+      .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
     return TraceUtil.trace(
       () -> doCheckAndMutate(row, family, qualifier, toCompareOperator(compareOp), value, null,
         null, put).isSuccess(),
@@ -810,8 +799,7 @@ public boolean checkAndPut(final byte [] row, final byte [] family, final byte [
       final CompareOperator op, final byte [] value, final Put put) throws IOException {
     final Supplier<Span> supplier = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
-      .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE)
-      .setContainerOperations(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE, HBaseSemanticAttributes.Operation.PUT);
+      .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
     return TraceUtil.trace(
       () -> doCheckAndMutate(row, family, qualifier, op, value, null, null, put).isSuccess(),
       supplier);
@@ -823,8 +811,7 @@ public boolean checkAndDelete(final byte[] row, final byte[] family, final byte[
     final byte[] value, final Delete delete) throws IOException {
     final Supplier<Span> supplier = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
-      .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE)
-      .setContainerOperations(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE, HBaseSemanticAttributes.Operation.DELETE);
+      .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
     return TraceUtil.trace(
       () -> doCheckAndMutate(row, family, qualifier, CompareOperator.EQUAL, value, null, null,
         delete).isSuccess(),
@@ -837,8 +824,7 @@ public boolean checkAndDelete(final byte[] row, final byte[] family, final byte[
     final CompareOp compareOp, final byte[] value, final Delete delete) throws IOException {
     final Supplier<Span> supplier = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
-      .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE)
-      .setContainerOperations(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE, HBaseSemanticAttributes.Operation.DELETE);
+      .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
     return TraceUtil.trace(
       () -> doCheckAndMutate(row, family, qualifier, toCompareOperator(compareOp), value, null,
         null, delete).isSuccess(),
@@ -851,8 +837,7 @@ public boolean checkAndDelete(final byte[] row, final byte[] family, final byte[
     final CompareOperator op, final byte[] value, final Delete delete) throws IOException {
     final Supplier<Span> supplier = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
-      .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE)
-      .setContainerOperations(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE, HBaseSemanticAttributes.Operation.DELETE);
+      .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
     return TraceUtil.trace(
       () -> doCheckAndMutate(row, family, qualifier, op, value, null, null, delete).isSuccess(),
       supplier);
@@ -929,8 +914,7 @@ public boolean checkAndMutate(final byte [] row, final byte [] family, final byt
     final CompareOp compareOp, final byte [] value, final RowMutations rm) throws IOException {
     final Supplier<Span> supplier = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
-      .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE)
-      .setContainerOperations(rm);
+      .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
     return TraceUtil.trace(
       () -> doCheckAndMutate(row, family, qualifier, toCompareOperator(compareOp), value, null,
         null, rm).isSuccess(),
@@ -943,8 +927,7 @@ public boolean checkAndMutate(final byte [] row, final byte [] family, final byt
       final CompareOperator op, final byte [] value, final RowMutations rm) throws IOException {
     final Supplier<Span> supplier = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
-      .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE)
-      .setContainerOperations(rm);
+      .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
     return TraceUtil.trace(
       () -> doCheckAndMutate(row, family, qualifier, op, value, null, null, rm).isSuccess(),
       supplier);
@@ -954,8 +937,7 @@ public boolean checkAndMutate(final byte [] row, final byte [] family, final byt
   public CheckAndMutateResult checkAndMutate(CheckAndMutate checkAndMutate) throws IOException {
     final Supplier<Span> supplier = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
-      .setOperation(checkAndMutate)
-      .setContainerOperations(checkAndMutate);
+      .setOperation(checkAndMutate);
     return TraceUtil.trace(() -> {
       Row action = checkAndMutate.getAction();
       if (action instanceof Put || action instanceof Delete || action instanceof Increment ||
@@ -1004,8 +986,7 @@ public List<CheckAndMutateResult> checkAndMutate(List<CheckAndMutate> checkAndMu
     throws IOException {
     final Supplier<Span> supplier = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
-      .setOperation(HBaseSemanticAttributes.Operation.BATCH)
-      .setContainerOperations(checkAndMutates);
+      .setOperation(HBaseSemanticAttributes.Operation.BATCH);
     return TraceUtil.trace(() -> {
       if (checkAndMutates.isEmpty()) {
         return Collections.emptyList();
@@ -1075,8 +1056,7 @@ public boolean exists(final Get get) throws IOException {
   public boolean[] exists(List<Get> gets) throws IOException {
     final Supplier<Span> supplier = new TableOperationSpanBuilder(connection)
       .setTableName(tableName)
-      .setOperation(HBaseSemanticAttributes.Operation.BATCH)
-      .setContainerOperations(gets);
+      .setOperation(HBaseSemanticAttributes.Operation.BATCH);
     return TraceUtil.trace(() -> {
       if (gets.isEmpty()) {
         return new boolean[] {};

hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncTableImpl.java

@@ -386,8 +386,7 @@ public CompletableFuture<Boolean> thenPut(Put put) {
       validatePut(put, conn.connConf.getMaxKeyValueSize());
       preCheck();
       final Supplier<Span> supplier = newTableOperationSpanBuilder()
-        .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE)
-        .setContainerOperations(put);
+        .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
       return tracedFuture(
         () -> RawAsyncTableImpl.this.<Boolean> newCaller(row, put.getPriority(), rpcTimeoutNs)
           .action((controller, loc, stub) -> RawAsyncTableImpl.mutate(controller, loc, stub, put,
@@ -402,8 +401,7 @@ public CompletableFuture<Boolean> thenPut(Put put) {
     public CompletableFuture<Boolean> thenDelete(Delete delete) {
       preCheck();
       final Supplier<Span> supplier = newTableOperationSpanBuilder()
-        .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE)
-        .setContainerOperations(delete);
+        .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
       return tracedFuture(
         () -> RawAsyncTableImpl.this.<Boolean> newCaller(row, delete.getPriority(), rpcTimeoutNs)
           .action((controller, loc, stub) -> RawAsyncTableImpl.mutate(controller, loc, stub, delete,
@@ -419,8 +417,7 @@ public CompletableFuture<Boolean> thenMutate(RowMutations mutations) {
       preCheck();
       validatePutsInRowMutations(mutations, conn.connConf.getMaxKeyValueSize());
       final Supplier<Span> supplier = newTableOperationSpanBuilder()
-        .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE)
-        .setContainerOperations(mutations);
+        .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
       return tracedFuture(
         () -> RawAsyncTableImpl.this
           .<Boolean> newCaller(row, mutations.getMaxPriority(), rpcTimeoutNs)
@@ -463,8 +460,7 @@ public CheckAndMutateWithFilterBuilder timeRange(TimeRange timeRange) {
     public CompletableFuture<Boolean> thenPut(Put put) {
       validatePut(put, conn.connConf.getMaxKeyValueSize());
       final Supplier<Span> supplier = newTableOperationSpanBuilder()
-        .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE)
-        .setContainerOperations(put);
+        .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
       return tracedFuture(
         () -> RawAsyncTableImpl.this.<Boolean> newCaller(row, put.getPriority(), rpcTimeoutNs)
         .action((controller, loc, stub) -> RawAsyncTableImpl.mutate(controller, loc,
@@ -479,8 +475,7 @@ public CompletableFuture<Boolean> thenPut(Put put) {
     @Override
     public CompletableFuture<Boolean> thenDelete(Delete delete) {
       final Supplier<Span> supplier = newTableOperationSpanBuilder()
-        .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE)
-        .setContainerOperations(delete);
+        .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
       return tracedFuture(
         () -> RawAsyncTableImpl.this.<Boolean> newCaller(row, delete.getPriority(), rpcTimeoutNs)
           .action((controller, loc, stub) -> RawAsyncTableImpl.mutate(controller, loc, stub, delete,
@@ -495,8 +490,7 @@ public CompletableFuture<Boolean> thenDelete(Delete delete) {
     public CompletableFuture<Boolean> thenMutate(RowMutations mutations) {
       validatePutsInRowMutations(mutations, conn.connConf.getMaxKeyValueSize());
       final Supplier<Span> supplier = newTableOperationSpanBuilder()
-        .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE)
-        .setContainerOperations(mutations);
+        .setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
       return tracedFuture(
         () -> RawAsyncTableImpl.this
           .<Boolean> newCaller(row, mutations.getMaxPriority(), rpcTimeoutNs)
@@ -518,8 +512,7 @@ public CheckAndMutateWithFilterBuilder checkAndMutate(byte[] row, Filter filter)
   @Override
   public CompletableFuture<CheckAndMutateResult> checkAndMutate(CheckAndMutate checkAndMutate) {
     final Supplier<Span> supplier = newTableOperationSpanBuilder()
-      .setOperation(checkAndMutate)
-      .setContainerOperations(checkAndMutate.getAction());
+      .setOperation(checkAndMutate);
     return tracedFuture(() -> {
       if (checkAndMutate.getAction() instanceof Put ||
         checkAndMutate.getAction() instanceof Delete ||
@@ -572,8 +565,7 @@ public CompletableFuture<CheckAndMutateResult> checkAndMutate(CheckAndMutate che
   public List<CompletableFuture<CheckAndMutateResult>>
     checkAndMutate(List<CheckAndMutate> checkAndMutates) {
     final Supplier<Span> supplier = newTableOperationSpanBuilder()
-      .setOperation(checkAndMutates)
-      .setContainerOperations(checkAndMutates);
+      .setOperation(checkAndMutates);
     return tracedFutures(
       () -> batch(checkAndMutates, rpcTimeoutNs).stream()
         .map(f -> f.thenApply(r -> (CheckAndMutateResult) r)).collect(toList()),
@@ -629,8 +621,7 @@ public CompletableFuture<Result> mutateRow(RowMutations mutations) {
     long nonceGroup = conn.getNonceGenerator().getNonceGroup();
     long nonce = conn.getNonceGenerator().newNonce();
     final Supplier<Span> supplier = newTableOperationSpanBuilder()
-      .setOperation(mutations)
-      .setContainerOperations(mutations);
+      .setOperation(mutations);
     return tracedFuture(
       () -> this
         .<Result> newCaller(mutations.getRow(), mutations.getMaxPriority(), writeRpcTimeoutNs)
@@ -703,32 +694,28 @@ public void onComplete() {
   @Override
   public List<CompletableFuture<Result>> get(List<Get> gets) {
     final Supplier<Span> supplier = newTableOperationSpanBuilder()
-      .setOperation(gets)
-      .setContainerOperations(HBaseSemanticAttributes.Operation.GET);
+      .setOperation(gets);
     return tracedFutures(() -> batch(gets, readRpcTimeoutNs), supplier);
   }
 
   @Override
   public List<CompletableFuture<Void>> put(List<Put> puts) {
     final Supplier<Span> supplier = newTableOperationSpanBuilder()
-      .setOperation(puts)
-      .setContainerOperations(HBaseSemanticAttributes.Operation.PUT);
+      .setOperation(puts);
     return tracedFutures(() -> voidMutate(puts), supplier);
   }
 
   @Override
   public List<CompletableFuture<Void>> delete(List<Delete> deletes) {
     final Supplier<Span> supplier = newTableOperationSpanBuilder()
-      .setOperation(deletes)
-      .setContainerOperations(HBaseSemanticAttributes.Operation.DELETE);
+      .setOperation(deletes);
     return tracedFutures(() -> voidMutate(deletes), supplier);
   }
 
   @Override
   public <T> List<CompletableFuture<T>> batch(List<? extends Row> actions) {
     final Supplier<Span> supplier = newTableOperationSpanBuilder()
-      .setOperation(actions)
-      .setContainerOperations(actions);
+      .setOperation(actions);
     return tracedFutures(() -> batch(actions, rpcTimeoutNs), supplier);
   }