Skip to content

Commit a4e6887

Browse files
authored
Upgrade to SDK 3.11 (#2116)
* Upgrade to SDK 3.11.0, Remove deprecated and redundant TracingIdentifiers.ATTR_OPERATION --------- Signed-off-by: Emilien Bevierre <emilien.bevierre@couchbase.com>
1 parent 259b6e7 commit a4e6887

4 files changed

Lines changed: 5 additions & 7 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</parent>
1919

2020
<properties>
21-
<couchbase>3.10.1</couchbase>
21+
<couchbase>3.11.0</couchbase>
2222
<springdata.commons>4.1.0-SNAPSHOT</springdata.commons>
2323
<java-module-name>spring.data.couchbase</java-module-name>
2424
<hibernate.validator>7.0.1.Final</hibernate.validator>

src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
import com.couchbase.client.core.cnc.CbTracing;
3535
import com.couchbase.client.core.cnc.RequestSpan;
36-
import com.couchbase.client.core.cnc.TracingIdentifiers;
3736
import com.couchbase.client.core.msg.kv.DurabilityLevel;
3837
import com.couchbase.client.core.transaction.CoreTransactionAttemptContext;
3938
import com.couchbase.client.core.transaction.support.SpanWrapper;
@@ -44,6 +43,7 @@
4443
/**
4544
* {@link ReactiveInsertByIdOperation} implementations for Couchbase.
4645
*
46+
* @author Emilien Bevierre
4747
* @author Michael Reiche
4848
* @author Tigran Babloyan
4949
*/
@@ -114,7 +114,7 @@ public Mono<T> one(T object) {
114114
CoreTransactionAttemptContext internal = ctxOpt.get().getCore();
115115
RequestSpan span = CbTracing.newSpan(internal.core().context(), TRANSACTION_OP_INSERT,
116116
internal.span());
117-
span.attribute(TracingIdentifiers.ATTR_OPERATION, TRANSACTION_OP_INSERT);
117+
118118
return internal
119119
.insert(makeCollectionIdentifier(collection.async()), converted.getId().toString(),
120120
template.getCouchbaseClientFactory().getCluster().environment().transcoder()

src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
import com.couchbase.client.core.cnc.CbTracing;
3434
import com.couchbase.client.core.cnc.RequestSpan;
35-
import com.couchbase.client.core.cnc.TracingIdentifiers;
3635
import com.couchbase.client.core.msg.kv.DurabilityLevel;
3736
import com.couchbase.client.core.transaction.CoreTransactionAttemptContext;
3837
import com.couchbase.client.core.transaction.CoreTransactionGetResult;
@@ -45,6 +44,7 @@
4544
/**
4645
* {@link ReactiveRemoveByIdOperation} implementations for Couchbase.
4746
*
47+
* @author Emilien Bevierre
4848
* @author Michael Reiche
4949
* @author Tigran Babloyan
5050
*/
@@ -125,7 +125,6 @@ public Mono<RemoveResult> one(final Object id) {
125125
}
126126
CoreTransactionAttemptContext internal = ctx;
127127
RequestSpan span = CbTracing.newSpan(internal.core().context(), TRANSACTION_OP_REMOVE, internal.span());
128-
span.attribute(TracingIdentifiers.ATTR_OPERATION, TRANSACTION_OP_REMOVE);
129128
return ctx.remove(getResult, new SpanWrapper(span)).map(r -> new RemoveResult(id.toString(), 0, null));
130129
});
131130

src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
import com.couchbase.client.core.cnc.CbTracing;
3535
import com.couchbase.client.core.cnc.RequestSpan;
36-
import com.couchbase.client.core.cnc.TracingIdentifiers;
3736
import com.couchbase.client.core.io.CollectionIdentifier;
3837
import com.couchbase.client.core.msg.kv.DurabilityLevel;
3938
import com.couchbase.client.core.transaction.CoreTransactionAttemptContext;
@@ -47,6 +46,7 @@
4746
/**
4847
* {@link ReactiveReplaceByIdOperation} implementations for Couchbase.
4948
*
49+
* @author Emilien Bevierre
5050
* @author Michael Reiche
5151
* @author Tigran Babloyan
5252
*/
@@ -134,7 +134,6 @@ public Mono<T> one(T object) {
134134
CoreTransactionAttemptContext internal = ctxOpt.get().getCore();
135135
RequestSpan span = CbTracing.newSpan(internal.core().context(), TRANSACTION_OP_REPLACE,
136136
internal.span());
137-
span.attribute(TracingIdentifiers.ATTR_OPERATION, TRANSACTION_OP_REPLACE);
138137
return ctx.replace(getResult, template.getCouchbaseClientFactory().getCluster().environment()
139138
.transcoder().encode(converted.export()).encoded(), new SpanWrapper(span));
140139
}).flatMap(

0 commit comments

Comments
 (0)