Skip to content

Commit 0512778

Browse files
wpesserswpessers
authored
Merge branch 'open-telemetry:main' into feat/nodejs/update-auto-instrumentation-defaults
2 parents e5c0a54 + ccb0158 commit 0512778

File tree

29 files changed

+1607
-663
lines changed

29 files changed

+1607
-663
lines changed

‎.github/lychee.toml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
include-fragments = true
2+
3+
accept = ["200..=299", "429"]
4+
5+
exclude = [
6+
"^http(s)?://localhost",
7+
"^http(s)?://example.com",
8+
"https://docs.aws.amazon.com",
9+
"https://console.aws.amazon.com"
10+
]
11+
12+
# better to be safe and avoid failures
13+
max-retries = 6

‎.github/workflows/check-links.yaml‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,51 @@
1-
name: "Link Check"
1+
name: check-links
22
on:
33
push:
44
branches: [main]
55
pull_request:
66

77
concurrency:
8-
group: ${{ github.workflow }}-${{ github.head_ref }}
8+
group: ${{ github.workflow }}-${{ github.ref_name }}
9+
cancel-in-progress: true
10+
11+
permissions: read-all
12+
913
jobs:
1014
changedfiles:
1115
name: changed files
1216
runs-on: ubuntu-latest
1317
env:
1418
PR_HEAD: ${{ github.event.pull_request.head.sha }}
1519
outputs:
16-
md: ${{ steps.changes.outputs.md }}
20+
files: ${{ steps.changes.outputs.files }}
1721
steps:
1822
- name: Checkout Repo
19-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
23+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2024
with:
2125
fetch-depth: 0
2226
- name: Get changed files
2327
id: changes
2428
run: |
25-
echo "md=$(git diff --name-only --diff-filter=ACMRTUXB $(git merge-base origin/main $PR_HEAD) $PR_HEAD | grep .md$ | xargs)" >> $GITHUB_OUTPUT
29+
files=$(git diff --name-only --diff-filter=ACMRTUXB $(git merge-base origin/main $PR_HEAD) $PR_HEAD | grep .md$ | xargs)
30+
31+
if [ -z "$files" ] && git diff --name-only $(git merge-base origin/main $PR_HEAD) $PR_HEAD | grep -q "package.json"; then
32+
files="**/*.md"
33+
fi
2634
35+
echo "files=$files" >> $GITHUB_OUTPUT
2736
check-links:
2837
runs-on: ubuntu-latest
2938
needs: changedfiles
30-
if: ${{needs.changedfiles.outputs.md}}
39+
if: ${{needs.changedfiles.outputs.files}}
3140
steps:
3241
- name: Checkout Repo
33-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
42+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3443
with:
3544
fetch-depth: 0
3645

37-
- name: Run markdown-link-check
38-
run: |
39-
npx --no -- markdown-link-check \
40-
--verbose \
41-
--config .github/workflows/check_links_config.json \
42-
${{needs.changedfiles.outputs.md}} \
43-
|| { echo "Check that anchor links are lowercase"; exit 1; }
46+
- name: Link Checker
47+
id: lychee
48+
uses: lycheeverse/lychee-action@f613c4a64e50d792e0b31ec34bbcbba12263c6a6
49+
with:
50+
args: "--verbose --no-progress ${{needs.changedfiles.outputs.files}} --config .github/lychee.toml"
51+
failIfEmpty: false

‎.github/workflows/check_links_config.json‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
matrix:
2929
# If you add a python version here, please make sure that the collector/Makefile publish and publish-layer targets
3030
# get updated as well
31-
python: ['3.8', '3.9', '3.10', '3.11', '3.12']
31+
python: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
3232

3333
steps:
3434
- name: Checkout this repo

‎.github/workflows/ossf-scorecard.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: OSSF Scorecard
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
schedule:
8+
- cron: "59 7 * * 6" # once a week
9+
workflow_dispatch:
10+
11+
permissions: read-all
12+
13+
jobs:
14+
analysis:
15+
runs-on: ubuntu-latest
16+
permissions:
17+
# Needed for Code scanning upload
18+
security-events: write
19+
# Needed for GitHub OIDC token if publish_results is true
20+
id-token: write
21+
steps:
22+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
23+
with:
24+
persist-credentials: false
25+
26+
- uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
27+
with:
28+
results_file: results.sarif
29+
results_format: sarif
30+
publish_results: true
31+
32+
# Upload the results as artifacts (optional). Commenting out will disable
33+
# uploads of run results in SARIF format to the repository Actions tab.
34+
# https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
35+
- name: "Upload artifact"
36+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
37+
with:
38+
name: SARIF file
39+
path: results.sarif
40+
retention-days: 5
41+
42+
# Upload the results to GitHub's code scanning dashboard (optional).
43+
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
44+
- name: "Upload to code-scanning"
45+
uses: github/codeql-action/upload-sarif@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
46+
with:
47+
sarif_file: results.sarif

‎.github/workflows/publish-layer-collector.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
artifact-name: opentelemetry-collector-layer-${{ matrix.architecture }}.zip
123123
layer-name: opentelemetry-collector
124124
architecture: ${{ matrix.architecture }}
125-
runtimes: "nodejs16.x nodejs18.x nodejs20.x nodejs22.x java11 java17 java21 python3.8 python3.9 python3.10 python3.11 python3.12"
125+
runtimes: "nodejs16.x nodejs18.x nodejs20.x nodejs22.x java11 java17 java21 python3.8 python3.9 python3.10 python3.11 python3.12 python3.13"
126126
release-group: prod
127127
aws_region: ${{ matrix.aws_region }}
128128
role-arn: ${{ github.event.inputs.role-arn }}

