Merge branch 'main' into reese-lee-patch-2

.cspell.yml

@@ -41,7 +41,6 @@ words:
   - autoloader
   - autoloading
   - backoff
-  - bytecode
   - caml
   - cartservice
   - cassandra
@@ -114,6 +113,7 @@ words:
   - overridable
   - outro
   - packagist
+  - pageinfo
   - Paixão
   - parentbased
   - Pavol

.github/CODEOWNERS

@@ -22,23 +22,27 @@ content-modules/opentelemetry-proto      @open-telemetry/docs-maintainers @open-
 content-modules/opentelemetry-specification  @open-telemetry/docs-maintainers @open-telemetry/specs-approvers
 content-modules/semantic-conventions     @open-telemetry/docs-maintainers @open-telemetry/specs-semconv-approvers
 content/en/blog/                         @open-telemetry/docs-maintainers
-content/en/community/end-user/           @open-telemetry/docs-approvers @open-telemetry/end-user-wg
+content/en/community/end-user/           @open-telemetry/docs-approvers @open-telemetry/sig-end-user-approvers
 content/en/docs/collector                @open-telemetry/docs-approvers @open-telemetry/collector-approvers
+content/en/docs/contributing/            @open-telemetry/docs-approvers @open-telemetry/docs-maintainers
 content/en/docs/demo                     @open-telemetry/docs-approvers @open-telemetry/demo-approvers
-content/en/docs/languages/cpp/     @open-telemetry/docs-approvers @open-telemetry/cpp-approvers
-content/en/docs/languages/erlang/  @open-telemetry/docs-approvers @open-telemetry/erlang-approvers
-content/en/docs/languages/go/      @open-telemetry/docs-approvers @open-telemetry/go-approvers @open-telemetry/go-instrumentation-approvers
-content/en/docs/languages/java/    @open-telemetry/docs-approvers @open-telemetry/java-approvers @open-telemetry/java-instrumentation-approvers
-content/en/docs/languages/js/      @open-telemetry/docs-approvers @open-telemetry/javascript-approvers
-content/en/docs/languages/net/     @open-telemetry/docs-approvers @open-telemetry/dotnet-approvers @open-telemetry/dotnet-instrumentation-approvers
-content/en/docs/languages/php/     @open-telemetry/docs-approvers @open-telemetry/php-approvers
-content/en/docs/languages/python/  @open-telemetry/docs-approvers @open-telemetry/python-approvers
-content/en/docs/languages/ruby/    @open-telemetry/docs-approvers @open-telemetry/ruby-approvers @open-telemetry/ruby-contrib-approvers
-content/en/docs/languages/rust/    @open-telemetry/docs-approvers @open-telemetry/rust-approvers
-content/en/docs/languages/swift/   @open-telemetry/docs-approvers @open-telemetry/swift-approvers
-content/en/docs/kubernetes/operator/     @open-telemetry/docs-approvers @open-telemetry/operator-approvers
 content/en/docs/kubernetes/helm/         @open-telemetry/docs-approvers @open-telemetry/helm-approvers
-content/en/docs/specs/                   @open-telemetry/docs-approvers @open-telemetry/specs-approvers
+content/en/docs/kubernetes/operator/     @open-telemetry/docs-approvers @open-telemetry/operator-approvers
+content/en/docs/languages/cpp/           @open-telemetry/docs-approvers @open-telemetry/cpp-approvers
+content/en/docs/languages/erlang/        @open-telemetry/docs-approvers @open-telemetry/erlang-approvers
+content/en/docs/languages/go/            @open-telemetry/docs-approvers @open-telemetry/go-approvers @open-telemetry/go-instrumentation-approvers
+content/en/docs/languages/java/          @open-telemetry/docs-approvers @open-telemetry/java-approvers @open-telemetry/java-instrumentation-approvers
+content/en/docs/languages/js/            @open-telemetry/docs-approvers @open-telemetry/javascript-approvers
+content/en/docs/languages/net/           @open-telemetry/docs-approvers @open-telemetry/dotnet-approvers @open-telemetry/dotnet-instrumentation-approvers
+content/en/docs/languages/php/           @open-telemetry/docs-approvers @open-telemetry/php-approvers
+content/en/docs/languages/python/        @open-telemetry/docs-approvers @open-telemetry/python-approvers
+content/en/docs/languages/ruby/          @open-telemetry/docs-approvers @open-telemetry/ruby-approvers @open-telemetry/ruby-contrib-approvers
+content/en/docs/languages/rust/          @open-telemetry/docs-approvers @open-telemetry/rust-approvers
+content/en/docs/languages/swift/         @open-telemetry/docs-approvers @open-telemetry/swift-approvers
 content/en/docs/security/                @open-telemetry/docs-approvers @open-telemetry/sig-security-maintainers
