Skip to content

Commit 96684c1

Browse files
committed
Merge branch 'main' into remove-lerna
2 parents 9d5e7e4 + d2c1be4 commit 96684c1

File tree

38 files changed

+4938
-1146
lines changed

38 files changed

+4938
-1146
lines changed

.github/component_owners.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ components:
3030
- pichlermarc
3131
- legendecas
3232
- blumamir
33+
packages/baggage-log-record-processor:
34+
- maryliag
3335
packages/baggage-span-processor:
3436
- mikegoldsmith
3537
- jamiedanielson
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: "31 18 * * 4" # 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

.release-please-manifest.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"metapackages/auto-instrumentations-node": "0.57.0",
1111
"metapackages/auto-instrumentations-web": "0.46.0",
1212
"packages/baggage-span-processor": "0.4.0",
13+
"packages/baggage-log-record-processor": "0.0.1",
1314
"packages/opentelemetry-host-metrics": "0.36.0",
1415
"packages/opentelemetry-id-generator-aws-xray": "2.0.0",
1516
"packages/opentelemetry-propagation-utils": "0.31.0",

metapackages/auto-instrumentations-node/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The net result is the ability to gather telemetry data from a Node application w
1111

1212
This module also provides a simple way to manually initialize multiple Node instrumentations for use with the OpenTelemetry SDK.
1313

14-
Compatible with OpenTelemetry JS API and SDK `1.0+`.
14+
Compatible with OpenTelemetry JS API and SDK `2.0+`.
1515

1616
## Installation
1717

0 commit comments

Comments
 (0)