Skip to content

Commit a663af2

Browse files
Merge branch 'main' into collect-java-otlpjson-logs
2 parents 677cc0e + 830397b commit a663af2

File tree

114 files changed

+452
-367
lines changed

Some content is hidden

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

114 files changed

+452
-367
lines changed

.github/workflows/scripts/update-registry-versions.sh

+20-10
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,11 @@ for yaml_file in ${FILES}; do
8282
echo "${yaml_file}: Package name and/or registry are missing in the YAML file."
8383
else
8484
# Get latest version
85-
latest_version=$(get_latest_version "$name" "$registry")
85+
latest_version=$(get_latest_version "$name" "$registry" || echo "Could not fetch version.")
8686

87-
if [ "$latest_version" == "Registry not supported." ]; then
87+
if [ "$latest_version" == "Could not fetch version." ]; then
88+
echo "${yaml_file} ($registry): Registry not supported.";
89+
elif [ "$latest_version" == "Registry not supported." ]; then
8890
echo "${yaml_file} ($registry): Registry not supported.";
8991
elif [ -z "$latest_version" ]; then
9092
echo "${yaml_file} ($registry): Could not get latest version from registry."
@@ -118,14 +120,22 @@ if [ "$existing_pr_count" -gt 0 ]; then
118120
exit 0
119121
fi
120122

121-
$NPM run fix:format
123+
if [[ -n $(git status --porcelain) ]]; then
124+
echo "Versions have been updated, formatting and pushing changes."
125+
126+
$NPM run fix:format
127+
128+
$GIT checkout -b "$branch"
129+
$GIT commit -a -m "$message"
130+
$GIT push --set-upstream origin "$branch"
122131

123-
$GIT checkout -b "$branch"
124-
$GIT commit -a -m "$message"
125-
$GIT push --set-upstream origin "$branch"
132+
body_file=$(mktemp)
133+
echo -en "${body}" >> "${body_file}"
126134

127-
body_file=$(mktemp)
128-
echo -en "${body}" >> "${body_file}"
135+
echo "Submitting auto-update PR '$message'."
136+
$GH pr create --title "$message" --body-file "${body_file}"
129137

130-
echo "Submitting auto-update PR '$message'."
131-
$GH pr create --title "$message" --body-file "${body_file}"
138+
else
139+
echo "No changes detected."
140+
exit 0
141+
fi

.prettierignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
!/layouts/shortcodes
88
/layouts/shortcodes/*
99
!/layouts/shortcodes/docs
10-
/layouts/shortcodes/pt
10+
!/layouts/shortcodes/es
11+
!/layouts/shortcodes/pt
1112

1213
/content/ja
1314
/content/zh

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ We, the OTel Communications SIG, meet every two weeks on Monday at 10:00 PT.
4444
Check out the [OpenTelemetry community calendar][] for the Zoom link and any
4545
updates to this schedule.
4646

47-
Meeting notes are available as a public [Google doc][]. If you have trouble accessing
48-
the doc, get in touch in the `#otel-comms` channel on [Slack][].
47+
Meeting notes are available as a public [Google doc][]. If you have trouble
48+
accessing the doc, get in touch in the `#otel-comms` channel on [Slack][].
4949

5050
## Roles
5151

@@ -74,8 +74,8 @@ Here is a list of community roles with current and previous members:
7474
- [Morgan McLean](https://github.com/mtwo)
7575
- [jparsana](https://github.com/jparsana)
7676

77-
Learn more about roles in the [community repository][]. Thanks to [all who have already
78-
contributed][contributors]!
77+
Learn more about roles in the [community repository][]. Thanks to [all who have
78+
already contributed][contributors]!
7979

8080
## Licenses
8181

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ your questions!
7474
Thanks [Sarah Novotny](https://twitter.com/sarahnovotny) for review and
7575
feedback!
7676

77-
_A version of this article was [originally posted][] on [medium.com/opentelemetry](https://medium.com/opentelemetry)._
77+
_A version of this article was [originally posted][] on
78+
[medium.com/opentelemetry](https://medium.com/opentelemetry)._
7879

7980
[originally posted]: {{% param canonical_url %}}

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ canonical_url: https://medium.com/opentelemetry/announcing-the-2021-opentelemetr
66
---
77

88
The OpenTelemetry project is excited to announce the 2021 OpenTelemetry
9-
Governance Committee (GC) election. For all the details, see the [original post][].
9+
Governance Committee (GC) election. For all the details, see the [original
10+
post][].
1011

1112
[original post]: {{% param canonical_url %}}

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ canonical_url: https://medium.com/opentelemetry/opentelemetry-observes-internati
66
---
77

88
Happy International Women’s Day! The OpenTelemetry project would like to extend
9-
our thanks to all our women contributors. For all the details, see the [original post][].
9+
our thanks to all our women contributors. For all the details, see the [original
10+
post][].
1011

1112
[original post]: {{% param canonical_url %}}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ in the NGINX module and we need to fix that.
229229

230230
### The fix
231231

232-
To fix our problem we [added some checks to the module for NGINX][], that make sure
233-
that the trace headers are only set once.
232+
To fix our problem we [added some checks to the module for NGINX][], that make
233+
sure that the trace headers are only set once.
234234

235235
This fix is contained in the [v1.0.1 release of the otel-webserver-module][].
236236
This means you can update the `Dockerfile` to install the NGINX module like the

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

+21-18
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@ The SDK is used to configure what happens with the data collected by the API.
4040
This typically includes processing it and exporting it out of process for
4141
analysis, often to an observability platform.
4242

43-
The API entry point for metrics is the [meter provider][]. It provides meters for
44-
different scopes, where a scope is just a logical unit of application code. For example,
45-
instrumentation for an HTTP client library would have a different scope and therefore
46-
a different meter than instrumentation for a database client library. You use meters
47-
to obtain instruments. You use instruments to report measurements, which consist
48-
of a value and set of attributes. This Java code snippet demonstrates the workflow:
43+
The API entry point for metrics is the [meter provider][]. It provides meters
44+
for different scopes, where a scope is just a logical unit of application code.
45+
For example, instrumentation for an HTTP client library would have a different
46+
scope and therefore a different meter than instrumentation for a database client
47+
library. You use meters to obtain instruments. You use instruments to report
48+
measurements, which consist of a value and set of attributes. This Java code
49+
snippet demonstrates the workflow:
4950

5051
```java
5152
OpenTelemetry openTelemetry = // declare OpenTelemetry instance
@@ -73,7 +74,8 @@ and when the sum of the things is more important than their individual values
7374
the distribution of measurements is relevant for analysis. For example, a
7475
histogram is a natural choice for tracking response times for HTTP servers,
7576
because it's useful to analyze the distribution of response times to evaluate
76-
SLAs and identify trends. To learn more, see the guidelines for [instrument selection][].
77+
SLAs and identify trends. To learn more, see the guidelines for [instrument
78+
selection][].
7779

7880
I mentioned earlier that the SDK aggregates measurements from instruments. Each
7981
instrument type has a default aggregation strategy (or simply [aggregation][])
@@ -125,10 +127,10 @@ request, you can determine:
125127
requests resolve quickly but a small number of requests take a long time and
126128
bring down the average.
127129

128-
The second type of OpenTelemetry histogram is the [exponential
129-
bucket histogram][]. Exponential bucket histograms have buckets and bucket
130-
counts, but instead of explicitly defining the bucket boundaries, the boundaries
131-
are computed based on an exponential scale. More specifically, each bucket is
130+
The second type of OpenTelemetry histogram is the [exponential bucket
131+
histogram][]. Exponential bucket histograms have buckets and bucket counts, but
132+
instead of explicitly defining the bucket boundaries, the boundaries are
133+
computed based on an exponential scale. More specifically, each bucket is
132134
defined by an index _i_ and has bucket boundaries _(base\*\*i, base\*\*(i+1)]_,
133135
where _base\*\*i_ means that _base_ is raised to the power of _i_. The base is
134136
derived from a scale factor that is adjustable to reflect the range of reported
@@ -197,13 +199,14 @@ large range of measurement values.
197199

198200
Let's bring everything together with a proper demonstration comparing explicit
199201
bucket histograms to exponential bucket histograms. I've put together some
200-
[example code][] that simulates tracking response time to an HTTP server in milliseconds.
201-
It records one million samples to an explicit bucket histogram with the default buckets,
202-
and to an exponential bucket histogram with a number of buckets that produces roughly
203-
the same size of [OTLP][] -encoded, Gzip-compressed payload as the explicit bucket
204-
defaults. Through trial and error, I determined that ~40 exponential buckets produce
205-
an equivalent payload size to the default explicit bucket histogram with 11 buckets.
206-
(Your results may vary.)
202+
[example code][] that simulates tracking response time to an HTTP server in
203+
milliseconds. It records one million samples to an explicit bucket histogram
204+
with the default buckets, and to an exponential bucket histogram with a number
205+
of buckets that produces roughly the same size of [OTLP][] -encoded,
206+
Gzip-compressed payload as the explicit bucket defaults. Through trial and
207+
error, I determined that ~40 exponential buckets produce an equivalent payload
208+
size to the default explicit bucket histogram with 11 buckets. (Your results may
209+
vary.)
207210

208211
I wanted the distribution of samples to reflect what we might see in an actual
209212
HTTP server, with bands of response times corresponding to different operations.

content/en/blog/2022/instrument-apache-httpd-server/index.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ cSpell:ignore: Centos centos7 Debajit debuggability libmod uncompress webserver
88
---
99

1010
If you are using Apache HTTP Server and in dire need of some observability tool
11-
to monitor your web server, the [OpenTelemetry Module for Apache HTTP Server][] is
12-
the right candidate for you: it enables tracing of incoming requests to the server
13-
and it will capture the response time of many modules (including `mod_proxy`) involved
14-
in such an incoming request. With that you will get hierarchical time consumption
15-
by each module. This article demonstrates the monitoring capabilities of the OpenTelemetry
16-
Module for Apache HTTP Server and quick guide to get started with the module.
11+
to monitor your web server, the [OpenTelemetry Module for Apache HTTP Server][]
12+
is the right candidate for you: it enables tracing of incoming requests to the
13+
server and it will capture the response time of many modules (including
14+
`mod_proxy`) involved in such an incoming request. With that you will get
15+
hierarchical time consumption by each module. This article demonstrates the
16+
monitoring capabilities of the OpenTelemetry Module for Apache HTTP Server and
17+
quick guide to get started with the module.
1718

1819
## Getting Started with OpenTelemetry Module
1920

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,11 @@ reducing the scope of the collector service account to a single namespace.
172172

173173
## Using Resource detector processor
174174

175-
As of [recently][pr#832], the [OpenTelemetry operator][] sets the `OTEL_RESOURCE_ATTRIBUTES`
176-
environment variable on the collector container with the K8s pod attributes. This
177-
lets you to use the resource detector processor, which attaches the environment variable
178-
values to the spans. This only works when the collector is deployed in sidecar mode.
175+
As of [recently][pr#832], the [OpenTelemetry operator][] sets the
176+
`OTEL_RESOURCE_ATTRIBUTES` environment variable on the collector container with
177+
the K8s pod attributes. This lets you to use the resource detector processor,
178+
which attaches the environment variable values to the spans. This only works
179+
when the collector is deployed in sidecar mode.
179180

180181
For example, if you deploy the following manifest:
181182

content/en/blog/2022/kubecon-na.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ cSpell:ignore: Kowall Logz Pothulapati unconference Vineeth
88

99
The OpenTelemetry project maintainers, and members of the governance committee
1010
and technical committee are excited to be at [KubeCon NA][] in a few weeks! Join
11-
in to meet up in person or virtually for [OpenTelemetry](/) activities in Detroit
12-
from October 24 - 28, 2022.
11+
in to meet up in person or virtually for [OpenTelemetry](/) activities in
12+
Detroit from October 24 - 28, 2022.
1313

1414
There are talks, workshops, an unconference as well as a project booth where you
1515
are welcome to stop by, say Hi! and tell us about how you are using

content/en/blog/2022/otel-demo-app-nomad/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,8 @@ Before I wrap this up, I do want to give a HUGE shoutout to
350350
[Luiz Aoqui](https://www.linkedin.com/in/luizaoqui/) of HashiCorp, who helped me
351351
tweak my Nomad jobspecs, and to
352352
[Riaan Nolan](https://www.linkedin.com/in/riaannolan/), for his continued work
353-
on HashiQube. (Aside, both [Luiz] and [Riaan] were my guests on the [On-Call
354-
Me Maybe Podcast]!)
353+
on HashiQube. (Aside, both [Luiz] and [Riaan] were my guests on the [On-Call Me
354+
Maybe Podcast]!)
355355

356356
I will now leave you with a picture of Phoebe the rat, peering out of a pink
357357
basket. Doesn’t she look cute? 🥰

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ projects? I don't know about you, but for me, up until last year, the prospect
2525
of contributing to open source was just plain _scary_!! I mean, when you open up
2626
a
2727
[pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests)
28-
(PR), _[you are putting yourself out there]_, to be judged by those little GitHub
29-
avatars that make up the approvers list for the repository you're contributing to.
30-
YIKES!
28+
(PR), _[you are putting yourself out there]_, to be judged by those little
29+
GitHub avatars that make up the approvers list for the repository you're
30+
contributing to. YIKES!
3131

3232
But as scary as the thought of opening a PR might be, it's also SO VERY
3333
SATISFYING to see your contributions merged into a codebase. And most

content/en/blog/2023/ecs-otel-semconv-convergence.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,13 @@ and join the discussion on our
4747

4848
- [Announcement from Elastic][]
4949
- [OpenTelemetry Semantic Conventions][]
50-
- [OTEP 199: Merge Elastic Common Schema with OpenTelemetry Semantic Conventions][]
51-
- [OTEP Issue 197: Proposal: Add support for Elastic Common Schema (ECS)
52-
in OpenTelemetry][]
50+
- [OTEP 199: Merge Elastic Common Schema with OpenTelemetry Semantic
51+
Conventions][]
52+
- [OTEP Issue 197: Proposal: Add support for Elastic Common Schema (ECS) in
53+
OpenTelemetry][]
5354
- [OTEP Pull Request 199: Support Elastic Common Schema in OpenTelemetry][]
54-
- [OTEP Pull Request 222: Support Elastic Common Schema (ECS)
55-
in OpenTelemetry][]
55+
- [OTEP Pull Request 222: Support Elastic Common Schema (ECS) in
56+
OpenTelemetry][]
5657

5758
[Announcement from Elastic]:
5859
https://elastic.co/blog/ecs-elastic-common-schema-otel-opentelemetry-announcement

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ cSpell:ignore: Ganesh Ruslan subsetting Vernekar Vovalov
66
canonical_url: https://dyladan.me/histograms/2023/05/04/exponential-histograms/
77
---
88

9-
Previously, in [Why Histograms?][] and [Histograms vs Summaries][], I went over the
10-
basics of histograms and summaries, explaining the tradeoffs, benefits, and limitations
11-
of each. Because they're easy to understand and demonstrate, those posts focused
12-
on so-called explicit bucket histograms. The exponential bucket histogram, also referred
13-
to as native histogram in Prometheus, is a low-cost, efficient alternative to explicit
14-
bucket histograms. In this post, I go through what they are, how they work, and the
15-
problems they solve that explicit bucket histograms struggle with.
9+
Previously, in [Why Histograms?][] and [Histograms vs Summaries][], I went over
10+
the basics of histograms and summaries, explaining the tradeoffs, benefits, and
11+
limitations of each. Because they're easy to understand and demonstrate, those
12+
posts focused on so-called explicit bucket histograms. The exponential bucket
13+
histogram, also referred to as native histogram in Prometheus, is a low-cost,
14+
efficient alternative to explicit bucket histograms. In this post, I go through
15+
what they are, how they work, and the problems they solve that explicit bucket
16+
histograms struggle with.
1617

1718
## Types of histograms
1819

@@ -129,9 +130,8 @@ relative error = (bucketWidth / 2) / bucketMidpoint
129130
= 4.329%
130131
```
131132
132-
For more information regarding histogram errors, see [OTEP 149][] and the [specification
133-
for
134-
exponential histogram aggregations][].
133+
For more information regarding histogram errors, see [OTEP 149][] and the
134+
[specification for exponential histogram aggregations][].
135135
136136
## Choosing a scale
137137

content/en/blog/2023/kubecon-eu.md

+11-10
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ author: '[Severin Neumann](https://github.com/svrnm)'
88
---
99

1010
The OpenTelemetry project maintainers, members of the governance committee, and
11-
technical committee are excited to be at [KubeCon EU][] in Amsterdam from April 18 -
12-
21, 2023!
11+
technical committee are excited to be at [KubeCon EU][] in Amsterdam from April
12+
18 - 21, 2023!
1313

1414
Read on to learn about all the things related OpenTelemetry during KubeCon.
1515

@@ -41,14 +41,15 @@ Come network with OpenTelemetry maintainers and core contributors during the
4141
[OpenTelemetry project meeting](https://sched.co/1JWS7), on Tuesday April 18,
4242
2023 from 16:00 - 17:00. You can attend with a _standard in-person pass_.
4343

44-
[Observability Day][] _fosters collaboration, discussion, and knowledge sharing of
45-
cloud-native observability projects_. This event will be held on April 18, 2023 from
46-
9:00 - 17:00. There will be several sessions on OpenTelemetry as well.
44+
[Observability Day][] _fosters collaboration, discussion, and knowledge sharing
45+
of cloud-native observability projects_. This event will be held on April 18,
46+
2023 from 9:00 - 17:00. There will be several sessions on OpenTelemetry as well.
4747

4848
> <i class="far fa-exclamation-triangle"></i> **IMPORTANT access note**: You
4949
> need an _in-person all-access_ pass for on-site access to **Observability
50-
> Day**. For details, see [KubeCon registration][]. If you have a virtual ticket,
51-
> you will be able to follow **Observability Day** through a live stream.
50+
> Day**. For details, see [KubeCon registration][]. If you have a virtual
51+
> ticket, you will be able to follow **Observability Day** through a live
52+
> stream.
5253
5354
## OpenTelemetry Project Booth
5455

@@ -66,9 +67,9 @@ You will find us in the Solutions Showcase in Hall 5, Kiosk Number 20.
6667

6768
You can help us improve the project by sharing your thoughts and feedback about
6869
your OpenTelemetry adoption, implementation, and usage! We also invite you to
69-
fill out our [community survey][]. We will create action items from your comments
70-
as appropriate. Check [#otel-user-research][] in CNCF's Slack instance for survey
71-
results and action item updates to come after KubeCon EU.
70+
fill out our [community survey][]. We will create action items from your
71+
comments as appropriate. Check [#otel-user-research][] in CNCF's Slack instance
72+
for survey results and action item updates to come after KubeCon EU.
7273

7374
Come join us to listen, learn, and get involved in OpenTelemetry.
7475

0 commit comments

Comments
 (0)