Skip to content

Commit

Permalink
[pkg/stanza] Move internal/stanza to pkg/stanza/adapter (open-telemet…
Browse files Browse the repository at this point in the history
  • Loading branch information
djaglowski committed May 28, 2022
1 parent 7a722af commit e6ec2dc
Show file tree
Hide file tree
Showing 64 changed files with 428 additions and 704 deletions.
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ internal/k8sconfig/ @open-telemetry/collector-c
internal/kubelet/ @open-telemetry/collector-contrib-approvers @dmitryax
internal/scrapertest/ @open-telemetry/collector-contrib-approvers @djaglowski
internal/splunk/ @open-telemetry/collector-contrib-approvers @pmcollins @dmitryax
internal/stanza/ @open-telemetry/collector-contrib-approvers @djaglowski

pkg/batchpersignal/ @open-telemetry/collector-contrib-approvers @jpkrohling
pkg/resourcetotelemetry/ @open-telemetry/collector-contrib-approvers @mx-psi
Expand Down
8 changes: 4 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -342,10 +342,6 @@ updates:
directory: "/internal/splunk"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/internal/stanza"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/internal/tools"
schedule:
Expand All @@ -366,6 +362,10 @@ updates:
directory: "/pkg/resourcetotelemetry"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/pkg/stanza"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/pkg/translator/jaeger"
schedule:
Expand Down
3 changes: 0 additions & 3 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,6 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.52.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.52.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.52.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.52.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.52.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.52.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.52.0 // indirect
Expand Down Expand Up @@ -558,8 +557,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/share

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

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza => ../../internal/stanza

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

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => ../../exporter/awscloudwatchlogsexporter
Expand Down
5 changes: 1 addition & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.52.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.52.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.52.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.52.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.52.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.52.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.52.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.52.0
Expand Down Expand Up @@ -384,7 +384,6 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.52.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.52.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.52.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.52.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.52.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.52.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.52.0 // indirect
Expand Down Expand Up @@ -562,8 +561,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/share

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

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza => ./internal/stanza

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

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => ./exporter/awscloudwatchlogsexporter
Expand Down
10 changes: 5 additions & 5 deletions internal/components/receivers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"go.opentelemetry.io/collector/consumer/consumertest"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver"
Expand Down Expand Up @@ -110,7 +110,7 @@ func TestDefaultReceivers(t *testing.T) {
receiver: "filelog",
getConfigFn: func() config.Receiver {
cfg := rcvrFactories["filelog"].CreateDefaultConfig().(*filelogreceiver.FileLogConfig)
cfg.Input = stanza.InputConfig{
cfg.Input = adapter.InputConfig{
"include": []string{
path.Join(testutil.NewTemporaryDirectory(t), "*"),
},
Expand Down Expand Up @@ -271,7 +271,7 @@ func TestDefaultReceivers(t *testing.T) {
receiver: "syslog",
getConfigFn: func() config.Receiver {
cfg := rcvrFactories["syslog"].CreateDefaultConfig().(*syslogreceiver.SysLogConfig)
cfg.Input = stanza.InputConfig{
cfg.Input = adapter.InputConfig{
"tcp": map[string]interface{}{
"listen_address": "0.0.0.0:0",
},
Expand All @@ -284,7 +284,7 @@ func TestDefaultReceivers(t *testing.T) {
receiver: "tcplog",
getConfigFn: func() config.Receiver {
cfg := rcvrFactories["tcplog"].CreateDefaultConfig().(*tcplogreceiver.TCPLogConfig)
cfg.Input = stanza.InputConfig{
cfg.Input = adapter.InputConfig{
"listen_address": "0.0.0.0:0",
}
return cfg
Expand All @@ -294,7 +294,7 @@ func TestDefaultReceivers(t *testing.T) {
receiver: "udplog",
getConfigFn: func() config.Receiver {
cfg := rcvrFactories["udplog"].CreateDefaultConfig().(*udplogreceiver.UDPLogConfig)
cfg.Input = stanza.InputConfig{
cfg.Input = adapter.InputConfig{
"listen_address": "0.0.0.0:0",
}
return cfg
Expand Down
1 change: 0 additions & 1 deletion internal/stanza/Makefile

This file was deleted.

51 changes: 0 additions & 51 deletions internal/stanza/go.mod

This file was deleted.

Loading

0 comments on commit e6ec2dc

Please sign in to comment.