Skip to content

Commit

Permalink
move-internal-kafka (#7)
Browse files Browse the repository at this point in the history
[pkg/kafka] move internal/kafka to pkg/kafka
  • Loading branch information
vincentfree committed Jan 10, 2024
1 parent 4b5b9b4 commit b55ea57
Show file tree
Hide file tree
Showing 35 changed files with 64 additions and 37 deletions.
27 changes: 27 additions & 0 deletions .chloggen/move_internal_kafka_to_pkg.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: kafkainternal

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: move internal/kafka to pkg/kafka so config is visible for downstream projects

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [30377]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user, api]
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ internal/docker/ @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
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
Expand All @@ -130,6 +129,7 @@ pkg/batchperresourceattr/ @open-telemetry/collect
pkg/batchpersignal/ @open-telemetry/collector-contrib-approvers @jpkrohling
pkg/experimentalmetricmetadata/ @open-telemetry/collector-contrib-approvers @rmfitzpatrick
pkg/golden/ @open-telemetry/collector-contrib-approvers @djaglowski @atoulme
pkg/kafka/ @open-telemetry/collector-contrib-approvers @pavolloffay @MovieStoreGuy
pkg/ottl/ @open-telemetry/collector-contrib-approvers @TylerHelmuth @kentquirk @bogdandrutu @evan-bradley
pkg/pdatatest/ @open-telemetry/collector-contrib-approvers @djaglowski @fatsheep9146
pkg/pdatautil/ @open-telemetry/collector-contrib-approvers @dmitryax
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ body:
- internal/filter
- internal/k8sconfig
- internal/k8stest
- internal/kafka
- internal/kubelet
- internal/metadataproviders
- internal/sharedcomponent
Expand All @@ -127,6 +126,7 @@ body:
- pkg/batchpersignal
- pkg/experimentalmetricmetadata
- pkg/golden
- pkg/kafka
- pkg/ottl
- pkg/pdatatest
- pkg/pdatautil
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ body:
- internal/filter
- internal/k8sconfig
- internal/k8stest
- internal/kafka
- internal/kubelet
- internal/metadataproviders
- internal/sharedcomponent
Expand All @@ -121,6 +120,7 @@ body:
- pkg/batchpersignal
- pkg/experimentalmetricmetadata
- pkg/golden
- pkg/kafka
- pkg/ottl
- pkg/pdatatest
- pkg/pdatautil
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/other.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ body:
- internal/filter
- internal/k8sconfig
- internal/k8stest
- internal/kafka
- internal/kubelet
- internal/metadataproviders
- internal/sharedcomponent
Expand All @@ -121,6 +120,7 @@ body:
- pkg/batchpersignal
- pkg/experimentalmetricmetadata
- pkg/golden
- pkg/kafka
- pkg/ottl
- pkg/pdatatest
- pkg/pdatautil
Expand Down
4 changes: 2 additions & 2 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -510,9 +510,9 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/collectd v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.92.0 // indirect
Expand Down Expand Up @@ -743,7 +743,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

Expand Down
2 changes: 1 addition & 1 deletion cmd/otelcontribcol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,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
Expand Down
4 changes: 2 additions & 2 deletions cmd/otelcontribcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -544,14 +544,14 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.92.0 // indirect
Expand Down Expand Up @@ -952,7 +952,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

Expand Down
2 changes: 1 addition & 1 deletion exporter/kafkaexporter/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion exporter/kafkaexporter/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions exporter/kafkaexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/jaegertracing/jaeger v1.53.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.92.0
github.com/openzipkin/zipkin-go v0.4.2
Expand Down Expand Up @@ -84,7 +84,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

Expand Down
2 changes: 1 addition & 1 deletion exporter/kafkaexporter/kafka_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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")
Expand Down
2 changes: 1 addition & 1 deletion exporter/kafkaexporter/kafka_exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata"
"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) {
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -516,14 +516,14 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.92.0 // indirect
Expand Down Expand Up @@ -744,7 +744,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

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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 (
"crypto/sha256"
Expand All @@ -11,7 +11,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.
Expand Down Expand Up @@ -51,7 +51,7 @@ type AWSMSKConfig struct {
BrokerAddr string `mapstructure:"broker_addr"`
}

// KerberosConfig defines kereros configuration.
// KerberosConfig defines kerberos configuration.
type KerberosConfig struct {
ServiceName string `mapstructure:"service_name"`
Realm string `mapstructure:"realm"`
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/kafka/awsmsk/doc.go → pkg/kafka/awsmsk/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/kafka/go.mod → pkg/kafka/go.mod
Original file line number Diff line number Diff line change
@@ -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.20

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion receiver/kafkametricsreceiver/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion receiver/kafkametricsreceiver/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions receiver/kafkametricsreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.20
require (
github.com/IBM/sarama v1.42.1
github.com/google/go-cmp v0.6.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka v0.92.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/component v0.92.0
go.opentelemetry.io/collector/config/configtls v0.92.0
Expand Down Expand Up @@ -73,7 +73,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
Expand Down
2 changes: 1 addition & 1 deletion receiver/kafkametricsreceiver/receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion receiver/kafkametricsreceiver/receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion receiver/kafkareceiver/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion receiver/kafkareceiver/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions receiver/kafkareceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/json-iterator/go v1.1.12
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.92.0
Expand Down Expand Up @@ -92,7 +92,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

Expand Down
2 changes: 1 addition & 1 deletion receiver/kafkareceiver/kafka_receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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 (
Expand Down
Loading

0 comments on commit b55ea57

Please sign in to comment.