Skip to content

Commit 38e804f

Browse files
authored
Merge pull request #3090 from aws-observability/awscont
Create awscontainerinsightreceiver patch file
2 parents 6d4491c + 7539001 commit 38e804f

File tree

5 files changed

+16
-4
lines changed

5 files changed

+16
-4
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ env:
5050
DDB_TABLE_NAME: BatchTestCache
5151
MAX_JOBS: 110
5252
BATCH_INCLUDED_SERVICES: EKS,ECS,EC2,EKS_ARM64,EKS_FARGATE
53-
GO_VERSION: ~1.24.5
53+
GO_VERSION: ~1.24.6
5454

5555

5656
concurrency:

.github/workflows/PR-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ env:
2525
IMAGE_NAME: aws-otel-collector
2626
PACKAGING_ROOT: build/packages
2727
TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework
28-
GO_VERSION: ~1.24.5
28+
GO_VERSION: ~1.24.6
2929

3030
concurrency:
3131
group: pr-build-${{ github.event.pull_request.number }}

.github/workflows/aws-resources-clean.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
default: "3"
2525
env:
2626
DAYS_TO_KEEP: 3
27-
GO_VERSION: ~1.24.5
27+
GO_VERSION: ~1.24.6
2828

2929
permissions:
3030
id-token: write

.github/workflows/perf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ env:
2727
COMMIT_USER: Github Actions
2828
COMMIT_EMAIL: [email protected]
2929
TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework
30-
GO_VERSION: ~1.24.5
30+
GO_VERSION: ~1.24.6
3131

3232
permissions:
3333
id-token: write
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/vendor/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver/internal/host/hostinfo.go b/vendor/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver/internal/host/hostinfo.go
2+
index c93bf0312..144c91575 100644
3+
--- a/vendor/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver/internal/host/hostinfo.go
4+
+++ b/vendor/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver/internal/host/hostinfo.go
5+
@@ -78,6 +78,7 @@ func NewInfo(containerOrchestrator string, refreshInterval time.Duration, logger
6+
if err != nil {
7+
return nil, fmt.Errorf("failed to create aws session: %w", err)
8+
}
9+
+ mInfo.awsConfig = cfg
10+
11+
mInfo.ec2Metadata = mInfo.ec2MetadataCreator(ctx, cfg, refreshInterval, mInfo.instanceIDReadyC, mInfo.instanceIPReadyC, logger)
12+

0 commit comments

Comments
 (0)