Skip to content

Commit dea3b9b

Browse files
Merge branch 'open-telemetry:main' into embrace-distro
2 parents 0c33ef2 + de50cea commit dea3b9b

32 files changed

+1544
-255
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
[submodule "content-modules/opamp-spec"]
2424
path = content-modules/opamp-spec
2525
url = https://github.com/open-telemetry/opamp-spec
26-
opamp-pin = v0.9.0-2-g950df29
26+
opamp-pin = v0.10.0
2727
[submodule "content-modules/opentelemetry-go"]
2828
path = content-modules/opentelemetry-go
2929
url = https://github.com/open-telemetry/opentelemetry-go

.htmltest.yml

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ CheckMailto: false
88
TestFilesConcurrently: true
99
IgnoreDirs:
1010
# DO NOT EDIT! IgnoreDirs list is auto-generated from markdown file front matter.
11+
# 2024-11-03 The following entry is for `en` pages only. Other locales do
12+
# not currently require it.
1113
- ^blog/(\d+/)?page/\d+
1214
# TODO drop next line after https://github.com/open-telemetry/opentelemetry.io/issues/5423 is fixed for ja pages:
1315
- ^ja/docs/concepts/instrumentation/libraries/
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
title: KubeCon North America 2024
3+
date: 2024-10-15
4+
expiryDate: 2024-11-15
5+
---
6+
7+
<i class="fas fa-bullhorn"></i> Join us in Salt Lake City for
8+
[**KubeCon + CloudNativeCon North America 2024**](/blog/2024/kubecon-na/) ,
9+
November 12 - 15, 2024

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

