feat: support parallel processing for couchbase integration test (#882)

* Added support for parallel processing for couchbase integration test * Added support for couchbase integration test parallel execution in tekton
instana · Sep 11, 2024 · 4c622fe · 4c622fe
1 parent f6878c5
commit 4c622fe
Show file tree

Hide file tree

Showing 16 changed files with 239 additions and 112 deletions.
diff --git a/.tekton/ci-build/pipeline.yaml b/.tekton/ci-build/pipeline.yaml
@@ -122,10 +122,6 @@ spec:
     - name: integration-test-couchbase
       runAfter:
         - integration-test-common
-      when:
-        - input: "$(params.go-version)"
-          operator: in
-          values: ["1.23"]
       params:
       - name: imageTag
         value: $(params.go-version)

diff --git a/.tekton/ci-build/task.yaml b/.tekton/ci-build/task.yaml
@@ -249,12 +249,21 @@ metadata:
 spec:
   sidecars:
     - name: couchbase
-      image: couchbase/server-sandbox:7.2.4
+      image: couchbase/server:7.1.4
       readinessProbe:
         httpGet:
            path: /ui/index.html
            port: 8091
         initialDelaySeconds: 60
+    - name: couchbase-setup
+      image: curlimages/curl
+      script: |
+        #!/bin/sh
+        sleep 30 && \
+        curl -v -X POST http://127.0.0.1:8091/pools/default -d memoryQuota=2024 -d indexMemoryQuota=512 && \
+        curl -v http://127.0.0.1:8091/node/controller/setupServices -d services=kv%2Ceventing%2Cindex%2Cn1ql%2Ccbas%2Cfts && \
+        curl -v http://127.0.0.1:8091/settings/web -d port=8091 -d username=Administrator -d password=password && \
+        curl -i -u Administrator:password -X POST http://127.0.0.1:8091/settings/indexes -d 'storageMode=memory_optimized'
   params:
   - name: imageTag
     type: string

diff --git a/docker-compose-integration.yaml b/docker-compose-integration.yaml
@@ -2,8 +2,25 @@ version: '3'
 
 services:
 
-  couchbase-server-sandbox:
-    image: couchbase/server-sandbox:7.1.1
+  couchbase:
+    image: couchbase/server:7.1.4
+    hostname: couchbase
     ports:
-      - 8091-8094:8091-8094
-      - 11210:11210
+      - '8091-8096:8091-8096'
+      - '11210:11210'
+
+  couchbase-setup:
+    image: amd64/centos:7
+    platform: linux/amd64
+    depends_on:
+      - couchbase
+    restart: "no"
+    entrypoint:
+      - "bash"
+      - "-ecx"
+      - |
+          sleep 30 && \
+          curl -v -X POST http://couchbase:8091/pools/default -d memoryQuota=2024 -d indexMemoryQuota=512 && \
+          curl -v http://couchbase:8091/node/controller/setupServices -d services=kv%2Ceventing%2Cindex%2Cn1ql%2Ccbas%2Cfts && \
+          curl -v http://couchbase:8091/settings/web -d port=8091 -d username=Administrator -d password=password && \
+          curl -i -u Administrator:password -X POST http://couchbase:8091/settings/indexes -d 'storageMode=memory_optimized'
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -19,11 +19,28 @@ services:
       - 5671:5671
       - 5672:5672
 
-  couchbase-server-sandbox:
-    image: couchbase/server-sandbox:7.1.1
+  couchbase:
+    image: couchbase/server:7.1.4
+    hostname: couchbase
     ports:
-      - 8091-8094:8091-8094
-      - 11210:11210
+      - '8091-8096:8091-8096'
+      - '11210:11210'
+
+  couchbase-setup:
+    image: amd64/centos:7
+    platform: linux/amd64
+    depends_on:
+      - couchbase
+    restart: "no"
+    entrypoint:
+      - "bash"
+      - "-ecx"
+      - |
+          sleep 30 && \
+          curl -v -X POST http://couchbase:8091/pools/default -d memoryQuota=2048 -d indexMemoryQuota=1024 && \
+          curl -v http://couchbase:8091/node/controller/setupServices -d services=kv%2Ceventing%2Cindex%2Cn1ql%2Ccbas%2Cfts && \
+          curl -v http://couchbase:8091/settings/web -d port=8091 -d username=Administrator -d password=password && \
+          curl -i -u Administrator:password -X POST http://couchbase:8091/settings/indexes -d 'storageMode=memory_optimized'
 
   redis:
     image: redis

diff --git a/instrumentation/instagocb/bucket_manager_test.go b/instrumentation/instagocb/bucket_manager_test.go
@@ -16,6 +16,7 @@ import (
 func TestBucketManager(t *testing.T) {
 	defer instana.ShutdownSensor()
 	recorder, ctx, cluster, a := prepare(t)
+	defer cluster.Close(&gocb.ClusterCloseOptions{})
 
 	bucketMgr := cluster.Buckets()
 

diff --git a/instrumentation/instagocb/cluster.go b/instrumentation/instagocb/cluster.go
@@ -128,6 +128,10 @@ func (ic *instaCluster) WrapTransactionAttemptContext(tac *gocb.TransactionAttem
 	return createTransactionAttemptContext(ic.iTracer, tac, parentSpan)
 }
 
+func (ic *instaCluster) Close(opts *gocb.ClusterCloseOptions) error {
+	return ic.Cluster.Close(opts)
+}
+
 // Helper functions
 
 // createCluster will wrap *gocb.Cluster in to instaCluster and will return it as Cluster interface

diff --git a/instrumentation/instagocb/cluster_test.go b/instrumentation/instagocb/cluster_test.go
@@ -17,10 +17,12 @@ import (
 
 func TestCluster(t *testing.T) {
 	defer instana.ShutdownSensor()
-	recorder, ctx, cluster, a, _ := prepareWithATestDocumentInCollection(t, "cluster")
+
+	recorder, ctx, cluster, a := prepare(t)
+	defer cluster.Close(&gocb.ClusterCloseOptions{})
 
 	// Query
-	q := "SELECT count(*) FROM `" + testBucketName + "`." + testScope + "." + testCollection + ";"
+	q := "SELECT count(*) FROM `" + cbTestBucket + "`." + cbTestScope + "." + cbTestCollection + ";"
 	_, err := cluster.Query(q, &gocb.QueryOptions{ParentSpan: instagocb.GetParentSpanFromContext(ctx)})
 	a.NoError(err)
 
@@ -41,8 +43,8 @@ func TestCluster(t *testing.T) {
 	err = cluster.SearchIndexes().UpsertIndex(
 		gocb.SearchIndex{
 			Type:       "fulltext-index",
-			Name:       "sample-index",
-			SourceName: testBucketName,
+			Name:       "sample-index" + testID,
+			SourceName: cbTestBucket,
 			SourceType: "couchbase",
 			PlanParams: map[string]interface{}{
 				"maxPartitionsPerPIndex": 171,
@@ -79,7 +81,7 @@ func TestCluster(t *testing.T) {
 	time.Sleep(4 * time.Second)
 
 	matchResult, err := cluster.SearchQuery(
-		"sample-index",
+		"sample-index"+testID,
 		search.NewMatchQuery("test"),
 		&gocb.SearchOptions{
 			Limit:      10,
@@ -106,7 +108,7 @@ func TestCluster(t *testing.T) {
 		Bucket: "",
 		Host:   "localhost",
 		Type:   "",
-		SQL:    "SEARCH sample-index",
+		SQL:    "SEARCH sample-index" + testID,
 		Error:  "",
 	}, data.Tags)
 

diff --git a/instrumentation/instagocb/collection_ds_list_test.go b/instrumentation/instagocb/collection_ds_list_test.go
@@ -19,12 +19,14 @@ func TestCollection_DS_List(t *testing.T) {
 	defer unsetAllowRootExitSpanEnv()
 
 	defer instana.ShutdownSensor()
-	recorder, _, cluster, a, _ := prepareWithATestDocumentInCollection(t, "ds_list")
 
-	collection := cluster.Bucket(testBucketName).Scope(testScope).Collection(testCollection)
+	recorder, _, cluster, a := prepare(t)
+	defer cluster.Close(&gocb.ClusterCloseOptions{})
+
+	collection := cluster.Bucket(cbTestBucket).Scope(cbTestScope).Collection(cbTestCollection)
 
 	// List
-	l := collection.List(testDocumentID)
+	l := collection.List(dsListTestDocumentID)
 
 	// Iterator
 	_, err := l.Iterator()
@@ -36,7 +38,7 @@ func TestCollection_DS_List(t *testing.T) {
 	a.IsType(instana.CouchbaseSpanData{}, span.Data)
 	data := span.Data.(instana.CouchbaseSpanData)
 	a.Equal(instana.CouchbaseSpanTags{
-		Bucket: testBucketName,
+		Bucket: cbTestBucket,
 		Host:   "localhost",
 		Type:   string(gocb.CouchbaseBucketType),
 		SQL:    "LIST_ITERATOR",
@@ -54,7 +56,7 @@ func TestCollection_DS_List(t *testing.T) {
 	a.IsType(instana.CouchbaseSpanData{}, span.Data)
 	data = span.Data.(instana.CouchbaseSpanData)
 	a.Equal(instana.CouchbaseSpanTags{
-		Bucket: testBucketName,
+		Bucket: cbTestBucket,
 		Host:   "localhost",
 		Type:   string(gocb.CouchbaseBucketType),
 		SQL:    "LIST_AT",
@@ -71,7 +73,7 @@ func TestCollection_DS_List(t *testing.T) {
 	a.IsType(instana.CouchbaseSpanData{}, span.Data)
 	data = span.Data.(instana.CouchbaseSpanData)
 	a.Equal(instana.CouchbaseSpanTags{
-		Bucket: testBucketName,
+		Bucket: cbTestBucket,
 		Host:   "localhost",
 		Type:   string(gocb.CouchbaseBucketType),
 		SQL:    "LIST_APPEND",
@@ -88,7 +90,7 @@ func TestCollection_DS_List(t *testing.T) {
 	a.IsType(instana.CouchbaseSpanData{}, span.Data)
 	data = span.Data.(instana.CouchbaseSpanData)
 	a.Equal(instana.CouchbaseSpanTags{
-		Bucket: testBucketName,
+		Bucket: cbTestBucket,
 		Host:   "localhost",
 		Type:   string(gocb.CouchbaseBucketType),
 		SQL:    "LIST_PREPEND",
@@ -106,7 +108,7 @@ func TestCollection_DS_List(t *testing.T) {
 	a.IsType(instana.CouchbaseSpanData{}, span.Data)
 	data = span.Data.(instana.CouchbaseSpanData)
 	a.Equal(instana.CouchbaseSpanTags{
-		Bucket: testBucketName,
+		Bucket: cbTestBucket,
 		Host:   "localhost",
 		Type:   string(gocb.CouchbaseBucketType),
 		SQL:    "LIST_INDEX_OF",
@@ -124,7 +126,7 @@ func TestCollection_DS_List(t *testing.T) {
 	a.IsType(instana.CouchbaseSpanData{}, span.Data)
 	data = span.Data.(instana.CouchbaseSpanData)
 	a.Equal(instana.CouchbaseSpanTags{
-		Bucket: testBucketName,
+		Bucket: cbTestBucket,
 		Host:   "localhost",
 		Type:   string(gocb.CouchbaseBucketType),
 		SQL:    "LIST_SIZE",
@@ -141,7 +143,7 @@ func TestCollection_DS_List(t *testing.T) {
 	a.IsType(instana.CouchbaseSpanData{}, span.Data)
 	data = span.Data.(instana.CouchbaseSpanData)
 	a.Equal(instana.CouchbaseSpanTags{
-		Bucket: testBucketName,
+		Bucket: cbTestBucket,
 		Host:   "localhost",
 		Type:   string(gocb.CouchbaseBucketType),
 		SQL:    "LIST_REMOVE_AT",
@@ -158,7 +160,7 @@ func TestCollection_DS_List(t *testing.T) {
 	a.IsType(instana.CouchbaseSpanData{}, span.Data)
 	data = span.Data.(instana.CouchbaseSpanData)
 	a.Equal(instana.CouchbaseSpanTags{
-		Bucket: testBucketName,
+		Bucket: cbTestBucket,
 		Host:   "localhost",
 		Type:   string(gocb.CouchbaseBucketType),
 		SQL:    "LIST_CLEAR",

diff --git a/instrumentation/instagocb/collection_ds_map_test.go b/instrumentation/instagocb/collection_ds_map_test.go
@@ -19,12 +19,14 @@ func TestCollection_DS_Map(t *testing.T) {
 	defer unsetAllowRootExitSpanEnv()
 
 	defer instana.ShutdownSensor()
-	recorder, _, cluster, a, _ := prepareWithATestDocumentInCollection(t, "ds_map")
 
-	collection := cluster.Bucket(testBucketName).Scope(testScope).Collection(testCollection)
+	recorder, _, cluster, a := prepare(t)
+	defer cluster.Close(&gocb.ClusterCloseOptions{})
+
+	collection := cluster.Bucket(cbTestBucket).Scope(cbTestScope).Collection(cbTestCollection)
 
 	// Map
-	m := collection.Map(testDocumentID)
+	m := collection.Map(dsMapTestDocumentID)
 
 	// Iterator
 	_, err := m.Iterator()
@@ -36,7 +38,7 @@ func TestCollection_DS_Map(t *testing.T) {
 	a.IsType(instana.CouchbaseSpanData{}, span.Data)
 	data := span.Data.(instana.CouchbaseSpanData)
 	a.Equal(instana.CouchbaseSpanTags{
-		Bucket: testBucketName,
+		Bucket: cbTestBucket,
 		Host:   "localhost",
 		Type:   string(gocb.CouchbaseBucketType),
 		SQL:    "MAP_ITERATOR",
@@ -54,7 +56,7 @@ func TestCollection_DS_Map(t *testing.T) {
 	a.IsType(instana.CouchbaseSpanData{}, span.Data)
 	data = span.Data.(instana.CouchbaseSpanData)
 	a.Equal(instana.CouchbaseSpanTags{
-		Bucket: testBucketName,
+		Bucket: cbTestBucket,
 		Host:   "localhost",
 		Type:   string(gocb.CouchbaseBucketType),
 		SQL:    "MAP_AT",
@@ -71,7 +73,7 @@ func TestCollection_DS_Map(t *testing.T) {
 	a.IsType(instana.CouchbaseSpanData{}, span.Data)
 	data = span.Data.(instana.CouchbaseSpanData)
 	a.Equal(instana.CouchbaseSpanTags{
-		Bucket: testBucketName,
+		Bucket: cbTestBucket,
 		Host:   "localhost",
 		Type:   string(gocb.CouchbaseBucketType),
 		SQL:    "MAP_ADD",
@@ -88,7 +90,7 @@ func TestCollection_DS_Map(t *testing.T) {
 	a.IsType(instana.CouchbaseSpanData{}, span.Data)
 	data = span.Data.(instana.CouchbaseSpanData)
 	a.Equal(instana.CouchbaseSpanTags{
-		Bucket: testBucketName,
+		Bucket: cbTestBucket,
 		Host:   "localhost",
 		Type:   string(gocb.CouchbaseBucketType),
 		SQL:    "MAP_REMOVE",
@@ -106,7 +108,7 @@ func TestCollection_DS_Map(t *testing.T) {
 	a.IsType(instana.CouchbaseSpanData{}, span.Data)
 	data = span.Data.(instana.CouchbaseSpanData)
 	a.Equal(instana.CouchbaseSpanTags{
-		Bucket: testBucketName,
+		Bucket: cbTestBucket,
 		Host:   "localhost",
 		Type:   string(gocb.CouchbaseBucketType),
 		SQL:    "MAP_EXISTS",
@@ -124,7 +126,7 @@ func TestCollection_DS_Map(t *testing.T) {
 	a.IsType(instana.CouchbaseSpanData{}, span.Data)
 	data = span.Data.(instana.CouchbaseSpanData)
 	a.Equal(instana.CouchbaseSpanTags{
-		Bucket: testBucketName,
+		Bucket: cbTestBucket,
 		Host:   "localhost",
 		Type:   string(gocb.CouchbaseBucketType),
 		SQL:    "MAP_SIZE",
@@ -142,7 +144,7 @@ func TestCollection_DS_Map(t *testing.T) {
 	a.IsType(instana.CouchbaseSpanData{}, span.Data)
 	data = span.Data.(instana.CouchbaseSpanData)
 	a.Equal(instana.CouchbaseSpanTags{
-		Bucket: testBucketName,
+		Bucket: cbTestBucket,
 		Host:   "localhost",
 		Type:   string(gocb.CouchbaseBucketType),
 		SQL:    "MAP_KEYS",
@@ -160,7 +162,7 @@ func TestCollection_DS_Map(t *testing.T) {
 	a.IsType(instana.CouchbaseSpanData{}, span.Data)
 	data = span.Data.(instana.CouchbaseSpanData)
 	a.Equal(instana.CouchbaseSpanTags{
-		Bucket: testBucketName,
+		Bucket: cbTestBucket,
 		Host:   "localhost",
 		Type:   string(gocb.CouchbaseBucketType),
 		SQL:    "MAP_VALUES",
@@ -177,7 +179,7 @@ func TestCollection_DS_Map(t *testing.T) {
 	a.IsType(instana.CouchbaseSpanData{}, span.Data)
 	data = span.Data.(instana.CouchbaseSpanData)
 	a.Equal(instana.CouchbaseSpanTags{
-		Bucket: testBucketName,
+		Bucket: cbTestBucket,
 		Host:   "localhost",
 		Type:   string(gocb.CouchbaseBucketType),
 		SQL:    "MAP_CLEAR",