diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 83c067a2d67f..6bc093bf1318 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -129,7 +129,7 @@ internal/exp/metrics/ @open-telemetry/collect internal/filter/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers internal/k8sconfig/ @open-telemetry/collector-contrib-approvers @dmitryax internal/k8stest/ @open-telemetry/collector-contrib-approvers @crobert-1 -internal/kafka/ @open-telemetry/collector-contrib-approvers @pavolloffay @MovieStoreGuy +pkg/kafka/ @open-telemetry/collector-contrib-approvers @pavolloffay @MovieStoreGuy internal/kubelet/ @open-telemetry/collector-contrib-approvers @dmitryax internal/metadataproviders/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole internal/sharedcomponent/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 18ebcf6084c2..e0079634f82a 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -127,7 +127,7 @@ body: - internal/filter - internal/k8sconfig - internal/k8stest - - internal/kafka + - pkg/kafka - internal/kubelet - internal/metadataproviders - internal/sharedcomponent diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index 55d3661cd630..61da17d7848c 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -121,7 +121,7 @@ body: - internal/filter - internal/k8sconfig - internal/k8stest - - internal/kafka + - pkg/kafka - internal/kubelet - internal/metadataproviders - internal/sharedcomponent diff --git a/.github/ISSUE_TEMPLATE/other.yaml b/.github/ISSUE_TEMPLATE/other.yaml index 00a97322e50a..531420ee29b2 100644 --- a/.github/ISSUE_TEMPLATE/other.yaml +++ b/.github/ISSUE_TEMPLATE/other.yaml @@ -121,7 +121,7 @@ body: - internal/filter - internal/k8sconfig - internal/k8stest - - internal/kafka + - pkg/kafka - internal/kubelet - internal/metadataproviders - internal/sharedcomponent diff --git a/.github/ISSUE_TEMPLATE/unmaintained.yaml b/.github/ISSUE_TEMPLATE/unmaintained.yaml index d5074d4c1e9f..7cbcb67a94eb 100644 --- a/.github/ISSUE_TEMPLATE/unmaintained.yaml +++ b/.github/ISSUE_TEMPLATE/unmaintained.yaml @@ -126,7 +126,7 @@ body: - internal/filter - internal/k8sconfig - internal/k8stest - - internal/kafka + - pkg/kafka - internal/kubelet - internal/metadataproviders - internal/sharedcomponent diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index fd5a1f84c638..731222dbe5b3 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -563,9 +563,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/collectd v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.101.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.101.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.101.0 // indirect @@ -810,7 +810,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/docke replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => ../../internal/k8sconfig -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka => ../../internal/kafka +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka => ../../pkg/kafka replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => ../../internal/kubelet diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index 00af6503fa80..d2380697469d 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -343,7 +343,7 @@ replaces: - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter => ../../exporter/azuredataexplorerexporter - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => ../../internal/k8sconfig - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest => ../../internal/k8stest - - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka => ../../internal/kafka + - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka => ../../pkg/kafka - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver => ../../receiver/carbonreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter => ../../exporter/splunkhecexporter - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter => ../../exporter/prometheusexporter diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 541a37840957..41628c35331b 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -619,7 +619,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.101.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.101.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.101.0 // indirect @@ -1041,7 +1041,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sco replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest => ../../internal/k8stest -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka => ../../internal/kafka +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka => ../../pkg/kafka replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver => ../../receiver/carbonreceiver diff --git a/exporter/kafkaexporter/config.go b/exporter/kafkaexporter/config.go index d048b27a88f9..4a526a0d34a5 100644 --- a/exporter/kafkaexporter/config.go +++ b/exporter/kafkaexporter/config.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/exporter/exporterhelper" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka" ) // Config defines configuration for Kafka exporter. diff --git a/exporter/kafkaexporter/config_test.go b/exporter/kafkaexporter/config_test.go index 4b43f948ebe3..89db7061324a 100644 --- a/exporter/kafkaexporter/config_test.go +++ b/exporter/kafkaexporter/config_test.go @@ -19,7 +19,7 @@ import ( "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter/internal/metadata" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka" ) func TestLoadConfig(t *testing.T) { diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index f9ea5aa1b492..fa8ed5fa4010 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/jaegertracing/jaeger v1.57.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.101.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.101.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.101.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka v0.101.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.101.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.101.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.101.0 @@ -95,7 +95,7 @@ require ( replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka => ../../internal/kafka +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka => ../../pkg/kafka replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal => ../../pkg/batchpersignal diff --git a/exporter/kafkaexporter/kafka_exporter.go b/exporter/kafkaexporter/kafka_exporter.go index 59fc26e647b1..d96c876dd1f2 100644 --- a/exporter/kafkaexporter/kafka_exporter.go +++ b/exporter/kafkaexporter/kafka_exporter.go @@ -18,7 +18,7 @@ import ( "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/zap" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka" ) var errUnrecognizedEncoding = fmt.Errorf("unrecognized encoding") diff --git a/exporter/kafkaexporter/kafka_exporter_test.go b/exporter/kafkaexporter/kafka_exporter_test.go index 1ebd548b49aa..0ba0af01d49b 100644 --- a/exporter/kafkaexporter/kafka_exporter_test.go +++ b/exporter/kafkaexporter/kafka_exporter_test.go @@ -21,7 +21,7 @@ import ( "go.opentelemetry.io/collector/pdata/testdata" "go.uber.org/zap" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka" ) func TestNewExporter_err_version(t *testing.T) { diff --git a/go.mod b/go.mod index ae201d079db7..f89a0d3c1f6f 100644 --- a/go.mod +++ b/go.mod @@ -566,7 +566,6 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.101.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.101.0 // indirect @@ -575,6 +574,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.101.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.101.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.101.0 // indirect @@ -809,7 +809,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sco replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest => ./internal/k8stest -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka => ./internal/kafka +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka => ./pkg/kafka replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => ./internal/kubelet diff --git a/internal/kafka/Makefile b/pkg/kafka/Makefile similarity index 100% rename from internal/kafka/Makefile rename to pkg/kafka/Makefile diff --git a/internal/kafka/authentication.go b/pkg/kafka/authentication.go similarity index 97% rename from internal/kafka/authentication.go rename to pkg/kafka/authentication.go index 104d6152a1b2..d75041208153 100644 --- a/internal/kafka/authentication.go +++ b/pkg/kafka/authentication.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package kafka // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka" +package kafka // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka" import ( "context" @@ -12,7 +12,7 @@ import ( "github.com/IBM/sarama" "go.opentelemetry.io/collector/config/configtls" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka/awsmsk" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/awsmsk" ) // Authentication defines authentication. diff --git a/internal/kafka/authentication_test.go b/pkg/kafka/authentication_test.go similarity index 100% rename from internal/kafka/authentication_test.go rename to pkg/kafka/authentication_test.go diff --git a/internal/kafka/awsmsk/doc.go b/pkg/kafka/awsmsk/doc.go similarity index 90% rename from internal/kafka/awsmsk/doc.go rename to pkg/kafka/awsmsk/doc.go index 94ac3cee7d7a..a0afa5b54832 100644 --- a/internal/kafka/awsmsk/doc.go +++ b/pkg/kafka/awsmsk/doc.go @@ -7,4 +7,4 @@ // Further details on how the SASL connector works can be viewed here: // // https://github.com/aws/aws-msk-iam-auth#details -package awsmsk // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka/awsmsk" +package awsmsk // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/awsmsk" diff --git a/internal/kafka/awsmsk/iam_scram_client.go b/pkg/kafka/awsmsk/iam_scram_client.go similarity index 99% rename from internal/kafka/awsmsk/iam_scram_client.go rename to pkg/kafka/awsmsk/iam_scram_client.go index b7098a322c9f..ba82cfff4d64 100644 --- a/internal/kafka/awsmsk/iam_scram_client.go +++ b/pkg/kafka/awsmsk/iam_scram_client.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package awsmsk // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka/awsmsk" +package awsmsk // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/awsmsk" import ( "encoding/json" diff --git a/internal/kafka/awsmsk/iam_scram_client_test.go b/pkg/kafka/awsmsk/iam_scram_client_test.go similarity index 100% rename from internal/kafka/awsmsk/iam_scram_client_test.go rename to pkg/kafka/awsmsk/iam_scram_client_test.go diff --git a/internal/kafka/awsmsk/package_test.go b/pkg/kafka/awsmsk/package_test.go similarity index 100% rename from internal/kafka/awsmsk/package_test.go rename to pkg/kafka/awsmsk/package_test.go diff --git a/internal/kafka/go.mod b/pkg/kafka/go.mod similarity index 99% rename from internal/kafka/go.mod rename to pkg/kafka/go.mod index a605525a4f2a..049b13db9b69 100644 --- a/internal/kafka/go.mod +++ b/pkg/kafka/go.mod @@ -1,4 +1,4 @@ -module github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka +module github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka go 1.21.0 diff --git a/internal/kafka/go.sum b/pkg/kafka/go.sum similarity index 100% rename from internal/kafka/go.sum rename to pkg/kafka/go.sum diff --git a/internal/kafka/metadata.yaml b/pkg/kafka/metadata.yaml similarity index 100% rename from internal/kafka/metadata.yaml rename to pkg/kafka/metadata.yaml diff --git a/internal/kafka/package_test.go b/pkg/kafka/package_test.go similarity index 100% rename from internal/kafka/package_test.go rename to pkg/kafka/package_test.go diff --git a/internal/kafka/scram_client.go b/pkg/kafka/scram_client.go similarity index 97% rename from internal/kafka/scram_client.go rename to pkg/kafka/scram_client.go index 0c3f83d8baaf..8d82fdc80ad5 100644 --- a/internal/kafka/scram_client.go +++ b/pkg/kafka/scram_client.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package kafka // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka" +package kafka // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka" import ( "github.com/IBM/sarama" diff --git a/receiver/kafkametricsreceiver/config.go b/receiver/kafkametricsreceiver/config.go index ab71492e10b3..56fe474d6f2c 100644 --- a/receiver/kafkametricsreceiver/config.go +++ b/receiver/kafkametricsreceiver/config.go @@ -6,7 +6,7 @@ package kafkametricsreceiver // import "github.com/open-telemetry/opentelemetry- import ( "go.opentelemetry.io/collector/receiver/scraperhelper" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver/internal/metadata" ) diff --git a/receiver/kafkametricsreceiver/config_test.go b/receiver/kafkametricsreceiver/config_test.go index 930405d361e8..928f9521896f 100644 --- a/receiver/kafkametricsreceiver/config_test.go +++ b/receiver/kafkametricsreceiver/config_test.go @@ -14,7 +14,7 @@ import ( "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/receiver/scraperhelper" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver/internal/metadata" ) diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index 78f38cfbf224..fb152aadb171 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -5,7 +5,7 @@ go 1.21.0 require ( github.com/IBM/sarama v1.43.2 github.com/google/go-cmp v0.6.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.101.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka v0.101.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.101.0 go.opentelemetry.io/collector/config/configtls v0.101.0 @@ -81,7 +81,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka => ../../internal/kafka +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka => ../../pkg/kafka // see https://github.com/distribution/distribution/issues/3590 exclude github.com/docker/distribution v2.8.0+incompatible diff --git a/receiver/kafkametricsreceiver/receiver.go b/receiver/kafkametricsreceiver/receiver.go index 7c8c8dd3e821..846edb7b0079 100644 --- a/receiver/kafkametricsreceiver/receiver.go +++ b/receiver/kafkametricsreceiver/receiver.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/scraperhelper" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka" ) const ( diff --git a/receiver/kafkametricsreceiver/receiver_test.go b/receiver/kafkametricsreceiver/receiver_test.go index 7bec0be85e99..47d861712c90 100644 --- a/receiver/kafkametricsreceiver/receiver_test.go +++ b/receiver/kafkametricsreceiver/receiver_test.go @@ -17,7 +17,7 @@ import ( "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/scraperhelper" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka" ) func TestNewReceiver_invalid_version_err(t *testing.T) { diff --git a/receiver/kafkareceiver/config.go b/receiver/kafkareceiver/config.go index 2f2eff8e6d52..75544db51bf7 100644 --- a/receiver/kafkareceiver/config.go +++ b/receiver/kafkareceiver/config.go @@ -9,7 +9,7 @@ import ( "go.opentelemetry.io/collector/component" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka" ) type AutoCommit struct { diff --git a/receiver/kafkareceiver/config_test.go b/receiver/kafkareceiver/config_test.go index 9d397bf93602..152f4f0bc69c 100644 --- a/receiver/kafkareceiver/config_test.go +++ b/receiver/kafkareceiver/config_test.go @@ -15,7 +15,7 @@ import ( "go.opentelemetry.io/collector/confmap/confmaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver/internal/metadata" ) diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index 14bc000fce1d..b1bf6530135b 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -10,7 +10,7 @@ require ( github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.101.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.101.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.101.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka v0.101.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.101.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.101.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.101.0 @@ -104,7 +104,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafka replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka => ../../internal/kafka +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka => ../../pkg/kafka replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger => ../../pkg/translator/jaeger diff --git a/receiver/kafkareceiver/kafka_receiver.go b/receiver/kafkareceiver/kafka_receiver.go index 6d4f43327c5b..4ba0500e4c32 100644 --- a/receiver/kafkareceiver/kafka_receiver.go +++ b/receiver/kafkareceiver/kafka_receiver.go @@ -18,7 +18,7 @@ import ( "go.opentelemetry.io/collector/receiver/receiverhelper" "go.uber.org/zap" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka" ) const ( diff --git a/receiver/kafkareceiver/kafka_receiver_test.go b/receiver/kafkareceiver/kafka_receiver_test.go index fbc49ecdf0cf..0cdbbe284c7f 100644 --- a/receiver/kafkareceiver/kafka_receiver_test.go +++ b/receiver/kafkareceiver/kafka_receiver_test.go @@ -29,7 +29,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/textutils" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka" ) func TestNewTracesReceiver_version_err(t *testing.T) { diff --git a/versions.yaml b/versions.yaml index 9bcb61d76519..1fac35ee9057 100644 --- a/versions.yaml +++ b/versions.yaml @@ -125,7 +125,7 @@ module-sets: - github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest - - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka + - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet - github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent