Skip to content

Commit d9f0eaa

Browse files
authored
Merge branch 'main' into filelogreceiver-line-numbers
2 parents b559d3b + d15830d commit d9f0eaa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+940
-459
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: kubeletstats
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "Add k8s.pod.cpu.node.utilization metric"
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [33390]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

.golangci.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,6 @@ linters-settings:
132132
predeclared:
133133
ignore: copy
134134

135-
gosec:
136-
excludes:
137-
# https://github.com/golangci/golangci-lint/issues/4735
138-
- G601
139-
# https://github.com/golangci/golangci-lint/issues/4735
140-
- G113
141-
142135
linters:
143136
enable:
144137
- decorder

cmd/otelcontribcol/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ require (
361361
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.47.0 // indirect
362362
github.com/IBM/sarama v1.43.2 // indirect
363363
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
364-
github.com/Microsoft/go-winio v0.6.1 // indirect
364+
github.com/Microsoft/go-winio v0.6.2 // indirect
365365
github.com/ReneKroon/ttlcache/v2 v2.11.0 // indirect
366366
github.com/SAP/go-hdb v1.9.8 // indirect
367367
github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc // indirect

cmd/otelcontribcol/go.sum

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

connector/datadogconnector/go.mod

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ require (
9696
github.com/DataDog/viper v1.13.3 // indirect
9797
github.com/DataDog/zstd v1.5.2 // indirect
9898
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.23.0 // indirect
99-
github.com/Microsoft/go-winio v0.6.1 // indirect
99+
github.com/Microsoft/go-winio v0.6.2 // indirect
100100
github.com/alecthomas/participle/v2 v2.1.1 // indirect
101101
github.com/aws/aws-sdk-go v1.53.11 // indirect
102102
github.com/benbjohnson/clock v1.3.5 // indirect
@@ -249,15 +249,12 @@ require (
249249
go.uber.org/fx v1.18.2 // indirect
250250
go.uber.org/multierr v1.11.0 // indirect
251251
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
252-
golang.org/x/mod v0.17.0 // indirect
253252
golang.org/x/net v0.26.0 // indirect
254253
golang.org/x/oauth2 v0.20.0 // indirect
255-
golang.org/x/sync v0.7.0 // indirect
256254
golang.org/x/sys v0.21.0 // indirect
257255
golang.org/x/term v0.21.0 // indirect
258256
golang.org/x/text v0.16.0 // indirect
259257
golang.org/x/time v0.5.0 // indirect
260-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
261258
gonum.org/v1/gonum v0.15.0 // indirect
262259
google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect
263260
google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect

connector/datadogconnector/go.sum

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

exporter/datadogexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ require (
131131
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
132132
github.com/DataDog/viper v1.13.3 // indirect
133133
github.com/DataDog/zstd v1.5.2 // indirect
134-
github.com/Microsoft/go-winio v0.6.1 // indirect
134+
github.com/Microsoft/go-winio v0.6.2 // indirect
135135
github.com/Showmax/go-fqdn v1.0.0 // indirect
136136
github.com/alecthomas/participle/v2 v2.1.1 // indirect
137137
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect

exporter/datadogexporter/go.sum

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

exporter/datadogexporter/integrationtest/go.mod

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ require (
9696
github.com/DataDog/viper v1.13.3 // indirect
9797
github.com/DataDog/zstd v1.5.2 // indirect
9898
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.23.0 // indirect
99-
github.com/Microsoft/go-winio v0.6.1 // indirect
99+
github.com/Microsoft/go-winio v0.6.2 // indirect
100100
github.com/alecthomas/participle/v2 v2.1.1 // indirect
101101
github.com/aws/aws-sdk-go v1.53.11 // indirect
102102
github.com/benbjohnson/clock v1.3.5 // indirect
@@ -249,15 +249,12 @@ require (
249249
go.uber.org/multierr v1.11.0 // indirect
250250
go.uber.org/zap v1.27.0 // indirect
251251
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
252-
golang.org/x/mod v0.17.0 // indirect
253252
golang.org/x/net v0.26.0 // indirect
254253
golang.org/x/oauth2 v0.20.0 // indirect
255-
golang.org/x/sync v0.7.0 // indirect
256254
golang.org/x/sys v0.21.0 // indirect
257255
golang.org/x/term v0.21.0 // indirect
258256
golang.org/x/text v0.16.0 // indirect
259257
golang.org/x/time v0.5.0 // indirect
260-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
261258
gonum.org/v1/gonum v0.15.0 // indirect
262259
google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect
263260
google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect

exporter/datadogexporter/integrationtest/go.sum

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

0 commit comments

Comments
 (0)