Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</parent>

<properties>
<couchbase>3.10.1</couchbase>
<couchbase>3.11.0</couchbase>
<springdata.commons>4.1.0-SNAPSHOT</springdata.commons>
<java-module-name>spring.data.couchbase</java-module-name>
<hibernate.validator>7.0.1.Final</hibernate.validator>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -44,6 +43,7 @@
/**
* {@link ReactiveInsertByIdOperation} implementations for Couchbase.
*
* @author Emilien Bevierre
* @author Michael Reiche
* @author Tigran Babloyan
*/
Expand Down Expand Up @@ -114,7 +114,7 @@ public Mono<T> 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);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious, I see the ATTR_OPERATION span attributes have been removed but I don't see any reasoning in the release notes.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nm. I see the change here as it was part of JDBC-2207. 👍🏻


return internal
.insert(makeCollectionIdentifier(collection.async()), converted.getId().toString(),
template.getCouchbaseClientFactory().getCluster().environment().transcoder()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -45,6 +44,7 @@
/**
* {@link ReactiveRemoveByIdOperation} implementations for Couchbase.
*
* @author Emilien Bevierre
* @author Michael Reiche
* @author Tigran Babloyan
*/
Expand Down Expand Up @@ -125,7 +125,6 @@ public Mono<RemoveResult> 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));
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -47,6 +46,7 @@
/**
* {@link ReactiveReplaceByIdOperation} implementations for Couchbase.
*
* @author Emilien Bevierre
* @author Michael Reiche
* @author Tigran Babloyan
*/
Expand Down Expand Up @@ -134,7 +134,6 @@ public Mono<T> 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(
Expand Down
Loading