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

chef: support .NET zero config on linux #4763

Merged
merged 1 commit into from
May 8, 2024
Merged

Conversation

jeffreyc-splunk
Copy link
Contributor

@jeffreyc-splunk jeffreyc-splunk commented May 2, 2024

  • Activate .NET auto instrumentation by default if arch is amd64/x86_64 and version >= 0.99.0 for either preload or systemd.
  • Update kitchen tests to verify env vars for preload and systemd configs.

@jeffreyc-splunk jeffreyc-splunk force-pushed the dotnet-zc-chef branch 2 times, most recently from b6ea903 to eb80a37 Compare May 6, 2024 16:43
@jeffreyc-splunk jeffreyc-splunk marked this pull request as ready for review May 7, 2024 13:45
@jeffreyc-splunk jeffreyc-splunk requested review from a team as code owners May 7, 2024 13:45
Instrumentation on Linux (x86_64/amd64 only):
- The .NET SDK is activated by default if the `with_auto_instrumentation` option is set to `true` and
`auto_instrumentation_version` is `latest` or >= `0.99.0`.
- Set the `with_auto_instrumentation_sdks` option to `java` and/or `nodejs` to skip .NET auto instrumentation.
Copy link
Contributor

Choose a reason for hiding this comment

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

I might suggest we make points like this more abstract now or later as we will keep adding more supported instrumentation instrumentation languages.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Something like?

Suggested change
- Set the `with_auto_instrumentation_sdks` option to `java` and/or `nodejs` to skip .NET auto instrumentation.
- To skip .NET auto instrumentation, configure the `with_auto_instrumentation_sdks` option without `dotnet`.

@@ -5,6 +5,8 @@
with_systemd = node['splunk_otel_collector']['auto_instrumentation_systemd'].to_s.downcase == 'true'
with_java = node['splunk_otel_collector']['with_auto_instrumentation_sdks'].include?('java')
with_nodejs = node['splunk_otel_collector']['with_auto_instrumentation_sdks'].include?('nodejs') && with_new_instrumentation
dotnet_supported = %w(x86_64 amd64).include?(node['cpu']['architecture']) && (node['splunk_otel_collector']['auto_instrumentation_version'] == 'latest' || Gem::Version.new(node['splunk_otel_collector']['auto_instrumentation_version']) >= Gem::Version.new('0.99.0'))
Copy link
Contributor

Choose a reason for hiding this comment

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

arm support was just added with the recent https://github.com/signalfx/splunk-otel-dotnet/releases/tag/v1.5.0 release. Should we account for this in this PR?

Copy link
Contributor Author

@jeffreyc-splunk jeffreyc-splunk May 7, 2024

Choose a reason for hiding this comment

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

We'll first need to update and release our splunk-otel-auto-instrumentation deb/rpm packages to include the splunk-otel-dotnet arm64 package before we can add support in our installers.

@jeffreyc-splunk jeffreyc-splunk merged commit 52753e1 into main May 8, 2024
29 checks passed
@jeffreyc-splunk jeffreyc-splunk deleted the dotnet-zc-chef branch May 8, 2024 13:49
@github-actions github-actions bot locked and limited conversation to collaborators May 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants