Skip to content

Commit c404756

Browse files
maxdaymaxday
authored
Merge branch 'open-telemetry:main' into maxday/use-sha-for-github-actions
2 parents 9157dc4 + 5b45bed commit c404756

File tree

11 files changed

+58
-39
lines changed

11 files changed

+58
-39
lines changed

‎.github/workflows/ci-collector.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ on:
1414
branches:
1515
- main
1616

17+
permissions:
18+
contents: read
19+
1720
jobs:
1821
test:
1922
runs-on: ubuntu-latest

‎.github/workflows/ci-nodejs.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ on:
1414
branches:
1515
- main
1616

17+
permissions:
18+
contents: read
19+
1720
jobs:
1821
build:
1922
runs-on: ubuntu-latest

‎.github/workflows/ci-python.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ env:
2020
# https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/.github/workflows/test.yml#L9
2121
CORE_REPO_SHA: v1.19.0
2222

23+
permissions:
24+
contents: read
25+
2326
jobs:
2427
build:
2528
runs-on: ubuntu-latest

‎.github/workflows/ci-shellcheck.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: "Continuous Build (shellcheck)"
22

33
on: [push, pull_request]
44

5+
permissions:
6+
contents: read
7+
58
jobs:
69
shellcheck:
710
runs-on: ubuntu-latest

‎.github/workflows/ci-terraform.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ on:
1414
branches:
1515
- main
1616

17+
permissions:
18+
contents: read
19+
1720
jobs:
1821
check-terraform-syntax:
1922
runs-on: ubuntu-latest

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ on:
2020
schedule:
2121
- cron: '37 10 * * 2'
2222

