Skip to content

Commit

Permalink
Merge pull request #2213 from aws-observability/updateMain31
Browse files Browse the repository at this point in the history
[chore] update main branch with release/v0.31.x
  • Loading branch information
bryan-aguilar authored Jul 20, 2023
2 parents 83e2bc0 + 00eabc0 commit 9b61518
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 8 deletions.
6 changes: 6 additions & 0 deletions .github/config/markdown-links-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
},
{
"pattern": "http(s)?://example.com"
},
{
"pattern": "https://github.com/aws-observability/aws-otel-collector/compare/v\\d+.\\d+.\\d+...v\\d+.\\d+.\\d+"
},
{
"pattern": "https://github.com/aws-observability/aws-otel-collector/tree/v\\d+.\\d+.\\d+"
}
],
"aliveStatusCodes": [429, 200],
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ env:
DDB_TABLE_NAME: BatchTestCache
MAX_JOBS: 110
BATCH_INCLUDED_SERVICES: EKS,ECS,EC2,EKS_ARM64,EKS_FARGATE
GO_VERSION: ~1.20.5
GO_VERSION: ~1.20.6


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.5
GO_VERSION: ~1.20.6

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.5
GO_VERSION: ~1.20.6

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.5'
go-version: '~1.20.6'
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: [email protected]
TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework
GO_VERSION: ~1.20.5
GO_VERSION: ~1.20.6

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.5
go-version: ~1.20.6

- name: Configure AWS Credentials
uses: aws-actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.30.0
v0.31.0
17 changes: 17 additions & 0 deletions docs/releases/v0.31.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Changelog

## [v0.31.0](https://github.com/aws-observability/aws-otel-collector/tree/v0.31.0) (2023-07-11)

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

**Merged pull requests:**

- Do not set prometheus normalize feature gate to alpha status at ADOT Collector startup [\#2178](https://github.com/aws-observability/aws-otel-collector/pull/2178) ([bryan-aguilar](https://github.com/bryan-aguilar))
- Chore: Update collector components to v0.80.0 [\#2169](https://github.com/aws-observability/aws-otel-collector/pull/2169) ([rapphil](https://github.com/rapphil))
- Update windows permissions in logs and configuration [\#2158](https://github.com/aws-observability/aws-otel-collector/pull/2158) ([rapphil](https://github.com/rapphil))
- Reduce permission in the folder that stores configuration and logs on Windows [\#2156](https://github.com/aws-observability/aws-otel-collector/pull/2156) ([rapphil](https://github.com/rapphil))
- Update go version to use 1.20.5 in workflows [\#2117](https://github.com/aws-observability/aws-otel-collector/pull/2117) ([vasireddy99](https://github.com/vasireddy99))
- Update aws-otel-fargate-sidecar-deployment-cfn.yaml [\#2054](https://github.com/aws-observability/aws-otel-collector/pull/2054) ([PaurushGarg](https://github.com/PaurushGarg))


\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
2 changes: 1 addition & 1 deletion tools/packaging/windows/aws-otel-collector.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Product Id="EBBD8548-75D1-41D3-A402-ABE189F0C167"
UpgradeCode="B7C263DD-95A5-436A-A025-DCA5200C2BE3"
Name="ADOT Collector"
Version="0.30.0"
Version="0.31.0"
Codepage='1252'
Manufacturer="Amazon.com, Inc."
Language="1033">
Expand Down

0 comments on commit 9b61518

Please sign in to comment.