IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update dependency @opentelemetry/semantic-conventions to v1 (#40377)

Browse Source 
* 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>
This commit is contained in:
renovate[bot]
2021-10-14 11:02:05 +02:00
committed by GitHub
parent 31d50f931d
commit 5664ffd094
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -240,7 +240,7 @@
"@jaegertracing/jaeger-ui-components": "workspace:*", "@jaegertracing/jaeger-ui-components": "workspace:*",
"@opentelemetry/api": "1.0.2", "@opentelemetry/api": "1.0.2",
"@opentelemetry/exporter-collector": "0.23.0", "@opentelemetry/exporter-collector": "0.23.0",
"@opentelemetry/semantic-conventions": "0.23.0", "@opentelemetry/semantic-conventions": "1.0.0",
"@popperjs/core": "2.5.4", "@popperjs/core": "2.5.4",
"@reduxjs/toolkit": "1.6.1", "@reduxjs/toolkit": "1.6.1",
"@sentry/browser": "5.25.0", "@sentry/browser": "5.25.0",

4
public/app/plugins/datasource/tempo/resultTransformer.ts
View File

@@ -12,7 +12,7 @@ import {
} from '@grafana/data'; } from '@grafana/data';
import { SpanKind, SpanStatus, SpanStatusCode } from '@opentelemetry/api'; import { SpanKind, SpanStatus, SpanStatusCode } from '@opentelemetry/api';
import { collectorTypes } from '@opentelemetry/exporter-collector'; import { collectorTypes } from '@opentelemetry/exporter-collector';
import { ResourceAttributes } from '@opentelemetry/semantic-conventions'; import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
import { createGraphFrames } from './graphTransform'; import { createGraphFrames } from './graphTransform';
export function createTableFrame( export function createTableFrame(
@@ -161,7 +161,7 @@ function resourceToProcess(resource: collectorTypes.opentelemetryProto.resource.
} }
for (const attribute of resource.attributes) { for (const attribute of resource.attributes) {
if (attribute.key === ResourceAttributes.SERVICE_NAME) { if (attribute.key === SemanticResourceAttributes.SERVICE_NAME) {
serviceName = attribute.value.stringValue || serviceName; serviceName = attribute.value.stringValue || serviceName;
} }
serviceTags.push({ key: attribute.key, value: getAttributeValue(attribute.value) }); serviceTags.push({ key: attribute.key, value: getAttributeValue(attribute.value) });

9
yarn.lock
View File

@@ -4493,6 +4493,13 @@ __metadata:
languageName: node languageName: node
linkType: hard 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": "@opentelemetry/tracing@npm:0.23.0":
version: 0.23.0 version: 0.23.0
resolution: "@opentelemetry/tracing@npm:0.23.0" resolution: "@opentelemetry/tracing@npm:0.23.0"
@@ -17808,7 +17815,7 @@ fsevents@~2.1.2:
"@kusto/monaco-kusto": 3.2.7 "@kusto/monaco-kusto": 3.2.7
"@opentelemetry/api": 1.0.2 "@opentelemetry/api": 1.0.2
"@opentelemetry/exporter-collector": 0.23.0 "@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 "@pmmmwh/react-refresh-webpack-plugin": ^0.5.0-rc.6
"@popperjs/core": 2.5.4 "@popperjs/core": 2.5.4
"@reduxjs/toolkit": 1.6.1 "@reduxjs/toolkit": 1.6.1