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

[OCB] Make AWS XRay/EMF Exporters available as individual modules directly from amazon-contributing #248

Closed
wants to merge 3 commits into from
Closed

[OCB] Make AWS XRay/EMF Exporters available as individual modules directly from amazon-contributing #248

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
0d81b22
rename aws exporters modules to be sourced from amazon-contributing
jj22ee Oct 16, 2024
02f8d8c
Remove dependency on internal/coreinternal
jj22ee Oct 30, 2024
136534d
go mod tidy
jj22ee Oct 30, 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
4 changes: 2 additions & 2 deletions exporter/awsemfexporter/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"go.opentelemetry.io/collector/component"
"go.uber.org/zap"

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

Check failure on line 12 in exporter/awsemfexporter/config.go

View workflow job for this annotation

GitHub Actions / collector-build 

missing go.sum entry for module providing package github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil (imported by github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter); to add:

Check failure on line 12 in exporter/awsemfexporter/config.go

View workflow job for this annotation

GitHub Actions / docker-build 

missing go.sum entry for module providing package github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil (imported by github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter); to add:

Check failure on line 12 in exporter/awsemfexporter/config.go

View workflow job for this annotation

GitHub Actions / setup-environment 

missing go.sum entry for module providing package github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil (imported by github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter); to add:
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs"

Check failure on line 13 in exporter/awsemfexporter/config.go

View workflow job for this annotation

GitHub Actions / collector-build 

missing go.sum entry for module providing package github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs (imported by github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter); to add:

Check failure on line 13 in exporter/awsemfexporter/config.go

View workflow job for this annotation

GitHub Actions / docker-build 

missing go.sum entry for module providing package github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs (imported by github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter); to add:

Check failure on line 13 in exporter/awsemfexporter/config.go

View workflow job for this annotation

GitHub Actions / setup-environment 

missing go.sum entry for module providing package github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs (imported by github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter); to add:
mxiamxia marked this conversation as resolved.
Show resolved Hide resolved
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry"
)

Expand Down
4 changes: 2 additions & 2 deletions exporter/awsemfexporter/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"go.opentelemetry.io/collector/featuregate"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/metadata"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil"
"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: 1 addition & 1 deletion exporter/awsemfexporter/datapoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"go.uber.org/zap"
"golang.org/x/exp/maps"

aws "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics"
aws "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics"

Check failure on line 17 in exporter/awsemfexporter/datapoint.go

View workflow job for this annotation

GitHub Actions / collector-build 

missing go.sum entry for module providing package github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics (imported by github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter); to add:

Check failure on line 17 in exporter/awsemfexporter/datapoint.go

View workflow job for this annotation

GitHub Actions / docker-build 

missing go.sum entry for module providing package github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics (imported by github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter); to add:

Check failure on line 17 in exporter/awsemfexporter/datapoint.go

View workflow job for this annotation

GitHub Actions / setup-environment 

missing go.sum entry for module providing package github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics (imported by github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter); to add:
)

const (
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsemfexporter/datapoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest/observer"

aws "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics"
aws "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics"
)

type metricValueType string
Expand Down
6 changes: 3 additions & 3 deletions exporter/awsemfexporter/emf_exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
"go.opentelemetry.io/collector/pdata/pmetric"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/appsignals"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs"
"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/appsignals"

Check failure on line 23 in exporter/awsemfexporter/emf_exporter.go

View workflow job for this annotation

GitHub Actions / collector-build 

no required module provides package github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/appsignals; to add it:

Check failure on line 23 in exporter/awsemfexporter/emf_exporter.go

View workflow job for this annotation

GitHub Actions / docker-build 

no required module provides package github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/appsignals; to add it:

Check failure on line 23 in exporter/awsemfexporter/emf_exporter.go

View workflow job for this annotation

GitHub Actions / setup-environment 

no required module provides package github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/appsignals; to add it:
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsemfexporter/emf_exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest/observer"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs"
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs"
)

