Skip to content

Commit

Permalink
Update RAIN API core and open telemetry
Browse files Browse the repository at this point in the history
  • Loading branch information
gjclark committed Sep 12, 2024
1 parent ea53862 commit 904dfc5
Showing 7 changed files with 24 additions and 12 deletions.
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -276,7 +276,12 @@ tea-dependency-builder: build/lambda-ci.Dockerfile
@mkdir -p $(EMPTY)
@touch $@

requirements/requirements-dev.txt: requirements/requirements-dev.in requirements/requirements.txt
requirements/requirements.txt: requirements/requirements.in requirements/constraints.txt

requirements/requirements-dev.txt: \
requirements/requirements-dev.in \
requirements/constraints.txt \
requirements/requirements.txt

requirements/%.txt: requirements/%.in
$(DOCKER_DEPENDENCY_BUILDER) pip-compile -q -U --cache-dir /var/task/$(DIR)/.pip-cache/ $<
2 changes: 1 addition & 1 deletion cloudformation/thin-egress-app.yaml.j2
Original file line number Diff line number Diff line change
@@ -633,7 +633,7 @@ Resources:
Runtime: 'python3.8'
Layers:
- !Ref EgressLambdaDependencyLayer
- !Sub "arn:aws:lambda:${AWS::Region}:901920570463:layer:aws-otel-python38-ver-1-5-0:3"
- !Sub "arn:aws:lambda:${AWS::Region}:901920570463:layer:aws-otel-python-amd64-ver-1-25-0:1"
MemorySize: !Ref LambdaMemory

ExtDomainName:
3 changes: 3 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# This needs to match the version of the otel lambda layer in cloudformation
# https://aws-otel.github.io/docs/getting-started/lambda/lambda-python#add-the-arn-of-the-lambda-layer
opentelemetry-api==1.25.0
1 change: 1 addition & 0 deletions requirements/requirements-dev.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-c constraints.txt
-c requirements.txt
boto3
moto[awslambda]
14 changes: 8 additions & 6 deletions requirements/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@
#
# pip-compile requirements/requirements-dev.in
#
boto3==1.35.14
boto3==1.35.18
# via
# -r requirements/requirements-dev.in
# moto
botocore==1.35.14
botocore==1.35.18
# via
# -c requirements/requirements.txt
# boto3
@@ -42,7 +42,7 @@ exceptiongroup==1.2.2
# via pytest
idna==3.8
# via requests
importlib-metadata==8.4.0
importlib-metadata==7.1.0
# via
# build
# opentelemetry-api
@@ -64,8 +64,10 @@ markupsafe==2.1.5
# werkzeug
moto[awslambda]==5.0.14
# via -r requirements/requirements-dev.in
opentelemetry-api==1.27.0
# via opentelemetry-instrumentation
opentelemetry-api==1.25.0
# via
# -c requirements/constraints.txt
# opentelemetry-instrumentation
opentelemetry-instrumentation==0.48b0
# via -r requirements/requirements-dev.in
packaging==24.1
@@ -84,7 +86,7 @@ pyproject-hooks==1.1.0
# via
# build
# pip-tools
pytest==8.3.2
pytest==8.3.3
# via
# -r requirements/requirements-dev.in
# pytest-cov
3 changes: 2 additions & 1 deletion requirements/requirements.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
-c constraints.txt
cachetools
cfnresponse
chalice
git+https://github.com/asfadmin/rain-api-core.git@a9a00d126878f56213af972f6fb5bf6bb1490909
git+https://github.com/asfadmin/rain-api-core.git@f5186c00c8e9d576f710eac62e6ca1e51516d6d7
netaddr
6 changes: 3 additions & 3 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
@@ -6,9 +6,9 @@
#
blessed==1.20.0
# via inquirer
botocore==1.35.14
botocore==1.35.18
# via chalice
cachetools==5.0.0
cachetools==5.5.0
# via
# -r requirements/requirements.in
# rain-api-core
@@ -48,7 +48,7 @@ pyyaml==6.0.2
# via
# chalice
# rain-api-core
rain-api-core @ git+https://github.com/asfadmin/rain-api-core.git@a9a00d126878f56213af972f6fb5bf6bb1490909
rain-api-core @ git+https://github.com/asfadmin/rain-api-core.git@f5186c00c8e9d576f710eac62e6ca1e51516d6d7
# via -r requirements/requirements.in
readchar==4.2.0
# via inquirer

0 comments on commit 904dfc5

Please sign in to comment.