‎collector/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ package: build
4747

4848
.PHONY: publish
4949
publish:
50-
aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/opentelemetry-collector-layer-$(GOARCH).zip --compatible-runtimes nodejs16.x nodejs18.x nodejs20.x nodejs22.x java11 java17 java21 python3.8 python3.9 python3.10 python3.11 python3.12 --query 'LayerVersionArn' --output text
50+
aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/opentelemetry-collector-layer-$(GOARCH).zip --compatible-runtimes nodejs16.x nodejs18.x nodejs20.x nodejs22.x java11 java17 java21 python3.8 python3.9 python3.10 python3.11 python3.12 python3.13 --query 'LayerVersionArn' --output text
5151

5252
.PHONY: publish-layer
5353
publish-layer: package
5454
@echo Publishing collector extension layer...
55-
aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/opentelemetry-collector-layer-$(GOARCH).zip --compatible-runtimes nodejs16.x nodejs18.x nodejs20.x nodejs22.x java11 java17 java21 python3.8 python3.9 python3.10 python3.11 python3.12 --query 'LayerVersionArn' --output text
55+
aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/opentelemetry-collector-layer-$(GOARCH).zip --compatible-runtimes nodejs16.x nodejs18.x nodejs20.x nodejs22.x java11 java17 java21 python3.8 python3.9 python3.10 python3.11 python3.12 python3.13 --query 'LayerVersionArn' --output text
5656
@echo OpenTelemetry Collector layer published.
5757

5858
.PHONY: set-otelcol-version

‎collector/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Once this build-tag is present, you need provide additional build-tags to includ
2727
- `lambdacomponents.processor.all` includes all available processors
2828
- `lambdacomponents.receiver.all` includes all available receivers
2929

30-
Each available component can also be included explicitly by using its specific build-tag. For a full-list of available components, have a look into the [lambdacomponents](./collector/lambdacomponents) package.
30+
Each available component can also be included explicitly by using its specific build-tag. For a full-list of available components, have a look into the [lambdacomponents](./lambdacomponents) package.
3131

3232
As an example, the full command to publish OpenTelemetry Collector Lambda layer in your AWS account and get its ARN including the following components:
3333
- All receivers
@@ -42,10 +42,10 @@ cd collector && BUILDTAGS="lambdacomponents.custom,lambdacomponents.receiver.all
4242
```
4343

4444
### Adding additional options
45-
To add more options for a customized build, you can add your desired component to the [lambdacomponents](./collector/lambdacomponents) package.
45+
To add more options for a customized build, you can add your desired component to the [lambdacomponents](./lambdacomponents) package.
4646
Make sure to always restrict your addition using the appropriate build-tags.
4747

48-
For example, if you want to add the extension `foo`, the file providing this extension should be located in the [extension](./collector/lambdacomponents/extension) directory have the following build restriction:
48+
For example, if you want to add the extension `foo`, the file providing this extension should be located in the [extension](./lambdacomponents/extension) directory have the following build restriction:
4949
```
5050
//go:build lambdacomponents.custom && (lambdacomponents.all || lambdacomponents.extension.all || lambdacomponents.extension.foo)
5151
```

‎collector/go.mod‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ replace cloud.google.com/go => cloud.google.com/go v0.107.0
2020

2121
require (
2222
github.com/golang-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259
23-
github.com/google/go-cmp v0.6.0
23+
github.com/google/go-cmp v0.7.0
2424
github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.119.0
2525
github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.119.0
2626
github.com/open-telemetry/opentelemetry-lambda/collector/lambdacomponents v0.98.0
@@ -43,24 +43,24 @@ require (
4343
github.com/alecthomas/participle/v2 v2.1.1 // indirect
4444
github.com/antchfx/xmlquery v1.4.3 // indirect
4545
github.com/antchfx/xpath v1.3.3 // indirect
46-
github.com/aws/aws-sdk-go-v2 v1.36.1 // indirect
47-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 // indirect
48-
github.com/aws/aws-sdk-go-v2/config v1.29.6 // indirect
49-
github.com/aws/aws-sdk-go-v2/credentials v1.17.59 // indirect
50-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.28 // indirect
51-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.32 // indirect
52-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.32 // indirect
53-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
54-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.32 // indirect
55-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
56-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.6 // indirect
57-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.13 // indirect
58-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.13 // indirect
59-
github.com/aws/aws-sdk-go-v2/service/s3 v1.76.0 // indirect
46+
github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect
47+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect
48+
github.com/aws/aws-sdk-go-v2/config v1.29.9 // indirect
49+
github.com/aws/aws-sdk-go-v2/credentials v1.17.62 // indirect
50+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
51+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
52+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
53+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
54+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect
55+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
56+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.0 // indirect
57+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
58+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect
59+
github.com/aws/aws-sdk-go-v2/service/s3 v1.78.2 // indirect
6060
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.14 // indirect
61-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.15 // indirect
62-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.14 // indirect
63-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.14 // indirect
61+
github.com/aws/aws-sdk-go-v2/service/sso v1.25.1 // indirect
62+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.1 // indirect
63+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.17 // indirect
6464
github.com/aws/smithy-go v1.22.2 // indirect
6565
github.com/beorn7/perks v1.0.1 // indirect
6666
github.com/cenkalti/backoff/v4 v4.3.0 // indirect

0 commit comments

Comments
 (0)