Fix Python Sample App dep and collector extension names #701
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vasireddy99
requested review from
Aneurysm9,
codeboten,
tsloughter and
tylerbenson
as code owners
vasireddy99
changed the title
ocelotl
reviewed
May 23, 2023
| @@ -48,12 +48,12 @@ package: build | |||
|
|
|||
| .PHONY: publish | |||
| publish: | |||
| aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/collector-extension-$(GOARCH).zip --compatible-runtimes nodejs14.x nodejs16.x nodejs18.x java11 python3.8 python3.9 --query 'LayerVersionArn' --output text | |||
| aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/opentelemetry-collector-layer-$(GOARCH).zip --compatible-runtimes nodejs14.x nodejs16.x nodejs18.x java11 python3.8 python3.9 --query 'LayerVersionArn' --output text | |||
There was a problem hiding this comment.
I see that the name for the file produced in the .PHONY: package is opentelemetry-collector-layer-$(GOARCH).zip. Is this fixing an issue where the .PHONY: publish action was failing because it couldn't find the file to publish? 🤔
There was a problem hiding this comment.
Yes That is correct and it will publish now with this change, it wasn't able to find the file since it was renamed.
ocelotl
reviewed
May 23, 2023
|
|
||
| .PHONY: publish-layer | ||
| publish-layer: package | ||
| @echo Publishing collector extension layer... | ||
| aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/collector-extension-$(GOARCH).zip --compatible-runtimes nodejs14.x nodejs16.x nodejs18.x java11 python3.8 python3.9 --query 'LayerVersionArn' --output text | ||
| aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/opentelemetry-collector-layer-$(GOARCH).zip --compatible-runtimes nodejs14.x nodejs16.x nodejs18.x java11 python3.8 python3.9 --query 'LayerVersionArn' --output text |
There was a problem hiding this comment.
I found collector-extension-$(GOARCH).zip elsewhere in this repo:
tigre@hilleman:~/github/ocelotl/opentelemetry-lambda$ ack collector-extension
go/integration-tests/aws-sdk/wrapper/main.tf
4: filename = "${path.module}/../../../../collector/build/collector-extension-amd64.zip"
7: source_code_hash = filebase64sha256("${path.module}/../../../../collector/build/collector-extension-amd64.zip")
python/integration-tests/aws-sdk/wrapper/main.tf
12: filename = "${path.module}/../../../../collector/build/collector-extension-amd64.zip"
15: source_code_hash = filebase64sha256("${path.module}/../../../../collector/build/collector-extension-amd64.zip")
nodejs/integration-tests/aws-sdk/wrapper/main.tf
12: filename = "${path.module}/../../../../collector/build/collector-extension-amd64.zip"
15: source_code_hash = filebase64sha256("${path.module}/../../../../collector/build/collector-extension-amd64.zip")
collector/Makefile
51: aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/collector-extension-$(GOARCH).zip --compatible-runtimes nodejs14.x nodejs16.x nodejs18.x java11 python3.8 python3.9 --query 'LayerVersionArn' --output text
56: aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/collector-extension-$(GOARCH).zip --compatible-runtimes nodejs14.x nodejs16.x nodejs18.x java11 python3.8 python3.9 --query 'LayerVersionArn' --output text
java/integration-tests/okhttp/wrapper/main.tf
12: filename = "${path.module}/../../../../collector/build/collector-extension-amd64.zip"
15: source_code_hash = filebase64sha256("${path.module}/../../../../collector/build/collector-extension-amd64.zip")
java/integration-tests/aws-sdk/wrapper/main.tf
12: filename = "${path.module}/../../../../collector/build/collector-extension-amd64.zip"
15: source_code_hash = filebase64sha256("${path.module}/../../../../collector/build/collector-extension-amd64.zip")
java/integration-tests/aws-sdk/agent/main.tf
12: filename = "${path.module}/../../../../collector/build/collector-extension-amd64.zip"
15: source_code_hash = filebase64sha256("${path.module}/../../../../collector/build/collector-extension-amd64.zip")
dotnet/integration-tests/aws-sdk/wrapper/main.tf
4: filename = "${path.module}/../../../../collector/build/collector-extension-amd64.zip"
7: source_code_hash = filebase64sha256("${path.module}/../../../../collector/build/collector-extension-amd64.zip")
utils/sam/run.sh
95: rm -f build/collector-extension-amd64.zip
do we need to also change those other occurrences?
There was a problem hiding this comment.
The rest of the occurrences in the .tf files are invalid for use in this repo. I am going to PR soon to remove those unused files in this repo.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes the python sample app, so it can pick up the right boto3 package versions that compatible with urlib3 and to solve the following error.
Also fixes the naming conventions of collector extension layer.