From 136534d26fb92614f38941f913f7d66e77c19036 Mon Sep 17 00:00:00 2001 From: jjllee Date: Wed, 30 Oct 2024 14:51:27 -0700 Subject: [PATCH] go mod tidy --- exporter/awsemfexporter/go.mod | 8 ++++---- exporter/awsxrayexporter/go.mod | 8 ++++---- exporter/awsxrayexporter/go.sum | 4 ---- internal/aws/awsutil/go.mod | 2 +- internal/aws/xray/go.mod | 4 ++-- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index 2b275ec25ace..55188e4b0fee 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -4,12 +4,12 @@ go 1.22.5 require ( github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240419190856-2f880467f335 - 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/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/pkg/resourcetotelemetry v0.103.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.103.0 @@ -27,7 +27,7 @@ require ( ) require ( - github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20241011214336-9ae2897e22a4 // 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 diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index 6f1f57d1ba59..e01e15aafed0 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -4,9 +4,9 @@ go 1.22.5 require ( github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240419190856-2f880467f335 - github.com/aws/aws-sdk-go v1.53.11 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/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.103.0 go.opentelemetry.io/collector/confmap v0.103.0 @@ -22,7 +22,7 @@ require ( ) require ( - github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20241011214336-9ae2897e22a4 // 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 @@ -69,9 +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/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil => ./../../internal/aws/awsutil replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../override/aws diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index 40cc7d20fc84..63352824831a 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -47,10 +47,6 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.103.9 h1:ms0v177rV7oK7uZ3vOMqR027SYZefvycfyN93iYlOtY= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.103.9/go.mod h1:Rr9/MHpdkCHpeSyk4OVzy2kYsSbQnxcreLVCjH4VKXk= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.103.9 h1:NAHWa/UjQyYNUuRoj5KbygQCBkFZJ6B0nrcG56b/5OI= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.103.9/go.mod h1:QS/EK0fxrJeTZO8DRvePd28E/5Q1VV7pUv8sRsEicvg= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= diff --git a/internal/aws/awsutil/go.mod b/internal/aws/awsutil/go.mod index 95fa71fc8e9c..47eda0d6ef76 100644 --- a/internal/aws/awsutil/go.mod +++ b/internal/aws/awsutil/go.mod @@ -3,7 +3,7 @@ module github.com/amazon-contributing/opentelemetry-collector-contrib/internal/a go 1.22.4 require ( - github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20241011214336-9ae2897e22a4 + github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20241024160840-0c7076070f12 github.com/aws/aws-sdk-go v1.53.11 github.com/stretchr/testify v1.9.0 go.uber.org/goleak v1.3.0 diff --git a/internal/aws/xray/go.mod b/internal/aws/xray/go.mod index c7a13297a3ad..7bd47ea69a66 100644 --- a/internal/aws/xray/go.mod +++ b/internal/aws/xray/go.mod @@ -3,9 +3,9 @@ module github.com/amazon-contributing/opentelemetry-collector-contrib/internal/a go 1.22.4 require ( - github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-00010101000000-000000000000 - github.com/aws/aws-sdk-go v1.53.11 github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.103.0 + github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20241024160840-0c7076070f12 + github.com/aws/aws-sdk-go v1.53.11 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.103.0 go.uber.org/goleak v1.3.0