diff --git a/pom.xml b/pom.xml index 73b4dffef..af116c1a7 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ - 3.10.1 + 3.11.0 4.1.0-SNAPSHOT spring.data.couchbase 7.0.1.Final diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java index 5f8cc95c8..4d8f78e21 100644 --- a/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java +++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java @@ -33,7 +33,6 @@ import com.couchbase.client.core.cnc.CbTracing; import com.couchbase.client.core.cnc.RequestSpan; -import com.couchbase.client.core.cnc.TracingIdentifiers; import com.couchbase.client.core.msg.kv.DurabilityLevel; import com.couchbase.client.core.transaction.CoreTransactionAttemptContext; import com.couchbase.client.core.transaction.support.SpanWrapper; @@ -44,6 +43,7 @@ /** * {@link ReactiveInsertByIdOperation} implementations for Couchbase. * + * @author Emilien Bevierre * @author Michael Reiche * @author Tigran Babloyan */ @@ -114,7 +114,7 @@ public Mono one(T object) { CoreTransactionAttemptContext internal = ctxOpt.get().getCore(); RequestSpan span = CbTracing.newSpan(internal.core().context(), TRANSACTION_OP_INSERT, internal.span()); - span.attribute(TracingIdentifiers.ATTR_OPERATION, TRANSACTION_OP_INSERT); + return internal .insert(makeCollectionIdentifier(collection.async()), converted.getId().toString(), template.getCouchbaseClientFactory().getCluster().environment().transcoder() diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java index ee8ecd247..236ad2945 100644 --- a/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java +++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java @@ -32,7 +32,6 @@ import com.couchbase.client.core.cnc.CbTracing; import com.couchbase.client.core.cnc.RequestSpan; -import com.couchbase.client.core.cnc.TracingIdentifiers; import com.couchbase.client.core.msg.kv.DurabilityLevel; import com.couchbase.client.core.transaction.CoreTransactionAttemptContext; import com.couchbase.client.core.transaction.CoreTransactionGetResult; @@ -45,6 +44,7 @@ /** * {@link ReactiveRemoveByIdOperation} implementations for Couchbase. * + * @author Emilien Bevierre * @author Michael Reiche * @author Tigran Babloyan */ @@ -125,7 +125,6 @@ public Mono one(final Object id) { } CoreTransactionAttemptContext internal = ctx; RequestSpan span = CbTracing.newSpan(internal.core().context(), TRANSACTION_OP_REMOVE, internal.span()); - span.attribute(TracingIdentifiers.ATTR_OPERATION, TRANSACTION_OP_REMOVE); return ctx.remove(getResult, new SpanWrapper(span)).map(r -> new RemoveResult(id.toString(), 0, null)); }); diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java index 876a01702..ec6c57271 100644 --- a/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java +++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java @@ -33,7 +33,6 @@ import com.couchbase.client.core.cnc.CbTracing; import com.couchbase.client.core.cnc.RequestSpan; -import com.couchbase.client.core.cnc.TracingIdentifiers; import com.couchbase.client.core.io.CollectionIdentifier; import com.couchbase.client.core.msg.kv.DurabilityLevel; import com.couchbase.client.core.transaction.CoreTransactionAttemptContext; @@ -47,6 +46,7 @@ /** * {@link ReactiveReplaceByIdOperation} implementations for Couchbase. * + * @author Emilien Bevierre * @author Michael Reiche * @author Tigran Babloyan */ @@ -134,7 +134,6 @@ public Mono one(T object) { CoreTransactionAttemptContext internal = ctxOpt.get().getCore(); RequestSpan span = CbTracing.newSpan(internal.core().context(), TRANSACTION_OP_REPLACE, internal.span()); - span.attribute(TracingIdentifiers.ATTR_OPERATION, TRANSACTION_OP_REPLACE); return ctx.replace(getResult, template.getCouchbaseClientFactory().getCluster().environment() .transcoder().encode(converted.export()).encoded(), new SpanWrapper(span)); }).flatMap(