const defaultRetryCount = 1
Expand Down
4 changes: 2 additions & 2 deletions exporter/awsemfexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"go.opentelemetry.io/collector/featuregate"
"go.uber.org/zap"

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

Check failure on line 15 in exporter/awsemfexporter/factory.go

View workflow job for this annotation

GitHub Actions / collector-build 

no required module provides package github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/metadata; to add it:

Check failure on line 15 in exporter/awsemfexporter/factory.go

View workflow job for this annotation

GitHub Actions / docker-build 

no required module provides package github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/metadata; to add it:

Check failure on line 15 in exporter/awsemfexporter/factory.go

View workflow job for this annotation

GitHub Actions / setup-environment 

no required module provides package github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/metadata; to add it:
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry"
)

Expand Down
2 changes: 1 addition & 1 deletion exporter/awsemfexporter/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"go.opentelemetry.io/collector/confmap/confmaptest"
"go.opentelemetry.io/collector/exporter/exportertest"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/metadata"
"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/metadata"
)

func TestCreateDefaultConfig(t *testing.T) {
Expand Down
19 changes: 8 additions & 11 deletions exporter/awsemfexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter
module github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter

go 1.22.5

require (
github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240419190856-2f880467f335
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.103.0
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.103.0
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics v0.103.0
github.com/aws/aws-sdk-go v1.53.11
github.com/google/uuid v1.6.0
github.com/jellydator/ttlcache/v3 v3.2.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.103.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.103.0
Expand All @@ -28,7 +27,7 @@ require (
)

require (
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-00010101000000-000000000000 // indirect
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20241024160840-0c7076070f12 // indirect
github.com/aws/aws-sdk-go-v2 v1.22.2 // indirect
github.com/aws/smithy-go v1.16.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand Down Expand Up @@ -74,13 +73,11 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics => ../../internal/aws/metrics
replace github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics => ../../internal/aws/metrics

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => ../../internal/aws/awsutil
replace github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil => ../../internal/aws/awsutil

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => ../../internal/aws/cwlogs

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
replace github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs => ../../internal/aws/cwlogs

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

Expand Down
2 changes: 2 additions & 0 deletions exporter/awsemfexporter/go.sum
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 exporter/awsemfexporter/grouped_metric.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"go.opentelemetry.io/collector/pdata/pmetric"
"go.uber.org/zap"

aws "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics"
aws "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics"
)

// groupedMetric defines set of metrics with same namespace, timestamp and labels
Expand Down
4 changes: 2 additions & 2 deletions exporter/awsemfexporter/metric_translator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"go.uber.org/multierr"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs"
aws "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics"
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs"
aws "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics"
)

const (
Expand Down
11 changes: 7 additions & 4 deletions exporter/awsemfexporter/metric_translator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,13 @@ import (
"go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest/observer"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/occonventions"
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs"
)

// Copied from "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal/occonventions"
// We do not want to add a dependency on internal package `occonventions` for a test case
const opencensusAttributeExporterVersion = "opencensus.exporterversion"

const defaultNumberOfTestMetrics = 3

func createTestResourceMetrics() pmetric.ResourceMetrics {
Expand All @@ -33,7 +36,7 @@ func createTestResourceMetrics() pmetric.ResourceMetrics {

func createTestResourceMetricsHelper(numMetrics int) pmetric.ResourceMetrics {
rm := pmetric.NewResourceMetrics()
rm.Resource().Attributes().PutStr(occonventions.AttributeExporterVersion, "SomeVersion")
rm.Resource().Attributes().PutStr(opencensusAttributeExporterVersion, "SomeVersion")
rm.Resource().Attributes().PutStr(conventions.AttributeServiceName, "myServiceName")
rm.Resource().Attributes().PutStr(conventions.AttributeServiceNamespace, "myServiceNS")
rm.Resource().Attributes().PutStr("ClusterName", "myCluster")
Expand Down Expand Up @@ -431,7 +434,7 @@ func TestTranslateOtToGroupedMetric(t *testing.T) {
t.Run("No metrics", func(t *testing.T) {
rm := pmetric.NewResourceMetrics()
rm.Resource().Attributes().PutStr(conventions.AttributeServiceName, "myServiceName")
rm.Resource().Attributes().PutStr(occonventions.AttributeExporterVersion, "SomeVersion")
rm.Resource().Attributes().PutStr(opencensusAttributeExporterVersion, "SomeVersion")
groupedMetrics := make(map[any]*groupedMetric)
err := translator.translateOTelToGroupedMetric(rm, groupedMetrics, config)
assert.NoError(t, err)
Expand Down
6 changes: 2 additions & 4 deletions exporter/awsemfexporter/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import (
"go.opentelemetry.io/collector/pdata/pmetric"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/occonventions"
)

func TestReplacePatternValidTaskId(t *testing.T) {
Expand Down Expand Up @@ -250,15 +248,15 @@ func TestGetNamespace(t *testing.T) {
func TestGetLogInfo(t *testing.T) {
rm1 := pmetric.NewResourceMetrics()
rm1.Resource().Attributes().PutStr(conventions.AttributeServiceName, "myServiceName")
rm1.Resource().Attributes().PutStr(occonventions.AttributeExporterVersion, "SomeVersion")
rm1.Resource().Attributes().PutStr(opencensusAttributeExporterVersion, "SomeVersion")
rm1.Resource().Attributes().PutStr("aws.ecs.cluster.name", "test-cluster-name")
rm1.Resource().Attributes().PutStr("aws.ecs.task.id", "test-task-id")
rm1.Resource().Attributes().PutStr("k8s.node.name", "ip-192-168-58-245.ec2.internal")
rm1.Resource().Attributes().PutStr("aws.ecs.container.instance.id", "203e0410260d466bab7873bb4f317b4e")
rm1.Resource().Attributes().PutStr("aws.ecs.task.family", "test-task-definition-family")
rm2 := pmetric.NewResourceMetrics()
rm2.Resource().Attributes().PutStr(conventions.AttributeServiceName, "test-emf")
rm2.Resource().Attributes().PutStr(occonventions.AttributeExporterVersion, "SomeVersion")
rm2.Resource().Attributes().PutStr(opencensusAttributeExporterVersion, "SomeVersion")
rm2.Resource().Attributes().PutStr("ClusterName", "test-cluster-name")
rm2.Resource().Attributes().PutStr("TaskId", "test-task-id")
rm2.Resource().Attributes().PutStr("NodeName", "ip-192-168-58-245.ec2.internal")
Expand Down
8 changes: 4 additions & 4 deletions exporter/awsxrayexporter/awsxray.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
"go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/translator"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil"
awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray/telemetry"
"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/translator"

Check failure on line 23 in exporter/awsxrayexporter/awsxray.go

View workflow job for this annotation

GitHub Actions / collector-build 

no required module provides package github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/translator; to add it:

Check failure on line 23 in exporter/awsxrayexporter/awsxray.go

View workflow job for this annotation

GitHub Actions / docker-build 

no required module provides package github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/translator; to add it:

Check failure on line 23 in exporter/awsxrayexporter/awsxray.go

View workflow job for this annotation

GitHub Actions / setup-environment 

no required module provides package github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/translator; to add it:
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
awsxray "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray"

Check failure on line 25 in exporter/awsxrayexporter/awsxray.go

View workflow job for this annotation

GitHub Actions / collector-build 

missing go.sum entry for module providing package github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray (imported by github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter); to add:

Check failure on line 25 in exporter/awsxrayexporter/awsxray.go

View workflow job for this annotation

GitHub Actions / docker-build 

missing go.sum entry for module providing package github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray (imported by github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter); to add:

Check failure on line 25 in exporter/awsxrayexporter/awsxray.go

View workflow job for this annotation

GitHub Actions / setup-environment 

missing go.sum entry for module providing package github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray (imported by github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter); to add:
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray/telemetry"

Check failure on line 26 in exporter/awsxrayexporter/awsxray.go

View workflow job for this annotation

GitHub Actions / collector-build 

missing go.sum entry for module providing package github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray/telemetry (imported by github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter); to add:

Check failure on line 26 in exporter/awsxrayexporter/awsxray.go

View workflow job for this annotation

GitHub Actions / docker-build 

missing go.sum entry for module providing package github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray/telemetry (imported by github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter); to add:

Check failure on line 26 in exporter/awsxrayexporter/awsxray.go

View workflow job for this annotation

GitHub Actions / setup-environment 

missing go.sum entry for module providing package github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray/telemetry (imported by github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter); to add:
)

const (
Expand Down
6 changes: 3 additions & 3 deletions exporter/awsxrayexporter/awsxray_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray/telemetry"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray/telemetry/telemetrytest"
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray/telemetry"
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray/telemetry/telemetrytest"
)

func TestTraceExport(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions exporter/awsxrayexporter/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package awsxrayexporter // import "github.com/open-telemetry/opentelemetry-colle
import (
"go.opentelemetry.io/collector/component"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray/telemetry"
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray/telemetry"
)

// Config defines configuration for AWS X-Ray exporter.
Expand Down
4 changes: 2 additions & 2 deletions exporter/awsxrayexporter/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/confmap/confmaptest"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/metadata"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil"
"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/metadata"
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
)

func TestLoadConfig(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions exporter/awsxrayexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/featuregate"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/metadata"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray/telemetry"
"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/metadata"

Check failure on line 13 in exporter/awsxrayexporter/factory.go

View workflow job for this annotation

GitHub Actions / collector-build 

no required module provides package github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/metadata; to add it:

Check failure on line 13 in exporter/awsxrayexporter/factory.go

View workflow job for this annotation

GitHub Actions / docker-build 

no required module provides package github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/metadata; to add it:

Check failure on line 13 in exporter/awsxrayexporter/factory.go

View workflow job for this annotation

GitHub Actions / setup-environment 

no required module provides package github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/metadata; to add it:
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray/telemetry"
)

var skipTimestampValidationFeatureGate = featuregate.GlobalRegistry().MustRegister(
Expand Down
4 changes: 2 additions & 2 deletions exporter/awsxrayexporter/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"go.opentelemetry.io/collector/exporter/exportertest"
"go.opentelemetry.io/collector/featuregate"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/metadata"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil"
"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/metadata"
"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
)

func TestCreateDefaultConfig(t *testing.T) {
Expand Down
15 changes: 6 additions & 9 deletions exporter/awsxrayexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter
module github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter

go 1.22.5

require (
github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240419190856-2f880467f335
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.103.0
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.103.0
github.com/aws/aws-sdk-go v1.53.11
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.103.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.103.0
go.opentelemetry.io/collector/confmap v0.103.0
Expand All @@ -23,7 +22,7 @@ require (
)

require (
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-00010101000000-000000000000 // indirect
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20241024160840-0c7076070f12 // indirect
github.com/aws/aws-sdk-go-v2 v1.22.2 // indirect
github.com/aws/smithy-go v1.16.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand Down Expand Up @@ -70,11 +69,9 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => ./../../internal/aws/xray
replace github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray => ./../../internal/aws/xray

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => ./../../internal/aws/awsutil

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
replace github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil => ./../../internal/aws/awsutil

replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../override/aws

Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/internal/translator/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"go.opentelemetry.io/collector/pdata/pcommon"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"

awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
awsxray "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray"
)

func makeAws(attributes map[string]pcommon.Value, resource pcommon.Resource, logGroupNames []string) (map[string]pcommon.Value, *awsxray.AWSData) {
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/internal/translator/aws_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"go.opentelemetry.io/collector/pdata/pcommon"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"

awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
awsxray "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray"
)

func TestAwsFromEc2Resource(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/internal/translator/cause.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"go.opentelemetry.io/collector/pdata/ptrace"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"

awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
awsxray "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray"
)

// ExceptionEventName the name of the exception event.
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/internal/translator/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"go.opentelemetry.io/collector/pdata/ptrace"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"

awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
awsxray "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray"
)

const (
Expand Down
Loading
Loading