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

Trace View: Remove "deployment.environment" default traces 2 logs tag #74986

Merged
merged 3 commits into from
Sep 26, 2023

Conversation

domasx2
Copy link
Contributor

@domasx2 domasx2 commented Sep 18, 2023

deployment.environment is an OTEL semantic attribute, but unlike service.name or service.namespace it is not automatically converted to a Loki label by Loki exporter or Grafana Agent. Thus it's very unlikely to exists and queries with it will return no data. It shouldn't be a default tag.

@domasx2 domasx2 added this to the 10.1.x milestone Sep 18, 2023
@domasx2 domasx2 requested a review from a team as a code owner September 18, 2023 09:23
@domasx2 domasx2 changed the title Trace View: Remove "deployment.environment" default tag Trace View: Remove "deployment.environment" default traces 2 logs tag Sep 18, 2023
@grafana-delivery-bot grafana-delivery-bot bot modified the milestones: 10.1.x, 10.2.x Sep 18, 2023
@github-actions
Copy link
Contributor

Backend code coverage report for PR #74986
No changes

@github-actions
Copy link
Contributor

Frontend code coverage report for PR #74986

Plugin Main PR Difference
explore 86.56% 86.56% 0%

Copy link
Contributor

@connorlindsey connorlindsey left a comment

Choose a reason for hiding this comment

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

We'll also need to remove it from the docs and settings tooltip. You can search for deployment.environment and see the following files:

  • docs/sources/datasources/jaeger/_index.md
  • docs/sources/datasources/zipkin/_index.md
  • docs/sources/datasources/tempo/_index.md
  • TraceToLogsSettings.tsx

@domasx2 domasx2 merged commit bd452fe into main Sep 26, 2023
21 checks passed
@domasx2 domasx2 deleted the domas-trace-view-remove-deployment-environment-tag branch September 26, 2023 13:52
@grafana-delivery-bot
Copy link
Contributor

The backport to v10.1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-74986-to-v10.1.x origin/v10.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x bd452fe904abcfe07a0b6e4fc089ece22fc28bf7
# When the conflicts are resolved, stage and commit the changes
git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-74986-to-v10.1.x
# Create the PR body template
PR_BODY=$(gh pr view 74986 --json body --template 'Backport bd452fe904abcfe07a0b6e4fc089ece22fc28bf7 from #74986{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.1.x] Trace View: Remove \"deployment.environment\" default traces 2 logs tag" --body-file - --label "type/bug" --label "type/docs" --label "area/explore" --label "area/frontend" --label "add to changelog" --label "area/panel/traceview" --label "backport" --base v10.1.x --milestone 10.1.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-74986-to-v10.1.x

# Create a pull request where the `base` branch is `v10.1.x` and the `compare`/`head` branch is `backport-74986-to-v10.1.x`.

# Remove the local backport branch
git switch main
git branch -D backport-74986-to-v10.1.x

@grafana-delivery-bot grafana-delivery-bot bot added the backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. label Sep 26, 2023
@domasx2 domasx2 added no-backport Skip backport of PR and removed backport v10.1.x backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. labels Sep 26, 2023
otilor pushed a commit to otilor/grafana that referenced this pull request Sep 28, 2023
…grafana#74986)

* Remove deployment.environment default tag

* format

* remove mentions from docs
rwwiv pushed a commit that referenced this pull request Oct 2, 2023
…#74986)

* Remove deployment.environment default tag

* format

* remove mentions from docs
@zerok zerok modified the milestones: 10.2.x, 10.2.0 Oct 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants