Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add kafka receiver/exporter and confmap providers #1945

Merged
merged 62 commits into from
Apr 5, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
00d1151
Use different test framework branch for dev branch
rapphil Nov 22, 2022
919030e
Merge pull request #1652 from aws-observability/rapphil-add-dev-ci
rapphil Nov 22, 2022
0b77c84
Enable only EC2 tests for the dev branch.
rapphil Nov 22, 2022
c98bc2d
Remove release candidate
rapphil Nov 22, 2022
e31626f
Merge pull request #1656 from aws-observability/rapphil-dev-enable-on…
rapphil Nov 22, 2022
8a73a88
Merge pull request #1657 from aws-observability/rapphil-dev
rapphil Nov 23, 2022
3557230
Use different test framework branch for dev branch
rapphil Nov 22, 2022
01531da
Enable only EC2 tests for the dev branch.
rapphil Nov 22, 2022
81dbd13
Remove release candidate
rapphil Nov 22, 2022
8991b55
Enable only EC2 tests for the dev branch.
rapphil Nov 22, 2022
7a9be31
Add support to kafka receiver/exporter
rapphil Nov 22, 2022
5cdce34
Merge branch 'dev' into rapphil-step1-updated-dev
rapphil Dec 9, 2022
1a96fc1
Merge pull request #1696 from aws-observability/rapphil-step1-updated…
bryan-aguilar Dec 9, 2022
a93d98a
Update package signer to use assumed IAM role
bryan-aguilar Dec 16, 2022
ededb58
Fix syntax
bryan-aguilar Dec 20, 2022
0cceb95
Merge pull request #1720 from bryan-aguilar/roleFixDev
bryan-aguilar Dec 20, 2022
a24ef40
Add ECS tests to the dev branch
humivo Jan 4, 2023
668e55b
Merge branch 'dev' into dev
humivo Jan 4, 2023
76b47b3
Fix go version
humivo Jan 4, 2023
c4223d6
Merge pull request #1737 from humivo/dev
humivo Jan 4, 2023
ffccd2b
Fix unit tests
rapphil Dec 8, 2022
d9967ce
Merge pull request #1660 from aws-observability/rapphil-add-kafka
rapphil Jan 6, 2023
3610653
Use different test framework branch for dev branch
rapphil Nov 22, 2022
7611412
Enable only EC2 tests for the dev branch.
rapphil Nov 22, 2022
cd8d103
Remove release candidate
rapphil Nov 22, 2022
47b9d0a
Add ECS tests to the dev branch
humivo Jan 4, 2023
13516da
Use different test framework branch for dev branch
rapphil Nov 22, 2022
7254bd8
Add support to kafka receiver/exporter
rapphil Nov 22, 2022
da56a3c
Fix unit tests
rapphil Dec 8, 2022
7a74dc9
Merge branch 'dev' into rapphil-updated-dev-v0.25
rapphil Jan 24, 2023
42d5634
Merge pull request #1779 from aws-observability/rapphil-updated-dev-v…
bryan-aguilar Jan 25, 2023
3280433
Use different test framework branch for dev branch
rapphil Nov 22, 2022
8f7cf50
Enable only EC2 tests for the dev branch.
rapphil Nov 22, 2022
bc0ef0d
Remove release candidate
rapphil Nov 22, 2022
0711e6e
Add ECS tests to the dev branch
humivo Jan 4, 2023
76f69a4
Use different test framework branch for dev branch
rapphil Nov 22, 2022
637a4ce
Add support to kafka receiver/exporter
rapphil Nov 22, 2022
09c05f0
Fix unit tests
rapphil Dec 8, 2022
5283ca4
Use different test framework branch for dev branch
rapphil Nov 22, 2022
259567c
Enable only EC2 tests for the dev branch.
rapphil Nov 22, 2022
012416a
Add ECS tests to the dev branch
humivo Jan 4, 2023
28c9c35
Use different test framework branch for dev branch
rapphil Nov 22, 2022
43432ef
Enable only EC2 tests for the dev branch.
rapphil Nov 22, 2022
1b1d3c9
Merge branch 'dev' into rapphil-update-from-main
rapphil Jan 26, 2023
b914867
Merge pull request #1782 from aws-observability/rapphil-update-from-main
rapphil Jan 26, 2023
68fb319
Add new components
rapphil Jan 27, 2023
b13b80e
Add the https confmap provider
rapphil Jan 27, 2023
9b70815
Update unit tests for new components
rapphil Jan 27, 2023
6c85a2e
fix formatting
rapphil Jan 27, 2023
3ee7326
Fix formatting
rapphil Jan 27, 2023
f3e9bb1
Merge pull request #1784 from aws-observability/rapphil-add-component…
rapphil Jan 27, 2023
745d133
Update dev branch (#1826)
bryan-aguilar Feb 7, 2023
989d59a
Use dev branch of test framework
rapphil Feb 21, 2023
5308a6e
Merge pull request #1862 from aws-observability/rapphil-use-dev-branc…
rapphil Feb 21, 2023
7040141
Add support to remote uris in service control scripts in Windows and …
rapphil Mar 15, 2023
28886e4
fix: make collector control script posix compliant (#1936)
rapphil Mar 29, 2023
3f3d840
Merge remote-tracking branch 'origin/main' into dev
rapphil Mar 30, 2023
2c670c7
Remove components that were not tested
rapphil Apr 4, 2023
d3141c4
Use CI workflows from main branch
rapphil Apr 4, 2023
6e565d7
Update README to add new components
rapphil Apr 5, 2023
b7d4959
Merge remote-tracking branch 'origin' into rapphil-add-new-components…
rapphil Apr 5, 2023
b3c0e05
Fix readme.md
rapphil Apr 5, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into dev
  • Loading branch information
rapphil committed Mar 30, 2023
commit 3f3d84048e8019de5117656b9d27ff7b9728beae
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ env:
DDB_TABLE_NAME: BatchTestCache
MAX_JOBS: 90
BATCH_INCLUDED_SERVICES: EC2,ECS
GO_VERSION: ~1.18.9
GO_VERSION: ~1.20.2

concurrency:
group: ci-batched${{ github.ref_name }}
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.26.0
v0.27.0
9 changes: 0 additions & 9 deletions cmd/awscollector/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,6 @@ func newCommand(params otelcol.CollectorSettings) *cobra.Command {
Version: params.BuildInfo.Version,
SilenceUsage: true,
RunE: func(cmd *cobra.Command, args []string) error {

flags := config.GetFeatureGatesFlag(flagSet)

for featureKey, featureEnable := range flags {
if err := featuregate.GlobalRegistry().Set(featureKey, featureEnable); err != nil {
return err
}
}

// Initialize provider after flags have been set
params.ConfigProvider = config.GetConfigProvider(flagSet)
col, err := otelcol.NewCollector(params)
Expand Down
188 changes: 95 additions & 93 deletions go.mod

Large diffs are not rendered by default.

350 changes: 177 additions & 173 deletions go.sum

Large diffs are not rendered by default.

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.26.0"
Version="0.27.0"
Codepage='1252'
Manufacturer="Amazon.com, Inc."
Language="1033">
Expand Down
3 changes: 3 additions & 0 deletions tools/release/adot-operator-images-mirror/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ sourceRepos:
name: opentelemetry-operator
host: ghcr.io
allowed_tags:
- v0.70.0
- v0.68.0
- v0.66.0
- v0.62.1
Expand All @@ -30,6 +31,7 @@ sourceRepos:
- 0.60.0
- 0.66.0
- 0.68.0
- 0.70.0
- registry: open-telemetry/opentelemetry-operator
name: autoinstrumentation-java
host: ghcr.io
Expand All @@ -39,6 +41,7 @@ sourceRepos:
- 1.19.1
- 1.20.2
- 1.22.1
- 1.23.0
- registry: open-telemetry/opentelemetry-operator
name: autoinstrumentation-nodejs
host: ghcr.io
Expand Down
2 changes: 1 addition & 1 deletion tools/release/bump-version-and-create-release-note.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ echo "${RELEASE_VERSION}" >VERSION

#Update aws-otel-collector wxs template file.
# Note: Only supports [0-9]*.[0-9]*.[0-9]* version pattern. If we decide to release with a full sem ver vX.XX.XX-prerelease then the .wxs file will need to be manually updated
sed -i '' "s/^Version\=\"[0-9]+.[0-9]+.[0-9]+\"/Version=\"${RELEASE_VERSION:1}\"/" tools/packaging/windows/aws-otel-collector.wxs
sed -E -i '' "s/^Version\=\"[0-9]+.[0-9]+.[0-9]+\"/Version=\"${RELEASE_VERSION:1}\"/" ./tools/packaging/windows/aws-otel-collector.wxs

# git commit
git add VERSION "docs/releases/${RELEASE_VERSION}.md"
Expand Down
2 changes: 1 addition & 1 deletion versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module-sets:
#Github Repo for Go Multimod: https://github.com/open-telemetry/opentelemetry-go-build-tools/tree/main/multimod
#Goals: Centralize all the module set into one files and use this version yaml to manage all the module set during the release.
adot-base:
version: v0.26.0
version: v0.27.0
modules:
- github.com/aws-observability/aws-otel-collector
- github.com/aws-observability/aws-otel-collector/pkg/lambdacomponents
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.