Skip to content

Commit

Permalink
GOCBC-1096: Add durability level to request spans
Browse files Browse the repository at this point in the history 
Motivation
----------
The observability RFC has added a requirement to set a durability
attribute on outer spans if durability level > none.

Changes
-------
If durability level is > none then add a durability attribute to
the request span containing the durability level as a string.

Change-Id: I746df7aee3271ec5186c78c61b52328faaed7bed
Reviewed-on: http://review.couchbase.org/c/gocb/+/153463
Tested-by: Charles Dixon <chvckd@gmail.com>
Reviewed-by: Brett Lawson <brett19@gmail.com>
  • Loading branch information
@chvck
chvck committed May 20, 2021
1 parent ec58a2e commit 6bc0de3
Show file tree
Hide file tree
Showing 6 changed files with 164 additions and 194 deletions.
42 changes: 14 additions & 28 deletions collection_binary_crud_test.go
View file
Expand Up @@ -48,12 +48,9 @@ func (suite *IntegrationTestSuite) TestBinaryAppend() {
suite.Require().Contains(suite.tracer.Spans, nil)
nilParents := suite.tracer.Spans[nil]
suite.Require().Equal(len(nilParents), 3)
suite.AssertKvOpSpan(nilParents[0], "upsert", memd.CmdSet.Name(), 1,
false, true)
suite.AssertKvOpSpan(nilParents[1], "append", memd.CmdAppend.Name(), 1,
false, false)
suite.AssertKvOpSpan(nilParents[2], "get", memd.CmdGet.Name(), 1,
false, false)
suite.AssertKvOpSpan(nilParents[0], "upsert", memd.CmdSet.Name(), 1, false, true, DurabilityLevelNone)
suite.AssertKvOpSpan(nilParents[1], "append", memd.CmdAppend.Name(), 1, false, false, DurabilityLevelNone)
suite.AssertKvOpSpan(nilParents[2], "get", memd.CmdGet.Name(), 1, false, false, DurabilityLevelNone)

suite.AssertKVMetrics(meterNameCBOperations, "upsert", 1, false)
suite.AssertKVMetrics(meterNameCBOperations, "append", 1, false)
Expand Down Expand Up @@ -110,12 +107,9 @@ func (suite *IntegrationTestSuite) TestBinaryPrepend() {
suite.Require().Contains(suite.tracer.Spans, nil)
nilParents := suite.tracer.Spans[nil]
suite.Require().Equal(len(nilParents), 3)
suite.AssertKvOpSpan(nilParents[0], "upsert", memd.CmdSet.Name(), 1,
false, true)
suite.AssertKvOpSpan(nilParents[1], "prepend", memd.CmdPrepend.Name(), 1,
false, false)
suite.AssertKvOpSpan(nilParents[2], "get", memd.CmdGet.Name(), 1,
false, false)
suite.AssertKvOpSpan(nilParents[0], "upsert", memd.CmdSet.Name(), 1, false, true, DurabilityLevelNone)
suite.AssertKvOpSpan(nilParents[1], "prepend", memd.CmdPrepend.Name(), 1, false, false, DurabilityLevelNone)
suite.AssertKvOpSpan(nilParents[2], "get", memd.CmdGet.Name(), 1, false, false, DurabilityLevelNone)

suite.AssertKVMetrics(meterNameCBOperations, "upsert", 1, false)
suite.AssertKVMetrics(meterNameCBOperations, "prepend", 1, false)
Expand Down Expand Up @@ -193,14 +187,10 @@ func (suite *IntegrationTestSuite) TestBinaryIncrement() {
suite.Require().Contains(suite.tracer.Spans, nil)
nilParents := suite.tracer.Spans[nil]
suite.Require().Equal(len(nilParents), 4)
suite.AssertKvOpSpan(nilParents[0], "increment", memd.CmdIncrement.Name(), 1,
false, false)
suite.AssertKvOpSpan(nilParents[1], "increment", memd.CmdIncrement.Name(), 1,
false, false)
suite.AssertKvOpSpan(nilParents[2], "increment", memd.CmdIncrement.Name(), 1,
false, false)
suite.AssertKvOpSpan(nilParents[3], "get", memd.CmdGet.Name(), 1,
false, false)
suite.AssertKvOpSpan(nilParents[0], "increment", memd.CmdIncrement.Name(), 1, false, false, DurabilityLevelNone)
suite.AssertKvOpSpan(nilParents[1], "increment", memd.CmdIncrement.Name(), 1, false, false, DurabilityLevelNone)
suite.AssertKvOpSpan(nilParents[2], "increment", memd.CmdIncrement.Name(), 1, false, false, DurabilityLevelNone)
suite.AssertKvOpSpan(nilParents[3], "get", memd.CmdGet.Name(), 1, false, false, DurabilityLevelNone)

suite.AssertKVMetrics(meterNameCBOperations, "increment", 3, false)
suite.AssertKVMetrics(meterNameCBOperations, "get", 1, false)
Expand Down Expand Up @@ -277,14 +267,10 @@ func (suite *IntegrationTestSuite) TestBinaryDecrement() {
suite.Require().Contains(suite.tracer.Spans, nil)
nilParents := suite.tracer.Spans[nil]
suite.Require().Equal(len(nilParents), 4)
suite.AssertKvOpSpan(nilParents[0], "decrement", memd.CmdDecrement.Name(), 1,
false, false)
suite.AssertKvOpSpan(nilParents[1], "decrement", memd.CmdDecrement.Name(), 1,
false, false)
suite.AssertKvOpSpan(nilParents[2], "decrement", memd.CmdDecrement.Name(), 1,
false, false)
suite.AssertKvOpSpan(nilParents[3], "get", memd.CmdGet.Name(), 1,
false, false)
suite.AssertKvOpSpan(nilParents[0], "decrement", memd.CmdDecrement.Name(), 1, false, false, DurabilityLevelNone)
suite.AssertKvOpSpan(nilParents[1], "decrement", memd.CmdDecrement.Name(), 1, false, false, DurabilityLevelNone)
suite.AssertKvOpSpan(nilParents[2], "decrement", memd.CmdDecrement.Name(), 1, false, false, DurabilityLevelNone)
suite.AssertKvOpSpan(nilParents[3], "get", memd.CmdGet.Name(), 1, false, false, DurabilityLevelNone)

suite.AssertKVMetrics(meterNameCBOperations, "decrement", 3, false)
suite.AssertKVMetrics(meterNameCBOperations, "get", 1, false)
Expand Down

0 comments on commit 6bc0de3

Please sign in to comment.