Skip to content

Commit 800e1be

Browse files
authored
Merge branch 'main' into dependabot/gradle/java/com.amazonaws-aws-lambda-java-events-3.11.3
2 parents f1e14fb + 40bfb8c commit 800e1be

File tree

35 files changed

+966
-1697
lines changed

35 files changed

+966
-1697
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
22

3-
* @Aneurysm9 @codeboten @tsloughter @tylerbenson
3+
* @open-telemetry/lambda-extension-approvers

.github/dependabot.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ updates:
1212
opentelemetry-deps-collector:
1313
patterns:
1414
- "*opentelemetry*"
15+
- package-ecosystem: "gomod"
16+
directory: "/collector/lambdacomponents"
17+
schedule:
18+
interval: "weekly"
19+
groups:
20+
opentelemetry-deps-lambdacomponents:
21+
patterns:
22+
- "*opentelemetry*"
1523
- package-ecosystem: "gradle"
1624
directory: "/java"
1725
schedule:
@@ -35,7 +43,7 @@ updates:
3543
- "@opentelemetry/*"
3644
rebase-strategy: "auto"
3745
- package-ecosystem: "pip"
38-
directory: "/python/src/otel/otel_sdk"
46+
directory: "/python/src/otel"
3947
schedule:
4048
interval: "weekly"
4149
groups:

.github/workflows/ci-collector.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
tidy:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
- uses: actions/setup-go@v4
2323
with:
24-
go-version: '^1.20.7'
24+
go-version: '^1.20.8'
2525
- uses: actions/cache@v3
2626
with:
2727
path: ~/go/pkg/mod
@@ -34,10 +34,10 @@ jobs:
3434
test:
3535
runs-on: ubuntu-latest
3636
steps:
37-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
3838
- uses: actions/setup-go@v4
3939
with:
40-
go-version: '^1.20.7'
40+
go-version: '^1.20.8'
4141
- uses: actions/cache@v3
4242
with:
4343
path: ~/go/pkg/mod
@@ -54,10 +54,10 @@ jobs:
5454
matrix:
5555
architecture: [ amd64, arm64 ]
5656
steps:
57-
- uses: actions/checkout@v3
57+
- uses: actions/checkout@v4
5858
- uses: actions/setup-go@v4
5959
with:
60-
go-version: '^1.20.7'
60+
go-version: '^1.20.8'
6161
- uses: actions/cache@v3
6262
with:
6363
path: ~/go/pkg/mod

.github/workflows/ci-java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
build:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
- uses: actions/setup-java@v3
2121
with:
2222
distribution: corretto

.github/workflows/ci-nodejs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
build:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
- uses: actions/setup-node@v3
2121
with:
2222
node-version: 14

.github/workflows/ci-shellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
shellcheck:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v3
9+
- uses: actions/checkout@v4
1010

1111
- name: Install shell check
1212
run: sudo apt update && sudo apt install --assume-yes shellcheck

.github/workflows/ci-terraform.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
check-terraform-syntax:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
- uses: hashicorp/setup-terraform@v2
2323
- run: terraform fmt -check -recursive

.github/workflows/codeql.yml

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,34 @@ jobs:
3838
strategy:
3939
fail-fast: false
4040
matrix:
41-
language: [ 'go', 'javascript', 'python', 'java' ]
41+
# Targets of the codeql analysis
42+
# Each entry is composed by two elements: the language and the directory
43+
# containing source code for that language.
44+
target:
45+
- language: 'go'
46+
directory: 'go'
47+
- language: 'javascript'
48+
directory: 'nodejs'
49+
- language: 'python'
50+
directory: 'python'
51+
- language: 'java'
52+
directory: 'java'
53+
- language: 'csharp'
54+
directory: 'dotnet'
4255
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
4356
# Use only 'java' to analyze code written in Java, Kotlin or both
4457
# Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
4558
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
4659

4760
steps:
4861
- name: Checkout repository
49-
uses: actions/checkout@v3
62+
uses: actions/checkout@v4
5063

5164
# Initializes the CodeQL tools for scanning.
5265
- name: Initialize CodeQL
5366
uses: github/codeql-action/init@v2
5467
with:
55-
languages: ${{ matrix.language }}
68+
languages: ${{ matrix.target.language }}
5669
# If you wish to specify custom queries, you can do so here or in a config file.
5770
# By default, queries listed here will override any specified in a config file.
5871
# Prefix the list here with "+" to use these queries and those in the config file.
@@ -65,7 +78,10 @@ jobs:
6578
# If this step fails, then you should remove it and run the build manually (see below)
6679
- name: Autobuild
6780
uses: github/codeql-action/autobuild@v2
68-
if: ${{ matrix.language != 'java' }}
81+
with:
82+
working-directory: ${{ matrix.target.directory }}
83+
# There are no array literals in GHA that is why we need to use fromJson.
84+
if: ${{ !contains(fromJson('["java", "csharp"]'), matrix.target.language) }}
6985

7086
# ℹ️ Command-line programs to run using the OS shell.
7187
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -82,16 +98,28 @@ jobs:
8298
with:
8399
distribution: corretto
84100
java-version: '11'
85-
if: ${{ matrix.language == 'java' }}
101+
if: ${{ matrix.target.language == 'java' }}
86102

87103
- name: build Java
88104
uses: gradle/gradle-build-action@v2
89105
with:
90106
arguments: build --no-build-cache
91-
build-root-directory: java
92-
if: ${{ matrix.language == 'java' }}
107+
build-root-directory: ${{ matrix.target.directory }}
108+
if: ${{ matrix.target.language == 'java' }}
109+
110+
- name: setup dotnet
111+
uses: actions/setup-dotnet@v3
112+
with:
113+
dotnet-version: 6.x
114+
if: ${{ matrix.target.language == 'csharp' }}
115+
116+
- name: build dotnet
117+
# Build all dotnet applications from this directory
118+
run: find . -name '*.sln' -exec dotnet build '{}' \;
119+
working-directory: ${{ matrix.target.directory }}
120+
if: ${{ matrix.target.language == 'csharp' }}
93121

94122
- name: Perform CodeQL Analysis
95123
uses: github/codeql-action/analyze@v2
96124
with:
97-
category: "/language:${{matrix.language}}"
125+
category: "/language:${{matrix.target.language}}"

.github/workflows/layer-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
with:
8181
name: ${{ inputs.artifact-name }}
8282

83-
- uses: aws-actions/configure-aws-credentials@v3
83+
- uses: aws-actions/configure-aws-credentials@v4
8484
with:
8585
role-to-assume: ${{ secrets.PROD_LAMBDA_ROLE_ARN }}
8686
role-duration-seconds: 1200

.github/workflows/pr-python.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: Checkout this repo
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727
- name: Setup Python for OTel Python SDK
2828
uses: actions/setup-python@v4
2929
with:
@@ -36,7 +36,7 @@ jobs:
3636
- name: Set up Go for ADOT Collector
3737
uses: actions/setup-go@v4
3838
with:
39-
go-version: '^1.20.7'
39+
go-version: '^1.20.8'
4040
- name: Build Python Layer which includes ADOT Collector
4141
working-directory: python/src
4242
run: ./run.sh -b

0 commit comments

Comments
 (0)