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.

Sign up for GitHub

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

Jump to bottom

distro: Avoid merge resource conflict #2759

Merged
merged 2 commits into from
Jan 22, 2024
Merged

distro: Avoid merge resource conflict #2759

merged 2 commits into from
Jan 22, 2024

Conversation

pellared
Copy link
Contributor

Why

Mitigate open-telemetry/opentelemetry-go#2341 in our distribution.

What

  1. Do not set the Scheme URL for Splunk resource attributes. They do not belong to the OTel semantic conventions anyway.
  2. Remove reference to semconv package in otel.go when getting the service.name key (which is stable so it will not change) to reduce the possibility that we accidently use semconv again when creating the resource.

@pellared pellared marked this pull request as ready for review January 22, 2024 09:16
@pellared pellared requested review from a team as code owners January 22, 2024 09:16
@pellared pellared changed the title distro: Fix merge resource conflict distro: Avoid merge resource conflict Jan 22, 2024
@pellared pellared merged commit c651943 into signalfx:main Jan 22, 2024
15 checks passed
@pellared pellared deleted the fix-res-confict branch January 22, 2024 18:59
@github-actions github-actions bot locked and limited conversation to collaborators Jan 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@theletterf theletterf theletterf approved these changes

@MrAlias MrAlias MrAlias approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pellared @theletterf @MrAlias