Skip to content

Commit 06a8dc7

Browse files
committed
Merge branch 'main' into add-trixie-support
2 parents a928b52 + 9ef4306 commit 06a8dc7

File tree

7 files changed

+130
-114
lines changed

7 files changed

+130
-114
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ permissions:
2020

2121
env:
2222
NFPM_VERSION: 'v2.35.3'
23-
GOPROXY: "direct"
23+
GOPROXY: "https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@azr.artifactory.f5net.com/artifactory/api/go/f5-nginx-go-dev"
2424

2525
jobs:
2626
proxy-sanity-check:

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2626

2727
- name: "Dependency Review"
28-
uses: actions/dependency-review-action@56339e523c0409420f6c2c9a2f4292bbb3c07dd3 # v4.8.0
28+
uses: actions/dependency-review-action@40c09b7dc99638e5ddb0bfd91c1673effc064d8a # v4.8.1
2929
with:
3030
config-file: "nginxinc/k8s-common/dependency-review-config.yml@main"

.github/workflows/scorecards.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
persist-credentials: false
3434

3535
- name: "Run analysis"
36-
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
36+
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
3737
with:
3838
results_file: results.sarif
3939
results_format: sarif
@@ -55,6 +55,6 @@ jobs:
5555

5656
# Upload the results to GitHub's code scanning dashboard.
5757
- name: "Upload to code-scanning"
58-
uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
58+
uses: github/codeql-action/upload-sarif@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
5959
with:
6060
sarif_file: results.sarif

go.mod

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -43,43 +43,43 @@ require (
4343
github.com/stretchr/testify v1.11.1
4444
github.com/testcontainers/testcontainers-go v0.39.0
4545
github.com/trivago/grok v1.0.0
46-
go.opentelemetry.io/collector/component v1.42.0
47-
go.opentelemetry.io/collector/component/componenttest v0.136.0
46+
go.opentelemetry.io/collector/component v1.43.0
47+
go.opentelemetry.io/collector/component/componenttest v0.137.0
4848
go.opentelemetry.io/collector/config/confighttp v0.136.0
49-
go.opentelemetry.io/collector/confmap v1.42.0
49+
go.opentelemetry.io/collector/confmap v1.43.0
5050
go.opentelemetry.io/collector/confmap/provider/envprovider v1.42.0
5151
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.42.0
5252
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.42.0
5353
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.42.0
5454
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.42.0
5555
go.opentelemetry.io/collector/connector v0.136.0
56-
go.opentelemetry.io/collector/consumer v1.42.0
57-
go.opentelemetry.io/collector/consumer/consumertest v0.136.0
58-
go.opentelemetry.io/collector/exporter v1.42.0
59-
go.opentelemetry.io/collector/exporter/debugexporter v0.136.0
56+
go.opentelemetry.io/collector/consumer v1.43.0
57+
go.opentelemetry.io/collector/consumer/consumertest v0.137.0
58+
go.opentelemetry.io/collector/exporter v1.43.0
59+
go.opentelemetry.io/collector/exporter/debugexporter v0.137.0
6060
go.opentelemetry.io/collector/exporter/otlpexporter v0.136.0
6161
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.136.0
62-
go.opentelemetry.io/collector/extension v1.42.0
62+
go.opentelemetry.io/collector/extension v1.43.0
6363
go.opentelemetry.io/collector/extension/extensionauth v1.42.0
64-
go.opentelemetry.io/collector/extension/xextension v0.136.0
64+
go.opentelemetry.io/collector/extension/xextension v0.137.0
6565
go.opentelemetry.io/collector/filter v0.136.0
6666
go.opentelemetry.io/collector/otelcol v0.136.0
67-
go.opentelemetry.io/collector/pdata v1.42.0
67+
go.opentelemetry.io/collector/pdata v1.43.0
6868
go.opentelemetry.io/collector/processor v1.42.0
6969
go.opentelemetry.io/collector/processor/batchprocessor v0.136.0
7070
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.136.0
7171
go.opentelemetry.io/collector/processor/processortest v0.136.0
72-
go.opentelemetry.io/collector/receiver v1.42.0
72+
go.opentelemetry.io/collector/receiver v1.43.0
7373
go.opentelemetry.io/collector/receiver/otlpreceiver v0.136.0
74-
go.opentelemetry.io/collector/receiver/receivertest v0.136.0
74+
go.opentelemetry.io/collector/receiver/receivertest v0.137.0
7575
go.opentelemetry.io/collector/scraper v0.136.0
7676
go.opentelemetry.io/collector/scraper/scraperhelper v0.136.0
7777
go.opentelemetry.io/collector/scraper/scrapertest v0.136.0
7878
go.opentelemetry.io/otel v1.38.0
7979
go.uber.org/goleak v1.3.0
8080
go.uber.org/multierr v1.11.0
8181
go.uber.org/zap v1.27.0
82-
golang.org/x/mod v0.28.0
82+
golang.org/x/mod v0.29.0
8383
google.golang.org/protobuf v1.36.9
8484
)
8585

