Skip to content

Commit

Permalink
[azureblobreceiver] Add azureblobreceiver to components (#16767)
Browse files Browse the repository at this point in the history 
* [azureblobreceiver] Add azureblobreceiver to components

Closes #16567

* add changelog entry

* Revert "add changelog entry"

This reverts commit dbd13dfd7ac79817ce3ddba07383e4630e8d9797.

* fix config for azureblobreceiver test

* fixing go module config after rebase

* ran make crosslink

* ran make gotidy
  • Loading branch information
@mattsains
mattsains authored Dec 29, 2022
1 parent 3b25b98 commit 2ada50f
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 12 deletions.
7 changes: 5 additions & 2 deletions cmd/configschema/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ require (
github.com/Azure/azure-kusto-go v0.9.2 // indirect
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
github.com/Azure/azure-sdk-for-go v67.1.0+incompatible // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.22.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 // indirect
github.com/Azure/azure-storage-blob-go v0.15.0 // indirect
github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd // indirect
Expand Down Expand Up @@ -418,6 +418,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.68.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfirehosereceiver v0.68.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.68.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureblobreceiver v0.0.0-00010101000000-000000000000 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver v0.68.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver v0.68.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.68.0 // indirect
Expand Down Expand Up @@ -870,6 +871,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfi

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => ../../receiver/awsxrayreceiver

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureblobreceiver => ../../receiver/azureblobreceiver

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver => ../../receiver/azureeventhubreceiver

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver => ../../receiver/bigipreceiver
Expand Down
6 changes: 4 additions & 2 deletions cmd/configschema/go.sum
View file

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

7 changes: 5 additions & 2 deletions cmd/otelcontribcol/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ require (
github.com/Azure/azure-kusto-go v0.9.2 // indirect
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
github.com/Azure/azure-sdk-for-go v67.1.0+incompatible // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.22.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 // indirect
github.com/Azure/azure-storage-blob-go v0.15.0 // indirect
github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd // indirect
Expand Down Expand Up @@ -407,6 +407,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.68.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfirehosereceiver v0.68.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.68.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureblobreceiver v0.68.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver v0.68.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver v0.68.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.68.0 // indirect
Expand Down Expand Up @@ -1010,3 +1011,5 @@ replace github.com/go-kit/log => github.com/dannykopping/go-kit-log v0.2.2-0.202

// see https://github.com/mattn/go-ieproxy/issues/45
replace github.com/mattn/go-ieproxy => github.com/mattn/go-ieproxy v0.0.1

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureblobreceiver => ../../receiver/azureblobreceiver
6 changes: 4 additions & 2 deletions cmd/otelcontribcol/go.sum
View file

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

2 changes: 2 additions & 0 deletions cmd/oteltestbedcol/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -633,3 +633,5 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpl
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor => ../../processor/probabilisticsamplerprocessor

replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/datadogprocessor => ../../processor/datadogprocessor

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureblobreceiver => ../../receiver/azureblobreceiver
7 changes: 5 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.68.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfirehosereceiver v0.68.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.68.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureblobreceiver v0.0.0-00010101000000-000000000000
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver v0.68.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver v0.68.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.68.0
Expand Down Expand Up @@ -200,8 +201,8 @@ require (
github.com/Azure/azure-kusto-go v0.9.2 // indirect
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
github.com/Azure/azure-sdk-for-go v67.1.0+incompatible // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.22.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 // indirect
github.com/Azure/azure-storage-blob-go v0.15.0 // indirect
github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd // indirect
Expand Down Expand Up @@ -870,6 +871,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfi

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => ./receiver/awsxrayreceiver

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureblobreceiver => ./receiver/azureblobreceiver

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver => ./receiver/azureeventhubreceiver

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver => ./receiver/bigipreceiver
Expand Down
6 changes: 4 additions & 2 deletions go.sum
View file

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

2 changes: 2 additions & 0 deletions internal/components/components.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfirehosereceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureblobreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver"
Expand Down Expand Up @@ -223,6 +224,7 @@ func Components() (otelcol.Factories, error) {
awsfirehosereceiver.NewFactory(),
awscloudwatchreceiver.NewFactory(),
awsxrayreceiver.NewFactory(),
azureblobreceiver.NewFactory(),
azureeventhubreceiver.NewFactory(),
bigipreceiver.NewFactory(),
carbonreceiver.NewFactory(),
Expand Down
11 changes: 11 additions & 0 deletions internal/components/receivers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (

tcpop "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/input/tcp"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscloudwatchreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureblobreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver"
Expand Down Expand Up @@ -94,6 +95,16 @@ func TestDefaultReceivers(t *testing.T) {
receiver: "awsxray",
skipLifecyle: true, // Requires AWS endpoint to check identity to run
},
{
receiver: "azureblob",
getConfigFn: func() component.Config {
cfg := rcvrFactories["azureblob"].CreateDefaultConfig().(*azureblobreceiver.Config)
cfg.ConnectionString = "DefaultEndpointsProtocol=http;AccountName=accountName;AccountKey=accountKey==;BlobEndpoint=test"
cfg.EventHub.EndPoint = "DefaultEndpointsProtocol=http;SharedAccessKeyName=secret;SharedAccessKey=secret;Endpoint=test.test"
return cfg
},
skipLifecyle: true, // Requires Azure event hub to run
},
{
receiver: "azureeventhub",
getConfigFn: func() component.Config {
Expand Down

0 comments on commit 2ada50f

Please sign in to comment.