Merge branch 'main' into duplicate-names-registration-validation

Author: jaydeluca

.github/workflows/test-release-build.yml

@@ -16,6 +16,8 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
+          fetch-tags: "true"
+          fetch-depth: 0
       - uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
         with:
           version: v2026.2.0
@@ -27,8 +29,10 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
-      - name: Build Javadoc
-        run: mise run javadoc
+      - name: Build GitHub Pages
+        run: mise run build-gh-pages
+        env:
+          BASE_URL: "/client_java"
       - name: Build release version
         run: mise run build-release
         env:

docs/themes/hugo-geekdoc/layouts/partials/microformats/schema.html

@@ -1,70 +1,58 @@
 {{ $isPage := or (and (ne .Type "posts") (in "section page" .Kind )) (and (eq .Type "posts") (eq .Kind "page")) }}
 {{- if eq .Kind "home" }}
+  {{- $schema := dict "@context" "http://schema.org" "@type" "WebSite" "name" .Site.Title "url" .Site.BaseURL "inLanguage" .Lang }}
+  {{- with partial "utils/description" . }}
+    {{- $schema = merge $schema (dict "description" (. | plainify | htmlUnescape | chomp)) }}
+  {{- end }}
+  {{- with partial "utils/featured" . }}
+    {{- $schema = merge $schema (dict "thumbnailUrl" .) }}
+  {{- end }}
+  {{- with .Site.Params.geekdocContentLicense }}
+    {{- $schema = merge $schema (dict "license" .name) }}
+  {{- end }}
   <script type="application/ld+json">
-  {
-      "@context": "http://schema.org",
-      "@type": "WebSite",
-      "name": {{ .Site.Title }},
-      "url": {{ .Site.BaseURL }},
-      {{- with partial "utils/description" . }}
-      "description": "{{ . | plainify | htmlUnescape | chomp }}",
-      {{- end }}
-      {{- with partial "utils/featured" . }}
-      "thumbnailUrl": {{ . }},
-      {{- end }}
-      {{- with .Site.Params.geekdocContentLicense }}
-      "license": "{{ .name }}",
-      {{- end }}
-      "inLanguage": {{ .Lang }}
-  }
+  {{- $schema | jsonify | safeJS }}
   </script>
 {{- else if $isPage }}
+  {{- $title := partial "utils/title" . }}
+  {{- $schema := dict
+      "@context" "http://schema.org"
+      "@type" "TechArticle"
+      "articleSection" (.Section | humanize | title)
+      "name" $title
+      "url" .Permalink
+      "headline" $title
+      "wordCount" (string .WordCount)
+      "inLanguage" .Lang
+      "isFamilyFriendly" "true"
+      "copyrightHolder" .Site.Title
+      "copyrightYear" (.Date.Format "2006")
+      "dateCreated" (.Date.Format "2006-01-02T15:04:05.00Z")
+      "datePublished" (.PublishDate.Format "2006-01-02T15:04:05.00Z")
+      "dateModified" (.Lastmod.Format "2006-01-02T15:04:05.00Z")
+    }}
+  {{- with .Params.lead }}
+    {{- $schema = merge $schema (dict "alternativeHeadline" .) }}
+  {{- end }}
+  {{- with partial "utils/description" . }}
+    {{- $schema = merge $schema (dict "description" (. | plainify | htmlUnescape | chomp)) }}
+  {{- end }}
+  {{- with partial "utils/featured" . }}
+    {{- $schema = merge $schema (dict "thumbnailUrl" .) }}
+  {{- end }}
+  {{- with .Site.Params.geekdocContentLicense }}
+    {{- $schema = merge $schema (dict "license" .name) }}
+  {{- end }}
+  {{- $mainEntity := dict "@type" "WebPage" "@id" .Permalink }}
+  {{- $schema = merge $schema (dict "mainEntityOfPage" $mainEntity) }}
+  {{- with $tags := .Params.tags }}
+    {{- $schema = merge $schema (dict "keywords" $tags) }}
+  {{- end }}
+  {{- $logoUrl := default "brand.svg" .Site.Params.logo | absURL }}
+  {{- $logo := dict "@type" "ImageObject" "url" $logoUrl "width" "32" "height" "32" }}
+  {{- $publisher := dict "@type" "Organization" "name" .Site.Title "url" .Site.BaseURL "logo" $logo }}
+  {{- $schema = merge $schema (dict "publisher" $publisher) }}
   <script type="application/ld+json">
-  {
-      "@context": "http://schema.org",
-      "@type": "TechArticle",
-      "articleSection": "{{ .Section | humanize | title }}",
-      "name": {{ partial "utils/title" . }},
-      "url" : {{ .Permalink }},
-      "headline": {{ partial "utils/title" . }},
-      {{- with .Params.lead }}
-      "alternativeHeadline": {{ . }},
-      {{- end }}
-      {{- with partial "utils/description" . }}
-      "description": "{{ . | plainify | htmlUnescape | chomp }}",
-      {{- end }}
-      {{- with partial "utils/featured" . }}
-      "thumbnailUrl": {{ . }},
-      {{- end }}
-      "wordCount" : "{{ .WordCount }}",
-      {{- with .Site.Params.geekdocContentLicense }}
-      "license": "{{ .name }}",
-      {{- end }}
-      "inLanguage": {{ .Lang }},
-      "isFamilyFriendly": "true",
-      "mainEntityOfPage": {
-          "@type": "WebPage",
-          "@id": {{ .Permalink }}
-      },
-      {{- with $tags := .Params.tags }}
-      "keywords" : [ {{ range $i, $tag := $tags }}{{ if $i }}, {{ end }}"{{ $tag }}" {{ end }}],
-      {{- end }}
-      "copyrightHolder" : "{{ .Site.Title }}",
-      "copyrightYear" : "{{ .Date.Format "2006" }}",
-      "dateCreated": "{{ .Date.Format "2006-01-02T15:04:05.00Z" | safeJS }}",
-      "datePublished": "{{ .PublishDate.Format "2006-01-02T15:04:05.00Z" | safeJS }}",
-      "dateModified": "{{ .Lastmod.Format "2006-01-02T15:04:05.00Z" | safeJS }}",
-      "publisher":{
-          "@type":"Organization",
-          "name": {{ .Site.Title }},
-          "url": {{ .Site.BaseURL }},
-          "logo": {
-              "@type": "ImageObject",
-              "url": {{ (default "brand.svg" .Site.Params.logo) | absURL }},
-              "width":"32",
-              "height":"32"
-          }
-      }
-  }
+  {{- $schema | jsonify | safeJS }}
   </script>
 {{- end }}

prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/HistogramTest.java

@@ -1,9 +1,11 @@
 package io.prometheus.metrics.core.metrics;
 
 import static io.prometheus.metrics.core.metrics.TestUtil.assertExemplarEquals;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.data.Offset.offset;
+import static org.awaitility.Awaitility.await;
 
 import io.prometheus.metrics.config.EscapingScheme;
 import io.prometheus.metrics.config.MetricsProperties;
@@ -1020,10 +1022,18 @@ public void markCurrentSpanAsExemplar() {}
     assertThat(getExemplar(snapshot, Double.POSITIVE_INFINITY, "path", "/hello")).isNull();
     assertThat(getExemplar(snapshot, Double.POSITIVE_INFINITY, "path", "/world")).isNull();
 
-    Thread.sleep(sampleIntervalMillis + 1);
+    waitForSampleInterval(sampleIntervalMillis);
     histogram.labelValues("/hello").observe(4.5);
     histogram.labelValues("/world").observe(4.5);
 
+    await()
+        .atMost(2, SECONDS)
+        .until(
+            () -> {
+              HistogramSnapshot s = histogram.collect();
+              return getExemplar(s, Double.POSITIVE_INFINITY, "path", "/hello") != null
+                  && getExemplar(s, Double.POSITIVE_INFINITY, "path", "/world") != null;
+            });
     snapshot = histogram.collect();
     assertExemplarEquals(ex1a, getExemplar(snapshot, 1.0, "path", "/hello"));
     assertExemplarEquals(ex1b, getExemplar(snapshot, 1.0, "path", "/world"));
@@ -1036,16 +1046,28 @@ public void markCurrentSpanAsExemplar() {}
     assertExemplarEquals(ex2a, getExemplar(snapshot, Double.POSITIVE_INFINITY, "path", "/hello"));
     assertExemplarEquals(ex2b, getExemplar(snapshot, Double.POSITIVE_INFINITY, "path", "/world"));
 
-    Thread.sleep(sampleIntervalMillis + 1);
+    waitForSampleInterval(sampleIntervalMillis);
     histogram.labelValues("/hello").observe(1.5);
     histogram.labelValues("/world").observe(1.5);
-    Thread.sleep(sampleIntervalMillis + 1);
+    waitForSampleInterval(sampleIntervalMillis);
     histogram.labelValues("/hello").observe(2.5);
     histogram.labelValues("/world").observe(2.5);
-    Thread.sleep(sampleIntervalMillis + 1);
+    waitForSampleInterval(sampleIntervalMillis);
     histogram.labelValues("/hello").observe(3.5);
     histogram.labelValues("/world").observe(3.5);
 
+    await()
+        .atMost(2, SECONDS)
+        .until(
+            () -> {
+              HistogramSnapshot s = histogram.collect();
+              return getExemplar(s, 2.0, "path", "/hello") != null
+                  && getExemplar(s, 2.0, "path", "/world") != null
+                  && getExemplar(s, 3.0, "path", "/hello") != null
+                  && getExemplar(s, 3.0, "path", "/world") != null
+                  && getExemplar(s, 4.0, "path", "/hello") != null
+                  && getExemplar(s, 4.0, "path", "/world") != null;
+            });
     snapshot = histogram.collect();
     assertExemplarEquals(ex1a, getExemplar(snapshot, 1.0, "path", "/hello"));
     assertExemplarEquals(ex1b, getExemplar(snapshot, 1.0, "path", "/world"));
@@ -1072,15 +1094,32 @@ public void markCurrentSpanAsExemplar() {}
                     "span_id",
                     "spanId-11"))
             .build();
-    Thread.sleep(sampleIntervalMillis + 1);
+    waitForSampleInterval(sampleIntervalMillis);
     histogram
         .labelValues("/hello")
         .observeWithExemplar(3.4, Labels.of("key1", "value1", "key2", "value2"));
+    await()
+        .atMost(2, SECONDS)
+        .until(
+            () -> {
+              Exemplar actual = getExemplar(histogram.collect(), 4.0, "path", "/hello");
+              return actual != null && Math.abs(actual.getValue() - 3.4) < 0.00001;
+            });
     snapshot = histogram.collect();
     // custom exemplars have preference, so the automatic exemplar is replaced
     assertExemplarEquals(custom, getExemplar(snapshot, 4.0, "path", "/hello"));
   }
 
+  /** Waits for the exemplar sampler's rate limit window so the next observation is accepted. */
+  private static void waitForSampleInterval(long sampleIntervalMillis) {
+    try {
+      Thread.sleep(2 * sampleIntervalMillis);
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new AssertionError("Interrupted while waiting for sample interval", e);
+    }
+  }
+
   private Exemplar getExemplar(HistogramSnapshot snapshot, double le, String... labels) {
     HistogramSnapshot.HistogramDataPointSnapshot data =
         snapshot.getDataPoints().stream()