From 426fa3b9f77489f9dbd4e5a016e4b4e86073cd71 Mon Sep 17 00:00:00 2001
From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com>
Date: Fri, 5 Apr 2024 02:23:05 +0200
Subject: [PATCH] Update semantic-conventions version to v1.25.0 (#4253)

---
 .gitmodules                             |  2 +-
 content-modules/semantic-conventions    |  2 +-
 scripts/content-modules/adjust-pages.pl |  4 ++-
 static/refcache.json                    | 44 +++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index bdcd3962d38e..5af52073fd80 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,7 +19,7 @@
 [submodule "content-modules/semantic-conventions"]
 	path = content-modules/semantic-conventions
 	url = https://github.com/open-telemetry/semantic-conventions
-	semconv-pin = v1.24.0
+	semconv-pin = v1.25.0
 [submodule "content-modules/opamp-spec"]
 	path = content-modules/opamp-spec
 	url = https://github.com/open-telemetry/opamp-spec
diff --git a/content-modules/semantic-conventions b/content-modules/semantic-conventions
index cafda7127683..f1be1511d917 160000
--- a/content-modules/semantic-conventions
+++ b/content-modules/semantic-conventions
@@ -1 +1 @@
-Subproject commit cafda7127683b7f667e27cdbd3220510b6f998c9
+Subproject commit f1be1511d91743a457974ed9a21b9193b2fe0e51
diff --git a/scripts/content-modules/adjust-pages.pl b/scripts/content-modules/adjust-pages.pl
index 9e5d63367a4e..24037d945e73 100755
--- a/scripts/content-modules/adjust-pages.pl
+++ b/scripts/content-modules/adjust-pages.pl
@@ -20,7 +20,7 @@
 my %versions = qw(
   spec: 1.31.0
   otlp: 1.1.0
-  semconv: 1.24.0
+  semconv: 1.25.0
 );
 my $otelSpecVers = $versions{'spec:'};
 my $otlpSpecVers = $versions{'otlp:'};
@@ -104,6 +104,8 @@ ()
 
     # TODO: drop after fix of https://github.com/open-telemetry/semantic-conventions/issues/419
     s|#instrument-advice\b|#instrument-advisory-parameters|g;
+    # TODO: drop after fix of https://github.com/open-telemetry/semantic-conventions/pull/883
+    s|(\]\(process.md)#process(\))|$1$2|g;
   }
 
   # SPECIFICATION custom processing
diff --git a/static/refcache.json b/static/refcache.json
index 293e8bbcc98b..66acfeeda282 100644
--- a/static/refcache.json
+++ b/static/refcache.json
@@ -23,6 +23,10 @@
     "StatusCode": 206,
     "LastSeen": "2024-01-18T19:02:04.404963-05:00"
   },
+  "http://publicsuffix.org": {
+    "StatusCode": 206,
+    "LastSeen": "2024-04-04T20:00:39.641034-04:00"
+  },
   "http://surl.li/fqdox": {
     "StatusCode": 200,
     "LastSeen": "2024-01-30T05:19:24.403175-05:00"
@@ -4639,6 +4643,10 @@
     "StatusCode": 200,
     "LastSeen": "2024-01-30T16:14:52.798893-05:00"
   },
+  "https://img.shields.io/badge/-experimental-blue": {
+    "StatusCode": 200,
+    "LastSeen": "2024-04-04T20:00:41.081038-04:00"
+  },
   "https://img.shields.io/badge/-stable-lightgreen": {
     "StatusCode": 200,
     "LastSeen": "2024-01-30T16:14:23.500512-05:00"
@@ -4863,6 +4871,18 @@
     "StatusCode": 200,
     "LastSeen": "2024-01-30T15:25:14.866011-05:00"
   },
