Skip to content

Commit baa43da

Browse files
juanhotencodingjuanhotencoding
authored
Merge branch 'main' into add-splunk-rolling-restart-metric
2 parents 25a5bfa + d676938 commit baa43da

File tree

14 files changed

+49
-48
lines changed

14 files changed

+49
-48
lines changed

‎.github/workflows/build-and-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -752,15 +752,15 @@ jobs:
752752
permissions:
753753
issues: write
754754
steps:
755-
- uses: actions/checkout@v4
756-
- uses: actions/setup-go@v5
755+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
756+
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
757757
with:
758758
go-version: "1.23.7"
759759
cache: false
760760
- name: Cache Go
761761
id: go-cache
762762
timeout-minutes: 5
763-
uses: actions/cache@v4
763+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
764764
with:
765765
path: |
766766
~/go/bin
@@ -770,7 +770,7 @@ jobs:
770770
- name: Install dependencies
771771
if: steps.go-cache.outputs.cache-hit != 'true'
772772
run: make -j2 gomoddownload
773-
- uses: actions/download-artifact@v4
773+
- uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4
774774
with:
775775
merge-multiple: true
776776
pattern: test-results-*

‎cmd/opampsupervisor/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ require (
66
github.com/cenkalti/backoff/v4 v4.3.0
77
github.com/google/uuid v1.6.0
88
github.com/knadh/koanf/maps v0.1.2
9-
github.com/knadh/koanf/parsers/yaml v0.1.0
9+
github.com/knadh/koanf/parsers/yaml v1.0.0
1010
github.com/knadh/koanf/providers/file v1.2.0
11-
github.com/knadh/koanf/providers/rawbytes v0.1.0
11+
github.com/knadh/koanf/providers/rawbytes v1.0.0
1212
github.com/knadh/koanf/v2 v2.2.0
1313
github.com/open-telemetry/opamp-go v0.19.0
1414
github.com/open-telemetry/opentelemetry-collector-contrib/testbed v0.125.0

‎cmd/opampsupervisor/go.sum

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/clickhouseexporter/example/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM alpine:latest@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c AS certs
22
RUN apk --update add ca-certificates
33

4-
FROM golang:latest@sha256:f52b85c1b58271ba213ac59878c4fe2fdbb41ac842c5c69f9e7a9d16d53c4ad8
4+
FROM golang:latest@sha256:3a060d683c28fbb21d7fe8966458e084a6d7ebfb1f3ef3fd901abd2083c43675
55

66
ARG USER_UID=10001
77
USER ${USER_UID}

‎exporter/datadogexporter/integrationtest/integration_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,7 @@ func TestIntegrationHostMetrics_WithRemapping_LegacyMetricClient(t *testing.T) {
583583
}
584584

585585
func TestIntegrationHostMetrics_WithoutRemapping_LegacyMetricClient(t *testing.T) {
586+
t.Skip("Flaky, see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/39632")
586587
prevVal := pkgdatadog.MetricRemappingDisabledFeatureGate.IsEnabled()
587588
require.NoError(t, featuregate.GlobalRegistry().Set(pkgdatadog.MetricRemappingDisabledFeatureGate.ID(), true))
588589
require.NoError(t, featuregate.GlobalRegistry().Set("exporter.datadogexporter.metricexportserializerclient", false))

‎exporter/googlecloudpubsubexporter/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ require (
1818
go.uber.org/goleak v1.3.0
1919
go.uber.org/multierr v1.11.0
2020
go.uber.org/zap v1.27.0
21-
google.golang.org/api v0.230.0
21+
google.golang.org/api v0.231.0
2222
google.golang.org/grpc v1.72.0
2323
)
2424

2525
require (
26-
cloud.google.com/go/auth v0.16.0 // indirect
26+
cloud.google.com/go/auth v0.16.1 // indirect
2727
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
2828
cloud.google.com/go/compute/metadata v0.6.0 // indirect
2929
cloud.google.com/go/iam v1.4.2 // indirect
@@ -78,7 +78,7 @@ require (
7878
golang.org/x/time v0.11.0 // indirect
7979
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
8080
google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
81-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e // indirect
81+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250425173222-7b384671a197 // indirect
8282
google.golang.org/protobuf v1.36.6 // indirect
8383
gopkg.in/yaml.v3 v3.0.1 // indirect
8484
sigs.k8s.io/yaml v1.4.0 // indirect

‎exporter/googlecloudpubsubexporter/go.sum

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/loadbalancingexporter/example/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.24@sha256:f52b85c1b58271ba213ac59878c4fe2fdbb41ac842c5c69f9e7a9d16d53c4ad8 AS build
1+
FROM golang:1.24@sha256:3a060d683c28fbb21d7fe8966458e084a6d7ebfb1f3ef3fd901abd2083c43675 AS build
22

33
WORKDIR /src
44
ADD . /src

‎receiver/googlecloudmonitoringreceiver/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
)
2020

2121
require (
22-
cloud.google.com/go/auth v0.16.0 // indirect
22+
cloud.google.com/go/auth v0.16.1 // indirect
2323
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
2424
cloud.google.com/go/compute/metadata v0.6.0 // indirect
2525
github.com/google/s2a-go v0.1.9 // indirect
@@ -72,8 +72,8 @@ require (
7272
golang.org/x/net v0.39.0 // indirect
7373
golang.org/x/sys v0.32.0 // indirect
7474
golang.org/x/text v0.24.0 // indirect
75-
google.golang.org/api v0.230.0
76-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e // indirect
75+
google.golang.org/api v0.231.0
76+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250425173222-7b384671a197 // indirect
7777
google.golang.org/grpc v1.72.0 // indirect
7878
google.golang.org/protobuf v1.36.6
7979
gopkg.in/yaml.v3 v3.0.1 // indirect

‎receiver/googlecloudmonitoringreceiver/go.sum

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎receiver/googlecloudpubsubreceiver/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
go.uber.org/goleak v1.3.0
3030
go.uber.org/multierr v1.11.0
3131
go.uber.org/zap v1.27.0
32-
google.golang.org/api v0.230.0
32+
google.golang.org/api v0.231.0
3333
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb
3434
google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4
3535
google.golang.org/grpc v1.72.0
@@ -38,7 +38,7 @@ require (
3838

3939
require (
4040
cloud.google.com/go v0.120.0 // indirect
41-
cloud.google.com/go/auth v0.16.0 // indirect
41+
cloud.google.com/go/auth v0.16.1 // indirect
4242
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
4343
cloud.google.com/go/compute/metadata v0.6.0 // indirect
4444
cloud.google.com/go/iam v1.4.2 // indirect
@@ -86,7 +86,7 @@ require (
8686
golang.org/x/sys v0.32.0 // indirect
8787
golang.org/x/text v0.24.0 // indirect
8888
golang.org/x/time v0.11.0 // indirect
89-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e // indirect
89+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250425173222-7b384671a197 // indirect
9090
gopkg.in/yaml.v3 v3.0.1 // indirect
9191
sigs.k8s.io/yaml v1.4.0 // indirect
9292
)

‎receiver/googlecloudpubsubreceiver/go.sum

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎receiver/googlecloudspannerreceiver/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ require (
2121
go.uber.org/goleak v1.3.0
2222
go.uber.org/multierr v1.11.0
2323
go.uber.org/zap v1.27.0
24-
google.golang.org/api v0.230.0
24+
google.golang.org/api v0.231.0
2525
google.golang.org/grpc v1.72.0
2626
gopkg.in/yaml.v3 v3.0.1
2727
)
2828

2929
require (
3030
cel.dev/expr v0.20.0 // indirect
3131
cloud.google.com/go v0.120.0 // indirect
32-
cloud.google.com/go/auth v0.16.0 // indirect
32+
cloud.google.com/go/auth v0.16.1 // indirect
3333
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
3434
cloud.google.com/go/compute/metadata v0.6.0 // indirect
3535
cloud.google.com/go/iam v1.5.0 // indirect
@@ -96,7 +96,7 @@ require (
9696
golang.org/x/time v0.11.0 // indirect
9797
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
9898
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e // indirect
99-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e // indirect
99+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250425173222-7b384671a197 // indirect
100100
google.golang.org/protobuf v1.36.6 // indirect
101101
sigs.k8s.io/yaml v1.4.0 // indirect
102102
)

‎receiver/googlecloudspannerreceiver/go.sum

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)