Build collector before we use SAM Docker Container

* The recent v0.39.0 collector introduced a change that required go 1.17
* We can't download go 1.17 in the Docker Container used by SAM
* We build the collector outside the Docker Container and just copy over later

.github/workflows/pr-python.yml

@@ -31,7 +31,9 @@ jobs:
         run: |
           pip install tox
           tox
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '^1.17'
       - name: Build layer
         working-directory: python/src
         run: ./run.sh -b
-

python/README.md

@@ -1,4 +1,4 @@
-# OpenTelemetry Lambda Python
+# OpenTelemetry Lambda Python TEST
 
 Scripts and files used to build AWS Lambda Layers for running OpenTelemetry on AWS Lambda for Python.
 

python/src/otel/Makefile

@@ -1,14 +1,6 @@
 export AOC=$(shell pwd)/otel_collector
 export SDK=$(shell pwd)/otel_sdk
 
-VERSION=$(shell cat $(AOC)/VERSION)
-GIT_SHA=$(shell git rev-parse HEAD)
-GOBUILD=GO111MODULE=on CGO_ENABLED=0 installsuffix=cgo go build -trimpath
-BUILD_INFO_IMPORT_PATH=main
-
-LDFLAGS=-ldflags "-s -w -X $(BUILD_INFO_IMPORT_PATH).GitHash=$(GIT_SHA) -X $(BUILD_INFO_IMPORT_PATH).Version=$(VERSION) \
--X github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter.collectorDistribution=aws-otel-collector-lambda"
-
 build-OTelLayer:
 	mkdir -p $(ARTIFACTS_DIR)/python
 	python3 -m pip install -r $(SDK)/requirements.txt -t $(ARTIFACTS_DIR)/python
@@ -20,9 +12,7 @@ build-OTelLayer:
 	rm -rf $(ARTIFACTS_DIR)/python/boto*
 	rm -rf $(ARTIFACTS_DIR)/python/urllib3*
 
-	rpm --rebuilddb
-	yum install -y go
-	mkdir -p $(ARTIFACTS_DIR)/extensions
-	cd $(AOC) && $(GOBUILD) $(LDFLAGS) -o $(ARTIFACTS_DIR)/extensions/collector .
+	mkdir -p $(ARTIFACTS_DIR)/extensions/collector
+	cp -r $(AOC)/extensions/collector $(ARTIFACTS_DIR)/extensions/collector
 	mkdir -p $(ARTIFACTS_DIR)/collector-config
 	cp $(AOC)/config* $(ARTIFACTS_DIR)/collector-config/

utils/sam/run.sh

@@ -89,6 +89,25 @@ main() {
 		rm -rf otel/otel_collector
 		mkdir -p otel/otel_collector
 		cp -r "$collectorPath"/* otel/otel_collector
+
+		echo "run.sh: building the collector..."
+		cd otel/otel_collector
+		mkdir -p ./extensions
+		GO111MODULE=on \
+			CGO_ENABLED=0 \
+			installsuffix=cgo \
+			go build -trimpath \
+				-ldflags "
+					-s
+					-w
+					-X main.GitHash=$(git rev-parse HEAD)
+					-X main.Version=$(cat ./VERSION)
+					-X github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter.collectorDistribution=aws-otel-collector-lambda
+				" \
+				-o ./extensions/collector .
+		cd ../../
+
+		echo "run.sh: Starting sam build."
 		sam build -u -t $template
 	fi