tmp test - amazon-contributing to jj22ee for override/aws

jj22ee · Nov 7, 2024 · c802bdd · c802bdd
1 parent fb0da8d
commit c802bdd
Show file tree

Hide file tree

Showing 22 changed files with 37 additions and 31 deletions.
diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml
@@ -461,7 +461,7 @@ replaces:
   - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/skywalking => ../../pkg/translator/skywalking
   - github.com/open-telemetry/opentelemetry-collector-contrib/internal/collectd => ../../internal/collectd
   - github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware => ../../extension/awsmiddleware
-  - github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../override/aws
+  - github.com/jj22ee/opentelemetry-collector-contrib/override/aws => ../../override/aws
   # remove sourcegraph.com/sourcegraph/appdash dependency
   - github.com/go-kit/kit => github.com/go-kit/kit v0.12.0
   # see https://github.com/mongodb/mongo-go-driver/pull/1485 (v1.13.0 was retracted)

diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod
@@ -370,7 +370,7 @@ 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.103.10 // indirect
+	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240415183253-230331014d2c // 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
@@ -549,6 +549,7 @@ require (
 	github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
 	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
 	github.com/jellydator/ttlcache/v3 v3.2.0 // indirect
+	github.com/jj22ee/opentelemetry-collector-contrib/override/aws v0.103.12 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
@@ -1266,7 +1267,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/colle
 
 replace github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware => ../../extension/awsmiddleware
 
-replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../override/aws
+replace github.com/jj22ee/opentelemetry-collector-contrib/override/aws => ../../override/aws
 
 replace github.com/go-kit/kit => github.com/go-kit/kit v0.12.0
 

diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum
diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod
@@ -24,7 +24,6 @@ require (
 )
 
 require (
-	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.103.10 // 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
@@ -35,6 +34,7 @@ require (
 	github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/jj22ee/opentelemetry-collector-contrib/override/aws v0.103.12 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
@@ -72,7 +72,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/a
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => ../../internal/aws/cwlogs
 
-replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../override/aws
+replace github.com/jj22ee/opentelemetry-collector-contrib/override/aws => ../../override/aws
 
 replace github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware => ../../extension/awsmiddleware
 

diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod
@@ -28,7 +28,6 @@ require (
 )
 
 require (
-	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.103.10 // 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
@@ -40,6 +39,7 @@ require (
 	github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/jj22ee/opentelemetry-collector-contrib/override/aws v0.103.12 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
@@ -90,7 +90,7 @@ retract (
 	v0.65.0
 )
 
-replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../override/aws
+replace github.com/jj22ee/opentelemetry-collector-contrib/override/aws => ../../override/aws
 
 replace github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware => ../../extension/awsmiddleware
 

diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod
@@ -23,7 +23,6 @@ require (
 )
 
 require (
-	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.103.10 // 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
@@ -36,6 +35,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/jj22ee/opentelemetry-collector-contrib/override/aws v0.103.12 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
@@ -76,7 +76,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/a
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
 
-replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../override/aws
+replace github.com/jj22ee/opentelemetry-collector-contrib/override/aws => ../../override/aws
 
 retract (
 	v0.76.2

diff --git a/extension/awsproxy/go.mod b/extension/awsproxy/go.mod
@@ -19,7 +19,6 @@ require (
 )
 
 require (
-	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.103.10 // indirect
 	github.com/aws/aws-sdk-go v1.53.11 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -31,6 +30,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/jj22ee/opentelemetry-collector-contrib/override/aws v0.103.12 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
 	github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
@@ -67,7 +67,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/a
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy => ./../../internal/aws/proxy
 
-replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../override/aws
+replace github.com/jj22ee/opentelemetry-collector-contrib/override/aws => ../../override/aws
 
 retract (
 	v0.76.2

diff --git a/go.mod b/go.mod
@@ -329,7 +329,7 @@ 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.103.10 // indirect
+	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240415183253-230331014d2c // 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
@@ -508,6 +508,7 @@ require (
 	github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
 	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
 	github.com/jellydator/ttlcache/v3 v3.2.0 // indirect
+	github.com/jj22ee/opentelemetry-collector-contrib/override/aws v0.103.12 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
@@ -1248,4 +1249,4 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdata
 
 replace github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware => ./extension/awsmiddleware
 
-replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ./override/aws
+replace github.com/jj22ee/opentelemetry-collector-contrib/override/aws => ./override/aws
diff --git a/go.sum b/go.sum
diff --git a/internal/aws/awsutil/conn.go b/internal/aws/awsutil/conn.go
@@ -13,7 +13,6 @@ import (
 	"os"
 	"time"
 
-	override "github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/client"
@@ -24,6 +23,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/endpoints"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/sts"
+	override "github.com/jj22ee/opentelemetry-collector-contrib/override/aws"
 	"go.uber.org/zap"
 	"golang.org/x/net/http2"
 )

diff --git a/internal/aws/awsutil/go.mod b/internal/aws/awsutil/go.mod
@@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/aw
 go 1.22.4
 
 require (
-	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.103.10
 	github.com/aws/aws-sdk-go v1.53.11
+	github.com/jj22ee/opentelemetry-collector-contrib/override/aws v0.103.12
 	github.com/stretchr/testify v1.9.0
 	go.uber.org/goleak v1.3.0
 	go.uber.org/zap v1.27.0
@@ -23,7 +23,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../../override/aws
+replace github.com/jj22ee/opentelemetry-collector-contrib/override/aws => ../../../override/aws
 
 retract (
 	v0.76.2

diff --git a/internal/aws/proxy/go.mod b/internal/aws/proxy/go.mod
@@ -13,10 +13,10 @@ require (
 )
 
 require (
-	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.103.10 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/jj22ee/opentelemetry-collector-contrib/override/aws v0.103.12 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	go.opentelemetry.io/collector/config/configopaque v1.10.0 // indirect
@@ -32,7 +32,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/a
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../../internal/common
 
-replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../../override/aws
+replace github.com/jj22ee/opentelemetry-collector-contrib/override/aws => ../../../override/aws
 
 retract (
 	v0.76.2

diff --git a/internal/aws/xray/go.mod b/internal/aws/xray/go.mod
@@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xr
 go 1.22.4
 
 require (
-	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.103.10
 	github.com/aws/aws-sdk-go v1.53.11
+	github.com/jj22ee/opentelemetry-collector-contrib/override/aws v0.103.12
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.103.0
 	github.com/stretchr/testify v1.9.0
 	go.opentelemetry.io/collector/component v0.103.0
@@ -35,7 +35,7 @@ require (
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => ../../../internal/aws/awsutil
 
-replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../../override/aws
+replace github.com/jj22ee/opentelemetry-collector-contrib/override/aws => ../../../override/aws
 
 retract (
 	v0.76.2

diff --git a/internal/aws/xray/telemetry/sender.go b/internal/aws/xray/telemetry/sender.go
@@ -8,11 +8,11 @@ import (
 	"sync"
 	"time"
 
-	override "github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/ec2metadata"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/xray"
+	override "github.com/jj22ee/opentelemetry-collector-contrib/override/aws"
 	"go.uber.org/zap"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil"

diff --git a/override/aws/credential.go b/override/aws/credential.go
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-package aws // import "github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws"
+package aws // import "github.com/jj22ee/opentelemetry-collector-contrib/override/aws"
 import (
 	"github.com/aws/aws-sdk-go/aws/credentials"
 )

diff --git a/override/aws/go.mod b/override/aws/go.mod
@@ -1,4 +1,4 @@
-module github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws
+module github.com/jj22ee/opentelemetry-collector-contrib/override/aws
 
 go 1.20
 

diff --git a/override/aws/imdsretryer.go b/override/aws/imdsretryer.go
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-package aws // import "github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws"
+package aws // import "github.com/jj22ee/opentelemetry-collector-contrib/override/aws"
 
 import (
 	"errors"

diff --git a/override/aws/imdsretryer_test.go b/override/aws/imdsretryer_test.go
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-package aws // import "github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws"
+package aws // import "github.com/jj22ee/opentelemetry-collector-contrib/override/aws"
 
 import (
 	"errors"

diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod
@@ -4,10 +4,10 @@ go 1.22.5
 
 require (
 	github.com/Microsoft/hcsshim v0.12.0-rc.3
-	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.103.10
 	github.com/aws/aws-sdk-go v1.53.11
 	github.com/go-kit/log v0.2.1
 	github.com/google/cadvisor v0.49.0
+	github.com/jj22ee/opentelemetry-collector-contrib/override/aws v0.103.12
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.103.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.103.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.103.0
@@ -256,7 +256,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prome
 // openshift removed all tags from their repo, use the pseudoversion from the release-3.9 branch HEAD
 replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api v0.0.0-20180801171038-322a19404e37
 
-replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../override/aws
+replace github.com/jj22ee/opentelemetry-collector-contrib/override/aws => ../../override/aws
 
 // see https://github.com/distribution/distribution/issues/3590
 exclude github.com/docker/distribution v2.8.0+incompatible

diff --git a/receiver/awscontainerinsightreceiver/internal/host/ec2metadata.go b/receiver/awscontainerinsightreceiver/internal/host/ec2metadata.go
@@ -7,10 +7,10 @@ import (
 	"context"
 	"time"
 
-	override "github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws"
 	"github.com/aws/aws-sdk-go/aws"
 	awsec2metadata "github.com/aws/aws-sdk-go/aws/ec2metadata"
 	"github.com/aws/aws-sdk-go/aws/session"
+	override "github.com/jj22ee/opentelemetry-collector-contrib/override/aws"
 	"go.uber.org/zap"
 )
 

diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod
@@ -27,7 +27,6 @@ require (
 )
 
 require (
-	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.103.10 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
@@ -37,6 +36,7 @@ require (
 	github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/jj22ee/opentelemetry-collector-contrib/override/aws v0.103.12 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
@@ -85,7 +85,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
 
-replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../override/aws
+replace github.com/jj22ee/opentelemetry-collector-contrib/override/aws => ../../override/aws
 
 retract (
 	v0.76.2

diff --git a/versions.yaml b/versions.yaml
@@ -6,7 +6,7 @@ module-sets:
     version: v0.103.0
     modules:
       - github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware
-      - github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws
+      - github.com/jj22ee/opentelemetry-collector-contrib/override/aws
       - github.com/open-telemetry/opentelemetry-collector-contrib
       - github.com/open-telemetry/opentelemetry-collector-contrib/cmd/githubgen
       - github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor