From f992e4a4910ef6996b50a33e403927f886026235 Mon Sep 17 00:00:00 2001
From: Patrice Chalin <pchalin@gmail.com>
Date: Wed, 29 Nov 2023 14:09:49 -0500
Subject: [PATCH] Update docsy to 0.8.0, clean up htmltest config, update OpAMP

---
 .htmltest.yml              | 17 +++++++----------
 content-modules/opamp-spec |  2 +-
 static/refcache.json       |  8 ++++++++
 themes/docsy               |  2 +-
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.htmltest.yml b/.htmltest.yml
index e5badd9f18d4..e82fd4381d0a 100644
--- a/.htmltest.yml
+++ b/.htmltest.yml
@@ -4,6 +4,8 @@ IgnoreDirectoryMissingTrailingSlash: true
 IgnoreAltMissing: true
 IgnoreCanonicalBrokenLinks: false
 CheckMailto: false
+IgnoreDirs:
+  - ^blog/(\d+/)?page/\d+
 IgnoreInternalURLs: # list of paths
 IgnoreURLs: # list of regexs of paths or URLs to be ignored
   - ^/docs/instrumentation/\w+/(api|examples)/$
@@ -18,6 +20,9 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
   - ^https?://127\.0\.0\.1\b
   - ^https?://(otel-demo|traefik)\.localhost
 
+  # OpAMP spec:
+  - ^https://pdf.sciencedirectassets.com/280203/1-s2.0-S1877050919X0006X/1-s2.0-S1877050919303576/main.pdf\?
+
   # Sites that deny access, always yielding 403 Forbidden (unless mentioned otherwise)
   - ^https://(www\.)?linkedin\.com\b # 999 Request Denied
   - ^https://(www\.)?mvnrepository\.com
@@ -41,13 +46,5 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
   - ^https://crates\.io/crates
   # TODO: drop after fix to https://github.com/micrometer-metrics/micrometer-docs/issues/239
   - ^https://micrometer\.io/docs
-  # TODO: drop after fix to https://github.com/google/docsy/issues/1337
-  - ^https://opentelemetry\.io/.
-  # TODO: drop after fix to https://github.com/open-telemetry/opentelemetry.io/issues/2354
-  - ^https://open-telemetry\.github\.io/opentelemetry-python/benchmarks/
-  # TODO: remove after merge of https://github.com/open-telemetry/opentelemetry.io/pull/2594
-  - ^https://elastic.co/blog/ecs-elastic-common-schema-otel-opentelemetry-announcement
-  # TODO: remove after OpAMP spec is fixed: https://github.com/open-telemetry/opamp-spec/issues/148
-  - ^https://example.com:4318/v1/metrics
-  - ^https://pdf.sciencedirectassets.com/280203/1-s2.0-S1877050919X0006X
-  - ^https://research.fb.com/wp-content/uploads/2016/11/holistic-configuration-management-at-facebook.pdf
+  # TODO: ensure .json isn't set as an alternate in ecosystem/registry/index.html and then drop:
+  - ^https://opentelemetry.io/ecosystem/registry/index.json
diff --git a/content-modules/opamp-spec b/content-modules/opamp-spec
index 7718250cb5d3..36c8e0a2eba9 160000
--- a/content-modules/opamp-spec
+++ b/content-modules/opamp-spec
@@ -1 +1 @@
-Subproject commit 7718250cb5d3982a366c06fb151d67b57048c9c7
+Subproject commit 36c8e0a2eba98b939934632accb8e8253b4a0ea7
diff --git a/static/refcache.json b/static/refcache.json
index ccfd933a252b..b745b0580dd4 100644
--- a/static/refcache.json
+++ b/static/refcache.json
@@ -1575,6 +1575,10 @@
     "StatusCode": 206,
     "LastSeen": "2023-06-30T09:35:36.578946-04:00"
   },
+  "https://elastic.co/blog/ecs-elastic-common-schema-otel-opentelemetry-announcement": {
+    "StatusCode": 200,
+    "LastSeen": "2023-11-29T05:19:30.624412-05:00"
+  },
   "https://en.cppreference.com/w/cpp/container/set": {
     "StatusCode": 200,
     "LastSeen": "2023-06-29T16:10:28.50163-04:00"
@@ -5263,6 +5267,10 @@
     "StatusCode": 206,
     "LastSeen": "2023-06-30T09:40:22.564248-04:00"
   },
+  "https://research.facebook.com/file/877841159827226/holistic-configuration-management-at-facebook.pdf": {
+    "StatusCode": 206,
+    "LastSeen": "2023-11-29T05:30:49.447684-05:00"
+  },
   "https://roadrunner.dev/": {
     "StatusCode": 200,
     "LastSeen": "2023-07-31T14:07:56.022667827Z"
diff --git a/themes/docsy b/themes/docsy
index fd669b752b7f..6bb4f99d1eab 160000
--- a/themes/docsy
+++ b/themes/docsy
@@ -1 +1 @@
-Subproject commit fd669b752b7f83fb2eb57cacd2c8f334f86ca7d2
+Subproject commit 6bb4f99d1eab4976fb80d1488c81ba12b1715c05