23+
permissions:
24+
contents: read
25+
2326
jobs:
2427
analyze:
2528
name: Analyze

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
![GitHub NodeJS Workflow Status](https://img.shields.io/github/actions/workflow/status/open-telemetry/opentelemetry-lambda/ci-nodejs.yml?branch%3Amain&label=CI%20%28NodeJS%29&style=for-the-badge)
66
![GitHub Terraform Lint Workflow Status](https://img.shields.io/github/actions/workflow/status/open-telemetry/opentelemetry-lambda/ci-terraform.yml?branch%3Amain&label=CI%20%28Terraform%20Lint%29&style=for-the-badge)
77
![GitHub Python Pull Request Workflow Status](https://img.shields.io/github/actions/workflow/status/open-telemetry/opentelemetry-lambda/ci-python.yml?branch%3Amain&label=Pull%20Request%20%28Python%29&style=for-the-badge)
8+
[![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/open-telemetry/opentelemetry-lambda/badge?style=for-the-badge)](https://scorecard.dev/viewer/?uri=github.com/open-telemetry/opentelemetry-lambda)
89

910
## OpenTelemetry Lambda Layers
1011

‎python/src/otel/otel_sdk/nodeps-requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# TODO: move these dependencies to requirements.txt when they stopped relying on a pinned version of
22
# opentelemetry-propagator-aws-xray
3-
opentelemetry-instrumentation-aws-lambda==0.54b0
4-
opentelemetry-instrumentation-botocore==0.54b0
3+
opentelemetry-instrumentation-aws-lambda==0.54b1
4+
opentelemetry-instrumentation-botocore==0.54b1

‎python/src/otel/otel_sdk/requirements.txt‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
opentelemetry-sdk==1.33.0
2-
opentelemetry-exporter-otlp-proto-http==1.33.0
3-
opentelemetry-distro==0.54b0
4-
opentelemetry-instrumentation==0.54b0
5-
opentelemetry-semantic-conventions==0.54b0
1+
opentelemetry-sdk==1.33.1
2+
opentelemetry-exporter-otlp-proto-http==1.33.1
3+
opentelemetry-distro==0.54b1
4+
opentelemetry-instrumentation==0.54b1
5+
opentelemetry-semantic-conventions==0.54b1
66
opentelemetry-propagator-aws-xray==1.0.2
77

88
# Instrumentation dependencies
9-
opentelemetry-instrumentation-aiohttp-client==0.54b0
10-
opentelemetry-util-http==0.54b0
11-
opentelemetry-instrumentation-asgi==0.54b0
12-
opentelemetry-instrumentation-asyncpg==0.54b0
13-
opentelemetry-instrumentation-boto==0.54b0
14-
opentelemetry-instrumentation-boto3sqs==0.54b0
15-
opentelemetry-instrumentation-celery==0.54b0
16-
opentelemetry-instrumentation-dbapi==0.54b0
17-
opentelemetry-instrumentation-django==0.54b0
18-
opentelemetry-instrumentation-elasticsearch==0.54b0
19-
opentelemetry-instrumentation-fastapi==0.54b0
20-
opentelemetry-instrumentation-falcon==0.54b0
21-
opentelemetry-instrumentation-flask==0.54b0
22-
opentelemetry-instrumentation-grpc==0.54b0
23-
opentelemetry-instrumentation-jinja2==0.54b0
24-
opentelemetry-instrumentation-mysql==0.54b0
25-
opentelemetry-instrumentation-psycopg2==0.54b0
26-
opentelemetry-instrumentation-pymemcache==0.54b0
27-
opentelemetry-instrumentation-pymongo==0.54b0
28-
opentelemetry-instrumentation-pymysql==0.54b0
29-
opentelemetry-instrumentation-pyramid==0.54b0
30-
opentelemetry-instrumentation-redis==0.54b0
31-
opentelemetry-instrumentation-requests==0.54b0
32-
opentelemetry-instrumentation-sqlalchemy==0.54b0
33-
opentelemetry-instrumentation-sqlite3==0.54b0
34-
opentelemetry-instrumentation-starlette==0.54b0
35-
opentelemetry-instrumentation-tornado==0.54b0
36-
opentelemetry-instrumentation-wsgi==0.54b0
9+
opentelemetry-instrumentation-aiohttp-client==0.54b1
10+
opentelemetry-util-http==0.54b1
11+
opentelemetry-instrumentation-asgi==0.54b1
12+
opentelemetry-instrumentation-asyncpg==0.54b1
13+
opentelemetry-instrumentation-boto==0.54b1
14+
opentelemetry-instrumentation-boto3sqs==0.54b1
15+
opentelemetry-instrumentation-celery==0.54b1
16+
opentelemetry-instrumentation-dbapi==0.54b1
17+
opentelemetry-instrumentation-django==0.54b1
18+
opentelemetry-instrumentation-elasticsearch==0.54b1
19+
opentelemetry-instrumentation-fastapi==0.54b1
20+
opentelemetry-instrumentation-falcon==0.54b1
21+
opentelemetry-instrumentation-flask==0.54b1
22+
opentelemetry-instrumentation-grpc==0.54b1
23+
opentelemetry-instrumentation-jinja2==0.54b1
24+
opentelemetry-instrumentation-mysql==0.54b1
25+
opentelemetry-instrumentation-psycopg2==0.54b1
26+
opentelemetry-instrumentation-pymemcache==0.54b1
27+
opentelemetry-instrumentation-pymongo==0.54b1
28+
opentelemetry-instrumentation-pymysql==0.54b1
29+
opentelemetry-instrumentation-pyramid==0.54b1
30+
opentelemetry-instrumentation-redis==0.54b1
31+
opentelemetry-instrumentation-requests==0.54b1
32+
opentelemetry-instrumentation-sqlalchemy==0.54b1
33+
opentelemetry-instrumentation-sqlite3==0.54b1
34+
opentelemetry-instrumentation-starlette==0.54b1
35+
opentelemetry-instrumentation-tornado==0.54b1
36+
opentelemetry-instrumentation-wsgi==0.54b1

‎python/src/otel/tests/nodeps-requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
opentelemetry-instrumentation-aws-lambda==0.54b0
1+
opentelemetry-instrumentation-aws-lambda==0.54b1

0 commit comments

Comments
 (0)