Skip to content

Commit 4dee19b

Browse files
Merge branch 'main' into add-splunk-rolling-restart-metric
2 parents 760235e + c2e1272 commit 4dee19b

File tree

26 files changed

+185
-155
lines changed

26 files changed

+185
-155
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: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: k8sobjectsreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Check for K8s API objects existence on receiver startup and not during config validation.
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: [38803]
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]

.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
steps:
3333
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3434
with:
35-
fetch-depth: ${{ github.event_name == 'pull_request' && github.event.pull_request.commits || 1 }}
35+
fetch-depth: 0
3636
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
3737
with:
3838
go-version: "1.23.8"

.github/workflows/check-links.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2525
with:
26-
fetch-depth: ${{ github.event_name == 'pull_request' && github.event.pull_request.commits || 1 }}
26+
fetch-depth: 0
2727
- name: Get changed files
2828
id: changes
2929
run: |
@@ -42,7 +42,7 @@ jobs:
4242
steps:
4343
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
4444
with:
45-
fetch-depth: 1
45+
fetch-depth: 0
4646

4747
- name: Link Checker
4848
id: lychee

.github/workflows/e2e-tests-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Checkout
2727
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2828
with:
29-
fetch-depth: ${{ github.event_name == 'pull_request' && github.event.pull_request.commits || 1 }}
29+
fetch-depth: 0
3030
- name: Did windows files changed
3131
run: echo "changed=$(./.github/workflows/scripts/is_changed_file_windows.sh )" >> "$GITHUB_OUTPUT"
3232
- run: echo $(./.github/workflows/scripts/is_changed_file_windows.sh ${{ github.event.pull_request.base.sha }} ${{ github.sha }} )

.github/workflows/scoped-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2222
with:
23-
fetch-depth: ${{ github.event_name == 'pull_request' && github.event.pull_request.commits || 1 }}
23+
fetch-depth: 0
2424

2525
- name: Get changes
2626
shell: bash

connector/datadogconnector/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ require (
4343

4444
require (
4545
cloud.google.com/go/compute/metadata v0.6.0 // indirect
46-
github.com/DataDog/agent-payload/v5 v5.0.147 // indirect
46+
github.com/DataDog/agent-payload/v5 v5.0.148 // indirect
4747
github.com/DataDog/datadog-agent/comp/core/config v0.66.0-devel.0.20250407180930-ebfcfa2817ce // indirect
4848
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.66.0-devel.0.20250407180930-ebfcfa2817ce // indirect
4949
github.com/DataDog/datadog-agent/comp/core/flare/types v0.66.0-devel.0.20250407180930-ebfcfa2817ce // 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
@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datado
33
go 1.23.0
44

55
require (
6-
github.com/DataDog/agent-payload/v5 v5.0.147
6+
github.com/DataDog/agent-payload/v5 v5.0.148
77
github.com/DataDog/datadog-agent/comp/core/config v0.66.0-devel.0.20250407180930-ebfcfa2817ce
88
github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.66.0-devel.0.20250407180930-ebfcfa2817ce
99
github.com/DataDog/datadog-agent/comp/core/log/def v0.66.0-devel.0.20250407180930-ebfcfa2817ce

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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datado
33
go 1.23.0
44

55
require (
6-
github.com/DataDog/agent-payload/v5 v5.0.147
6+
github.com/DataDog/agent-payload/v5 v5.0.148
77
github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.66.0-devel.0.20250407180930-ebfcfa2817ce
88
github.com/DataDog/datadog-agent/pkg/proto v0.66.0-devel.0.20250407180930-ebfcfa2817ce
99
github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.124.1

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.

exporter/stefexporter/exporter_test.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ func (m *mockMetricDestServer) start() {
7777
Logger: nil,
7878
ServerSchema: &schema,
7979
MaxDictBytes: 0,
80-
OnStream: m.onStream,
80+
Callbacks: stefgrpc.Callbacks{
81+
OnStream: m.onStream,
82+
},
8183
}
8284
mockServer := stefgrpc.NewStreamServer(settings)
8385
stef_proto.RegisterSTEFDestinationServer(grpcServer, mockServer)
@@ -93,7 +95,7 @@ func (m *mockMetricDestServer) stop() {
9395
m.grpcServer.Stop()
9496
}
9597

96-
func (m *mockMetricDestServer) onStream(grpcReader stefgrpc.GrpcReader, ackFunc func(sequenceId uint64) error) error {
98+
func (m *mockMetricDestServer) onStream(grpcReader stefgrpc.GrpcReader, stream stefgrpc.STEFStream) error {
9799
m.logger.Info("Incoming TEF/gRPC connection.")
98100

99101
reader, err := oteltef.NewMetricsReader(grpcReader)
@@ -115,9 +117,11 @@ func (m *mockMetricDestServer) onStream(grpcReader stefgrpc.GrpcReader, ackFunc
115117
continue
116118
}
117119

118-
if err = ackFunc(reader.RecordCount()); err != nil {
120+
err = stream.SendDataResponse(&stef_proto.STEFDataResponse{AckRecordId: reader.RecordCount()})
121+
if err != nil {
119122
return err
120123
}
124+
121125
m.acksSent.Add(1)
122126
}
123127
}

exporter/stefexporter/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ go 1.23.0
44

55
require (
66
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.124.1
7-
github.com/splunk/stef/go/grpc v0.0.4
8-
github.com/splunk/stef/go/otel v0.0.4
9-
github.com/splunk/stef/go/pdata v0.0.4
7+
github.com/splunk/stef/go/grpc v0.0.5
8+
github.com/splunk/stef/go/otel v0.0.5
9+
github.com/splunk/stef/go/pdata v0.0.5
1010
github.com/splunk/stef/go/pkg v0.0.5
1111
github.com/stretchr/testify v1.10.0
1212
go.opentelemetry.io/collector/component v1.30.0

exporter/stefexporter/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/datadogreceiver/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datado
33
go 1.23.0
44

55
require (
6-
github.com/DataDog/agent-payload/v5 v5.0.146
6+
github.com/DataDog/agent-payload/v5 v5.0.148
77
github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.3
88
github.com/DataDog/datadog-agent/pkg/proto v0.64.3
99
github.com/DataDog/datadog-agent/pkg/trace v0.64.3

receiver/datadogreceiver/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.

receiver/k8sobjectsreceiver/config.go

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -58,28 +58,7 @@ type Config struct {
5858
}
5959

6060
func (c *Config) Validate() error {
61-
validObjects, err := c.getValidObjects()
62-
if err != nil {
63-
return err
64-
}
6561
for _, object := range c.Objects {
66-
gvrs, ok := validObjects[object.Name]
67-
if !ok {
68-
availableResource := make([]string, len(validObjects))
69-
for k := range validObjects {
70-
availableResource = append(availableResource, k)
71-
}
72-
return fmt.Errorf("resource %v not found. Valid resources are: %v", object.Name, availableResource)
73-
}
74-
75-
gvr := gvrs[0]
76-
for i := range gvrs {
77-
if gvrs[i].Group == object.Group {
78-
gvr = gvrs[i]
79-
break
80-
}
81-
}
82-
8362
if object.Mode == "" {
8463
object.Mode = defaultMode
8564
} else if _, ok := modeMap[object.Mode]; !ok {
@@ -93,8 +72,6 @@ func (c *Config) Validate() error {
9372
if object.Mode == PullMode && len(object.ExcludeWatchType) != 0 {
9473
return errors.New("the Exclude config can only be used with watch mode")
9574
}
96-
97-
object.gvr = gvr
9875
}
9976
return nil
10077
}

0 commit comments

Comments
 (0)