Skip to content

Commit b456375

Browse files
authored
Merge branch 'main' into issues-1804
2 parents 9ab1feb + 76f2714 commit b456375

File tree

35 files changed

+1554
-5552
lines changed

35 files changed

+1554
-5552
lines changed

.github/workflows/release-layer-nodejs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Save Node SDK Version
4141
id: save-node-sdk-version
4242
run: |
43-
SDK_VERSION=$(node version.js)
43+
SDK_VERSION=$(npm list @opentelemetry/core --depth=0 | grep @opentelemetry/core | sed 's/^.*@//')
4444
echo "SDK_VERSION=$SDK_VERSION" >> $GITHUB_OUTPUT
4545
working-directory: nodejs/packages/layer/scripts
4646

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ The table below captures the state of various features and their levels of suppo
102102

103103
The following are runtimes which are no longer or not yet supported by this repository:
104104

105-
* Node.js 12 - not [officially supported](https://github.com/open-telemetry/opentelemetry-js#supported-runtimes) by OpenTelemetry JS
105+
* Node.js 12, Node.js 16 - not [officially supported](https://github.com/open-telemetry/opentelemetry-js#supported-runtimes) by OpenTelemetry JS
106106

107107
[1]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/faas/faas-spans.md#general-attributes
108108
[2]: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/faas/faas-spans.md#incoming-invocations
@@ -118,6 +118,7 @@ Here is a list of community roles with current and previous members:
118118
- Approvers ([@open-telemetry/lambda-extension-approvers](https://github.com/orgs/open-telemetry/teams/lambda-extension-approvers)):
119119

120120
- [Ivan Santos](https://github.com/pragmaticivan)
121+
- [Warre Pessers](https://github.com/wpessers)
121122

122123
- Emeritus Approvers:
123124

collector/go.mod

Lines changed: 98 additions & 95 deletions
Large diffs are not rendered by default.

collector/go.sum

Lines changed: 211 additions & 202 deletions
Large diffs are not rendered by default.

collector/internal/tools/go.mod

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ require (
1111
github.com/pavius/impi v0.0.3
1212
github.com/tcnksm/ghr v0.17.0
1313
github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad
14-
go.opentelemetry.io/build-tools/chloggen v0.22.0
15-
go.opentelemetry.io/build-tools/crosslink v0.22.0
16-
go.opentelemetry.io/build-tools/multimod v0.22.0
17-
go.opentelemetry.io/build-tools/semconvgen v0.22.0
14+
go.opentelemetry.io/build-tools/chloggen v0.23.1
15+
go.opentelemetry.io/build-tools/crosslink v0.23.1
16+
go.opentelemetry.io/build-tools/multimod v0.23.1
17+
go.opentelemetry.io/build-tools/semconvgen v0.23.1
1818
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
19-
golang.org/x/tools v0.32.0
19+
golang.org/x/tools v0.33.0
2020
)
2121

2222
require (
2323
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
2424
4d63.com/gochecknoglobals v0.2.2 // indirect
25-
dario.cat/mergo v1.0.0 // indirect
25+
dario.cat/mergo v1.0.1 // indirect
2626
github.com/4meepo/tagalign v1.4.2 // indirect
2727
github.com/Abirdcfly/dupword v0.1.3 // indirect
2828
github.com/Antonboom/errname v1.0.0 // indirect
@@ -35,7 +35,7 @@ require (
3535
github.com/Masterminds/semver/v3 v3.3.0 // indirect
3636
github.com/Microsoft/go-winio v0.6.2 // indirect
3737
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
38-
github.com/ProtonMail/go-crypto v1.1.5 // indirect
38+
github.com/ProtonMail/go-crypto v1.2.0 // indirect
3939
github.com/Songmu/retry v0.1.0 // indirect
4040
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
4141
github.com/alexkohler/nakedret/v2 v2.0.5 // indirect
@@ -60,7 +60,7 @@ require (
6060
github.com/charithe/durationcheck v0.0.10 // indirect
6161
github.com/chavacava/garif v0.1.0 // indirect
6262
github.com/ckaznocha/intrange v0.3.0 // indirect
63-
github.com/cloudflare/circl v1.6.0 // indirect
63+
github.com/cloudflare/circl v1.6.1 // indirect
6464
github.com/curioswitch/go-reassign v0.3.0 // indirect
6565
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
6666
github.com/daixiang0/gci v0.13.5 // indirect
@@ -72,13 +72,13 @@ require (
7272
github.com/fatih/color v1.18.0 // indirect
7373
github.com/fatih/structtag v1.2.0 // indirect
7474
github.com/firefart/nonamedreturns v1.0.5 // indirect
75-
github.com/fsnotify/fsnotify v1.8.0 // indirect
75+
github.com/fsnotify/fsnotify v1.9.0 // indirect
7676
github.com/fzipp/gocyclo v0.6.0 // indirect
7777
github.com/ghostiam/protogetter v0.3.9 // indirect
7878
github.com/go-critic/go-critic v0.12.0 // indirect
7979
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
8080
github.com/go-git/go-billy/v5 v5.6.2 // indirect
81-
github.com/go-git/go-git/v5 v5.14.0 // indirect
81+
github.com/go-git/go-git/v5 v5.16.0 // indirect
8282
github.com/go-toolsmith/astcast v1.1.0 // indirect
8383
github.com/go-toolsmith/astcopy v1.1.0 // indirect
8484
github.com/go-toolsmith/astequal v1.2.0 // indirect
@@ -156,7 +156,7 @@ require (
156156
github.com/ory/viper v1.7.5 // indirect
157157
github.com/pborman/uuid v1.2.0 // indirect
158158
github.com/pelletier/go-toml v1.9.5 // indirect
159-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
159+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
160160
github.com/pjbgf/sha1cd v0.3.2 // indirect
161161
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
162162
github.com/polyfloyd/go-errorlint v1.7.1 // indirect
@@ -174,7 +174,7 @@ require (
174174
github.com/rogpeppe/go-internal v1.14.1 // indirect
175175
github.com/ryancurrah/gomodguard v1.3.5 // indirect
176176
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
177-
github.com/sagikazarmark/locafero v0.7.0 // indirect
177+
github.com/sagikazarmark/locafero v0.9.0 // indirect
178178
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
179179
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
180180
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
@@ -188,12 +188,12 @@ require (
188188
github.com/sonatard/noctx v0.1.0 // indirect
189189
github.com/sourcegraph/conc v0.3.0 // indirect
190190
github.com/sourcegraph/go-diff v0.7.0 // indirect
191-
github.com/spf13/afero v1.12.0 // indirect
191+
github.com/spf13/afero v1.14.0 // indirect
192192
github.com/spf13/cast v1.7.1 // indirect
193193
github.com/spf13/cobra v1.9.1 // indirect
194194
github.com/spf13/jwalterweatherman v1.1.0 // indirect
195195
github.com/spf13/pflag v1.0.6 // indirect
196-
github.com/spf13/viper v1.20.0 // indirect
196+
github.com/spf13/viper v1.20.1 // indirect
197197
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
198198
github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
199199
github.com/stretchr/objx v0.5.2 // indirect
@@ -220,18 +220,18 @@ require (
220220
gitlab.com/bosi/decorder v0.4.2 // indirect
221221
go-simpler.org/musttag v0.13.0 // indirect
222222
go-simpler.org/sloglint v0.9.0 // indirect
223-
go.opentelemetry.io/build-tools v0.22.0 // indirect
223+
go.opentelemetry.io/build-tools v0.23.1 // indirect
224224
go.uber.org/automaxprocs v1.6.0 // indirect
225225
go.uber.org/multierr v1.11.0 // indirect
226226
go.uber.org/zap v1.27.0 // indirect
227-
golang.org/x/crypto v0.37.0 // indirect
227+
golang.org/x/crypto v0.38.0 // indirect
228228
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
229229
golang.org/x/mod v0.24.0 // indirect
230-
golang.org/x/net v0.39.0 // indirect
230+
golang.org/x/net v0.40.0 // indirect
231231
golang.org/x/oauth2 v0.26.0 // indirect
232-
golang.org/x/sync v0.13.0 // indirect
233-
golang.org/x/sys v0.32.0 // indirect
234-
golang.org/x/text v0.24.0 // indirect
232+
golang.org/x/sync v0.14.0 // indirect
233+
golang.org/x/sys v0.33.0 // indirect
234+
golang.org/x/text v0.25.0 // indirect
235235
google.golang.org/protobuf v1.36.5 // indirect
236236
gopkg.in/ini.v1 v1.67.0 // indirect
237237
gopkg.in/warnings.v0 v0.1.2 // indirect

0 commit comments

Comments
 (0)