Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[azureeventhubreceiver] migrate to current Azure SDK #18

Open
wants to merge 3 commits into
base: nslaughter/azureeventhubreceiver-20240611
Choose a base branch
from
Open

[azureeventhubreceiver] migrate to current Azure SDK #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97bee5d
[azureeventhubreceiver] port PR
nslaughter Jun 6, 2024
6186854
Merge branch 'nslaughter/azureeventhubreceiver-20240611' into nslaugh…
nslaughter Jun 11, 2024
0190b8c
rm Makefile
nslaughter Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion collector/components/azureeventhubreceiver/Makefile
View file
Open in desktop

This file was deleted.

118 changes: 118 additions & 0 deletions collector/components/azureeventhubreceiver/azureresourcelogs_unmarshaler_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 6 additions & 13 deletions collector/components/azureeventhubreceiver/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,12 @@ var (
)

type Config struct {
Connection string `mapstructure:"connection"`
EventHubName string `mapstructure:"eventhub"`
Partition string `mapstructure:"partition"`
Offset string `mapstructure:"offset"`
//
StorageID *component.ID `mapstructure:"storage"`
StorageConnection string `mapstructure:"storage_connection"`
StorageContainer string `mapstructure:"storage_container"`
//
Format string `mapstructure:"format"`
ConsumerGroup string `mapstructure:"group"`
BatchDelay string `mapstructure:"batch_delay"`
BatchCount int `mapstructure:"batch_count"`
Connection string `mapstructure:"connection"`
Partition string `mapstructure:"partition"`
Offset string `mapstructure:"offset"`
StorageID *component.ID `mapstructure:"storage"`
Format string `mapstructure:"format"`
ConsumerGroup string `mapstructure:"group"`
}

func isValidFormat(format string) bool {
Expand Down
11 changes: 0 additions & 11 deletions collector/components/azureeventhubreceiver/eventhubhandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,6 @@ func (c *consumerClientWrapperImpl) Close(ctx context.Context) error {
return c.consumerClient.Close(ctx)
}

// type processorHandler struct {
// processor *azeventhubs.Processor
// dataConsumer dataConsumer
// config *Config
// settings receiver.CreateSettings
// cancel context.CancelFunc
// }

type eventhubHandler struct {
processor *azeventhubs.Processor
consumerClient consumerClientWrapper
Expand All @@ -92,9 +84,6 @@ func newEventhubHandler(config *Config, settings receiver.CreateSettings) *event
// Check if the configuration is meant for testing. This can be done by checking a specific field or a pattern in the connection string.
if strings.Contains(config.Connection, "fake.servicebus.windows.net") {
return nil
// Return a mock handler if the connection string is empty or obviously fake.
// return newMockEventhubHandler()
// return newMockEventhubHandler(config, settings)
}

return &eventhubHandler{
Expand Down
2 changes: 0 additions & 2 deletions collector/components/azureeventhubreceiver/generated_component_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion collector/components/azureeventhubreceiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ require (

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => ../../extension/storage

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

retract (
v0.76.2
Expand Down
40 changes: 0 additions & 40 deletions collector/components/azureeventhubreceiver/rawlogs_unmarshaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,43 +35,3 @@ func (r rawLogsUnmarshaler) UnmarshalLogs(event *azeventhubs.ReceivedEventData)

return l, nil
}

// // Copyright The OpenTelemetry Authors
// // SPDX-License-Identifier: Apache-2.0

// package azureeventhubreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver"

// import (
// "github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs"
// "go.opentelemetry.io/collector/pdata/pcommon"
// "go.opentelemetry.io/collector/pdata/plog"
// "go.uber.org/zap"
// )

// type rawLogsUnmarshaler struct {
// logger *zap.Logger
// }

// func newRawLogsUnmarshaler(logger *zap.Logger) eventLogsUnmarshaler {

// return rawLogsUnmarshaler{
// logger: logger,
// }
// }

// func (r rawLogsUnmarshaler) UnmarshalLogs(event *[]azeventhubs.ReceivedEventData) (plog.Logs, error) {

// l := plog.NewLogs()
// lr := l.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty().LogRecords().AppendEmpty()
// slice := lr.Body().SetEmptyBytes()
// slice.Append(event.EventData...)
// if event.SystemProperties.EnqueuedTime != nil {
// lr.SetTimestamp(pcommon.NewTimestampFromTime(*event.SystemProperties.EnqueuedTime))
// }

// if err := lr.Attributes().FromRaw(event.Properties); err != nil {
// return l, err
// }

// return l, nil
// }
Loading