+content/en/docs/specs/                   @open-telemetry/docs-approvers @open-telemetry/specs-approvers
+content/en/docs/zero-code/java/          @open-telemetry/docs-approvers @open-telemetry/java-approvers @open-telemetry/java-instrumentation-approvers
+content/en/docs/zero-code/js/            @open-telemetry/docs-approvers @open-telemetry/javascript-approvers
+content/en/docs/zero-code/net/           @open-telemetry/docs-approvers @open-telemetry/dotnet-approvers @open-telemetry/dotnet-instrumentation-approvers
 content/en/ecosystem/demo/               @open-telemetry/demo-approvers @open-telemetry/demo-approvers
-content/en/docs/contributing/       @open-telemetry/docs-approvers @open-telemetry/docs-maintainers
+content/zh/                              @open-telemetry/docs-maintainers @open-telemetry/docs-zh-approvers

.github/component-label-map.yml

@@ -2,6 +2,18 @@ blog:
   - changed-files:
       - any-glob-to-any-file:
           - content/en/blog/**
+registry:
+  - changed-files:
+      - any-glob-to-any-file:
+          - data/registry/**
+lang:zh:
+  - changed-files:
+      - any-glob-to-any-file:
+          - content/zh/**
+lang:ja:
+  - changed-files:
+      - any-glob-to-any-file:
+          - content/ja/**
 sig:cpp:
   - changed-files:
       - any-glob-to-any-file:
@@ -18,22 +30,27 @@ sig:java:
   - changed-files:
       - any-glob-to-any-file:
           - content/en/docs/languages/java/**
+          - content/en/docs/zero-code/java/**
 sig:js:
   - changed-files:
       - any-glob-to-any-file:
           - content/en/docs/languages/js/**
+          - content/en/docs/zero-code/js/**
 sig:dotnet:
   - changed-files:
       - any-glob-to-any-file:
           - content/en/docs/languages/net/**
+          - content/en/docs/zero-code/net/**
 sig:php:
   - changed-files:
       - any-glob-to-any-file:
           - content/en/docs/languages/php/**
+          - content/en/docs/zero-code/php/**
 sig:python:
   - changed-files:
       - any-glob-to-any-file:
           - content/en/docs/languages/python/**
+          - content/en/docs/zero-code/python/**
 sig:ruby:
   - changed-files:
       - any-glob-to-any-file:

.github/workflows/auto-update-versions.yml

@@ -15,8 +15,7 @@ jobs:
       DEPTH: --depth 500 # submodule clone depth
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
       - name: Use CLA approved github bot
         run: |

.github/workflows/check-i18n.yml

@@ -0,0 +1,18 @@
+name: i18n
+
+on:
+  pull_request:
+
+jobs:
+  check-i18n:
+    name: I18N check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # all
+      - name: Any files missing hash key?
+        run: scripts/check-i18n.sh -n -x -v
+      - name: Any files with invalid hash keys?
+        run: scripts/check-i18n.sh -v
+      - run: .github/workflows/scripts/check-i18n-helper.sh

.github/workflows/pr-actions.yml

@@ -31,7 +31,7 @@ jobs:
         run: |
           PR_ACTION=$(echo $COMMENT | grep -oP '/fix:\K\w+')
           echo "Action is $PR_ACTION"
-          ACTION_NAMES="all|dict|filenames|format|markdown|refcache|submodules"
+          ACTION_NAMES="all|dict|filenames|format|i18n|markdown|refcache|submodules|text"
           if [[ ! "$PR_ACTION" =~ ^($ACTION_NAMES)$ ]]; then
             echo "Invalid action name: $PR_ACTION"
             echo "Action name should be one of: $ACTION_NAMES"

.github/workflows/scripts/check-i18n-helper.sh

@@ -0,0 +1,26 @@
+#!/bin/bash -e
+
+echo "For localization docs, see https://opentelemetry.io/docs/contributing/localization"
+
+CHANGES=`git status --porcelain`
+
+if [[ -z $CHANGES ]]; then
+  echo "All localization pages have the requisit commit hash. <3"
+  exit;
+fi
+
+cat <<EOS
+Some localization pages are missing the 'default_lang_commit' front matter
+field. To fix this in your local development environment, run
+
+    npm run fix:i18n:new
+
+and commit the changes for your localization. Here are the list of pages that
+need to be updated:
+---
+EOS
+
+echo "$CHANGES"
+echo "---"
+
+exit 1

.gitmodules

@@ -1,30 +1,30 @@
 [submodule "themes/docsy"]
 	path = themes/docsy
 	url = https://github.com/google/docsy.git
-	docsy-pin = v0.9.1-17-gb077a74
+	docsy-pin = v0.10.0-6-g102892d
 	docsy-note = "2024-04-01 Switching to google/docsy.git from cncf/docsy.git since we don't have any CNCF customizations."
 	docsy-reminder = "Ensure that any tag referenced by `docsy-pin` is present in the remote repo (url), otherwise add (push) the tags to the repo."
 [submodule "content-modules/opentelemetry-specification"]
 	path = content-modules/opentelemetry-specification
 	url = https://github.com/open-telemetry/opentelemetry-specification.git
-	spec-pin = v1.32.0
+	spec-pin = v1.34.0
 [submodule "content-modules/community"]
 	path = content-modules/community
 	url = https://github.com/open-telemetry/community
 	community-pin = f16a58e
 [submodule "content-modules/opentelemetry-proto"]
 	path = content-modules/opentelemetry-proto
 	url = https://github.com/open-telemetry/opentelemetry-proto
-	otlp-pin = v1.3.0
+	otlp-pin = v1.3.1
 [submodule "content-modules/semantic-conventions"]
 	path = content-modules/semantic-conventions
 	url = https://github.com/open-telemetry/semantic-conventions
-	semconv-pin = v1.25.0
+	semconv-pin = v1.26.0
 [submodule "content-modules/opamp-spec"]
 	path = content-modules/opamp-spec
 	url = https://github.com/open-telemetry/opamp-spec
 	opamp-pin = v0.9.0-2-g950df29
 [submodule "content-modules/opentelemetry-go"]
 	path = content-modules/opentelemetry-go
 	url = https://github.com/open-telemetry/opentelemetry-go
-  go-pin = v1.23.0-rc.1-31-geabcef4c2
+  go-pin = v1.27.0

.htmltest.yml

@@ -3,17 +3,18 @@ DirectoryPath: public
 IgnoreDirectoryMissingTrailingSlash: true
 IgnoreAltMissing: true
 IgnoreCanonicalBrokenLinks: false
+IgnoreInternalEmptyHash: true # TODO: remove after resolution of https://github.com/google/docsy/issues/1995
 CheckMailto: false
 TestFilesConcurrently: true
 IgnoreDirs:
   - ^blog/(\d+/)?page/\d+
 IgnoreInternalURLs: # list of paths
 IgnoreURLs: # list of regexs of paths or URLs to be ignored
-  - ^/docs/languages/\w+/(api|examples|registry)/$
-  - ^/docs/collector/registry/$
-  - ^/docs/languages/net/(metrics-api|traces-api)/
-  - ^/community/end-user/feedback-survey/$
-  - ^(/docs/migration/)?opencensus/$
+  - ^(/..)?/docs/languages/\w+/(api|examples|registry)/$
+  - ^(/..)?/docs/collector/registry/$
+  - ^(/..)?/docs/languages/net/(metrics-api|traces-api)/
+  - ^((/..)?/docs/migration/)?opencensus/$
+  - ^(/community/end-user/)?feedback-survey/$
 
   - ^https://deploy-preview-\d+--opentelemetry.netlify.app/
   - ^https://www\.googletagmanager\.com
@@ -33,6 +34,7 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
   - ^https://www.chathamhouse.org
   - ^https://www.zocdoc.com
   - ^https://x.com
+  - ^https://platform.openai.com
   # OTel Google calendar - curl returns 200, but the link checker gets a 401:
   - ^https://calendar.google.com/calendar/embed\?src=google.com_b79e3e90j7bbsa2n2p5an5lf60%40group.calendar.google.com
   # YouTube playlists sometimes give a 404, although they give a 200 when accessed via browser:
@@ -70,3 +72,5 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
   - ^https://wikipedia.org/wiki/(S.M.A.R.T|Hop_)
   # TODO move into content/en/blog/2023/contributing-to-otel/index.md once https://github.com/open-telemetry/opentelemetry.io/issues/3889 is implemented
   - ^https://shorturl.at/vLYZ0$
+  # TODO remove the following temporary ignore rule (@chalin)
+  - ^/en/docs/specs$

.prettierignore

@@ -8,6 +8,11 @@
 /layouts/shortcodes/*
 !/layouts/shortcodes/docs
 
+# Ignore all languages other than en for now
+
+/content/*
+!/content/en
+
 # Ignore content-modules except for published Community pages
 
 /content-modules/*

.textlintrc.yml

@@ -115,7 +115,8 @@ rules:
       - ['3rd[- ]party', third-party]
       - ['auto[- ]c(onfigur)(es?|ations?)', 'autoc$1$2'] # cspell:ignore autoc ations onfigur
       - ['back[- ]end(s)?', 'backend$1']
-      - ['bugfix', 'bug fix']
+      - [bugfix, bug fix]
+      - [byte code, bytecode]
       - [cpp, C++]
       - # dotnet|.net -> .NET, but NOT for strings like:
         # - File extension: file.net