Skip to content

Commit f74138b

Browse files
sethAmazonsethAmazon
authored
Merge pull request open-telemetry#53 from sethAmazon/add-back-override-creds
Add Back Creds Override
2 parents e85dd5f + 5a766a0 commit f74138b

File tree

19 files changed

+84
-29
lines changed

19 files changed

+84
-29
lines changed

‎cmd/configschema/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ require (
277277
github.com/alecthomas/participle/v2 v2.0.0 // indirect
278278
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
279279
github.com/aliyun/aliyun-log-go-sdk v0.1.44 // indirect
280+
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230712194013-e85dd5f17ce4 // indirect
280281
github.com/andybalholm/brotli v1.0.5 // indirect
281282
github.com/antonmedv/expr v1.12.5 // indirect
282283
github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect

‎cmd/otelcontribcol/go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ require (
269269
github.com/alecthomas/participle/v2 v2.0.0 // indirect
270270
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
271271
github.com/aliyun/aliyun-log-go-sdk v0.1.44 // indirect
272+
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230712194013-e85dd5f17ce4 // indirect
272273
github.com/andybalholm/brotli v1.0.5 // indirect
273274
github.com/antonmedv/expr v1.12.5 // indirect
274275
github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
@@ -277,7 +278,7 @@ require (
277278
github.com/apache/thrift v0.18.1 // indirect
278279
github.com/ardielle/ardielle-go v1.5.2 // indirect
279280
github.com/armon/go-metrics v0.4.1 // indirect
280-
github.com/aws/aws-sdk-go v1.44.255 // indirect
281+
github.com/aws/aws-sdk-go v1.44.293 // indirect
281282
github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
282283
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
283284
github.com/aws/aws-sdk-go-v2/config v1.18.22 // indirect

‎cmd/otelcontribcol/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/awscloudwatchlogsexporter/go.mod

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsclo
33
go 1.19
44

55
require (
6-
github.com/aws/aws-sdk-go v1.44.255
6+
github.com/aws/aws-sdk-go v1.44.293
77
github.com/cenkalti/backoff/v4 v4.2.1
88
github.com/google/uuid v1.3.0
99
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.77.0
@@ -19,6 +19,7 @@ require (
1919
)
2020

2121
require (
22+
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230712194013-e85dd5f17ce4 // indirect
2223
github.com/davecgh/go-spew v1.1.1 // indirect
2324
github.com/gogo/protobuf v1.3.2 // indirect
2425
github.com/golang/protobuf v1.5.3 // indirect
@@ -53,6 +54,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/a
5354

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

57+
replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../override/aws
58+
5659
retract (
5760
v0.76.2
5861
v0.76.1

‎exporter/awscloudwatchlogsexporter/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/awsemfexporter/go.mod

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemf
33
go 1.19
44

55
require (
6-
github.com/aws/aws-sdk-go v1.44.255
6+
github.com/aws/aws-sdk-go v1.44.293
77
github.com/census-instrumentation/opencensus-proto v0.4.1
88
github.com/golang/protobuf v1.5.3
99
github.com/google/uuid v1.3.0
@@ -24,6 +24,7 @@ require (
2424
)
2525

2626
require (
27+
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230712194013-e85dd5f17ce4 // indirect
2728
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
2829
github.com/davecgh/go-spew v1.1.1 // indirect
2930
github.com/gogo/protobuf v1.3.2 // indirect
@@ -79,3 +80,5 @@ retract (
7980
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest
8081

8182
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil
83+
84+
replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../override/aws

‎exporter/awsemfexporter/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/awsxrayexporter/go.mod

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxra
33
go 1.19
44

55
require (
6-
github.com/aws/aws-sdk-go v1.44.255
6+
github.com/aws/aws-sdk-go v1.44.293
77
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.77.0
88
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.77.0
99
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.77.0
@@ -18,6 +18,7 @@ require (
1818
)
1919

2020
require (
21+
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230712194013-e85dd5f17ce4 // indirect
2122
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
2223
github.com/davecgh/go-spew v1.1.1 // indirect
2324
github.com/gogo/protobuf v1.3.2 // indirect
@@ -55,6 +56,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/a
5556

5657
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
5758

59+
replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../override/aws
60+
5861
retract (
5962
v0.76.2
6063
v0.76.1

‎exporter/awsxrayexporter/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ require (
257257
github.com/alecthomas/participle/v2 v2.0.0 // indirect
258258
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
259259
github.com/aliyun/aliyun-log-go-sdk v0.1.44 // indirect
260+
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230712194013-e85dd5f17ce4 // indirect
260261
github.com/andybalholm/brotli v1.0.5 // indirect
261262
github.com/antonmedv/expr v1.12.5 // indirect
262263
github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect

0 commit comments

Comments
 (0)