Skip to content

Commit

Permalink
[release/v0.33.x] Prepare release v0.33.0 (#2316)
Browse files Browse the repository at this point in the history
* update upstream otel v0.84.0

* Update StatSD Patch file

* bump version to v0.33.0

* Add statsd_instscopedisabled testcase

* Update go version in workflows to 1.20.8

* [aoc-collector non-root user]:  Statement breaking change non root user (#2299)

* Statement about non-root user breaking change for awscontainerinightreceiver component

* Resolving Comments

* Adding the Issue Link

* Update README.md

---------

Co-authored-by: Raphael Philipe Mendes da Silva <rapphil@gmail.com>
Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com>

---------

Co-authored-by: Paurush Garg <62579325+PaurushGarg@users.noreply.github.com>
Co-authored-by: Raphael Philipe Mendes da Silva <rapphil@gmail.com>
  • Loading branch information
3 people committed Sep 6, 2023
1 parent ddc5d47 commit 830533f
Show file tree
Hide file tree
Showing 2,559 changed files with 109,690 additions and 52,896 deletions.
8 changes: 7 additions & 1 deletion .github/config/testcases.json
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,13 @@
"EKS",
"EKS_ARM64"
]
},
{
"case_name": "statsd_instscopedisabled",
"platforms": [
"EKS",
"EKS_ARM64"
]
}

]
}
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ env:
DDB_TABLE_NAME: BatchTestCache
MAX_JOBS: 110
BATCH_INCLUDED_SERVICES: EKS,ECS,EC2,EKS_ARM64,EKS_FARGATE
GO_VERSION: ~1.20.6
GO_VERSION: ~1.20.8


concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/PR-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
IMAGE_NAME: aws-otel-collector
PACKAGING_ROOT: build/packages
TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework
GO_VERSION: ~1.20.6
GO_VERSION: ~1.20.8

concurrency:
group: pr-build-${{ github.event.pull_request.number }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aws-resources-clean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
default: "3"
env:
DAYS_TO_KEEP: 3
GO_VERSION: ~1.20.6
GO_VERSION: ~1.20.8

permissions:
id-token: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v4
with:
go-version: '~1.20.6'
go-version: '~1.20.8'
cache-dependency-path: testing-framework/cmd/aotutil/go.sum
- name: Build aotutil
run: cd testing-framework/cmd/aotutil && make build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ env:
COMMIT_USER: Github Actions
COMMIT_EMAIL: actions@github.com
TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework
GO_VERSION: ~1.20.6
GO_VERSION: ~1.20.8

permissions:
id-token: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prod-image-mirror.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v4
with:
go-version: ~1.20.6
go-version: ~1.20.8

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v2.2.0
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ Use the community resources below for getting help with the ADOT Collector.
Users of the `statsd` receiver, please refer to GitHub Issue - [Warning: StatsD Receiver → EMF Exporter Metric Pipeline Breaking Change](https://github.com/aws-observability/aws-otel-collector/issues/2249)
for information on an upcoming breaking change.

### Notice: ADOT Collector v0.35.0 Breaking Change
Users of the 'awscontainerinsightreceiver', please refer to the GitHub Issue - [Warning: Container Image Default User Change → Important consideration for AWSContainerInsightReceiver](https://github.com/aws-observability/aws-otel-collector/issues/2317) for more information on an upcoming breaking change.

#### ADOT Collector Built-in Components

This table represents the supported components of the ADOT Collector. The highlighted components below are developed by AWS in-house. The rest of the components in the table are the essential default components that the ADOT Collector will support.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.32.0
v0.33.0
4 changes: 4 additions & 0 deletions cmd/awscollector/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ func buildAndParseFlagSet(featgate *featuregate.Registry) (*flag.FlagSet, error)
log.Printf("attn: users of the statsd receiver please refer to " +
"https://github.com/aws-observability/aws-otel-collector/issues/2249 in regards to an ADOT Collector v0.33.0 " +
"breaking change")
// TODO: remove after ADOT Collector v0.35.0 is released
log.Printf("attn: users of the awscontainerinsightreceiver please refer to " +
"https://github.com/aws-observability/aws-otel-collector/issues/2317 in regards to an ADOT Collector v0.35.0 " +
"breaking change")
if err := flagSet.Parse(os.Args[1:]); err != nil {
return nil, err
}
Expand Down
15 changes: 15 additions & 0 deletions docs/releases/v0.33.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Changelog

## [v0.33.0](https://github.com/aws-observability/aws-otel-collector/tree/v0.33.0) (2023-09-05)

[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.32.0...v0.33.0)

**Merged pull requests:**

- \[aoc-collector non-root user\]: Removing code that changes user [\#2297](https://github.com/aws-observability/aws-otel-collector/pull/2297) ([PaurushGarg](https://github.com/PaurushGarg))
- Fix control script to avoid sed special characters [\#2267](https://github.com/aws-observability/aws-otel-collector/pull/2267) ([rapphil](https://github.com/rapphil))
- Fix: don't overwrite .env file [\#2261](https://github.com/aws-observability/aws-otel-collector/pull/2261) ([rapphil](https://github.com/rapphil))



\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
266 changes: 135 additions & 131 deletions go.mod

Large diffs are not rendered by default.

555 changes: 277 additions & 278 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion patches/statsDfeatGateInstrumentationScope.patch
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ index 1cfec5cf..699d6ee7 100644
)

+var instNameFeatGate = featuregate.GlobalRegistry().MustRegister("aws.statsd.populateInstrumentationScope",
+ featuregate.StageAlpha,
+ featuregate.StageBeta,
+ featuregate.WithRegisterFromVersion("v0.82.0"),
+ featuregate.WithRegisterDescription("populates instrumentation scope library name on StatsD receiver "+
+ "metric data points"),
Expand Down
Loading

0 comments on commit 830533f

Please sign in to comment.