From 5664ffd094742854d6c5b2eb887ecc1bf8e13e40 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 14 Oct 2021 11:02:05 +0200
Subject: [PATCH] Update dependency @opentelemetry/semantic-conventions to v1
 (#40377)

* Update dependency @opentelemetry/semantic-conventions to v1

* chore(tempo): update import to match semantic-conventions api changes

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
---
 package.json                                             | 2 +-
 public/app/plugins/datasource/tempo/resultTransformer.ts | 4 ++--
 yarn.lock                                                | 9 ++++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 27289341633..f59d3c3a56b 100644
--- a/package.json
+++ b/package.json
@@ -240,7 +240,7 @@
     "@jaegertracing/jaeger-ui-components": "workspace:*",
     "@opentelemetry/api": "1.0.2",
     "@opentelemetry/exporter-collector": "0.23.0",
-    "@opentelemetry/semantic-conventions": "0.23.0",
+    "@opentelemetry/semantic-conventions": "1.0.0",
     "@popperjs/core": "2.5.4",
     "@reduxjs/toolkit": "1.6.1",
     "@sentry/browser": "5.25.0",
diff --git a/public/app/plugins/datasource/tempo/resultTransformer.ts b/public/app/plugins/datasource/tempo/resultTransformer.ts
index cd24191e3e8..8e034a310af 100644
--- a/public/app/plugins/datasource/tempo/resultTransformer.ts
+++ b/public/app/plugins/datasource/tempo/resultTransformer.ts
@@ -12,7 +12,7 @@ import {
 } from '@grafana/data';
 import { SpanKind, SpanStatus, SpanStatusCode } from '@opentelemetry/api';
 import { collectorTypes } from '@opentelemetry/exporter-collector';
-import { ResourceAttributes } from '@opentelemetry/semantic-conventions';
+import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
 import { createGraphFrames } from './graphTransform';
 
 export function createTableFrame(
@@ -161,7 +161,7 @@ function resourceToProcess(resource: collectorTypes.opentelemetryProto.resource.
   }
 
   for (const attribute of resource.attributes) {
-    if (attribute.key === ResourceAttributes.SERVICE_NAME) {
+    if (attribute.key === SemanticResourceAttributes.SERVICE_NAME) {
       serviceName = attribute.value.stringValue || serviceName;
     }
     serviceTags.push({ key: attribute.key, value: getAttributeValue(attribute.value) });
diff --git a/yarn.lock b/yarn.lock
index eeb4b582103..34de28f4979 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4493,6 +4493,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@opentelemetry/semantic-conventions@npm:1.0.0":
+  version: 1.0.0
+  resolution: "@opentelemetry/semantic-conventions@npm:1.0.0"
+  checksum: 1fc7a5cbabd49ebfaf83413dcadd742a483efb8d95532aef3522b332abf32cc5c4602ec87ea5d9fc0bcfeea4e88e4993d2e996bf050fdfae3d19d1fa91ddae8a
+  languageName: node
+  linkType: hard
+
 "@opentelemetry/tracing@npm:0.23.0":
   version: 0.23.0
   resolution: "@opentelemetry/tracing@npm:0.23.0"
@@ -17808,7 +17815,7 @@ fsevents@~2.1.2:
     "@kusto/monaco-kusto": 3.2.7
     "@opentelemetry/api": 1.0.2
     "@opentelemetry/exporter-collector": 0.23.0
-    "@opentelemetry/semantic-conventions": 0.23.0
+    "@opentelemetry/semantic-conventions": 1.0.0
     "@pmmmwh/react-refresh-webpack-plugin": ^0.5.0-rc.6
     "@popperjs/core": 2.5.4
     "@reduxjs/toolkit": 1.6.1