+  "https://learn.microsoft.com/azure/event-hubs/event-hubs-about": {
+    "StatusCode": 200,
+    "LastSeen": "2024-04-04T20:00:42.394166-04:00"
+  },
+  "https://learn.microsoft.com/azure/service-bus-messaging/message-transfers-locks-settlement#peeklock": {
+    "StatusCode": 200,
+    "LastSeen": "2024-04-04T20:00:36.37594-04:00"
+  },
+  "https://learn.microsoft.com/azure/service-bus-messaging/service-bus-messaging-overview": {
+    "StatusCode": 200,
+    "LastSeen": "2024-04-04T20:00:36.708409-04:00"
+  },
   "https://learn.microsoft.com/dotnet/api/microsoft.aspnetcore.diagnostics.iexceptionhandler": {
     "StatusCode": 200,
     "LastSeen": "2024-01-30T16:14:24.003181-05:00"
@@ -4907,6 +4927,10 @@
     "StatusCode": 200,
     "LastSeen": "2024-01-30T16:14:24.361664-05:00"
   },
+  "https://learn.microsoft.com/windows/win32/api/ws2tcpip/nf-ws2tcpip-getaddrinfo": {
+    "StatusCode": 200,
+    "LastSeen": "2024-04-04T20:00:38.324091-04:00"
+  },
   "https://letsencrypt.org/": {
     "StatusCode": 206,
     "LastSeen": "2024-01-18T19:02:28.807499-05:00"
@@ -4975,6 +4999,10 @@
     "StatusCode": 206,
     "LastSeen": "2024-01-18T08:54:07.441277-05:00"
   },
+  "https://man7.org/linux/man-pages/man3/getaddrinfo.3.html": {
+    "StatusCode": 206,
+    "LastSeen": "2024-04-04T20:00:36.904671-04:00"
+  },
   "https://man7.org/linux/man-pages/man5/proc.5.html": {
     "StatusCode": 206,
     "LastSeen": "2024-01-30T16:04:48.740728-05:00"
@@ -7895,6 +7923,10 @@
     "StatusCode": 206,
     "LastSeen": "2024-01-30T16:05:22.031745-05:00"
   },
+  "https://www.freedesktop.org/software/systemd/man/machine-id.html": {
+    "StatusCode": 206,
+    "LastSeen": "2024-04-04T20:00:40.645221-04:00"
+  },
   "https://www.fulcrumapp.com/": {
     "StatusCode": 206,
     "LastSeen": "2024-01-30T06:06:09.538965-05:00"
@@ -7963,6 +7995,10 @@
     "StatusCode": 206,
     "LastSeen": "2024-01-18T19:07:50.513752-05:00"
   },
+  "https://www.ietf.org/rfc/rfc4122.txt": {
+    "StatusCode": 206,
+    "LastSeen": "2024-04-04T20:00:31.717502-04:00"
+  },
   "https://www.influxdata.com/time-series-platform/telegraf/": {
     "StatusCode": 206,
     "LastSeen": "2024-01-30T16:05:10.329813-05:00"
@@ -8519,6 +8555,10 @@
     "StatusCode": 206,
     "LastSeen": "2024-01-18T19:10:25.020977-05:00"
   },
+  "https://www.rfc-editor.org/rfc/rfc2732#section-2": {
+    "StatusCode": 206,
+    "LastSeen": "2024-04-04T20:00:34.113871-04:00"
+  },
   "https://www.rfc-editor.org/rfc/rfc3986": {
     "StatusCode": 206,
     "LastSeen": "2024-01-30T06:01:08.536854-05:00"
@@ -8547,6 +8587,10 @@
     "StatusCode": 206,
     "LastSeen": "2024-01-30T16:04:54.139913-05:00"
   },
+  "https://www.rfc-editor.org/rfc/rfc7301.html": {
+    "StatusCode": 206,
+    "LastSeen": "2024-04-04T20:00:34.603183-04:00"
+  },
   "https://www.rfc-editor.org/rfc/rfc9110.html": {
     "StatusCode": 200,
     "LastSeen": "2024-01-18T19:07:23.848229-05:00"