Merge branch 'main' into patch-2

.github/CODEOWNERS

@@ -42,3 +42,8 @@ content/en/docs/specs/                   @open-telemetry/docs-approvers @open-te
 content/en/docs/security/                @open-telemetry/docs-approvers @open-telemetry/sig-security-maintainers
 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-zh-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
+

.github/component-label-map.yml

@@ -2,6 +2,14 @@ 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/**
 sig:cpp:
   - changed-files:
       - any-glob-to-any-file:

.gitmodules

@@ -1,25 +1,25 @@
 [submodule "themes/docsy"]
 	path = themes/docsy
 	url = https://github.com/google/docsy.git
-	docsy-pin = v0.10.0
+	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.33.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

.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)/
+  - ^(/zh)?/docs/languages/\w+/(api|examples|registry)/$
+  - ^(/zh)?/docs/collector/registry/$
+  - ^(/zh)?/docs/languages/net/(metrics-api|traces-api)/
+  - ^((/zh)?/docs/migration/)?opencensus/$
   - ^/community/end-user/feedback-survey/$
-  - ^(/docs/migration/)?opencensus/$
 
   - ^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,6 @@ 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$
+  # FIXME(@chalin) drop this temporary rule
+  - ^/docs/languages/java/automatic
+  - ^\.\./automatic

.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/*

README.md

@@ -36,7 +36,7 @@ Check out the [OpenTelemetry community calendar][] for the Zoom link and any
 updates to this schedule.
 
 Meeting notes are available as a public [Google doc][]. If you have trouble
-accessing the doc, get in touch on [Slack][].
+accessing the doc, get in touch in the `#otel-comms` channel on [Slack][].
 
 Here is a list of community roles with current and previous members:
 
@@ -94,4 +94,4 @@ already contributed][contributors]!
   https://github.com/open-telemetry/opentelemetry.io/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22
 [google doc]:
   https://docs.google.com/document/d/1wW0jLldwXN8Nptq2xmgETGbGn9eWP8fitvD5njM-xZY/edit?usp=sharing
-[slack]: https://cloud-native.slack.com/archives/C02UN96HZH6
+[slack]: https://slack.cncf.io/

archetypes/blog.md

@@ -9,6 +9,8 @@ author: >- # If you have only one author, then add the single name on this line
 draft: true # TODO: remove this line once your post is ready to be published
 # canonical_url: http://somewhere.else/ # TODO: if this blog post has been posted somewhere else already, uncomment & provide the canonical URL here.
 body_class: otel-with-contributions-from # TODO: remove this line if there are no secondary contributing authors
+issue: the issue ID for this blog post # TODO: See https://opentelemetry.io/docs/contributing/blog/ for details
+sig: SIG Name # TODO: add the name of the SIG that sponsors this blog post 
 ---
 
 <!-- If your post doesn't have secondary authors, then delete the following paragraph: -->

assets/scss/_styles_project.scss

@@ -184,7 +184,7 @@
   }
 
   details {
-    background-color: $gray-100;
+    background-color: var(--bs-tertiary-bg);
     margin-bottom: 0.5em;
 
     summary {

content/en/_index.md

@@ -3,10 +3,25 @@ title: OpenTelemetry
 description: >-
   High-quality, ubiquitous, and portable telemetry to enable effective
   observability
-show_banner: true
+outputs:
+  - HTML
+  - REDIRECTS # Include this `content/en` ONLY
 developer_note:
   The blocks/cover shortcode (used below) will use as a background image any
   image file containing "background" in its name.
+show_banner: true
+limit_banner: 2 # Default to 2, adjust as needed
+banners:
+  - message:
+      '<i class="fas fa-bullhorn"></i> Join us for [**OTel Community Day** on
+      June
+      25th](https://events.linuxfoundation.org/open-telemetry-community-day/)!'
+    to: 2024-06-25
+  - message:
+      '<i class="fas fa-bullhorn"></i> Help improve OTel and Prometheus
+      interoperability: [complete our
+      survey](https://forms.gle/bZAG9f7udoJsjZUG9) by May 31'
+    to: 2024-05-31
 ---
 
 <div class="d-none"><a rel="me" href="https://fosstodon.org/@opentelemetry"></a></div>

content/en/blog/2022/debug-otel-with-otel/index.md

@@ -253,8 +253,7 @@ COPY opentelemetry_module.conf /etc/nginx/conf.d
 [put nginx between two services]:
   /blog/2022/instrument-nginx/#put-nginx-between-two-services
 [localhost:16686]: http://localhost:16686/
-[http request & response headers]:
-  /docs/specs/semconv/http/http-spans/#common-attributes
+[http request & response headers]: /docs/specs/semconv/http/http-spans/
 [rfc7230]: https://httpwg.org/specs/rfc7230.html#field.order
 [added some checks to the module for nginx]:
   https://github.com/open-telemetry/opentelemetry-cpp-contrib/pull/204

content/en/blog/2023/end-user-discussions-03.md

@@ -190,9 +190,8 @@ agent to the host metrics receiver for infrastructure monitoring.
   maturing in OTel; for example, the Java JAR agent takes care of instrumenting
   [most libraries](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/docs/supported-libraries.md#libraries--frameworks)
   that are used by applications. Auto-instrumentation is also available for
-  [Python](/docs/languages/python/automatic/),
-  [.NET](/docs/languages/net/automatic/), and
-  [Node.js](/docs/languages/js/automatic).
+  [Python](/docs/languages/python/automatic/), [.NET](/docs/zero-code/net/), and
+  [Node.js](/docs/zero-code/js/).
 - If you’re using Kubernetes, they can use the
   [OTel operator](https://github.com/open-telemetry/opentelemetry-operator),
   which takes care of instrumentations for applications deployed on K8s. The

content/en/blog/2023/otel-dotnet-auto-instrumentation.md

@@ -20,8 +20,7 @@ package that simplify the task of deploying and configuring the collection of
 telemetry. The automatic instrumentation is fully compatible with manual
 instrumentation in case you need to send custom spans or metrics.
 
-To get started, [read the documentation](/docs/languages/net/automatic) or
-browse the
+To get started, [read the documentation](/docs/zero-code/net) or browse the
 [examples](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/tree/main/examples)
 for demonstrations of different instrumentation scenarios covered by the
 OpenTelemetry .NET Automatic Instrumentation.

content/en/blog/2024/collector-roadmap/index.md

@@ -0,0 +1,97 @@
+---
+title: The roadmap to v1 for the OpenTelemetry Collector
+linkTitle: Collector Roadmap
+date: 2024-05-06
+# prettier-ignore
+cSpell:ignore: Antipatterns Boten Broadbridge Helmuth Hrabovcak Ishan Jaglowski OTTL Pantuza pushback Shishi Vijay
+author: '[Alex Boten](https://github.com/codeboten) (Honeycomb)'
+---
+
+The [OpenTelemetry Collector](/docs/collector/) is a very popular component in
+OpenTelemetry that has been under heavy development for quite some time. It is a
+binary that allows many formats of telemetry to be sent to it, transformed, and
+emitted to a destination. Much has been said about the Collector over the past
+few years in various blog posts and talks. Here's a small list of talks about
+the Collector if you haven't had the chance to learn about it:
+
+- [Connected Observability Pipelines in the OpenTelemetry Collector - Dan Jaglowski](https://www.youtube.com/watch?v=uPpZ23iu6kI)
+- [OpenTelemetry Collector Antipatterns - Adriana Villela](/blog/2024/otel-collector-anti-patterns/)
+- [Telemetry Showdown: Fluent Bit Vs. OpenTelemetry Collector - Henrik Rexed](https://www.youtube.com/watch?v=ykq1F_3PmJw)
+- [OpenTelemetry Collector Deployment Patterns - Juraci Kröhling](https://www.youtube.com/watch?v=WhRrwSHDBFs)
+- [OTTL Me Why Transforming Telemetry in the OpenTelemetry Collector Just Got Better - Tyler Helmuth & Evan Bradley](https://www.youtube.com/watch?v=uVs0oUV72CE)
+- [Manage OpenTelemetry Collectors at scale with Ansible - Ishan Jain](/blog/2024/scaling-collectors/)
+
+The Collector has been a core component for organizations looking to adopt
+OpenTelemetry as part of their strategy to improve the telemetry emitted by
+their systems. Organizations around the world have already adopted it and
+successfully process large amounts of data through pipelines as documented by
+these various talks:
+
+- [Adopting OpenTelemetry Collector @ eBay - Swapping Engines Mid Flight - Vijay Samuel](https://www.youtube.com/watch?v=tZJd6W-CIcU)
+- [Ingesting 6.5 Tb of Telemetry Data Daily Through OpenTelemetry Protocol and Collectors - Gustavo Pantuza](https://www.youtube.com/watch?v=aDysORX1zIs)
+- [Today, Not Tomorrow: Scalable Strategies for Migrating to OpenTelemetry - Jason Anderson & Kevin Broadbridge](https://www.youtube.com/watch?v=iPGd9_aYu-A)
+- [How and Why You Should Adopt and Expose OSS Interfaces Like OTel & Prometheus - Daniel Hrabovcak & Shishi Chen](https://www.youtube.com/watch?v=D71fK2MFreI)
+- [Why, How to, and Issues: Tail-Based Sampling in the OpenTelemetry Collector - Reese Lee](https://www.youtube.com/watch?v=l4PeclHKl7I)
+
+A few months ago, there was an
+[ask from the community](https://github.com/open-telemetry/community/issues/1971)
+to declare the OpenTelemetry Collector stable.
+
+![Can haz Collector v1?](can-haz-collector.png)
+
+Now you might be asking yourself "Why would anyone want the Collector to be
+declared stable? You just told me it's already used in production!" It's true,
+the Collector and its configuration have been fairly stable for core components
+for some time. However, being "unofficially stable" is not good enough for a
+wide variety of organizations who wish to adopt the Collector:
+
+- An official v1 will signal that the OpenTelemetry community is ready to
+  provide long term support and not introduce backwards incompatible changes
+  without bumping the major version.
+- Organizations with policies not to use pre-release software will be able to
+  start adopting the Collector.
+- Stability in the Collector helps the community move OpenTelemetry to become a
+  CNCF Graduated project.
+
+The request to stabilize was met with pushback from maintainers since calling
+anything 1.0 has a way of setting expectations indefinitely. This led to a
+series of discussions and meetings that brought together the maintainers of the
+Collector to decide on what a 1.0 really means for the Collector.
+
+And after a lot of back and forth, we decided on a limited scope of what we
+wanted to focus on:
+
+1. A distribution of the Collector that only includes an OTLP receiver and an
+   OTLP exporter.
+2. Individual Go modules that the Collector components rely upon must also be
+   marked as stable as per the project's
+   [versioning guidelines](https://github.com/open-telemetry/opentelemetry-collector/blob/main/VERSIONING.md#public-api-expectations).
+
+Aside from this, there were a few areas the contributors wanted to improve based
+on user feedback:
+
+- The telemetry generated by the Collector about itself:
+  - Traces, metrics, and logs must be available via OTLP.
+  - The configuration for the telemetry must follow the configuration schema.
+- The scalability of the Collector:
+  - Handling for queueing, back pressure, and errors must be improved.
+  - Clear benchmarks and performance expectations for end users.
+- Overall documentation befitting of a stable piece of critical infrastructure.
+
+The
+[roadmap](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/ga-roadmap.md)
+was published in the Collector's repository and milestones were created to track
+the work underway. To ensure the effort can be successful, the scope of the
+deliverable was limited to provide:
+
+- a clear and achievable goal
+- the focus needed to not get distracted
+- a signal to new contributors of where the project is focusing
+
+There is much to do as you can see on the
+[project board](https://github.com/orgs/open-telemetry/projects/83), but there
+is a lot of excitement around this effort. If you're keen on helping, reach out
+either by commenting on any of the open issues in GitHub, or attending the
+Collector SIG call that happens weekly on Wednesdays. For a quick overview of
+the 1.0 progress you can checkout the tracking
+[issue](https://github.com/open-telemetry/opentelemetry-collector/issues/9375).