Skip to content

Commit e6ec2dc

Browse files
djaglowskidjaglowski
authored
[pkg/stanza] Move internal/stanza to pkg/stanza/adapter (#10378)
1 parent 7a722af commit e6ec2dc

Some content is hidden

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

64 files changed

+428
-704
lines changed

‎.github/CODEOWNERS

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ internal/k8sconfig/ @open-telemetry/collector-c
8282
internal/kubelet/ @open-telemetry/collector-contrib-approvers @dmitryax
8383
internal/scrapertest/ @open-telemetry/collector-contrib-approvers @djaglowski
8484
internal/splunk/ @open-telemetry/collector-contrib-approvers @pmcollins @dmitryax
85-
internal/stanza/ @open-telemetry/collector-contrib-approvers @djaglowski
8685

8786
pkg/batchpersignal/ @open-telemetry/collector-contrib-approvers @jpkrohling
8887
pkg/resourcetotelemetry/ @open-telemetry/collector-contrib-approvers @mx-psi

‎.github/dependabot.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -342,10 +342,6 @@ updates:
342342
directory: "/internal/splunk"
343343
schedule:
344344
interval: "weekly"
345-
- package-ecosystem: "gomod"
346-
directory: "/internal/stanza"
347-
schedule:
348-
interval: "weekly"
349345
- package-ecosystem: "gomod"
350346
directory: "/internal/tools"
351347
schedule:
@@ -366,6 +362,10 @@ updates:
366362
directory: "/pkg/resourcetotelemetry"
367363
schedule:
368364
interval: "weekly"
365+
- package-ecosystem: "gomod"
366+
directory: "/pkg/stanza"
367+
schedule:
368+
interval: "weekly"
369369
- package-ecosystem: "gomod"
370370
directory: "/pkg/translator/jaeger"
371371
schedule:

‎cmd/configschema/go.mod

-3
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,6 @@ require (
303303
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.52.0 // indirect
304304
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.52.0 // indirect
305305
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.52.0 // indirect
306-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.52.0 // indirect
307306
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.52.0 // indirect
308307
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.52.0 // indirect
309308
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.52.0 // indirect
@@ -558,8 +557,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/share
558557

559558
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => ../../internal/splunk
560559

561-
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza => ../../internal/stanza
562-
563560
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter => ../../exporter/alibabacloudlogserviceexporter
564561

565562
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => ../../exporter/awscloudwatchlogsexporter

‎go.mod

+1-4
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ require (
6060
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.52.0
6161
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.52.0
6262
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.52.0
63-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.52.0
63+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.52.0
6464
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.52.0
6565
github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.52.0
6666
github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.52.0
@@ -384,7 +384,6 @@ require (
384384
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.52.0 // indirect
385385
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.52.0 // indirect
386386
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.52.0 // indirect
387-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.52.0 // indirect
388387
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.52.0 // indirect
389388
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.52.0 // indirect
390389
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.52.0 // indirect
@@ -562,8 +561,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/share
562561

563562
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => ./internal/splunk
564563

565-
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza => ./internal/stanza
566-
567564
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter => ./exporter/alibabacloudlogserviceexporter
568565

569566
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => ./exporter/awscloudwatchlogsexporter

‎internal/components/receivers_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"go.opentelemetry.io/collector/consumer/consumertest"
3131

3232
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil"
33-
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza"
33+
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter"
3434
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver"
3535
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver"
3636
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver"
@@ -110,7 +110,7 @@ func TestDefaultReceivers(t *testing.T) {
110110
receiver: "filelog",
111111
getConfigFn: func() config.Receiver {
112112
cfg := rcvrFactories["filelog"].CreateDefaultConfig().(*filelogreceiver.FileLogConfig)
113-
cfg.Input = stanza.InputConfig{
113+
cfg.Input = adapter.InputConfig{
114114
"include": []string{
115115
path.Join(testutil.NewTemporaryDirectory(t), "*"),
116116
},
@@ -271,7 +271,7 @@ func TestDefaultReceivers(t *testing.T) {
271271
receiver: "syslog",
272272
getConfigFn: func() config.Receiver {
273273
cfg := rcvrFactories["syslog"].CreateDefaultConfig().(*syslogreceiver.SysLogConfig)
274-
cfg.Input = stanza.InputConfig{
274+
cfg.Input = adapter.InputConfig{
275275
"tcp": map[string]interface{}{
276276
"listen_address": "0.0.0.0:0",
277277
},
@@ -284,7 +284,7 @@ func TestDefaultReceivers(t *testing.T) {
284284
receiver: "tcplog",
285285
getConfigFn: func() config.Receiver {
286286
cfg := rcvrFactories["tcplog"].CreateDefaultConfig().(*tcplogreceiver.TCPLogConfig)
287-
cfg.Input = stanza.InputConfig{
287+
cfg.Input = adapter.InputConfig{
288288
"listen_address": "0.0.0.0:0",
289289
}
290290
return cfg
@@ -294,7 +294,7 @@ func TestDefaultReceivers(t *testing.T) {
294294
receiver: "udplog",
295295
getConfigFn: func() config.Receiver {
296296
cfg := rcvrFactories["udplog"].CreateDefaultConfig().(*udplogreceiver.UDPLogConfig)
297-
cfg.Input = stanza.InputConfig{
297+
cfg.Input = adapter.InputConfig{
298298
"listen_address": "0.0.0.0:0",
299299
}
300300
return cfg

‎internal/stanza/Makefile

-1
This file was deleted.

‎internal/stanza/go.mod

-51
This file was deleted.

0 commit comments

Comments
 (0)