Skip to content

Commit

Permalink
more 'amazon-contributing' related updates - part 4
Browse files Browse the repository at this point in the history
  • Loading branch information
@jj22ee
jj22ee committed Nov 6, 2024
1 parent 6e06dca commit c59e56d
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 15 deletions.
4 changes: 2 additions & 2 deletions cmd/otelcontribcol/components.go
View file

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

5 changes: 3 additions & 2 deletions cmd/otelcontribcol/exporters_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@ import (
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/ptrace"

"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter"
"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter"
"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awskinesisexporter"
"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter"
Expand Down
18 changes: 11 additions & 7 deletions cmd/otelcontribcol/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/otelcontrib
go 1.22.5

require (
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.103.0
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.103.0
Expand All @@ -19,10 +21,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.103.0
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awskinesisexporter v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.103.0
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.103.0
Expand Down Expand Up @@ -370,7 +370,11 @@ require (
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
github.com/aliyun/aliyun-log-go-sdk v0.1.76 // indirect
github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240419190856-2f880467f335 // indirect
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240415183253-230331014d2c // indirect
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.103.0 // indirect
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.103.0 // indirect
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics v0.103.0 // indirect
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.103.0 // indirect
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20241024160840-0c7076070f12 // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/apache/arrow/go/v15 v15.0.0 // indirect
github.com/apache/pulsar-client-go v0.8.1 // indirect
Expand Down Expand Up @@ -609,14 +613,14 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampcustommessages v0.103.0 // indirect
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.103.0 // indirect
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.103.0 // indirect
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.103.0 // indirect
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/collectd v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.103.0 // indirect
Expand Down
8 changes: 8 additions & 0 deletions cmd/otelcontribcol/go.sum
View file

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

1 change: 1 addition & 0 deletions exporter/awsemfexporter/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry"
)

Expand Down
1 change: 1 addition & 0 deletions exporter/awsemfexporter/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (

"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/metadata"
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry"
)

Expand Down
1 change: 1 addition & 0 deletions exporter/awsemfexporter/factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (

"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/metadata"
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry"
)

Expand Down
2 changes: 2 additions & 0 deletions exporter/awsemfexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,5 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest

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

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
2 changes: 0 additions & 2 deletions exporter/awsemfexporter/go.sum
View file

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

4 changes: 2 additions & 2 deletions internal/components/components.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import (
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/otlpreceiver"

"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter"
"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector"
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector"
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector"
Expand All @@ -30,9 +32,7 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter"
"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awskinesisexporter"
"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter"
Expand Down

0 comments on commit c59e56d

Please sign in to comment.