+134
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
---
2+
title: Join us for OpenTelemetry Talks and Activities at KubeCon NA 2024
3+
linkTitle: KubeCon NA '24
4+
date: 2024-11-05
5+
# prettier-ignore
6+
cSpell:ignore: Arnell Ashok Chandrasekar Clario Contribfest Ekansh Grabner Haeussler Helmuth Jernigan Kalkanis Kats Kowall Kruthika Liudmila Mclean Molkova Novatec OTTL Prasanna Shivanshu Shrivastava simha Woerner
7+
author: '[Severin Neumann](https://github.com/svrnm) (Cisco)'
8+
---
9+
10+
The OpenTelemetry project maintainers, members of the governance committee, and
11+
technical committee are thrilled to be at [KubeCon NA][] in Salt Lake City from November
12+
12 - 15, 2024.
13+
14+
Read on to learn about all the things related OpenTelemetry during KubeCon.
15+
16+
## OpenTelemetry Contribfest
17+
18+
Join the OpenTelemetry maintainers for the
19+
[OpenTelemetry Contribfest](https://sched.co/1hoyF) to make the project better
20+
for everyone. You can choose between several opportunities to contribute, and
21+
you can count on maintainers from different project areas to help you on your
22+
first steps: documentation, Collector, Java, JS, Ruby, Python, .NET, and more.
23+
24+
## KubeCon Talks and Maintainer Sessions
25+
26+
- **[Jaeger: Distributed Tracing with Jaeger and OpenTelemetry | Project Lightning Talk](https://sched.co/1iW8S)**<br>
27+
by Jaeger Maintainers<br> Tuesday November 12, 2024 9:59am - 10:04am MST
28+
- **[OpenTelemetry: OpenTelemetry in Five Minutes | Project Lightning Talk](https://sched.co/1iW8Y)**<br>
29+
by OpenTelemetry Maintainers<br> Tuesday November 12, 2024 10:13am - 10:18am
30+
MST
31+
- **[OpenTelemetry: The OpenTelemetry Hero’s Journey: Working with Open Source Observability | Project Lightning Talk](https://sched.co/1iW8e)**<br>
32+
Tuesday November 12, 2024 10:27am - 10:32am MST
33+
- **[OpenTelemetry: The Future of Network Monitoring, eBPF for Low-Level Insights | Project Lightning Talk](https://sched.co/1iW8k)**<br>
34+
Tuesday November 12, 2024 10:41am - 10:46am MST
35+
- **[Lightning Talk: Minimizing Data Loss Within the OpenTelemetry (OTel) Collector](https://sched.co/1i7kC)**<br>
36+
by Alex Kats, Capital One<br> Tuesday November 12, 2024 6:05pm - 6:10pm MST
37+
- **[Optimizing LLM Performance in Kubernetes with OpenTelemetry](https://sched.co/1i7lA)**<br>
38+
by Ashok Chandrasekar, Google & Liudmila Molkova, Microsoft<br> Wednesday
39+
November 13, 2024 2:30pm - 3:05pm MST
40+
- **[Unifying Observability: Correlating Metrics, Traces, and Logs with Exemplars and OpenTelemetry](https://sched.co/1i7lJ)**<br>
41+
by Kruthika Prasanna Simha & Charlie Le, Apple<br> Wednesday November 13, 2024
42+
2:30pm - 3:05pm MST
43+
- **[OpenTelemetry Project Update](https://sched.co/1hovy)**<br> by Alolita
44+
Sharma, Apple; Juraci Paixão Kröhling, Grafana Labs; Ted Young, ServiceNow;
45+
Morgan Mclean, Splunk; Daniel Dyla, Dynatrace<br> Wednesday November 13, 2024
46+
3:25pm - 4:00pm MST
47+
- **[Using OpenTelemetry for Deep Observability Within Messaging Queues](https://sched.co/1i7li)**<br>
48+
by Shivanshu Raj Shrivastava & Ekansh Gupta, SigNoz<br> Wednesday November 13,
49+
2024 3:25pm - 4:00pm MST
50+
- **[Distributed Tracing with Jaeger and OpenTelemetry](https://sched.co/1hoyb)**<br>
51+
by Jonah Kowall, Independent & Pavol Loffay, Red Hat<br> Wednesday November
52+
13, 2024 4:30pm - 5:05pm MST
53+
- **[Understanding How OpenTelemetry Network Uses eBPF for Network Observability](https://sched.co/1how7)**<br>
54+
by Shivanshu Raj Shrivastava, SigNoz & Jonathan Perry, PerfPod<br> Wednesday
55+
November 13, 2024 5:25pm - 6:00pm MST
56+
- **[The OTTL Cookbook: A Collection of Solutions to Common Problems](https://sched.co/1i7mZ)**<br>
57+
by Tyler Helmuth, Honeycomb & Evan Bradley, Dynatrace<br> Wednesday November
58+
13, 2024 5:25pm - 6:00pm MST
59+
- **[Lesson’s Learned Adopting OpenTelemetry at Scale](https://sched.co/1i7nC)**<br>
60+
by Alex Arnell, Heroku / Salesforce<br> Thursday November 14, 2024 11:00am -
61+
11:35am MST
62+
- **[How We Made OpenTelemetry Be Our Fitness Tracker for Your CI/CD Pipelines!](https://sched.co/1i7nM)**<br>
63+
by Nicolas Woerner, Clario & Andreas Grabner, Dynatrace<br> Thursday November
64+
14, 2024 11:00am - 11:35am MST
65+
- **[Low-Overhead, Zero-Instrumentation, Continuous Profiling for OpenTelemetry](https://sched.co/1i7nz)**<br>
66+
by Christos Kalkanis, Elastic<br> Thursday November 14, 2024 2:30pm - 3:05pm
67+
MST
68+
- **[Fluent Bit: Better Pipelines for Observability](https://sched.co/1hoxB)**<br>
69+
by Eduardo Silva, Chronosphere<br> Thursday November 14, 2024 4:30pm - 5:05pm
70+
MST
71+
- **[Mastering OpenTelemetry Collector Configuration](https://sched.co/1i7ot)**<br>
72+
by Steve Flanders, Cisco<br> Thursday November 14, 2024 4:30pm - 5:05pm MST
73+
- **[Tutorial: OpenTelemetry Hands-on - Automatic and Manual Instrumentation for Java and Python Apps](https://sched.co/1i7pd)**<br>
74+
by Matthias Haeussler, Novatec Consulting GmbH & Tiffany Jernigan,
75+
Independent<br> Friday November 15, 2024 11:00am - 12:30pm MST
76+
- **[Contribfest: OpenTelemetry Contribfest](https://sched.co/1hoyF)**<br> by
77+
OpenTelemetry Maintainers<br> Friday November 15, 2024 4:00pm - 5:30pm MST
78+
79+
## Observability Day
80+
81+
_[Observability Day][] fosters collaboration, discussion, and knowledge sharing of
82+
cloud-native observability projects_. This event will be held on November 12, 2024
83+
from 9am to 6pm. [Check the full schedule](https://colocatedeventsna2024.sched.com/overview/type/Observability+Day)
84+
to find your favorite talks about Observability and OpenTelemetry.
85+
86+
> <i class="far fa-exclamation-triangle"></i> **IMPORTANT access note**: You
87+
> need an _in-person all-access_ pass for on-site access to **Observability
88+
> Day**. For details, see [KubeCon registration][]. If you have a virtual ticket,
89+
> you will be able to follow **Observability Day** through a live stream.
90+
91+
## OpenTelemetry Observatory
92+
93+
Drop by and say _"Hi!"_ at OpenTelemetry Observatory presented by Splunk in the
94+
Expo Hall. This will be a place for informal chats, meetups, and other
95+
discussions led by OpenTelemetry community members and maintainers.
96+
97+
Note, that the Observatory may show up as "Splunk Activation Booth" on the event
98+
map.
99+
100+
For the activity schedule, see the
101+
[OTel Observatory Schedule](https://docs.google.com/spreadsheets/d/1E23Dkz1B2us71BtlQq8oG4o_QFsTeLPeh-X2uVnlubg/edit?usp=sharing).
102+
Note that this schedule may be updated up until the day of the event, so check
103+
back for the latest!
104+
105+
New for this year!
106+
107+
- SIG Office Hours: Come meet the people behind the project, learn about their
108+
work, ask questions, share feedback, or find out how to contribute.
109+
- Special Topic Discussions: Come learn about two of the hottest OTEPs right
110+
now, Events and Entities!
111+
112+
If you'd like to participate by leading a discussion, or if there is a
113+
discussion topic you're interested in, please reach out to the
114+
[OpenTelemetry End User SIG](https://cloud-native.slack.com/archives/C01RT3MSWGZ)
115+
to let us know, and we will see what we can do.
116+
117+
You can help us improve the project by sharing your thoughts and feedback about
118+
your OpenTelemetry adoption, implementation, and usage.
119+
120+
We will create action items from your comments as appropriate. Check
121+
[#otel-sig-end-user][] in CNCF's Slack instance for results and action item
122+
updates to come after KubeCon EU.
123+
124+
Come join us to listen, learn, and get involved in OpenTelemetry.
125+
126+
See you in Salt Lake City!
127+
128+
[kubecon na]:
129+
https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/
130+
[Observability Day]:
131+
https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/co-located-events/observability-day/
132+
[kubecon registration]:
133+
https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/register/
134+
[#otel-sig-end-user]: https://cloud-native.slack.com/archives/C01RT3MSWGZ

content/en/blog/_index.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
---
22
title: Blog
33
menu: { main: { weight: 50 } }
4-
redirects: [{ from: '', to: '2024/ 301!' }]
4+
redirects:
5+
# Every January, update the year number in the paths below
6+
- { from: '', to: '2024/ 301!' }
7+
# Workaround to https://github.com/open-telemetry/opentelemetry.io/issues/4440:
8+
- { from: 'index.xml', to: '2024/index.xml 301!' }
59
outputs: [HTML, RSS]
610
htmltest:
711
IgnoreDirs:
12+
# 2024-11-03 The following entry is for `en` pages only. Other locales do
13+
# not currently require it.
814
- ^blog/(\d+/)?page/\d+
915
---

content/en/docs/collector/_index.md

+7
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ It is also easier to [setup a collector](quick-start) than you might think: the
5252
default OTLP exporters in each language assume a local collector endpoint, so if
5353
you launch a collector it will automatically start receiving telemetry.
5454

55+
## Collector security
56+
57+
Follow best practices to make sure your collectors are [hosted] and [configured]
58+
securely.
59+
5560
## Status and releases
5661

5762
The **Collector** status is: [mixed][], since core Collector components
@@ -70,6 +75,8 @@ for more details.
7075
{{% docs/latest-release collector-releases /%}}
7176

7277
[registry]: /ecosystem/registry/?language=collector
78+
[hosted]: /docs/security/hosting-best-practices/
79+
[configured]: /docs/security/config-best-practices/
7380
[mixed]: /docs/specs/otel/document-status/#mixed
7481
[stability levels]:
7582
https://github.com/open-telemetry/opentelemetry-collector#stability-levels

content/en/docs/collector/configuration.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ the following content:
1414

1515
- [Data collection concepts][dcc], to understand the repositories applicable to
1616
the OpenTelemetry Collector.
17-
- [Security guidance](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/security-best-practices.md)
17+
- [Security guidance for end users](/docs/security/config-best-practices/)
18+
- [Security guidance for component developers](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/security-best-practices.md)
1819

1920
## Location {#location}
2021

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

+3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ The OpenTelemetry Collector consists of a single binary which you can use in
88
different ways, for different use cases. This section describes deployment
99
patterns, their use cases along with pros and cons and best practices for
1010
collector configurations for cross-environment and multi-backend deployments.
11+
For deployment security considerations, see [Collector hosting best
12+
practices][security].
1113

1214
## Resources
1315

1416
- KubeCon NA 2021 Talk on [OpenTelemetry Collector Deployment
1517
Patterns][y-patterns]
1618
- [Deployment Patterns][gh-patterns] accompanying the talk
1719

20+
[security]: /docs/security/hosting-best-practices/
1821
[gh-patterns]:
1922
https://github.com/jpkrohling/opentelemetry-collector-deployment-patterns/
2023
[y-patterns]: https://www.youtube.com/watch?v=WhRrwSHDBFs

content/en/docs/collector/deployment/gateway.md content/en/docs/collector/deployment/gateway/index.md

+34-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ description:
44
Why and how to send signals to a single OTLP end-point and from there to
55
backends
66
weight: 3
7-
cSpell:ignore: hostnames loadbalancer loadbalancing
7+
# prettier-ignore
8+
cSpell:ignore: filelogreceiver hostmetricsreceiver hostnames loadbalancer loadbalancing resourcedetectionprocessor
89
---
910

1011
The gateway collector deployment pattern consists of applications (or other
@@ -198,6 +199,38 @@ The load-balancing exporter emits metrics including
198199
that you can use for health and performance monitoring of the OTLP endpoint
199200
collector.
200201

202+
## Combined deployment of Collectors as agents and gateways
203+
204+
Often a deployment of multiple OpenTelemetry collectors involves running both
205+
Collector as gateways and as [agents](/docs/collector/deployment/agent/).
206+
207+
The following diagram shows an architecture for such a combined deployment:
208+
209+
- We use the Collectors running in the agent deployment pattern (running on each
210+
host, similar to Kubernetes daemonsets) to collect telemetry from services
211+
running on the host and host telemetry, such as host metrics and scrap logs.
212+
- We use Collectors running in the gateway deployment pattern to process data,
213+
such as filtering, sampling, and exporting to backends etc.
214+
215+
![gateway](otel-gateway-arch.svg)
216+
217+
This combined deployment pattern is necessary, when you use components in your
218+
Collector that either need to be unique per host or that consume information
219+
that is only available on the same host as the application is running:
220+
221+
- Receivers like the
222+
[`hostmetricsreceiver`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/hostmetricsreceiver)
223+
or
224+
[`filelogreceiver`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/filelogreceiver)
225+
need to be unique per host instance. Running multiple instances of these
226+
receivers will result in duplicated data.
227+
228+
- Processors like the
229+
[`resourcedetectionprocessor`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourcedetectionprocessor)
230+
are used to add information about the host, the collector and the application
231+
are running on. Running them within a Collector on a remote machine will
232+
result in incorrect data.
233+
201234
## Tradeoffs
202235

203236
Pros:

0 commit comments

Comments
 (0)