diff --git a/.htmltest.yml b/.htmltest.yml
index d29cf03b3de6..117b5dd37bdb 100644
--- a/.htmltest.yml
+++ b/.htmltest.yml
@@ -11,6 +11,10 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
- ^/community/end-user/feedback-survey/$
- ^(/docs/migration/)?opencensus/$
+ # TODO(@chalin) remove once the website pages have caught up with latest semconv changes:
+ - ^/docs/specs/otel/\w+/semantic_conventions
+ - \#instrument-advice
+
- ^https://deploy-preview-\d+--opentelemetry.netlify.app/
- ^https://www\.googletagmanager\.com
diff --git a/.warnings-skip-list.txt b/.warnings-skip-list.txt
index e69de29bb2d1..a1bf445bac4e 100644
--- a/.warnings-skip-list.txt
+++ b/.warnings-skip-list.txt
@@ -0,0 +1 @@
+docs/specs/otel/common/attribute-requirement-level.md
diff --git a/content-modules/opentelemetry-specification b/content-modules/opentelemetry-specification
index 4f23dce407b6..c517f628cc66 160000
--- a/content-modules/opentelemetry-specification
+++ b/content-modules/opentelemetry-specification
@@ -1 +1 @@
-Subproject commit 4f23dce407b6fcaba34a049df7c3d41cdd58cb77
+Subproject commit c517f628cc667d2aba7d6cdaba5950dfc5223808
diff --git a/content-modules/semantic-conventions b/content-modules/semantic-conventions
index e53154102599..cadfe5394926 160000
--- a/content-modules/semantic-conventions
+++ b/content-modules/semantic-conventions
@@ -1 +1 @@
-Subproject commit e531541025992b68177a68b87628c5dc75c4f7d9
+Subproject commit cadfe53949266d33476b15ca52c92f682600a29c
diff --git a/scripts/content-modules/adjust-pages.pl b/scripts/content-modules/adjust-pages.pl
index 46c7b82cfc40..875b523561f4 100755
--- a/scripts/content-modules/adjust-pages.pl
+++ b/scripts/content-modules/adjust-pages.pl
@@ -19,9 +19,9 @@
my $specBasePath = '/docs/specs';
my $path_base_for_github_subdir = "content/en$specBasePath";
my %versions = qw(
- spec: 1.25.0
+ spec: 1.26.0
otlp: 1.0.0
- semconv: 1.21.0
+ semconv: 1.22.0
);
my $otelSpecVers = $versions{'spec:'};
my $otlpSpecVers = $versions{'otlp:'};
@@ -134,6 +134,7 @@ ()
# Images
s|(\.\./)?internal(/img/[-\w]+\.png)|$2|g;
s|(\]\()(img/.*?\))|$1../$2|g if $ARGV !~ /(logs|schemas)._index/ && $ARGV !~ /otlp\/docs/;
+ s|(\]\()([^)]+\.png\))|$1../$2|g if $ARGV =~ /\/tmp\/semconv\/docs\/general\/attributes/;
# Fix links that are to the title of the .md page
# TODO: fix these in the spec
diff --git a/static/refcache.json b/static/refcache.json
index ad8532b7040b..9eb159b2f144 100644
--- a/static/refcache.json
+++ b/static/refcache.json
@@ -563,6 +563,10 @@
"StatusCode": 200,
"LastSeen": "2023-06-30T09:18:28.374093-04:00"
},
+ "https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels": {
+ "StatusCode": 200,
+ "LastSeen": "2023-10-16T14:13:38.873062-04:00"
+ },
"https://developer.android.com/reference/android/os/Build#MANUFACTURER": {
"StatusCode": 200,
"LastSeen": "2023-06-29T16:08:18.483355-04:00"
@@ -859,10 +863,18 @@
"StatusCode": 206,
"LastSeen": "2023-07-06T17:58:46.994822-04:00"
},
+ "https://docs.docker.com/engine/api/v1.43/#tag/Image/operation/ImageInspect": {
+ "StatusCode": 206,
+ "LastSeen": "2023-10-16T14:13:22.14114-04:00"
+ },
"https://docs.docker.com/engine/reference/run/#container-identification": {
"StatusCode": 206,
"LastSeen": "2023-06-29T16:07:35.082785-04:00"
},
+ "https://docs.docker.com/registry/spec/manifest-v2-2/#example-image-manifest": {
+ "StatusCode": 206,
+ "LastSeen": "2023-10-16T14:13:33.061931-04:00"
+ },
"https://docs.fluentbit.io/manual/pipeline/inputs/opentelemetry/": {
"StatusCode": 206,
"LastSeen": "2023-07-21T16:51:51.751459+02:00"
@@ -1163,6 +1175,10 @@
"StatusCode": 200,
"LastSeen": "2023-06-29T15:47:45.601398-04:00"
},
+ "https://docs.oracle.com/en/java/javase/17/docs/api/java.management/java/lang/management/OperatingSystemMXBean.html#getSystemLoadAverage%28%29": {
+ "StatusCode": 200,
+ "LastSeen": "2023-10-16T14:12:45.788489-04:00"
+ },
"https://docs.oracle.com/en/java/javase/17/docs/api/jdk.management/com/sun/management/OperatingSystemMXBean.html#getCpuLoad%28%29": {
"StatusCode": 200,
"LastSeen": "2023-06-30T11:41:27.635612-04:00"
@@ -1191,6 +1207,10 @@
"StatusCode": 200,
"LastSeen": "2023-06-29T15:51:44.10099-04:00"
},
+ "https://docs.oracle.com/javase/8/docs/api/java/lang/Runtime.html#availableProcessors--": {
+ "StatusCode": 200,
+ "LastSeen": "2023-10-16T14:12:40.31885-04:00"
+ },
"https://docs.oracle.com/javase/8/docs/api/java/lang/management/BufferPoolMXBean.html#getCount--": {
"StatusCode": 200,
"LastSeen": "2023-06-30T11:41:48.215405-04:00"
@@ -3963,6 +3983,10 @@
"StatusCode": 200,
"LastSeen": "2023-08-14T07:27:51.174082501Z"
},
+ "https://learn.microsoft.com/en-us/archive/blogs/askcore/windows-performance-monitor-disk-counters-explained#windows-performance-monitor-disk-counters-explained": {
+ "StatusCode": 200,
+ "LastSeen": "2023-10-16T14:12:52.488179-04:00"
+ },
"https://learn.microsoft.com/en-us/dotnet/api/system.reflection.assembly.getentryassembly": {
"StatusCode": 200,
"LastSeen": "2023-09-06T15:04:13.518691+02:00"
@@ -4063,6 +4087,10 @@
"StatusCode": 206,
"LastSeen": "2023-06-29T16:06:20.249047-04:00"
},
+ "https://man7.org/linux/man-pages/man5/proc.5.html": {
+ "StatusCode": 206,
+ "LastSeen": "2023-10-16T14:13:03.195663-04:00"
+ },
"https://man7.org/linux/man-pages/man7/ip.7.html": {
"StatusCode": 206,
"LastSeen": "2023-06-29T16:06:09.52953-04:00"
@@ -4295,6 +4323,10 @@
"StatusCode": 206,
"LastSeen": "2023-06-29T18:37:38.705465-04:00"
},
+ "https://opencontainers.org/": {
+ "StatusCode": 206,
+ "LastSeen": "2023-10-16T14:13:27.523763-04:00"
+ },
"https://openfeature.dev/": {
"StatusCode": 206,
"LastSeen": "2023-10-05T19:47:00.973306+02:00"
@@ -5035,6 +5067,10 @@
"StatusCode": 200,
"LastSeen": "2023-06-29T18:53:19.161811-04:00"
},
+ "https://superuser.com/a/980821": {
+ "StatusCode": 200,
+ "LastSeen": "2023-10-16T14:12:57.75446-04:00"
+ },
"https://sysdig.com/blog/kubernetes-1-25-whats-new/": {
"StatusCode": 206,
"LastSeen": "2023-06-01T15:55:25.047205-04:00"
@@ -5235,6 +5271,10 @@
"StatusCode": 200,
"LastSeen": "2023-09-27T06:45:36.696402804Z"
},
+ "https://wiki.osdev.org/CPUID": {
+ "StatusCode": 200,
+ "LastSeen": "2023-10-16T14:13:16.464459-04:00"
+ },
"https://wiki.python.org/moin/PythonImplementations": {
"StatusCode": 200,
"LastSeen": "2023-06-30T08:37:31.222649-04:00"
@@ -5927,6 +5967,10 @@
"StatusCode": 200,
"LastSeen": "2023-06-27T17:17:33.646508-04:00"
},
+ "https://www.rfc-editor.org/rfc/rfc5952.html": {
+ "StatusCode": 206,
+ "LastSeen": "2023-10-16T14:13:10.625503-04:00"
+ },
"https://www.rfc-editor.org/rfc/rfc9110.html": {
"StatusCode": 200,
"LastSeen": "2023-06-29T18:38:37.624739-04:00"