Skip to content

Commit bd5fd6c

Browse files
Merge branch 'main' into dependabot/github_actions/actions-0f7df6ce22
2 parents 00e7e21 + 5cc1580 commit bd5fd6c

File tree

11 files changed

+135
-93
lines changed

11 files changed

+135
-93
lines changed

collector/README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,15 @@ from an S3 object using a CloudFormation template:
163163
164164
Loading configuration from S3 will require that the IAM role attached to your function includes read access to the relevant bucket.
165165
166+
## Environment Variables
167+
168+
The following environment variables can be used to configure the OpenTelemetry Collector Lambda extension:
169+
170+
| Variable Name | Value | Description |
171+
| ------------------------------------ | ------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
172+
| `OPENTELEMETRY_COLLECTOR_CONFIG_URI` | URI (e.g., `/var/task/collector.yaml`, `http://...`, `s3://...`) | Specifies the location of the OpenTelemetry Collector configuration file. This can be a path within the function's deployment package, an HTTP URI, or an S3 URI. If loading from S3, the function's IAM role needs read access to the specified S3 object. |
173+
| `OPENTELEMETRY_EXTENSION_LOG_LEVEL` | `debug`, `info`, `warn`, `error`, `dpanic`, `panic`, `fatal` (Default: `info`) | Controls the logging level of the OpenTelemetry Lambda extension itself. |
174+
166175
## Auto-Configuration
167176

168177
Configuring the Lambda Collector without the decouple processor and batch processor can lead to performance issues. So the OpenTelemetry Lambda Layer automatically adds the decouple processor to the end of the chain if the batch processor is used and the decouple processor is not.

collector/internal/tools/go.mod

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/open-telemetry/opentelemetry-lambda/collector/internal/tools
22

3-
go 1.19
3+
go 1.23.1
44

55
require (
66
github.com/client9/misspell v0.3.4
@@ -12,8 +12,8 @@ require (
1212
github.com/tcnksm/ghr v0.17.0
1313
github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad
1414
go.opentelemetry.io/build-tools/chloggen v0.22.0
15-
go.opentelemetry.io/build-tools/crosslink v0.15.0
16-
go.opentelemetry.io/build-tools/multimod v0.14.0
15+
go.opentelemetry.io/build-tools/crosslink v0.22.0
16+
go.opentelemetry.io/build-tools/multimod v0.22.0
1717
go.opentelemetry.io/build-tools/semconvgen v0.22.0
1818
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
1919
golang.org/x/tools v0.32.0
@@ -33,9 +33,9 @@ require (
3333
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
3434
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.1 // indirect
3535
github.com/Masterminds/semver/v3 v3.3.0 // indirect
36-
github.com/Microsoft/go-winio v0.6.1 // indirect
36+
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.3 // indirect
38+
github.com/ProtonMail/go-crypto v1.1.5 // 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,9 +60,9 @@ 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.3.7 // indirect
63+
github.com/cloudflare/circl v1.6.0 // indirect
6464
github.com/curioswitch/go-reassign v0.3.0 // indirect
65-
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
65+
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
6666
github.com/daixiang0/gci v0.13.5 // indirect
6767
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6868
github.com/denis-tingaikin/go-header v0.5.0 // 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.7.0 // indirect
75+
github.com/fsnotify/fsnotify v1.8.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
80-
github.com/go-git/go-billy/v5 v5.6.1 // indirect
81-
github.com/go-git/go-git/v5 v5.13.1 // indirect
80+
github.com/go-git/go-billy/v5 v5.6.2 // indirect
81+
github.com/go-git/go-git/v5 v5.14.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
@@ -90,8 +90,8 @@ require (
9090
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
9191
github.com/gobwas/glob v0.2.3 // indirect
9292
github.com/gofrs/flock v0.12.1 // indirect
93-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
94-
github.com/golang/protobuf v1.5.3 // indirect
93+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
94+
github.com/golang/protobuf v1.5.4 // indirect
9595
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
9696
github.com/golangci/go-printf-func-name v0.1.0 // indirect
9797
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
@@ -157,7 +157,7 @@ require (
157157
github.com/pborman/uuid v1.2.0 // indirect
158158
github.com/pelletier/go-toml v1.9.5 // indirect
159159
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
160-
github.com/pjbgf/sha1cd v0.3.0 // indirect
160+
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
163163
github.com/prometheus/client_golang v1.12.1 // indirect
@@ -174,8 +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.4.0 // indirect
178-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
177+
github.com/sagikazarmark/locafero v0.7.0 // indirect
179178
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
180179
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
181180
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
@@ -185,16 +184,16 @@ require (
185184
github.com/sirupsen/logrus v1.9.3 // indirect
186185
github.com/sivchari/containedctx v1.0.3 // indirect
187186
github.com/sivchari/tenv v1.12.1 // indirect
188-
github.com/skeema/knownhosts v1.3.0 // indirect
187+
github.com/skeema/knownhosts v1.3.1 // indirect
189188
github.com/sonatard/noctx v0.1.0 // indirect
190189
github.com/sourcegraph/conc v0.3.0 // indirect
191190
github.com/sourcegraph/go-diff v0.7.0 // indirect
192191
github.com/spf13/afero v1.12.0 // indirect
193-
github.com/spf13/cast v1.6.0 // indirect
192+
github.com/spf13/cast v1.7.1 // indirect
194193
github.com/spf13/cobra v1.9.1 // indirect
195194
github.com/spf13/jwalterweatherman v1.1.0 // indirect
196195
github.com/spf13/pflag v1.0.6 // indirect
197-
github.com/spf13/viper v1.19.0 // indirect
196+
github.com/spf13/viper v1.20.0 // indirect
198197
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
199198
github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
200199
github.com/stretchr/objx v0.5.2 // indirect

0 commit comments

Comments
 (0)