Merge pull request #2094 from aws-observability/hotfix/backport22707

Backport fix for X-Ray

.github/workflows/CI.yml

@@ -134,6 +134,10 @@ jobs:
         echo "replace go.opentelemetry.io/collector => ./pkg/opentelemetry-collector" >> go.mod
         cat go.mod
         ls pkg
+
+    - name: Apply patches
+      run: make apply-patches
+
     #Cache go build and dependencies before making unit testing and build
     #Samples codes for different OS: https://github.com/actions/cache/blob/main/examples.md#go---modules
     #Since we are using Linux, the go packages are in /go/pkg/mod and build are in /.cache/go-build

.github/workflows/PR-build.yml

@@ -86,6 +86,11 @@ jobs:
     - name: Checkout
       if: ${{ needs.changes.outputs.changed == 'true' }}
       uses: actions/checkout@v3
+
+    - name: apply patches
+      if: ${{ needs.changes.outputs.changed == 'true' }}
+      run: make apply-patches
+
     - name: install tools
       if: ${{ needs.changes.outputs.changed == 'true' }}
       run: make install-tools
@@ -115,6 +120,10 @@ jobs:
       if: ${{ needs.changes.outputs.changed == 'true' }}
       uses: actions/checkout@v3
 
+    - name: Apply patches
+      if: ${{ needs.changes.outputs.changed == 'true' }}
+      run: make apply-patches
+
     - name: Cache go
       if: ${{ needs.changes.outputs.changed == 'true' }}
       uses: actions/cache@v3

Makefile

@@ -24,7 +24,7 @@ ALL_SHELL_SCRIPTS := "tools/ctl/linux/aws-otel-collector-ctl"
 
 BUILD_INFO_IMPORT_PATH=$(AOC_IMPORT_PATH)/tools/version
 
-GOBUILD=GO111MODULE=on CGO_ENABLED=0 installsuffix=cgo go build -trimpath
+GOBUILD=GO111MODULE=on CGO_ENABLED=0 GOPROXY=off installsuffix=cgo go build -trimpath
 
 # Use linker flags to provide version/build settings
 LDFLAGS=-ldflags "-s -w -X $(BUILD_INFO_IMPORT_PATH).GitHash=$(GIT_SHA) \
@@ -50,7 +50,9 @@ $(GOMODULES):
 .PHONY: for-all-target
 for-all-target: $(GOMODULES)
 
-
+PATCHES := $(shell find ./patches -name *.patch)
+apply-patches: $(PATCHES)
+	$(foreach patch,$(PATCHES), patch --posix --forward -p1 < $(patch))
 
 all-modules:
 	@echo $(ALL_MODULES) | tr ' ' '\n' | sort

patches/2079-xray-ddb-attrs.patch

@@ -0,0 +1,28 @@
+--- a/vendor/github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/translator/aws.go
++++ b/vendor/github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/translator/aws.go
+@@ -157,14 +157,19 @@ func makeAws(attributes map[string]pcommon.Value, resource pcommon.Resource, log
+ 		queueURL = value.Str()
+ 	}
+ 	if value, ok := attributes[conventions.AttributeAWSDynamoDBTableNames]; ok {
+-		if value.Slice().Len() == 1 {
+-			tableName = value.Slice().At(0).Str()
+-		} else if value.Slice().Len() > 1 {
+-			tableName = ""
+-			tableNames = []string{}
+-			for i := 0; i < value.Slice().Len(); i++ {
+-				tableNames = append(tableNames, value.Slice().At(i).Str())
++		switch value.Type() {
++		case pcommon.ValueTypeSlice:
++			if value.Slice().Len() == 1 {
++				tableName = value.Slice().At(0).Str()
++			} else if value.Slice().Len() > 1 {
++				tableName = ""
++				tableNames = []string{}
++				for i := 0; i < value.Slice().Len(); i++ {
++					tableNames = append(tableNames, value.Slice().At(i).Str())
++				}
+ 			}
++		case pcommon.ValueTypeStr:
++			tableName = value.Str()
+ 		}
+ 	}