diff --git a/.cspell.yml b/.cspell.yml
index 093e65ff96e3..57d3c4fbc4f2 100644
--- a/.cspell.yml
+++ b/.cspell.yml
@@ -5,6 +5,7 @@ version: '0.2'
language: en-US
import:
- '@cspell/dict-es-es/cspell-ext.json'
+ - '@cspell/dict-fr-fr/cspell-ext.json'
- '@cspell/dict-pt-br/cspell-ext.json'
caseSensitive: true
ignorePaths:
@@ -31,6 +32,8 @@ dictionaryDefinitions:
path: .cspell/en-words.txt
- name: es-palabras
path: .cspell/es-palabras.txt
+ - name: fr-mots
+ path: .cspell/fr-mots.txt
- name: pt-palavras
path: .cspell/pt-palavras.txt
dictionaries:
@@ -40,6 +43,7 @@ dictionaries:
# Local word lists
- en-words
- es-palabras
+ - fr-mots
- pt-palavras
# Programming languages and software terms
- cpp
@@ -49,3 +53,5 @@ dictionaries:
- softwareTerms
# Other
- companies
+words: # Valid words across all locales
+ - htmltest
diff --git a/.cspell/en-words.txt b/.cspell/en-words.txt
index 7f3a83d42974..d22571563ed6 100644
--- a/.cspell/en-words.txt
+++ b/.cspell/en-words.txt
@@ -34,6 +34,7 @@ discoverability
dotnet
Dyla
dynatrace
+ebpf
emailservice
EMEA
erlang
diff --git a/.cspell/es-palabras.txt b/.cspell/es-palabras.txt
index 73807ec34e1b..a6f26c4b633b 100644
--- a/.cspell/es-palabras.txt
+++ b/.cspell/es-palabras.txt
@@ -7,3 +7,10 @@ microservicios
extensibilidad
correlacionarse
deserializa
+proprietarias
+aspiracional
+deserializar
+Muestreadores
+muestreadores
+monitoreo
+multilenguaje
diff --git a/.cspell/fr-mots.txt b/.cspell/fr-mots.txt
new file mode 100644
index 000000000000..7970e82b0e43
--- /dev/null
+++ b/.cspell/fr-mots.txt
@@ -0,0 +1,213 @@
+analyse
+analyser
+avec
+collecter
+collectez
+comportement
+contenant
+créez
+dans
+découvrez
+définie
+démo
+dessous
+données
+d'utiliser
+efficace
+entièrement
+être
+générer
+gratuit
+indépendant
+instrumenter
+intégrations
+langages
+librairies
+logiciels
+métriques
+nombreux
+nombreuses
+observabilité
+outils
+permet
+permettant
+projet
+projets
+peut
+qualité
+savoir
+s'intègre
+supporte
+supporté
+tant
+télémétrie
+transmettez
+universelle
+utilisé
+visuel
+votre
+vous
+l'état
+système
+incluent
+rendre
+signifie
+émettre
+metriques
+produites
+doivent
+transmises
+Pourquoi
+l'essor
+commerciales
+besoin
+répond
+suivant
+principes
+clés
+propriétaire
+générez
+dépendance
+fournisseur
+n'avez
+d'apprendre
+seul
+combinés
+offrent
+équipes
+organisations
+flexibilité
+dont
+informatique
+Extensibilité
+conçu
+extensible
+Quelques
+façon
+étendu
+Ajouter
+receveur
+Collecteur
+afin
+prendre
+venant
+personnalisée
+bibliothèques
+personnalisées
+Créer
+collecteur
+adaptée
+utilisation
+spécifique
+nouvel
+exportateur
+personnalisé
+prend
+propagateur
+contexte
+plupart
+utilisateurs
+n'aient
+d'étendre
+presque
+tous
+niveaux
+Histoire
+trouve
+antérieurs
+créés
+résoudre
+même
+problème
+norme
+décrivant
+manière
+transmettre
+Aucun
+n'étant
+indépendante
+fusionné
+leurs
+offrant
+utilisez
+actuellement
+pouvez
+découvrir
+migrer
+ensuite
+commencer
+Lancez
+directement
+composants
+standardisé
+définissant
+sémantiques
+décrire
+langage
+implémentent
+spécifications
+écosystème
+instrumentent
+automatique
+génèrent
+requérir
+reçoit
+modifie
+autre
+Opérateur
+ressources
+Faas
+variété
+intègrent
+fournir
+défaut
+pris
+fournisseurs
+fournissent
+contribuent
+n’aient
+d’étendre
+conçus
+créer
+gérer
+telles
+outil
+compris
+ainsi
+commerciaux
+d'autres
+génération
+collecte
+gestion
+objectifs
+principaux
+pouvoir
+aisément
+systèmes
+quelque
+soit
+leur
+environnement
+d'exécution
+stockage
+visualisation
+sont
+intentionnellement
+laissés
+d'autres
+comprendre
+sortantes
+logiciel
+d’aujourd’hui
+souhaitez
+jetez
+oeil
+valeurs
+principaux
+suivants
+spécification
+communautaires
+brève
+êtes
+standardisée
+autres
diff --git a/.github/component-label-map.yml b/.github/component-label-map.yml
index 5d46cf7e0ced..9caa5a08906b 100644
--- a/.github/component-label-map.yml
+++ b/.github/component-label-map.yml
@@ -22,6 +22,10 @@ lang:es:
- changed-files:
- any-glob-to-any-file:
- content/es/**
+lang:fr:
+ - changed-files:
+ - any-glob-to-any-file:
+ - content/fr/**
sig:cpp:
- changed-files:
- any-glob-to-any-file:
diff --git a/.github/component-owners.yml b/.github/component-owners.yml
index 65d9e881b1b0..2cba8f7d7a1b 100644
--- a/.github/component-owners.yml
+++ b/.github/component-owners.yml
@@ -80,3 +80,6 @@ components:
content/es:
- open-telemetry/docs-maintainers
- open-telemetry/docs-es-approvers
+ content/fr:
+ - open-telemetry/docs-maintainers
+ - open-telemetry/docs-fr-approvers
diff --git a/.gitmodules b/.gitmodules
index b3e0735ae018..b444d2d24a00 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
[submodule "themes/docsy"]
path = themes/docsy
url = https://github.com/google/docsy.git
- docsy-pin = v0.10.0-26-g79511949
+ docsy-pin = v0.11.0-2-g68aa7b3
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"]
@@ -23,7 +23,7 @@
[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
+ opamp-pin = v0.10.0
[submodule "content-modules/opentelemetry-go"]
path = content-modules/opentelemetry-go
url = https://github.com/open-telemetry/opentelemetry-go
@@ -31,4 +31,4 @@
[submodule "content-modules/opentelemetry-java-examples"]
path = content-modules/opentelemetry-java-examples
url = https://github.com/open-telemetry/opentelemetry-java-examples.git
- javaexamples-pin = 8fe9a11
+ javaexamples-pin = 0f736ec
diff --git a/.htmltest.yml b/.htmltest.yml
index 9ad637f30f5d..2278e2d4e6ac 100644
--- a/.htmltest.yml
+++ b/.htmltest.yml
@@ -7,9 +7,15 @@ IgnoreInternalEmptyHash: true # TODO: remove after resolution of https://github.
CheckMailto: false
TestFilesConcurrently: true
IgnoreDirs:
+ # DO NOT EDIT! IgnoreDirs list is auto-generated from markdown file front matter.
+ # 2024-11-03 The following entry is for `en` pages only. Other locales do
+ # not currently require it.
- ^blog/(\d+/)?page/\d+
- # TODO drop after https://github.com/open-telemetry/opentelemetry.io/issues/5267 is fixed:
- - zh/docs/contributing/pr-checks
+ # TODO drop next line after https://github.com/open-telemetry/opentelemetry.io/issues/5423 is fixed for ja pages:
+ - ^ja/docs/concepts/instrumentation/libraries/
+ # TODO drop next line after https://github.com/open-telemetry/opentelemetry.io/issues/5423 is fixed for pt pages:
+ - ^pt/docs/concepts/instrumentation/libraries/
+ # DO NOT EDIT! IgnoreDirs list is auto-generated from markdown file front matter.
IgnoreInternalURLs: # list of paths
IgnoreURLs: # list of regexs of paths or URLs to be ignored
- ^/api$
diff --git a/README.md b/README.md
index 9a2c86de3d00..3f4e8247d349 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@ This is the source repository for the [OpenTelemetry][] website, project
documentation, and blog. The site is [built][contributing.md] using [Hugo][] and
is hosted on [Netlify][].
+Public analytics for the website is [available here][].
+
## Get involved
To learn how to contribute fixes and new content to this project, read the
@@ -52,7 +54,7 @@ Here is a list of community roles with current and previous members:
- Approvers: [@open-telemetry/docs-approvers][]
- [Michael Hausenblas](https://github.com/mhausenblas), Amazon
- - [Tiffany Hrabusa](https://github.com/tiffany76)
+ - [Tiffany Hrabusa](https://github.com/tiffany76), Grafana Labs
- Maintainers: [@open-telemetry/docs-maintainers][]
@@ -101,3 +103,5 @@ contributed][contributors]!
[slack]: https://slack.cncf.io/
[hugo]: https://gohugo.io
[netlify]: https://netlify.com
+[available here]:
+ https://lookerstudio.google.com/reporting/34c2a65a-39e8-44aa-afa0-094975fee55d/page/4VDGB
diff --git a/content-modules/opamp-spec b/content-modules/opamp-spec
index 950df2967e22..fb2ff487c70a 160000
--- a/content-modules/opamp-spec
+++ b/content-modules/opamp-spec
@@ -1 +1 @@
-Subproject commit 950df2967e22526aa553aac1d874ac90b973d140
+Subproject commit fb2ff487c70ac1895652ab5c4a965dfc2ae20d03
diff --git a/content-modules/opentelemetry-java-examples b/content-modules/opentelemetry-java-examples
index 8fe9a11a33af..0f736eca6a4b 160000
--- a/content-modules/opentelemetry-java-examples
+++ b/content-modules/opentelemetry-java-examples
@@ -1 +1 @@
-Subproject commit 8fe9a11a33affcc4942f2df6668cd6ce787cde3f
+Subproject commit 0f736eca6a4b6865fb62b00033a53369e69440f7
diff --git a/content/en/announcements/2024-community-awards.md b/content/en/announcements/2024-community-awards.md
new file mode 100644
index 000000000000..eaf465e9499b
--- /dev/null
+++ b/content/en/announcements/2024-community-awards.md
@@ -0,0 +1,9 @@
+---
+title: OpenTelemetry Community Awards
+date: 2024-10-29
+expiryDate: 2024-11-08
+---
+
+
+[**2024 OpenTelemetry Community Awards**](/blog/2024/community-awards/)
+nominations are open!
diff --git a/content/en/blog/2023/spring-native/index.md b/content/en/blog/2023/spring-native/index.md
index acb1127a0601..5c4aaab586fe 100644
--- a/content/en/blog/2023/spring-native/index.md
+++ b/content/en/blog/2023/spring-native/index.md
@@ -37,11 +37,11 @@ Boot 3) out of the box:
```
To get even more visibility, the Starter can be combined with
-[instrumentation libraries](/docs/languages/java/libraries/). For this purpose,
-the OpenTelemetry Java contributors have improved the JDBC (database) libraries
-and logging instrumentation libraries. For example, for the Logback logging
-library, they have added GraalVM configuration to make the library work in
-native mode[^1].
+[instrumentation libraries](/docs/languages/java/instrumentation/). For this
+purpose, the OpenTelemetry Java contributors have improved the JDBC (database)
+libraries and logging instrumentation libraries. For example, for the Logback
+logging library, they have added GraalVM configuration to make the library work
+in native mode[^1].
Furthermore, they have worked to reduce the configuration to set up the logging
and database instrumentation with the Starter. For example, if your application
diff --git a/content/en/blog/2024/community-awards.md b/content/en/blog/2024/community-awards.md
new file mode 100644
index 000000000000..e1fc9b54de94
--- /dev/null
+++ b/content/en/blog/2024/community-awards.md
@@ -0,0 +1,28 @@
+---
+title: 2024 OpenTelemetry Community Awards
+linkTitle: OpenTelemetry Community Awards
+date: 2024-10-29
+author: OpenTelemetry Governance Committee
+---
+
+OpenTelemetry is a community-driven project, fueled by a group of awesome humans
+who are actively revolutionizing the field of observability with their
+contributions. Whether it's through code, documentation, project management,
+outreach, adoption, or simply helping others answer technical questions on our
+[CNCF Slack](https://slack.cncf.io/), we want to recognize these contributions
+and the people behind them -- because we're all human, and we all like that warm
+fuzzy feeling of appreciation.
+
+We are thrilled to announce the first-ever **OpenTelemetry Community Awards**!
+This is your chance to nominate individuals who have made a notable impact to
+OpenTelemetry over the past year. _Everyone_ can nominate _anyone_ in the
+community, be they a contributor, end-user, or community member.
+
+Submit nominations using
+[this Google Form](https://forms.gle/ioqFNmDhKNYYAtRs7).
+
+Although we require sign-in to ensure only one form submission per person,
+nominations are completely anonymous. You can nominate up to five people per
+submission, and nominations will be open **until midnight UTC on November 8th,
+2024**. Winners will be announced at KubeCon + CloudNativeCon North
+America 2024.
diff --git a/content/en/blog/2024/gc-candidates.md b/content/en/blog/2024/gc-candidates.md
new file mode 100644
index 000000000000..0a2a9fc5c02b
--- /dev/null
+++ b/content/en/blog/2024/gc-candidates.md
@@ -0,0 +1,36 @@
+---
+title:
+ Announcing the 2024 OpenTelemetry Governance Committee Election Candidates
+linkTitle: 2024 GC Candidates
+date: 2024-10-15
+author: OpenTelemetry Governance Committee
+cSpell:ignore: Baeyens Danielson Marylia
+---
+
+The OpenTelemetry election committee is excited to announce the final list of
+candidates for the upcoming 2024 OpenTelemetry Governance Committee Election!
+
+If you are an
+[eligible voter](https://github.com/open-telemetry/community/blob/main/elections/2024/governance-committee-election.md#voter-eligibility),
+you’ll have the opportunity to continue shaping the future of OpenTelemetry by
+casting your vote between 21 October 2024 00:00 UTC and 23 October 2024 23:59
+UTC. You'll be selecting your preferred candidates to fill the four available
+seats in this year's election.
+
+You can find the candidates' pictures, profile link, and descriptions on the
+[candidates page](https://github.com/open-telemetry/community/blob/main/elections/2024/governance-committee-candidates.md).
+Here are their names:
+
+- Adriana Villela
+- Alolita Sharma
+- Daniel Dyla
+- Jamie Danielson
+- Marylia Gutierrez
+- Morgan McLean
+- Pablo Baeyens Fernández
+- Trask Stalnaker
+
+You can check your eligibility by reviewing
+[this GitHub issue](https://github.com/open-telemetry/community/issues/2329). If
+you are not listed there but believe you have the right to vote, kindly
+[fill out this registration form](https://forms.gle/LBvyRpNwZvqcJxUbA).
diff --git a/content/en/blog/2024/gc-election-results.md b/content/en/blog/2024/gc-election-results.md
new file mode 100644
index 000000000000..fc102c1543e2
--- /dev/null
+++ b/content/en/blog/2024/gc-election-results.md
@@ -0,0 +1,32 @@
+---
+title: Announcing the 2024 Governance Committee Election Results
+linkTitle: 2024 GC Election Results
+date: 2024-10-24
+author: OpenTelemetry Governance Committee
+cSpell:ignore: Baeyens
+---
+
+We are delighted to announce the results of the
+[2024 OpenTelemetry Governance Committee Election](https://github.com/open-telemetry/community/blob/main/elections/2024/governance-committee-election.md)!
+
+The OpenTelemetry project continues to bring together an exceptionally vibrant
+community, who are shaping the future of observability with their contributions.
+This year, active contributors have shown their commitment again by
+participating in our election process, and they've done it in great numbers.
+
+701 contributors were eligible to vote this year, and 299 of them cast their
+ballot. This is a new record for the project! With a participation rate of 43%,
+it represents a significant increase from the 2023 election, where 206 ballots
+were cast with 616 eligible voters, proof of OpenTelemetry's healthy growth and
+engagement.
+
+Four positions were up for election in this year's Governance Committee
+selection process. Without further ado, please join us in congratulating
+[Alolita Sharma](https://github.com/alolita),
+[Morgan McLean](https://github.com/mtwo),
+[Pablo Baeyens Fernández](https://github.com/mx-psi), and
+[Trask Stalnaker](https://github.com/trask)! All will serve a two-year term.
+
+We'd like to thank everyone who participated -- candidates, voters, and the
+election organizers -- for their efforts. You can find the
+[full results of the election here](https://vote.heliosvoting.org/helios/elections/176e7ca8-647d-11ef-9b9a-2a30e2a223da/view).
diff --git a/content/en/blog/2024/state-profiling.md b/content/en/blog/2024/state-profiling.md
new file mode 100644
index 000000000000..70010be554bd
--- /dev/null
+++ b/content/en/blog/2024/state-profiling.md
@@ -0,0 +1,117 @@
+---
+title: The State of Profiling
+linkTitle: Profiling state
+date: 2024-10-25
+cSpell:ignore: Baeyens Florian Geisendörfer Kalkanis Lehner Mathieu Rühsen
+author: >-
+ [Damien Mathieu](https://github.com/dmathieu) (Elastic), [Pablo
+ Baeyens](https://github.com/mx-psi) (Datadog), [Felix
+ Geisendörfer](https://github.com/felixge) (Datadog), [Christos
+ Kalkanis](https://github.com/christos68k) (Elastic), [Morgan
+ McLean](https://github.com/mtwo) (Splunk), [Florian
+ Lehner](https://github.com/florianl) (Elastic), [Tim
+ Rühsen](https://github.com/rockdaboot) (Elastic)
+issue: https://github.com/open-telemetry/opentelemetry.io/issues/5477
+sig: Profiling SIG
+---
+
+A little over six months ago, OpenTelemetry announced
+[support for the profiling signal](/blog/2024/profiling/). While the signal is
+still in development and isn’t yet recommended for production use, the Profiling
+SIG has made substantial progress on many fronts.
+
+This post provides a summary of the progress the Profiling SIG has made over the
+past six months.
+
+## OTLP improvements
+
+Profiles were added as a new signal type to OTLP in
+[v1.3.0](https://github.com/open-telemetry/opentelemetry-proto/releases/tag/v1.3.0),
+though this area is still marked as unstable as we continue to make changes to
+it.
+
+While our original intent was to keep wire compatibility with
+[pprof](https://github.com/google/pprof), that goal proved impractical, so the
+Profiling SIG
+[has decided](https://github.com/open-telemetry/opentelemetry-proto/issues/567#issuecomment-2286565449)
+to refactor the protocol and not aim for strict compatibility with pprof.
+Instead, we will aim for convertibility, similarly to what we already do for
+other signals. This shift is still a work in progress, and is causing several
+breaking changes to the profiling section of the protocol. Note that this has no
+impact on the stable sections that make up the majority of the OTLP protocol,
+like metrics, spans, logs, resources, etc.
+
+## eBPF agent improvements
+
+Back in June, the
+[donation of the Elastic Continuous Profiling Agent](/blog/2024/elastic-contributes-continuous-profiling-agent/)
+was finalized. Since then, the
+[opentelemetry-ebpf-profiler](https://github.com/open-telemetry/opentelemetry-ebpf-profiler)
+repository has been buzzing with improvements.
+
+Our next goal for the eBPF agent is for it to run as a Collector receiver. Once
+this is complete, the Collector can be run on every node as an agent, which
+collects profiles for that host and forwards them using OTLP. This architecture
+will allow us to extract some specific parts of the agent that aren’t strictly
+profiling, such as retrieving host metadata and system metrics, and move them to
+processors, making the agent lighter and more modular.
+
+## Collector support
+
+Since
+[v0.112.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.112.0),
+the OpenTelemetry Collector is able to receive, process and export profiling
+data, and has support for profile ingestion and export using OTLP.
+
+You can try it out by enabling the `service.profilesSupport`
+[feature gate](https://github.com/open-telemetry/opentelemetry-collector/blob/main/featuregate/README.md#controlling-gates)
+in your collector, followed by a configuration similar to the following, which
+ingests and exports data using OTLP:
+
+```yaml
+receivers:
+ otlp:
+ protocols:
+ grpc:
+exporters:
+ otlp:
+ endpoint: 'localhost:4317'
+service:
+ pipelines:
+ profiles:
+ receivers: [otlp]
+ exporters: [otlp]
+```
+
+While this feature can be used now on the Collector, we do not yet recommend
+doing so in production: it is still under heavy development and is expected to
+have breaking changes, such as the ones mentioned above with OTLP.
+
+However, this support in the Collector means that any receiver, processor or
+exporter of the Collector can now start adding profiles support, which we highly
+encourage to do, as a way to allow a smoother integration in the future, as well
+as to find potential issues early. If you wish to report a bug or contribute on
+this effort, you can
+[view them on the contrib repository](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22+label%3Adata%3Aprofiles).
+
+## Semantic Conventions and Specification
+
+To improve interoperability, the Profiling SIG worked also on
+[OpenTelemetry Semantic Conventions for profiling](/docs/specs/semconv/attributes-registry/profile/).
+There is also ongoing work to introduce a
+[profiling OpenTelemetry specification](https://github.com/open-telemetry/opentelemetry-specification/pull/4197).
+This work will continue and should enable wide adoption across different
+platforms, tools and other OTel signals.
+
+## What’s next ?
+
+Support for profiles in OpenTelemetry is moving very quickly, and while we’re
+still far from being able to provide a stable signal, we are happy to report
+that folks can start hacking with it, and integrate it within their modules.
+
+If you’re interested in helping profiling move forward, or face issues when
+integrating with it, the Profiling SIG is always happy to get or provide help.
+
+You can find us on
+[#otel-profiles](https://cloud-native.slack.com/archives/C03J794L0BV) in the
+CNCF slack.
diff --git a/content/en/blog/_index.md b/content/en/blog/_index.md
index 022dd0feceae..9fddb96c7694 100644
--- a/content/en/blog/_index.md
+++ b/content/en/blog/_index.md
@@ -1,7 +1,15 @@
---
title: Blog
-menu:
- main: { weight: 50 }
-redirects: [{ from: '', to: '2024/ 301!' }]
+menu: { main: { weight: 50 } }
+redirects:
+ # Every January, update the year number in the paths below
+ - { from: '', to: '2024/ 301!' }
+ # Workaround to https://github.com/open-telemetry/opentelemetry.io/issues/4440:
+ - { from: 'index.xml', to: '2024/index.xml 301!' }
outputs: [HTML, RSS]
+htmltest:
+ IgnoreDirs:
+ # 2024-11-03 The following entry is for `en` pages only. Other locales do
+ # not currently require it.
+ - ^blog/(\d+/)?page/\d+
---
diff --git a/content/en/docs/collector/_index.md b/content/en/docs/collector/_index.md
index 4aeecbd40f26..6885af6eaab7 100644
--- a/content/en/docs/collector/_index.md
+++ b/content/en/docs/collector/_index.md
@@ -3,7 +3,7 @@ title: Collector
description: Vendor-agnostic way to receive, process and export telemetry data.
aliases: [collector/about]
cascade:
- vers: 0.111.0
+ vers: 0.112.0
weight: 270
---
diff --git a/content/en/docs/collector/building/connector.md b/content/en/docs/collector/building/connector/index.md
similarity index 99%
rename from content/en/docs/collector/building/connector.md
rename to content/en/docs/collector/building/connector/index.md
index e36741c2f030..410cfb733635 100644
--- a/content/en/docs/collector/building/connector.md
+++ b/content/en/docs/collector/building/connector/index.md
@@ -54,11 +54,11 @@ following links:
### The Old Architecture:
-![Before picture of how processors emitted data directly to another pipelines exporter](../../img/otel-collector-before-connector.png)
+![Before picture of how processors emitted data directly to another pipelines exporter](./otel-collector-before-connector.svg)
### New Architecture Using a Connector:
-![How the pipeline should work using the connector component](../../img/otel-collector-after-connector.png)
+![How the pipeline should work using the connector component](./otel-collector-after-connector.svg)
## Building Example Connector
diff --git a/content/en/docs/collector/building/connector/otel-collector-after-connector.svg b/content/en/docs/collector/building/connector/otel-collector-after-connector.svg
new file mode 100644
index 000000000000..a6bd7802b339
--- /dev/null
+++ b/content/en/docs/collector/building/connector/otel-collector-after-connector.svg
@@ -0,0 +1,235 @@
+
diff --git a/content/en/docs/collector/building/connector/otel-collector-before-connector.svg b/content/en/docs/collector/building/connector/otel-collector-before-connector.svg
new file mode 100644
index 000000000000..662198cd7766
--- /dev/null
+++ b/content/en/docs/collector/building/connector/otel-collector-before-connector.svg
@@ -0,0 +1,177 @@
+
diff --git a/content/en/docs/collector/custom-collector.md b/content/en/docs/collector/custom-collector.md
index d476c8e3b307..d88480e14f15 100644
--- a/content/en/docs/collector/custom-collector.md
+++ b/content/en/docs/collector/custom-collector.md
@@ -166,11 +166,11 @@ receivers:
go.opentelemetry.io/collector/receiver/otlpreceiver {{% version-from-registry collector-receiver-otlp %}}
providers:
- - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.16.0
- - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.16.0
- - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.110.0
- - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.110.0
- - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.110.0
+ - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.18.0
+ - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.18.0
+ - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.18.0
+ - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.18.0
+ - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.18.0
```
{{% alert color="primary" title="Tip" %}}
diff --git a/content/en/docs/collector/deployment/agent.md b/content/en/docs/collector/deployment/agent.md
index 2a17343c3b7b..eff8d8df82ef 100644
--- a/content/en/docs/collector/deployment/agent.md
+++ b/content/en/docs/collector/deployment/agent.md
@@ -129,7 +129,7 @@ Cons:
[instrumentation]: /docs/languages/
[otlp]: /docs/specs/otel/protocol/
[collector]: /docs/collector/
-[instrument-java-metrics]: /docs/languages/java/instrumentation/#metrics
+[instrument-java-metrics]: /docs/languages/java/api-components/#meterprovider
[otlp-exporter]: /docs/specs/otel/protocol/exporter/
[java-otlp-example]:
https://github.com/open-telemetry/opentelemetry-java-docs/tree/main/otlp
diff --git a/content/en/docs/collector/img/otel-collector-after-connector.png b/content/en/docs/collector/img/otel-collector-after-connector.png
deleted file mode 100644
index e106c5fd9726..000000000000
Binary files a/content/en/docs/collector/img/otel-collector-after-connector.png and /dev/null differ
diff --git a/content/en/docs/collector/img/otel-collector-before-connector.png b/content/en/docs/collector/img/otel-collector-before-connector.png
deleted file mode 100644
index a8667d4b6edf..000000000000
Binary files a/content/en/docs/collector/img/otel-collector-before-connector.png and /dev/null differ
diff --git a/content/en/docs/collector/img/otel-collector.svg b/content/en/docs/collector/img/otel-collector.svg
index 022696c23bb7..1e1583cfb3b2 100644
--- a/content/en/docs/collector/img/otel-collector.svg
+++ b/content/en/docs/collector/img/otel-collector.svg
@@ -1,6 +1,6 @@
-