@@ -264,51 +264,51 @@ require (
264264
github.com/yusufpapurcu/wmi v1.2.4 // indirect
265265
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
266266
go.opentelemetry.io/collector v0.136.0 // indirect
267-
go.opentelemetry.io/collector/client v1.42.0 // indirect
267+
go.opentelemetry.io/collector/client v1.43.0 // indirect
268268
go.opentelemetry.io/collector/component/componentstatus v0.136.0 // indirect
269269
go.opentelemetry.io/collector/config/configauth v0.136.0 // indirect
270270
go.opentelemetry.io/collector/config/configcompression v1.42.0 // indirect
271271
go.opentelemetry.io/collector/config/configgrpc v0.136.0 // indirect
272272
go.opentelemetry.io/collector/config/configmiddleware v1.42.0 // indirect
273273
go.opentelemetry.io/collector/config/confignet v1.42.0 // indirect
274274
go.opentelemetry.io/collector/config/configopaque v1.42.0 // indirect
275-
go.opentelemetry.io/collector/config/configoptional v0.136.0 // indirect
276-
go.opentelemetry.io/collector/config/configretry v1.42.0 // indirect
277-
go.opentelemetry.io/collector/config/configtelemetry v0.136.0 // indirect
275+
go.opentelemetry.io/collector/config/configoptional v1.43.0 // indirect
276+
go.opentelemetry.io/collector/config/configretry v1.43.0 // indirect
277+
go.opentelemetry.io/collector/config/configtelemetry v0.137.0 // indirect
278278
go.opentelemetry.io/collector/config/configtls v1.42.0 // indirect
279-
go.opentelemetry.io/collector/confmap/xconfmap v0.136.0 // indirect
279+
go.opentelemetry.io/collector/confmap/xconfmap v0.137.0 // indirect
280280
go.opentelemetry.io/collector/connector/connectortest v0.136.0 // indirect
281281
go.opentelemetry.io/collector/connector/xconnector v0.136.0 // indirect
282-
go.opentelemetry.io/collector/consumer/consumererror v0.136.0 // indirect
283-
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.136.0 // indirect
284-
go.opentelemetry.io/collector/consumer/xconsumer v0.136.0 // indirect
285-
go.opentelemetry.io/collector/exporter/exporterhelper v0.136.0 // indirect
286-
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.136.0 // indirect
287-
go.opentelemetry.io/collector/exporter/exportertest v0.136.0 // indirect
288-
go.opentelemetry.io/collector/exporter/xexporter v0.136.0 // indirect
282+
go.opentelemetry.io/collector/consumer/consumererror v0.137.0 // indirect
283+
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.137.0 // indirect
284+
go.opentelemetry.io/collector/consumer/xconsumer v0.137.0 // indirect
285+
go.opentelemetry.io/collector/exporter/exporterhelper v0.137.0 // indirect
286+
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.137.0 // indirect
287+
go.opentelemetry.io/collector/exporter/exportertest v0.137.0 // indirect
288+
go.opentelemetry.io/collector/exporter/xexporter v0.137.0 // indirect
289289
go.opentelemetry.io/collector/extension/extensioncapabilities v0.136.0 // indirect
290290
go.opentelemetry.io/collector/extension/extensionmiddleware v0.136.0 // indirect
291-
go.opentelemetry.io/collector/extension/extensiontest v0.136.0 // indirect
291+
go.opentelemetry.io/collector/extension/extensiontest v0.137.0 // indirect
292292
go.opentelemetry.io/collector/extension/zpagesextension v0.136.0 // indirect
293-
go.opentelemetry.io/collector/featuregate v1.42.0 // indirect
293+
go.opentelemetry.io/collector/featuregate v1.43.0 // indirect
294294
go.opentelemetry.io/collector/internal/fanoutconsumer v0.136.0 // indirect
295295
go.opentelemetry.io/collector/internal/memorylimiter v0.136.0 // indirect
296296
go.opentelemetry.io/collector/internal/sharedcomponent v0.136.0 // indirect
297-
go.opentelemetry.io/collector/internal/telemetry v0.136.0 // indirect
298-
go.opentelemetry.io/collector/pdata/pprofile v0.136.0 // indirect
299-
go.opentelemetry.io/collector/pdata/testdata v0.136.0 // indirect
300-
go.opentelemetry.io/collector/pdata/xpdata v0.136.0 // indirect
301-
go.opentelemetry.io/collector/pipeline v1.42.0 // indirect
302-
go.opentelemetry.io/collector/pipeline/xpipeline v0.136.0 // indirect
297+
go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect
298+
go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect
299+
go.opentelemetry.io/collector/pdata/testdata v0.137.0 // indirect
300+
go.opentelemetry.io/collector/pdata/xpdata v0.137.0 // indirect
301+
go.opentelemetry.io/collector/pipeline v1.43.0 // indirect
302+
go.opentelemetry.io/collector/pipeline/xpipeline v0.137.0 // indirect
303303
go.opentelemetry.io/collector/processor/processorhelper v0.136.0 // indirect
304304
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.136.0 // indirect
305305
go.opentelemetry.io/collector/processor/xprocessor v0.136.0 // indirect
306306
go.opentelemetry.io/collector/receiver/receiverhelper v0.136.0 // indirect
307-
go.opentelemetry.io/collector/receiver/xreceiver v0.136.0 // indirect
307+
go.opentelemetry.io/collector/receiver/xreceiver v0.137.0 // indirect
308308
go.opentelemetry.io/collector/semconv v0.128.1-0.20250610090210-188191247685 // indirect
309309
go.opentelemetry.io/collector/service v0.136.0 // indirect
310310
go.opentelemetry.io/collector/service/hostcapabilities v0.136.0 // indirect
311-
go.opentelemetry.io/contrib/bridges/otelzap v0.12.0 // indirect
311+
go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect
312312
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0 // indirect
313313
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
314314
go.opentelemetry.io/contrib/otelconf v0.17.0 // indirect
@@ -338,7 +338,7 @@ require (
338338
golang.org/x/oauth2 v0.30.0 // indirect
339339
golang.org/x/sync v0.17.0 // indirect
340340
golang.org/x/time v0.12.0 // indirect
341-
golang.org/x/tools v0.36.0 // indirect
341+
golang.org/x/tools v0.37.0 // indirect
342342
gonum.org/v1/gonum v0.16.0 // indirect
343343
google.golang.org/api v0.239.0 // indirect
344344
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect

0 commit comments

Comments
 (0)