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

Not ignore the container-names annotation when the multi-instrumentation is enabled #3213

Merged
merged 10 commits into from
Aug 30, 2024

Conversation

iblancasa
Copy link
Contributor

Description: previously, the container-names annotation was ignored when multi-instrumentation was enabled in the operator (even if for that Instrumentation object a single instrumentation was used). Now, it is not ignored.

If that annotation is used simultaneously with the ones used for multi-instrumentation, the areContainerNamesConfiguredForMultipleInstrumentations will raise an error.

Link to tracking Issue(s):

This is the first step to enable the multi-instrumentation by default.

@iblancasa iblancasa requested a review from a team August 12, 2024 14:37
Copy link
Contributor

@swiatekm swiatekm left a comment

Choose a reason for hiding this comment

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

LGTM, with one nitpick.

pkg/instrumentation/podmutator.go Outdated Show resolved Hide resolved
@pavolloffay
Copy link
Member

@iblancasa could we deprecate/remove --enable-multi-instrumentation flag so that it is enabled by default and users can combine annotations?

Copy link
Member

@pavolloffay pavolloffay left a comment

Choose a reason for hiding this comment

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

Perhaps some documentation needs to be updated?

component: auto-instrumentation

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Not ignore the container-names annotation when the multi-instrumentation is enabled"
Copy link
Member

Choose a reason for hiding this comment

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

Please put here the entire annotation or in the subtext. It will be clearer for end users.

@iblancasa
Copy link
Contributor Author

@iblancasa could we deprecate/remove --enable-multi-instrumentation flag so that it is enabled by default and users can combine annotations?

I'll do it as part of other PR because I don't want this one to be really big. Just to make it easy to review.

…ion is enabled

Signed-off-by: Israel Blancas <iblancasa@gmail.com>
@iblancasa
Copy link
Contributor Author

Perhaps some documentation needs to be updated?

I'm not sure. I read the README.md file and I think it should be ok but I'm open to make changes on that. Please let me know what do you think it should be included.

@iblancasa
Copy link
Contributor Author

Checking the errors in the E2E tests...

Signed-off-by: Israel Blancas <iblancasa@gmail.com>
Signed-off-by: Israel Blancas <iblancasa@gmail.com>
Copy link
Contributor

@swiatekm swiatekm left a comment

Choose a reason for hiding this comment

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

LGTM, some minor nitpicks.

pkg/instrumentation/helper.go Outdated Show resolved Hide resolved
pkg/instrumentation/podmutator.go Outdated Show resolved Hide resolved
@pavolloffay pavolloffay merged commit 1a5d464 into open-telemetry:main Aug 30, 2024
33 checks passed
@artem-nefedov
Copy link
Contributor

This PR may have broken handling of language-specific annotations.

I have deployment with the following pod annotations:

      instrumentation.opentelemetry.io/inject-sdk: otel-system/otel-instrumentation
      instrumentation.opentelemetry.io/sdk-container-names: test-app

This works fine with versions up to v0.107.0, but after upgrade to v0.108.0 it no longer injects variables.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants