Skip to content

Commit 7a793e6

Browse files
authored
Update semantic-conventions repo to 1.23.0, for real! (open-telemetry#3511)
1 parent 8a3891c commit 7a793e6

File tree

5 files changed

+135
-19
lines changed

5 files changed

+135
-19
lines changed

.github/workflows/scripts/auto-update-version.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ if [ "$existing_pr_count" -gt 0 ]; then
7070
fi
7171

7272
if [[ "$repo" == "opentelemetry-specification"
73-
|| "$repo" == "opentelemetry-proto" ]]; then
73+
|| "$repo" == "opentelemetry-proto"
74+
|| "$repo" == "semantic-conventions" ]]; then
7475
echo "Switching to $repo at tag v$latest_version"
7576
( set -x;
7677
npm run get:submodule -- content-modules/$repo &&

content-modules/semantic-conventions

gulp-src/prune.js

+27-17
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ async function pruneTask() {
7171
([url, date, statusCode]) => 400 <= statusCode && statusCode <= 499,
7272
);
7373

74+
var msg = `INFO: ${entriesWith4xxStatus.length} entries with 4XX status.`;
7475
if (prune4xx && entriesWith4xxStatus.length > 0) {
75-
console.log(
76-
`INFO: pruning ${entriesWith4xxStatus.length} entries with 4XX status.`,
77-
);
76+
msg += ' Pruning them.';
7877
const keysToPrune = entriesWith4xxStatus.map((item) => item[0]);
7978
keysToPrune.forEach((key) => delete entries[key]);
8079
}
80+
console.log(msg);
8181
return entriesWith4xxStatus.length;
8282
}
8383

@@ -103,7 +103,11 @@ async function pruneTask() {
103103
return;
104104
} else {
105105
console.log(
106-
`INFO: ${pruneCandidatesByDate__sorted.length} entries as prune candidates for given date.`,
106+
`INFO: ${
107+
pruneCandidatesByDate__sorted.length
108+
} entries as prune candidates for before-date ${formattedDate(
109+
beforeDate,
110+
)}.`,
107111
);
108112
}
109113

@@ -139,22 +143,28 @@ function listOldest(entries, numberOfEntries) {
139143

140144
oldestEntries.forEach((e) => {
141145
const date = new Date(e[1]);
142-
const formattedDate = date
143-
.toLocaleDateString('en-CA', {
144-
year: 'numeric',
145-
month: '2-digit',
146-
day: '2-digit',
147-
})
148-
.replace(/\//g, '-');
149-
const formattedTime = date.toLocaleTimeString('en-CA', {
150-
hour: '2-digit',
151-
minute: '2-digit',
152-
hour12: false,
153-
});
154-
console.log(` ${formattedDate} ${formattedTime} for ${e[0]}`);
146+
console.log(` ${formattedDate(date)} ${formattedTime(date)} for ${e[0]}`);
155147
});
156148
}
157149

158150
pruneTask.description = `Prune --num <n> entries from ${refcacheFile} file. For details, use --info.`;
159151

160152
gulp.task('prune', pruneTask);
153+
154+
function formattedDate(date) {
155+
return date
156+
.toLocaleDateString('en-CA', {
157+
year: 'numeric',
158+
month: '2-digit',
159+
day: '2-digit',
160+
})
161+
.replace(/\//g, '-');
162+
}
163+
164+
function formattedTime(date) {
165+
return date.toLocaleTimeString('en-CA', {
166+
hour: '2-digit',
167+
minute: '2-digit',
168+
hour12: false,
169+
});
170+
}

scripts/content-modules/adjust-pages.pl

+1
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ ()
135135
s|(\.\./)?internal(/img/[-\w]+\.png)|$2|g;
136136
s|(\]\()(img/.*?\))|$1../$2|g if $ARGV !~ /(logs|schemas)._index/ && $ARGV !~ /otlp\/docs/;
137137
s|(\]\()([^)]+\.png\))|$1../$2|g if $ARGV =~ /\/tmp\/semconv\/docs\/general\/attributes/;
138+
s|(\]\()([^)]+\.png\))|$1../$2|g if $ARGV =~ /\/tmp\/semconv\/docs\/http\/http-spans/;
138139

