Skip to content

Commit d4dd134

Browse files
sumukhswamysumukhswamy
authored
Merge branch 'main' into mds-traces
2 parents 32e10d2 + 9aee128 commit d4dd134

33 files changed

+3283
-4
lines changed

‎public/components/custom_panels/helpers/utils.tsx

+13-4
Original file line numberDiff line numberDiff line change
@@ -704,16 +704,25 @@ export const constructOtelMetricsMetaData = () => {
704704
};
705705
};
706706

707+
export const parseMetadataUserConfig = (
708+
userConfigs?: string | SavedObjectAttributes
709+
): SavedObjectAttributes => {
710+
if (userConfigs === undefined || userConfigs === '') {
711+
return {};
712+
} else if (typeof userConfigs === 'string') {
713+
return JSON.parse(userConfigs);
714+
} else {
715+
return userConfigs;
716+
}
717+
};
718+
707719
// Renders visualization in the vizualization container component
708720
export const displayVisualization = (metaData: any, data: any, type: string) => {
709721
if (metaData === undefined || isEmpty(metaData)) {
710722
return <></>;
711723
}
712724

713-
if (metaData.userConfigs !== undefined && metaData.userConfigs !== '') {
714-
metaData.userConfigs = JSON.parse(metaData.userConfigs);
715-
}
716-
725+
metaData.userConfigs = parseMetadataUserConfig(metaData.userConfigs);
717726
const dataConfig = { ...(metaData.userConfigs?.dataConfig || {}) };
718727
const hasBreakdowns = !_.isEmpty(dataConfig.breakdowns);
719728
const realTimeParsedStats = {

‎server/adaptors/integrations/__data__/repository/otel-services/assets/otel-amp-network-metrics-dashboard-1.0.0.ndjson

+20
Large diffs are not rendered by default.

‎server/adaptors/integrations/__data__/repository/otel-services/assets/otel-apm-network-services-1.0.0.ndjson

+17
Large diffs are not rendered by default.

‎server/adaptors/integrations/__data__/repository/otel-services/assets/otel-ingestion-rate-dashboard-1.0.0.ndjson

+11
Large diffs are not rendered by default.

‎server/adaptors/integrations/__data__/repository/otel-services/assets/otel-services-dashboard-1.0.0.ndjson

+11
Large diffs are not rendered by default.

‎server/adaptors/integrations/__data__/repository/otel-services/assets/otel-single-service-dashboard-1.0.0.ndjson

+9
Large diffs are not rendered by default.

‎server/adaptors/integrations/__data__/repository/otel-services/data/logs-samples.json

+126
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
[
2+
{
3+
"traceId": "",
4+
"spanId": "",
5+
"severityText": "Information",
6+
"flags": 0,
7+
"time": "2024-01-31T23:06:12.018111600Z",
8+
"severityNumber": 9,
9+
"droppedAttributesCount": 0,
10+
"serviceName": "cartservice",
11+
"body": "Successfully connected to Redis",
12+
"observedTime": "2024-01-31T23:06:12.018111600Z",
13+
"schemaUrl": "",
14+
"resource.attributes.telemetry@sdk@name": "opentelemetry",
15+
"resource.attributes.telemetry@sdk@language": "dotnet",
16+
"resource.attributes.service@namespace": "opentelemetry-demo",
17+
"resource.attributes.container@id": "e3740ac228f0e0b8294baca2ca110b5ecd371aa56e299b1fae7e1226e3b1e58b",
18+
"resource.attributes.telemetry@sdk@version": "1.6.0",
19+
"resource.attributes.service@name": "cartservice"
20+
},
21+
{
22+
"traceId": "",
23+
"spanId": "",
24+
"severityText": "INFO",
25+
"flags": 0,
26+
"time": "2024-01-31T23:09:00.134592768Z",
27+
"severityNumber": 9,
28+
"droppedAttributesCount": 0,
29+
"serviceName": "recommendationservice",
30+
"body": "Recommendation service started, listening on port 9001",
31+
"observedTime": "1970-01-01T00:00:00Z",
32+
"schemaUrl": "",
33+
"instrumentationScope.name": "opentelemetry.sdk._logs._internal",
34+
"resource.attributes.telemetry@sdk@name": "opentelemetry",
35+
"log.attributes.otelSpanID": "0",
36+
"resource.attributes.telemetry@sdk@language": "python",
37+
"log.attributes.otelServiceName": "recommendationservice",
38+
"log.attributes.otelTraceID": "0",
39+
"resource.attributes.service@namespace": "opentelemetry-demo",
40+
"resource.attributes.telemetry@sdk@version": "1.19.0",
41+
"resource.attributes.service@name": "recommendationservice",
42+
"log.attributes.otelTraceSampled": false
43+
},
44+
{
45+
"traceId": "",
46+
"spanId": "",
47+
"severityText": "INFO",
48+
"flags": 0,
49+
"time": "2024-01-31T23:07:45.416585703Z",
50+
"severityNumber": 9,
51+
"droppedAttributesCount": 0,
52+
"serviceName": "adservice",
53+
"body": "Ad service started, listening on 9555",
54+
"observedTime": "2024-01-31T23:07:45.416601598Z",
55+
"schemaUrl": "https://opentelemetry.io/schemas/1.21.0",
56+
"resource.attributes.telemetry@sdk@language": "java",
57+
"resource.attributes.host@name": "573322d2c5f8",
58+
"resource.attributes.process@pid": 1,
59+
"resource.attributes.host@arch": "amd64",
60+
"resource.attributes.process@runtime@description": "Eclipse Adoptium OpenJDK 64-Bit Server VM 21.0.1+12-LTS",
61+
"resource.attributes.service@namespace": "opentelemetry-demo",
62+
"resource.attributes.process@executable@path": "/opt/java/openjdk/bin/java",
63+
"resource.attributes.telemetry@sdk@version": "1.31.0",
64+
"resource.attributes.service@name": "adservice",
65+
"resource.attributes.process@command_line": "/opt/java/openjdk/bin/java -javaagent:/usr/src/app/opentelemetry-javaagent.jar oteldemo.AdService",
66+
"instrumentationScope.name": "oteldemo.AdService",
67+
"resource.attributes.process@runtime@version": "21.0.1+12-LTS",
68+
"resource.attributes.telemetry@sdk@name": "opentelemetry",
69+
"resource.attributes.process@runtime@name": "OpenJDK Runtime Environment",
70+
"resource.attributes.os@type": "linux",
71+
"resource.attributes.container@id": "573322d2c5f89180e0eec0fff3661d4750b082525142171d925fb750c685d588",
72+
"resource.attributes.telemetry@auto@version": "1.31.0",
73+
"resource.attributes.os@description": "Linux 6.3.13-linuxkit"
74+
},
75+
{
76+
"traceId": "",
77+
"spanId": "",
78+
"severityText": "INFO",
79+
"flags": 0,
80+
"time": "2024-01-31T23:07:38.186531875Z",
81+
"severityNumber": 9,
82+
"droppedAttributesCount": 0,
83+
"serviceName": "adservice",
84+
"body": "Ad service starting.",
85+
"observedTime": "2024-01-31T23:07:38.186575167Z",
86+
"schemaUrl": "https://opentelemetry.io/schemas/1.21.0",
87+
"resource.attributes.telemetry@sdk@language": "java",
88+
"resource.attributes.host@name": "573322d2c5f8",
89+
"resource.attributes.process@pid": 1,
90+
"resource.attributes.host@arch": "amd64",
91+
"resource.attributes.process@runtime@description": "Eclipse Adoptium OpenJDK 64-Bit Server VM 21.0.1+12-LTS",
92+
"resource.attributes.service@namespace": "opentelemetry-demo",
93+
"resource.attributes.process@executable@path": "/opt/java/openjdk/bin/java",
94+
"resource.attributes.telemetry@sdk@version": "1.31.0",
95+
"resource.attributes.service@name": "adservice",
96+
"resource.attributes.process@command_line": "/opt/java/openjdk/bin/java -javaagent:/usr/src/app/opentelemetry-javaagent.jar oteldemo.AdService",
97+
"instrumentationScope.name": "oteldemo.AdService",
98+
"resource.attributes.process@runtime@version": "21.0.1+12-LTS",
99+
"resource.attributes.telemetry@sdk@name": "opentelemetry",
100+
"resource.attributes.process@runtime@name": "OpenJDK Runtime Environment",
101+
"resource.attributes.os@type": "linux",
102+
"resource.attributes.container@id": "573322d2c5f89180e0eec0fff3661d4750b082525142171d925fb750c685d588",
103+
"resource.attributes.telemetry@auto@version": "1.31.0",
104+
"resource.attributes.os@description": "Linux 6.3.13-linuxkit"
105+
},
106+
{
107+
"traceId": "",
108+
"spanId": "",
109+
"severityText": "Information",
110+
"flags": 0,
111+
"time": "2024-01-31T23:06:19.235638700Z",
112+
"severityNumber": 9,
113+
"droppedAttributesCount": 0,
114+
"serviceName": "cartservice",
115+
"body": "Now listening on: {address}",
116+
"observedTime": "2024-01-31T23:06:19.235638700Z",
117+
"schemaUrl": "",
118+
"resource.attributes.telemetry@sdk@name": "opentelemetry",
119+
"resource.attributes.telemetry@sdk@language": "dotnet",
120+
"resource.attributes.service@namespace": "opentelemetry-demo",
121+
"log.attributes.address": "http://[::]:7070",
122+
"resource.attributes.container@id": "e3740ac228f0e0b8294baca2ca110b5ecd371aa56e299b1fae7e1226e3b1e58b",
123+
"resource.attributes.telemetry@sdk@version": "1.6.0",
124+
"resource.attributes.service@name": "cartservice"
125+
}
126+
]

0 commit comments

Comments
 (0)