Skip to content

Commit 5569f35

Browse files
tiffany76tiffany76
authored
Merge branch 'main' into patch-1
2 parents c81c473 + 43ecc19 commit 5569f35

File tree

75 files changed

+1097
-349
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+1097
-349
lines changed

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[submodule "themes/docsy"]
33
path = themes/docsy
44
url = https://github.com/google/docsy.git
5-
docsy-pin = v0.11.0-39-g9e685592
5+
docsy-pin = v0.11.0-44-gcbc714be
66
docsy-note = "2024-04-01 Switching to google/docsy.git from cncf/docsy.git since we don't have any CNCF customizations."
77
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."
88
[submodule "content-modules/opentelemetry-specification"]

‎.htmltest.yml

+17-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ IgnoreAltMissing: true
55
IgnoreCanonicalBrokenLinks: false
66
IgnoreInternalEmptyHash: true # TODO: remove after resolution of https://github.com/google/docsy/issues/1995
77
CheckMailto: false
8+
# StripQueryString: false # TODO: enable once htmltest is fixed
89
TestFilesConcurrently: true
910
IgnoreDirs:
1011
# DO NOT EDIT! IgnoreDirs list is auto-generated from markdown file front matter.
@@ -54,7 +55,7 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
5455

5556
# Ignore Docsy-generated GitHub links for now, until
5657
# https://github.com/google/docsy/issues/1432 is fixed
57-
- ^https?://github\.com/.*?/.*?/(new|edit|issues/new\?title)/ # view-page, edit-source etc
58+
- ^https?://github\.com/.*?/.*?/(new/|edit/|issues/new\?) # view-page, edit-source etc
5859
# Ignore "View page source" links, except for spec pages, i.e., links starting with
5960
# https://github.com/open-telemetry/opentelemetry.io/tree/main/content/en/docs/specs
6061
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/[^e]
@@ -80,3 +81,18 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
8081
- ^https://cloud.google.com/functions/docs/concepts/exec#function_scope_versus_global_scope
8182
- ^https://developer.apple.com/documentation/uikit/uiapplicationdelegate#1656902
8283
- ^https://docs.docker.com/registry/spec/manifest-v2-2/#example-image-manifest
84+
- ^https://www.openssl.org/docs/man1.1.1/man3/SSL_get_version.html#RETURN-VALUES
85+
- ^https://www.erlang.org/doc/man/erl_error.html#format_exception-3
86+
# Fixed via https://github.com/open-telemetry/semantic-conventions/pull/1814
87+
- ^https://github.com/open-telemetry/opentelemetry-specification/tree/v1.41.0/specification/logs/api.md#emit-an-event
88+
89+
# Temporary until
90+
# https://pkg.go.dev/go.opentelemetry.io/collector/config/[email protected]+
91+
# is published to include
92+
# https://github.com/open-telemetry/opentelemetry-collector/pull/12309
93+
- ^https://pkg.go.dev/go.opentelemetry.io/collector/config/configauth#client-authenticators
94+
- ^https://pkg.go.dev/go.opentelemetry.io/collector/config/configauth#server-authenticators
95+
96+
# Temporary until
97+
# https://github.com/open-telemetry/opentelemetry.io/issues/6237 is resolved
98+
- ^https://github.com/open-telemetry/opentelemetry-operator/blob/main/docs/api.md#

‎content/en/blog/2019/opentelemetry-governance-committee-explained/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ feedback!
7777
_A version of this article was [originally posted][] on
7878
[medium.com/opentelemetry](https://medium.com/opentelemetry)._
7979

80-
[originally posted]: {{% param canonical_url %}}
80+
[originally posted]: <{{% param canonical_url %}}>

‎content/en/blog/2021/auto-instrumentation-k8s.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ This article introduces OpenTelemetry Operator’s new feature that significantl
99
simplifies instrumenting workloads deployed on Kubernetes. Read all the details
1010
from the [original post][].
1111

12-
[original post]: {{% param canonical_url %}}
12+
[original post]: <{{% param canonical_url %}}>

‎content/en/blog/2021/collector.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ canonical_url: https://medium.com/opentelemetry/opentelemetry-collector-achieves
88
The OpenTelemetry Collector has made its first GA release. For all the details,
99
see the [original post][].
1010

11-
[original post]: {{% param canonical_url %}}
11+
[original post]: <{{% param canonical_url %}}>

‎content/en/blog/2021/cpp.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ OpenTelemetry C++ released its v1.0 stable version last month, which implements
99
the OpenTelemetry distributed tracing specification! For all the details, see
1010
the [original post][].
1111

12-
[original post]: {{% param canonical_url %}}
12+
[original post]: <{{% param canonical_url %}}>

‎content/en/blog/2021/gc-election.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ The OpenTelemetry project is excited to announce the 2021 OpenTelemetry
99
Governance Committee (GC) election. For all the details, see the [original
1010
post][].
1111

12-
[original post]: {{% param canonical_url %}}
12+
[original post]: <{{% param canonical_url %}}>

‎content/en/blog/2021/malabi.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ cSpell:ignore: Malabi
1010
This article introduces you to Malabi, a new open source tool for trace-based
1111
testing. For all the details, see the [original post][].
1212

13-
[original post]: {{% param canonical_url %}}
13+
[original post]: <{{% param canonical_url %}}>

‎content/en/blog/2021/otel-gc.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ canonical_url: https://medium.com/opentelemetry/welcome-to-the-incoming-2021-ope
88
The OpenTelemetry project just completed its 2021 election for the Governance
99
Committee (GC). For all the details, see the [original post][].
1010

11-
[original post]: {{% param canonical_url %}}
11+
[original post]: <{{% param canonical_url %}}>

‎content/en/blog/2021/python.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ canonical_url: https://medium.com/opentelemetry/announcing-opentelemetry-python-
88
Today, OpenTelemetry Python distributed tracing API/SDK released its 1.0
99
version. For all the details, see the [original post][].
1010

11-
[original post]: {{% param canonical_url %}}
11+
[original post]: <{{% param canonical_url %}}>

‎content/en/blog/2021/swift.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ canonical_url: https://medium.com/opentelemetry/opentelemetry-swift-1-0-beta-8f7
88
Today, OpenTelemetry Swift distributed tracing API/SDK has released its 1.0
99
version. For all the details, see the [original post][].
1010

11-
[original post]: {{% param canonical_url %}}
11+
[original post]: <{{% param canonical_url %}}>

‎content/en/blog/2021/womens-day.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ Happy International Women’s Day! The OpenTelemetry project would like to exten
99
our thanks to all our women contributors. For all the details, see the [original
1010
post][].
1111

12-
[original post]: {{% param canonical_url %}}
12+
[original post]: <{{% param canonical_url %}}>

‎content/en/blog/2022/apisix/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -395,4 +395,4 @@ _A version of this article was [originally posted][] on the Apache APISIX blog._
395395

396396
[^1]: {{% param notes.docker-compose-v2 %}}
397397

398-
[originally posted]: {{% param canonical_url %}}
398+
[originally posted]: <{{% param canonical_url %}}>

‎content/en/blog/2022/exponential-histograms/index.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,6 @@ documentation on [instrumentation][] or [github.com/open-telemetry][].
278278

279279
_A version of this article was [originally posted][] on the New Relic blog._
280280

281-
[originally posted]: {{% param canonical_url %}}
282-
283281
[api]: /docs/specs/otel/metrics/api/
284282
[sdk]: /docs/specs/otel/metrics/sdk/
285283
[meter provider]: /docs/specs/otel/metrics/api/#meterprovider
@@ -304,3 +302,4 @@ _A version of this article was [originally posted][] on the New Relic blog._
304302
[environment variable]: /docs/specs/otel/metrics/sdk_exporters/otlp/
305303
[instrumentation]: /docs/languages
306304
[github.com/open-telemetry]: https://github.com/open-telemetry
305+
[originally posted]: <{{% param canonical_url %}}>

‎content/en/blog/2022/go-web-app-instrumentation/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -415,4 +415,4 @@ find all files ready to use in our GitHub
415415

416416
_A version of this article was [originally posted][] on the Aspecto blog._
417417

418-
[originally posted]: {{% param canonical_url %}}
418+
[originally posted]: <{{% param canonical_url %}}>

‎content/en/blog/2022/k8s-metadata/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ cSpell:ignore: k8sattributes k8sattributesprocessor k8sprocessor KUBE replicaset
99

1010
{{% alert title="Note" color="info" %}} The most up to date information for how
1111
to enhance telemetry with Kubernetes metadata can be found in the docs. See
12-
[Getting Started with Kubernetes](/docs/platforms/kubernetes/getting-started/) for more
13-
info. {{% /alert %}}
12+
[Getting Started with Kubernetes](/docs/platforms/kubernetes/getting-started/)
13+
for more info. {{% /alert %}}
1414

1515
Attaching Kubernetes resource metadata to OpenTelemetry traces is useful to
1616
identify which resource (such as a pod) is failing or having performance

‎content/en/blog/2022/k8s-otel-expose/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ in this setup are mentioned in brackets.
106106
[v1.2.1] installed.
107107
- A Kubernetes [v1.23.3] edge cluster to create a test cluster. Using
108108
[Kind](https://kind.sigs.k8s.io/) is recommended.
109-
- Installed [OpenTelemetry Operator](/docs/platforms/kubernetes/operator/) [v0.58.0] on
110-
both ends.
109+
- Installed [OpenTelemetry Operator](/docs/platforms/kubernetes/operator/)
110+
[v0.58.0] on both ends.
111111
- Installed [Jaeger Operator](https://www.jaegertracing.io/docs/1.37/operator/)
112112
[v1.37.0] on your public cluster.
113113
- Installed [cert-manager](https://cert-manager.io/) [v1.9.1] on your public

‎content/en/blog/2022/tail-sampling/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,4 +227,4 @@ for more information.
227227

228228
_A version of this article was [originally posted][] on the New Relic blog._
229229

230-
[originally posted]: {{% param canonical_url %}}
230+
[originally posted]: <{{% param canonical_url %}}>

‎content/en/blog/2022/troubleshooting-nodejs.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -385,4 +385,4 @@ For a list of OpenTelemetry vendors, see [Vendors](/ecosystem/vendors/).
385385

386386
_A version of this article was [originally posted][] on the Aspecto blog._
387387

388-
[originally posted]: {{% param canonical_url %}}
388+
[originally posted]: <{{% param canonical_url %}}>

‎content/en/blog/2022/v1.0-trio.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ new languages (Ruby, JavaScript, and Erlang/Elixir) have had their first 1.0
1010
releases, joining the existing GA releases from C++, Go, Java, .NET, Python and
1111
Swift. Read all the details from the [announcement][].
1212

13-
[announcement]: {{% param canonical_url %}}
13+
[announcement]: <{{% param canonical_url %}}>

‎content/en/blog/2022/why-and-how-ebay-pivoted-to-opentelemetry/index.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ ongoing issues in critical workflows that could potentially impact customer
2121
experience. The Observability landscape is an ever-changing one and recent
2222
developments in the OpenTelemetry world forced us to rethink our strategy in
2323
order to pivot to using it. eBay’s observability platform Sherlock.io provides
24-
developers and Site Reliability Engineers (SREs) with a robust set of
25-
cloud native offerings to observe the various applications that power the eBay
24+
developers and Site Reliability Engineers (SREs) with a robust set of cloud
25+
native offerings to observe the various applications that power the eBay
2626
ecosystem. Sherlock.io supports the three pillars of observability — metrics,
2727
logs and traces. The platform’s metric store is a clustered and sharded
2828
implementation of the Prometheus storage engine. We use the Metricbeat agent to
@@ -353,4 +353,4 @@ OpenTelemetry Collector community:
353353

354354
_A version of this article was [originally posted][] on the eBay Tech Blog._
355355

356-
[originally posted]: {{% param canonical_url %}}
356+
[originally posted]: <{{% param canonical_url %}}>

‎content/en/blog/2023/contributing-to-otel/index.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ Feeling a little more adventurous? Then why not join one of the other OTel
145145
(SIGs)? By joining a SIG, you can contribute to things like (but not limited to)
146146
SDK development, auto-instrumentation of libraries, the
147147
[OTel Collector](/docs/collector/), and the
148-
[OTel Operator](/docs/platforms/kubernetes/operator/). You don't even need to be a regular
149-
contributor. Sometimes, contributions come out of necessity. Like maybe you
150-
found a bug in the Collector. Why not take a stab at fixing it? Or maybe there's
151-
a feature that you and your team desperately need. Again, why not take a stab at
152-
implementing it?
148+
[OTel Operator](/docs/platforms/kubernetes/operator/). You don't even need to be
149+
a regular contributor. Sometimes, contributions come out of necessity. Like
150+
maybe you found a bug in the Collector. Why not take a stab at fixing it? Or
151+
maybe there's a feature that you and your team desperately need. Again, why not
152+
take a stab at implementing it?
153153

154154
Now, before you go off writing code, you should make sure that you:
155155

‎content/en/blog/2023/end-user-q-and-a-03.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ others are still instrumented using the [legacy OpenTracing
156156
[using shims](/docs/migration/opentracing/).
157157

158158
The OpenTelemetry Operator is being implemented to auto-instrument Java and .NET
159-
code. Among other things, the [OTel Operator](/docs/platforms/kubernetes/operator/)
160-
supports injecting and
159+
code. Among other things, the
160+
[OTel Operator](/docs/platforms/kubernetes/operator/) supports injecting and
161161
[configuring auto-instrumentation](/docs/platforms/kubernetes/operator/automatic/#configure-automatic-instrumentation)
162162
in .NET, Java, Python, and Node.js. Iris hopes that Go auto-instrumentation will
163163
be available in the near-future. To track progress of auto-instrumentation in
@@ -255,8 +255,9 @@ would be a bottleneck in terms of load and single point of failure. The team
255255
currently has one
256256
[OpenTelemetry Collector agent](/docs/collector/deployment/agent/) per
257257
Kubernetes cluster. The end goal is to replace those agents with the
258-
[OTel Operator](/docs/platforms/kubernetes/operator/) instead, which allows you to deploy
259-
and configure the OTel Collector and inject and configure auto-instrumentation.
258+
[OTel Operator](/docs/platforms/kubernetes/operator/) instead, which allows you
259+
to deploy and configure the OTel Collector and inject and configure
260+
auto-instrumentation.
260261

261262
Everything is then sent to a central OTel Collector (i.e. an
262263
[OTel Collector gateway](/docs/collector/deployment/gateway/)) per data center,

‎content/en/blog/2023/exponential-histograms.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -198,5 +198,4 @@ _A version of this article was [originally posted][] to the author's blog._
198198
/docs/specs/otel/metrics/sdk/#base2-exponential-bucket-histogram-aggregation
199199
[Why Histograms?]: ../why-histograms/
200200
[Histograms vs Summaries]: ../histograms-vs-summaries/
201-
202-
[originally posted]: {{% param canonical_url %}}
201+
[originally posted]: <{{% param canonical_url %}}>

‎content/en/blog/2023/histograms-vs-summaries/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,4 @@ Until then, here are some talks I found helpful:
110110

111111
_A version of this article was [originally posted][] to the author's blog._
112112

113-
[originally posted]: {{% param canonical_url %}}
113+
[originally posted]: <{{% param canonical_url %}}>

‎content/en/blog/2023/lambda-release.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ cSpell:ignore: adot otel-faas socha
99
The
1010
[Functions-as-a-Service (FaaS) SIG](https://docs.google.com/document/d/187XYoQcXQ9JxS_5v2wvZ0NEysaJ02xoOYNXj08pT0zc)
1111
is incredibly excited to announce that the release of OpenTelemetry Lambda
12-
layers, and associated [documentation](/docs/platforms/faas/) on how to monitor Amazon Web
13-
Services (AWS) Lambdas.
12+
layers, and associated [documentation](/docs/platforms/faas/) on how to monitor
13+
Amazon Web Services (AWS) Lambdas.
1414

1515
## OTel FaaS repackaged
1616

‎content/en/blog/2023/opamp-status/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ with a backlog of issues created to guide further development.
105105
## OpAMP in Kubernetes
106106

107107
In OTel we have dedicated support for Kubernetes as a compute platform via the
108-
[OpenTelemetry Operator for Kubernetes](/docs/platforms/kubernetes/operator/). In this
109-
context, we're also working on OpAMP support in Kubernetes which will be
108+
[OpenTelemetry Operator for Kubernetes](/docs/platforms/kubernetes/operator/).
109+
In this context, we're also working on OpAMP support in Kubernetes which will be
110110
available through a
111111
[bridge component](https://docs.google.com/document/d/1M8VLNe_sv1MIfu5bUR5OV_vrMBnAI7IJN-7-IAr37JY/)
112112
to be deployed by the OpenTelemetry Operator:

‎content/en/blog/2023/why-histograms/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ avoid these subtle problems if they apply to you.
9393

9494
_A version of this article was [originally posted][] to the author's blog._
9595

96-
[originally posted]: {{% param canonical_url %}}
96+
[originally posted]: <{{% param canonical_url %}}>

‎content/en/blog/2024/collecting-otel-compliant-java-logs-from-files/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ OTLP/JSON format, with a JSON object per line. The log records are nested in the
205205

206206
## Configure the Collector to ingest the OTLP/JSON logs
207207

208-
{{< figure class="figure" src="otel-collector-otlpjson-pipeline.png" attr="View OTel Collector pipeline with OTelBin" attrlink="https://www.otelbin.io/s/69739d790cf279c203fc8efc86ad1a876a2fc01a" >}}
208+
{{< figure class="figure" src="otel-collector-otlpjson-pipeline.png" attr="View OTel Collector pipeline with OTelBin" attrlink=`https://www.otelbin.io/s/69739d790cf279c203fc8efc86ad1a876a2fc01a` >}}
209209

210210
```yaml
211211
# tested with otelcol-contrib v0.112.0

‎content/en/blog/2024/otel-operator-q-and-a/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ title:
55
linkTitle: OTel Operator Q&A
66
date: 2024-05-13
77
author: '[Adriana Villela](https://github.com/avillela) (ServiceNow)'
8-
canonical_url: https://adri-v.medium.com/81d63addbf92?
8+
canonical_url: https://adri-v.medium.com/81d63addbf92
99
cSpell:ignore: automagically mycollector
1010
---
1111

‎content/en/blog/2024/prometheus-compatibility-survey/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ and
2525
It has been used to implement Prometheus
2626
[(pull) exporters for OpenTelemetry SDKs](https://pkg.go.dev/go.opentelemetry.io/otel/exporters/prometheus),
2727
[OTLP export from Prometheus libraries](https://prometheus.github.io/client_java/otel/otlp/),
28-
[OTLP ingestion for the Prometheus server](https://prometheus.io/docs/prometheus/latest/feature_flags/#otlp-receiver),
28+
[OTLP ingestion for the Prometheus server](https://prometheus.io/docs/prometheus/2.55/feature_flags/#otlp-receiver),
2929
and the OpenTelemetry Collector's
3030
[Prometheus Receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/prometheusreceiver),
3131
[Prometheus Remote Write exporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/prometheusremotewriteexporter),

‎content/en/blog/2025/otel-mainframe-priorities-survey.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,5 @@ OpenTelemetry on Mainframe SIG, join the conversation at
6363
_A version of this article was [originally posted] on the Open Mainframe Project
6464
blog._
6565

66-
[originally posted]: {{% param canonical_url %}}
67-
66+
[originally posted]: <{{% param canonical_url %}}>
6867
[survey]: https://www.surveymonkey.com/r/HGTD2KJ

‎content/en/docs/collector/_index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Collector
33
description: Vendor-agnostic way to receive, process and export telemetry data.
44
aliases: [./about]
55
cascade:
6-
vers: 0.118.0
6+
vers: 0.119.0
77
weight: 270
88
---
99

0 commit comments

Comments
 (0)