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

[extension/ackextension] release ackextension in alpha stability #32308

Merged
merged 49 commits into from
Apr 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
3c24fd7
[extension/ackextension] release ackextension in alpha stability
zpzhuSplunk Apr 10, 2024
ac1043d
add chloggen
zpzhuSplunk Apr 10, 2024
ea41899
test
zpzhuSplunk Apr 10, 2024
f932bcb
test
zpzhuSplunk Apr 10, 2024
a9b13bc
test
zpzhuSplunk Apr 10, 2024
ba569d5
Merge branch 'main' into release-ack-extension
zpzhuSplunk Apr 10, 2024
9f58d54
test
zpzhuSplunk Apr 10, 2024
0d19233
Merge branch 'main' into release-ack-extension
zpzhuSplunk Apr 10, 2024
f8038c9
test
zpzhuSplunk Apr 10, 2024
78ef6ea
test
zpzhuSplunk Apr 10, 2024
94a6bf6
address MR comments
zpzhuSplunk Apr 11, 2024
3160c6e
Merge branch 'main' into release-ack-extension
zpzhuSplunk Apr 11, 2024
6e14555
test
zpzhuSplunk Apr 11, 2024
a8440e0
test
zpzhuSplunk Apr 11, 2024
a975188
test
zpzhuSplunk Apr 11, 2024
29b2f72
Merge branch 'main' into release-ack-extension
zpzhuSplunk Apr 11, 2024
12e900c
test
zpzhuSplunk Apr 11, 2024
b2b98cb
test
zpzhuSplunk Apr 11, 2024
304272f
test
zpzhuSplunk Apr 11, 2024
bbe55f6
Merge branch 'main' into release-ack-extension
zpzhuSplunk Apr 12, 2024
0dc5d11
test
zpzhuSplunk Apr 15, 2024
bdac36a
Merge branch 'main' into release-ack-extension
zpzhuSplunk Apr 15, 2024
1baea33
test'
zpzhuSplunk Apr 15, 2024
e300158
test
zpzhuSplunk Apr 15, 2024
be3e849
test
zpzhuSplunk Apr 15, 2024
667077d
test
zpzhuSplunk Apr 15, 2024
0f3103e
test
zpzhuSplunk Apr 15, 2024
c19a803
test
zpzhuSplunk Apr 15, 2024
a8f8817
Merge branch 'main' into release-ack-extension
zpzhuSplunk Apr 15, 2024
1692539
Merge branch 'main' into release-ack-extension
zpzhuSplunk Apr 15, 2024
b6ee825
test
zpzhuSplunk Apr 15, 2024
c89a434
test
zpzhuSplunk Apr 15, 2024
74bfba0
Merge branch 'main' into release-ack-extension
zpzhuSplunk Apr 15, 2024
e077e77
Merge branch 'main' into release-ack-extension
zpzhuSplunk Apr 15, 2024
18082d8
Merge branch 'main' into release-ack-extension
zpzhuSplunk Apr 15, 2024
b31cfaa
address PR comments
zpzhuSplunk Apr 15, 2024
a86f99c
test
zpzhuSplunk Apr 15, 2024
285b70b
test
zpzhuSplunk Apr 15, 2024
a5a1fe0
add extension
zpzhuSplunk Apr 15, 2024
907f708
test
zpzhuSplunk Apr 15, 2024
f8bd589
test
zpzhuSplunk Apr 16, 2024
3962053
Merge branch 'main' into release-ack-extension
zpzhuSplunk Apr 16, 2024
d970415
test
zpzhuSplunk Apr 16, 2024
27a5b9d
test
zpzhuSplunk Apr 16, 2024
d7cbc9a
Merge branch 'main' into release-ack-extension
zpzhuSplunk Apr 16, 2024
8d2acde
Merge branch 'main' into release-ack-extension
zpzhuSplunk Apr 16, 2024
b0b135f
Merge branch 'main' into release-ack-extension
zpzhuSplunk Apr 16, 2024
49277d0
test
zpzhuSplunk Apr 16, 2024
9cfc9e8
Merge branch 'main' into release-ack-extension
zpzhuSplunk Apr 16, 2024
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
27 changes: 27 additions & 0 deletions .chloggen/release-ack-extension.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: new_component

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: ackextension

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Promote to `alpha` stability"

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [26376]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
2 changes: 2 additions & 0 deletions cmd/otelcontribcol/builder-config.yaml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe you also want to add the component to the extensions block near the top of this file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok I added the component. make checks seemed to have resolved my component to version v0.0.0-00010101000000-000000000000. I assume this is normal given that the extension hasn't been released yet. Is this the right version to use?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it matters either way as the replace will simply override whatever is stated with the current contents of the relative dir below. However, could you test to see if CI passes with v0.98.0? (Same with other v0.0... reference in cmd/otelcontribcol/go.mod)

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dist:
extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.98.1-0.20240416174005-d0f15e2463f8
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.98.1-0.20240416174005-d0f15e2463f8
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.98.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.98.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.98.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.98.0
Expand Down Expand Up @@ -448,3 +449,4 @@ replaces:
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension => ../../extension/sumologicextension
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/namedpipereceiver => ../../receiver/namedpipereceiver
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery => ../../internal/sqlquery
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension => ../../extension/ackextension
2 changes: 2 additions & 0 deletions cmd/otelcontribcol/components.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions cmd/otelcontribcol/extensions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"go.opentelemetry.io/collector/extension/extensiontest"
"go.opentelemetry.io/collector/extension/zpagesextension"

"github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension"
Expand Down Expand Up @@ -248,6 +249,12 @@ func TestDefaultExtensions(t *testing.T) {
extension: "solarwindsapmsettings",
skipLifecycle: true, // Requires Solarwinds APM endpoint and token
},
{
extension: "ackextension",
getConfigFn: func() component.Config {
return extFactories["ackextension"].CreateDefaultConfig().(*ackextension.Config)
},
},
}

extensionCount := 0
Expand Down
3 changes: 3 additions & 0 deletions cmd/otelcontribcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.98.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter v0.98.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.98.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.98.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.98.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.98.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.98.0
Expand Down Expand Up @@ -1192,3 +1193,5 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumo
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/namedpipereceiver => ../../receiver/namedpipereceiver

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery => ../../internal/sqlquery

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension => ../../extension/ackextension
4 changes: 2 additions & 2 deletions extension/ackextension/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<!-- status autogenerated section -->
| Status | |
| ------------- |-----------|
| Stability | [development] |
| Stability | [alpha] |
| Distributions | [contrib] |
| Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aextension%2Fack%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aextension%2Fack) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aextension%2Fack%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aextension%2Fack) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@zpzhuSplunk](https://www.github.com/zpzhuSplunk), [@splunkericl](https://www.github.com/splunkericl) |

[development]: https://github.com/open-telemetry/opentelemetry-collector#development
[alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha
[contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib
<!-- end autogenerated section -->

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion extension/ackextension/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ scope_name: otelcol/ack
status:
class: extension
stability:
development: [extension]
alpha: [extension]
distributions: [contrib]
codeowners:
active: [zpzhuSplunk, splunkericl]
Expand Down
Loading