139140
# Fix links that are to the title of the .md page
140141
# TODO: fix these in the spec

static/refcache.json

+104
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,10 @@
167167
"StatusCode": 206,
168168
"LastSeen": "2023-06-29T12:28:09.411462-04:00"
169169
},
170+
"https://azure.microsoft.com/global-infrastructure/geographies/": {
171+
"StatusCode": 206,
172+
"LastSeen": "2023-11-08T07:23:05.338824-05:00"
173+
},
170174
"https://azure.microsoft.com/products/cosmos-db/": {
171175
"StatusCode": 200,
172176
"LastSeen": "2023-07-06T17:58:02.342209-04:00"
@@ -583,6 +587,10 @@
583587
"StatusCode": 200,
584588
"LastSeen": "2023-06-30T09:18:28.374093-04:00"
585589
},
590+
"https://developer.android.com/guide/components/activities/activity-lifecycle#lc": {
591+
"StatusCode": 200,
592+
"LastSeen": "2023-11-08T07:23:26.997244-05:00"
593+
},
586594
"https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels": {
587595
"StatusCode": 200,
588596
"LastSeen": "2023-10-16T14:13:38.873062-04:00"
@@ -595,6 +603,10 @@
595603
"StatusCode": 200,
596604
"LastSeen": "2023-06-29T16:08:12.4633-04:00"
597605
},
606+
"https://developer.apple.com/documentation/uikit/uiapplicationdelegate#1656902": {
607+
"StatusCode": 200,
608+
"LastSeen": "2023-11-08T07:23:21.699535-05:00"
609+
},
598610
"https://developer.apple.com/documentation/uikit/uidevice/1620059-identifierforvendor": {
599611
"StatusCode": 200,
600612
"LastSeen": "2023-06-29T16:08:06.985321-04:00"
@@ -1067,6 +1079,10 @@
10671079
"StatusCode": 200,
10681080
"LastSeen": "2023-06-29T15:46:55.73361-04:00"
10691081
},
1082+
"https://docs.microsoft.com/azure/azure-functions/manage-connections#static-clients": {
1083+
"StatusCode": 200,
1084+
"LastSeen": "2023-11-08T07:22:17.430061-05:00"
1085+
},
10701086
"https://docs.microsoft.com/azure/azure-monitor/app/opentelemetry-overview": {
10711087
"StatusCode": 200,
10721088
"LastSeen": "2023-06-29T15:46:12.472701-04:00"
@@ -1083,6 +1099,10 @@
10831099
"StatusCode": 200,
10841100
"LastSeen": "2023-06-29T15:53:37.193001-04:00"
10851101
},
1102+
"https://docs.microsoft.com/dotnet/api/system.exception.tostring": {
1103+
"StatusCode": 200,
1104+
"LastSeen": "2023-11-08T07:22:23.190616-05:00"
1105+
},
10861106
"https://docs.microsoft.com/dotnet/api/system.net.http.httpclient": {
10871107
"StatusCode": 200,
10881108
"LastSeen": "2023-09-06T15:04:28.468986+02:00"
@@ -1091,6 +1111,10 @@
10911111
"StatusCode": 200,
10921112
"LastSeen": "2023-09-06T15:04:29.255967+02:00"
10931113
},
1114+
"https://docs.microsoft.com/dotnet/api/system.servicemodel.servicesecuritycontext": {
1115+
"StatusCode": 200,
1116+
"LastSeen": "2023-11-08T07:21:40.065749-05:00"
1117+
},
10941118
"https://docs.microsoft.com/dotnet/core/diagnostics/metrics-instrumentation": {
10951119
"StatusCode": 200,
10961120
"LastSeen": "2023-06-29T16:17:12.119364-04:00"
@@ -1159,6 +1183,22 @@
11591183
"StatusCode": 200,
11601184
"LastSeen": "2023-06-29T15:48:28.159167-04:00"
11611185
},
1186+
"https://docs.microsoft.com/rest/api/resources/resources/get-by-id": {
1187+
"StatusCode": 200,
1188+
"LastSeen": "2023-11-08T07:22:12.212546-05:00"
1189+
},
1190+
"https://docs.microsoft.com/sql/connect/jdbc/building-the-connection-url": {
1191+
"StatusCode": 200,
1192+
"LastSeen": "2023-11-08T07:21:07.811418-05:00"
1193+
},
1194+
"https://docs.microsoft.com/windows/win32/api/netioapi/nf-netioapi-getifentry2": {
1195+
"StatusCode": 200,
1196+
"LastSeen": "2023-11-08T07:22:44.999744-05:00"
1197+
},
1198+
"https://docs.microsoft.com/windows/win32/api/netioapi/ns-netioapi-mib_if_row2": {
1199+
"StatusCode": 200,
1200+
"LastSeen": "2023-11-08T07:22:39.742787-05:00"
1201+
},
11621202
"https://docs.microsoft.com/windows/win32/api/winsock2/nf-winsock2-bind": {
11631203
"StatusCode": 200,
11641204
"LastSeen": "2023-06-29T15:50:36.741227-04:00"
@@ -1219,6 +1259,10 @@
12191259
"StatusCode": 200,
12201260
"LastSeen": "2023-06-29T15:47:40.319503-04:00"
12211261
},
1262+
"https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/ThreadInfo.html#isDaemon%28%29": {
1263+
"StatusCode": 200,
1264+
"LastSeen": "2023-11-08T07:22:01.424324-05:00"
1265+
},
12221266
"https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpClient.html": {
12231267
"StatusCode": 200,
12241268
"LastSeen": "2023-09-14T09:36:38.052527-05:00"
@@ -1311,6 +1355,14 @@
13111355
"StatusCode": 200,
13121356
"LastSeen": "2023-06-30T11:41:32.736885-04:00"
13131357
},
1358+
"https://docs.oracle.com/javase/8/docs/api/java/lang/management/ThreadInfo.html#getThreadState--": {
1359+
"StatusCode": 200,
1360+
"LastSeen": "2023-11-08T07:21:56.320234-05:00"
1361+
},
1362+
"https://docs.oracle.com/javase/8/docs/api/java/lang/management/ThreadMXBean.html#getAllThreadIds--": {
1363+
"StatusCode": 200,
1364+
"LastSeen": "2023-11-08T07:21:46.130999-05:00"
1365+
},
13141366
"https://docs.oracle.com/javase/8/docs/api/java/lang/management/ThreadMXBean.html#getDaemonThreadCount--": {
13151367
"StatusCode": 200,
13161368
"LastSeen": "2023-06-30T11:40:51.871681-04:00"
@@ -1319,6 +1371,10 @@
13191371
"StatusCode": 200,
13201372
"LastSeen": "2023-06-30T11:40:56.959874-04:00"
13211373
},
1374+
"https://docs.oracle.com/javase/8/docs/api/java/lang/management/ThreadMXBean.html#getThreadInfo-long:A-": {
1375+
"StatusCode": 200,
1376+
"LastSeen": "2023-11-08T07:21:51.21529-05:00"
1377+
},
13221378
"https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html": {
13231379
"StatusCode": 200,
13241380
"LastSeen": "2023-06-29T15:54:17.103682-04:00"
@@ -3971,6 +4027,10 @@
39714027
"StatusCode": 200,
39724028
"LastSeen": "2023-08-03T17:44:10.601039+02:00"
39734029
},
4030+
"https://img.shields.io/badge/-stable-lightgreen": {
4031+
"StatusCode": 200,
4032+
"LastSeen": "2023-11-08T07:21:29.389953-05:00"
4033+
},
39744034
"https://jaegertracing.io": {
39754035
"StatusCode": 206,
39764036
"LastSeen": "2023-06-01T15:55:20.985886-04:00"
@@ -4167,6 +4227,10 @@
41674227
"StatusCode": 206,
41684228
"LastSeen": "2023-06-29T16:21:28.969704-04:00"
41694229
},
4230+
"https://learn.microsoft.com/archive/blogs/askcore/windows-performance-monitor-disk-counters-explained#windows-performance-monitor-disk-counters-explained": {
4231+
"StatusCode": 200,
4232+
"LastSeen": "2023-11-08T07:22:34.14265-05:00"
4233+
},
41704234
"https://learn.microsoft.com/aspnet/core/tutorials/min-web-api": {
41714235
"StatusCode": 200,
41724236
"LastSeen": "2023-08-14T07:27:51.174082501Z"
@@ -4199,6 +4263,10 @@
41994263
"StatusCode": 200,
42004264
"LastSeen": "2023-06-30T09:16:26.155249-04:00"
42014265
},
4266+
"https://learn.microsoft.com/rest/api/resources/resources/get-by-id": {
4267+
"StatusCode": 200,
4268+
"LastSeen": "2023-11-08T07:22:07.040171-05:00"
4269+
},
42024270
"https://letsencrypt.org/": {
42034271
"StatusCode": 206,
42044272
"LastSeen": "2023-06-29T16:14:21.541903-04:00"
@@ -5267,6 +5335,10 @@
52675335
"StatusCode": 200,
52685336
"LastSeen": "2023-06-29T18:36:13.877675-04:00"
52695337
},
5338+
"https://standards.ieee.org/wp-content/uploads/import/documents/tutorials/eui.pdf": {
5339+
"StatusCode": 206,
5340+
"LastSeen": "2023-11-08T07:23:33.211618-05:00"
5341+
},
52705342
"https://storiesfromtheherd.com/just-in-time-nomad-80f57cd403ca": {
52715343
"StatusCode": 200,
52725344
"LastSeen": "2023-06-29T18:50:57.528605-04:00"
@@ -5387,6 +5459,10 @@
53875459
"StatusCode": 200,
53885460
"LastSeen": "2023-06-29T18:42:20.913106-04:00"
53895461
},
5462+
"https://tools.ietf.org/html/rfc9110#section-7.2": {
5463+
"StatusCode": 200,
5464+
"LastSeen": "2023-11-08T07:23:16.17102-05:00"
5465+
},
53905466
"https://tools.ietf.org/html/rfc9113#section-8.3.1": {
53915467
"StatusCode": 200,
53925468
"LastSeen": "2023-11-03T03:04:37.939785-04:00"
@@ -5523,6 +5599,30 @@
55235599
"StatusCode": 200,
55245600
"LastSeen": "2023-06-30T08:40:17.830752-04:00"
55255601
},
5602+
"https://wikipedia.org/wiki/Count_noun": {
5603+
"StatusCode": 200,
5604+
"LastSeen": "2023-11-08T07:21:23.868848-05:00"
5605+
},
5606+
"https://wikipedia.org/wiki/Deployment_environment": {
5607+
"StatusCode": 200,
5608+
"LastSeen": "2023-11-08T07:23:39.11906-05:00"
5609+
},
5610+
"https://wikipedia.org/wiki/Function_as_a_service": {
5611+
"StatusCode": 200,
5612+
"LastSeen": "2023-11-08T07:21:18.690062-05:00"
5613+
},
5614+
"https://wikipedia.org/wiki/Hop_%28networking%29": {
5615+
"StatusCode": 200,
5616+
"LastSeen": "2023-11-08T07:21:13.325261-05:00"
5617+
},
5618+
"https://wikipedia.org/wiki/Inter-process_communication": {
5619+
"StatusCode": 200,
5620+
"LastSeen": "2023-11-08T07:21:34.564864-05:00"
5621+
},
5622+
"https://wikipedia.org/wiki/Load_%28computing%29": {
5623+
"StatusCode": 200,
5624+
"LastSeen": "2023-11-08T07:22:50.172555-05:00"
5625+
},
55265626
"https://wikipedia.org/wiki/Monotonic_function": {
55275627
"StatusCode": 200,
55285628
"LastSeen": "2023-06-30T08:40:28.153623-04:00"
@@ -5531,6 +5631,10 @@
55315631
"StatusCode": 200,
55325632
"LastSeen": "2023-06-30T08:40:22.997241-04:00"
55335633
},
5634+
"https://wikipedia.org/wiki/S.M.A.R.T.": {
5635+
"StatusCode": 200,
5636+
"LastSeen": "2023-11-08T07:22:28.763824-05:00"
5637+
},
55345638
"https://wukongdoc.tingyun.com/apm/userguide/deploy_manage/opentelemetry.html": {
55355639
"StatusCode": 206,
55365640
"LastSeen": "2023-11-01T09:14:51.938778+08:00"

0 commit comments

Comments
 (0)