Skip to content

Commit a259e38

Browse files
authored
Merge branch 'main' into chore/localize-exporter-of-concepts
2 parents f5a6c58 + fe47025 commit a259e38

File tree

83 files changed

+1476
-434
lines changed

Some content is hidden

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

83 files changed

+1476
-434
lines changed

.github/workflows/build-dev.yml

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ on:
1212
submodule_path_regex:
1313
type: string
1414
required: true
15+
skip_ref_cache_check:
16+
type: boolean
17+
default: false
1518

1619
jobs:
1720
build-and-test:
@@ -57,6 +60,7 @@ jobs:
5760
name: REFCACHE updates?
5861
needs: build-and-test
5962
runs-on: ubuntu-latest
63+
if: ${{ !inputs.skip_ref_cache_check }}
6064
steps:
6165
- uses: actions/checkout@v4
6266
- uses: actions/download-artifact@v4

.github/workflows/build-semconv-daily.yml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
uses: ./.github/workflows/build-dev.yml
1212
with:
1313
submodule_path_regex: semantic-conventions
14+
skip_ref_cache_check: true
1415

1516
workflow-notification:
1617
needs:

.github/workflows/reusable-workflow-notification.yml

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ on:
1313
required: false
1414
secrets:
1515
opentelemetrybot_github_token:
16-
type: string
1716
required: false
1817

1918
jobs:

.github/workflows/survey-on-merged-pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ jobs:
3535
- name: Add comment to PR if author is not a member
3636
if: env.MEMBER_FOUND == 'false'
3737
run: |
38-
gh pr comment ${PR_NUM} --body "Thank you for your contribution! 🎉 We would like to hear from you about your experience contributing to OpenTelemetry by taking a few minutes to fill out out this survey: ${SURVEY_URL}"
38+
gh pr comment ${PR_NUM} --repo open-telemetry/opentelemetry.io --body "Thank you for your contribution! 🎉 We would like to hear from you about your experience contributing to OpenTelemetry by taking a few minutes to fill out this survey: ${SURVEY_URL}"
3939
env:
4040
GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
[submodule "content-modules/semantic-conventions"]
2121
path = content-modules/semantic-conventions
2222
url = https://github.com/open-telemetry/semantic-conventions
23-
semconv-pin = v1.29.0
23+
semconv-pin = v1.30.0
2424
[submodule "content-modules/opamp-spec"]
2525
path = content-modules/opamp-spec
2626
url = https://github.com/open-telemetry/opamp-spec

.textlintrc.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,9 @@ rules:
146146
# - Compound names: go.opentelemetry.io
147147
# - Paths: medium.com/opentelemetry
148148
# - Repo names: opentelemetry-cpp or ocaml-opentelemetry
149+
# - Repo names: open-telemetry/opentelemetry-cpp
149150
# - Slack or social media anchors: #opentelemetry or @opentelemetry
150-
- '(?<![-#@./])\bopen[- ]?telemetry\b(?![.-])'
151+
- '(?<![-#@./])\bopen[- ]?telemetry\b(?![-./])'
151152
- OpenTelemetry
152153
- [os x, macOS]
153154
- [postgres, PostgreSQL]
@@ -159,6 +160,8 @@ rules:
159160
- ['screen[- ]shot(s)?', screenshot$1]
160161
- ['time[- ]stamp(s)?', timestamp$1]
161162
- ["uid['’]?(s)?", UID$1]
163+
- ['(walk)-(throughs?)', $1$2] # cSpell:disable-line
164+
- ['(work)-(arounds?)', $1$2]
162165
# Enable the following to find and replace "instrumentation module/package" with "instrumentation library":
163166
# - ["(auto(matic)?[- ])?instrumentation (module|package)", "instrumentation library"]
164167
# - ["(auto(matic)?[- ])?instrumentation (modules|packages)", "instrumentation libraries"]

archetypes/blog.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ markdown formatter (see below).
3030

3131
## Images
3232

33-
If you use images, make sure that your blog post is located in it's own
33+
If you use images, make sure that your blog post is located in its own
3434
directory. Put the images into the same directory.
3535

3636
If you have an image stored at `content/en/{{ .File.Dir }}imagename.png`, you

content-modules/semantic-conventions

content/en/blog/2022/announcing-opentelemetry-demo-release/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Now, it’d be enough to just provide a great demonstration of OpenTelemetry, bu
3737
one thing we wanted to focus on for our 1.0 release was showing not just the
3838
‘how’, but the ‘why’, of OpenTelemetry. To that end, we’ve built a framework for
3939
implementing [failure scenarios](/docs/demo/#scenarios) gated by feature flags.
40-
In addition, we include pre-configured dashboards and walk-throughs in our docs
40+
In addition, we include pre-configured dashboards and walkthroughs in our docs
4141
on how to read and interpret the telemetry data each service emits to discover
4242
the underlying cause of performance regressions in the application.
4343

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,6 @@ communicate via the
393393

394394
_A version of this article was [originally posted][] on the Apache APISIX blog._
395395

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

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ COPY default.conf /etc/nginx/conf.d
247247
COPY opentelemetry_module.conf /etc/nginx/conf.d
248248
```
249249

250-
[^1]: {{% _param notes.docker-compose-v2 %}}
250+
[^1]: {{% param notes.docker-compose-v2 %}}
251251

252252
[learn how to instrument nginx with opentelemetry]: /blog/2022/instrument-nginx/
253253
[put nginx between two services]:

content/en/blog/2022/demo-announcement/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,4 +155,4 @@ from there.
155155
- [Demo Requirements](/docs/demo/requirements/)
156156
- [Get Involved](https://github.com/open-telemetry/opentelemetry-demo#contributing)
157157

158-
[^1]: {{% _param notes.docker-compose-v2 %}}
158+
[^1]: {{% param notes.docker-compose-v2 %}}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ writing this blog, support for other architectures is not provided.
254254
- Now, restart the Apache HTTP Server and OpenTelemetry module should be
255255
instrumented.
256256

257-
[^1]: {{% _param notes.docker-compose-v2 %}}
257+
[^1]: {{% param notes.docker-compose-v2 %}}
258258

259259
[docker-compose.yml]:
260260
https://github.com/open-telemetry/opentelemetry-cpp-contrib/blob/main/instrumentation/otel-webserver-module/docker-compose.yml

content/en/blog/2022/instrument-nginx/index.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ linkTitle: Instrument Nginx
44
date: 2022-08-22
55
author: >-
66
[Debajit Das](https://github.com/debajitdas), [Kumar
7-
Pratyus](https://github.com/kpratyus), [Severin
7+
Pratyush](https://github.com/kpratyus), [Severin
88
Neumann](https://github.com/svrnm) (Cisco)
9-
cSpell:ignore: Debajit Kumar Pratyus webserver
9+
cSpell:ignore: Debajit Kumar Pratyush webserver
1010
---
1111

1212
Apache HTTP Server and NGINX are the most popular web servers. It's most likely
@@ -369,7 +369,7 @@ You should now be able to apply what you have learned from this blog post to
369369
your own installation of NGINX. We would love to hear about your experience! If
370370
you run into any problems, [create an issue][].
371371

372-
[^1]: {{% _param notes.docker-compose-v2 %}}
372+
[^1]: {{% param notes.docker-compose-v2 %}}
373373

374374
[create an issue]:
375375
https://github.com/open-telemetry/opentelemetry-cpp-contrib/issues

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: OpenTelemetry Erlang/Elixir, Javascript, and Ruby v1.0 (Medium)
2+
title: OpenTelemetry Erlang/Elixir, JavaScript, and Ruby v1.0 (Medium)
33
linkTitle: Erlang/Elixir, JS, and Ruby 1.0
44
date: 2022-02-01
55
canonical_url: https://medium.com/opentelemetry/opentelemetry-erlang-elixir-javascript-and-ruby-v1-0-3a0c32e0add4

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ Please also check out
196196
**A:** Implementing correlation takes time and is a work in progress.
197197
Correlation work is more mature for some languages (e.g. Java, Go) than for
198198
others. The best approach is to raise this issue in one of the language-specific
199-
repositories that pertains to your situation. A possible work-around is to start
199+
repositories that pertains to your situation. A possible workaround is to start
200200
traces at the log level, whereby every log will have its own associated trace.
201201

202202
#### 3- Profiling

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -304,4 +304,4 @@ Be sure to follow OpenTelemetry on
304304
[Twitter](https://twitter.com/opentelemetry), and share your stories using the
305305
**#OpenTelemetry** hashtag!
306306

307-
[^1]: {{% _param notes.docker-compose-v2 %}}
307+
[^1]: {{% param notes.docker-compose-v2 %}}

content/en/blog/2024/go-contrib-removal.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: >-
77
issue: 4542
88
sig: SIG Go
99
# prettier-ignore
10-
cSpell:ignore: aws Benedetti Fabrizio Ferri gopkg labstack macaron moduled otelaws otelecho otellambda otelmacaron otelmongo otelmux
10+
cSpell:ignore: aws Benedetti Fabrizio Ferri gopkg labstack macaron otelaws otelecho otellambda otelmacaron otelmongo otelmux
1111
---
1212

1313
The Go SIG will remove the code of contrib modules that lack code owners
@@ -30,7 +30,7 @@ Currently unowned modules include the following:
3030
- [`go.opentelemetry.io/contrib/samplers/aws/xray`](https://pkg.go.dev/go.opentelemetry.io/contrib/samplers/aws/xray)
3131

3232
For a full list of modules at risk for removal, see the
33-
[Remove unowned moduled](https://github.com/orgs/open-telemetry/projects/92/views/1)
33+
[Remove unowned modules](https://github.com/orgs/open-telemetry/projects/92/views/1)
3434
project board.
3535

3636
## Why are those modules going to be removed?

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ env:
116116
```yaml
117117
exporters:
118118
otlp:
119-
endpoint: '<your_backend_ndpoint_here>'
119+
endpoint: '<your_backend_endpoint_here>'
120120
headers:
121121
'<token_name>': '${TOKEN_VALUE}'
122122
```
@@ -130,8 +130,8 @@ along with the
130130
131131
For every Collector release, there is an Operator release which provides support
132132
for that Collector version. For example, at the time of this writing, the latest
133-
Operator version is 0.98.0. Thus, the the default image of the Collector used by
134-
the Operator is version 0.98.0 of the
133+
Operator version is 0.98.0. Thus, the default image of the Collector used by the
134+
Operator is version 0.98.0 of the
135135
[core distribution](/blog/2024/otel-collector-anti-patterns/#3--not-using-the-right-collector-distribution-or-not-building-your-own-distribution)
136136
(as opposed to the contrib distribution).
137137

content/en/blog/2024/prom-and-otel/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ Let’s dig into each of these.
220220
The Target Allocator’s first job is to discover targets to scrape and OTel
221221
Collectors to allocate targets to. It does so as follows:
222222

223-
1. The Target Allocator finds all of the the metrics targets to scrape
223+
1. The Target Allocator finds all of the metrics targets to scrape
224224
2. The Target Allocator finds all of the available Collectors
225225
3. The Target Allocator determines which Collectors scrape which metrics
226226
4. The Collectors query the Target Allocator to find out what metrics to scrape

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ of their opinions on units or delimiters.
8888

8989
## Dots and Underscores
9090

91-
OpenTelemetry [specifies](/docs/specs/semconv/general/attribute-naming/) that
92-
conventions should use dots as the namespace delimiter, and underscores as the
93-
delimiter between "multi-word-dot-delimited components" (for example,
91+
OpenTelemetry [specifies](/docs/specs/semconv/general/naming/) that conventions
92+
should use dots as the namespace delimiter, and underscores as the delimiter
93+
between "multi-word-dot-delimited components" (for example,
9494
`http.response.status_code`). On the other hand, Prometheus
9595
[uses underscores](https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels)
9696
as its delimiter.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
---
2+
title:
3+
Alibaba, Datadog, and Quesma Join Forces on Go Compile-Time Instrumentation
4+
linkTitle: Go Compile-Time Instrumentation
5+
date: 2025-01-24
6+
author: OpenTelemetry Governance Committee
7+
issue: https://github.com/open-telemetry/community/issues/2509
8+
sig: Governance Committee
9+
cSpell:ignore: instrgen quesma toolexec
10+
---
11+
12+
Standards are only useful if they're widely adopted, and adoption is only
13+
effective if the available tooling facilitates it. I imagine
14+
[SI units](https://en.wikipedia.org/wiki/International_System_of_Units) would
15+
not have been too popular when they were introduced if you had to build your own
16+
scales to weigh things in Kilograms!
17+
18+
If you use [OpenTelemetry in Go](/docs/languages/go/), you'll be familiar with
19+
the challenges of configuring instrumentation libraries to automatically
20+
generate telemetry from well-known open source components. Due to the compiled
21+
nature of the language, you currently have two options[^1]:
22+
23+
- Use a separate binary that analyzes your Go process and attaches eBPF programs
24+
to hooks in your application &mdash; see
25+
[opentelemetry-go-instrumentation](https://github.com/open-telemetry/opentelemetry-go-instrumentation/).
26+
- Manually configure instrumentation libraries in your code, for example see
27+
[Instrument the HTTP server](/docs/languages/go/getting-started/#instrument-the-http-server).
28+
29+
For different reasons, it is possible that none of those options is viable, or
30+
optimal, in your environment. However, things are about to change!
31+
32+
## Industry collaboration at the heart of open standards
33+
34+
Over the past few months, OpenTelemetry has received not one, but two donation
35+
proposals from industry leaders to provide a solution to the problem described
36+
above, and enable the use of zero-code, vendor-neutral, compile-time
37+
instrumentation in Go applications. These are:
38+
39+
- Alibaba's
40+
[donation proposal](https://github.com/open-telemetry/community/issues/2344)
41+
of
42+
[opentelemetry-go-auto-instrumentation](https://github.com/alibaba/opentelemetry-go-auto-instrumentation)
43+
- Datadog's
44+
[donation proposal](https://github.com/open-telemetry/community/issues/2497)
45+
of [Orchestrion](https://github.com/datadog/orchestrion)
46+
47+
We are very grateful to Alibaba and Datadog for these donation proposals. This
48+
continues to demonstrate the convergence of the wider industry towards the
49+
standards defined by OpenTelemetry.
50+
51+
Compile-time instrumentation leverages the standard Go toolchain’s `-toolexec`
52+
mechanism to re-write Go source code before it is passed to the Go compiler,
53+
adding instrumentation in all relevant places (including dependencies as well as
54+
the Go standard library).
55+
56+
The most exciting part of this announcement is that it won't be Alibaba's or
57+
Datadog's solution that "wins". In the true spirit of open source collaboration,
58+
these two organizations have decided to join forces and commit the necessary
59+
resources to bootstrap a new
60+
[Go Compile-Time Instrumentation SIG](https://github.com/open-telemetry/community/blob/main/projects/go-compile-instrumentation.md),
61+
with the intention of providing a unified, vendor-neutral approach that picks
62+
the best aspects of each solution and benefits the community as a whole. They
63+
will be supported with further contributions from Quesma, bringing in experience
64+
on
65+
[instrgen](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/dafdad14b7858c7f491c8cb72e4bc7deaf9378e3/instrgen/README.md),
66+
OpenTelemetry's initial experimental approach to provide Go compile-time
67+
instrumentation based on `-toolexec` and which will be superseded as part of the
68+
initial efforts of this SIG.
69+
70+
In the longer term, this SIG will focus on:
71+
72+
- Developing compiler plugins or enhancements that inject instrumentation code
73+
automatically, ensuring minimal runtime performance overhead and compatibility
74+
with existing Go projects.
75+
- Providing standardized instrumentation patterns aligned with OpenTelemetry and
76+
other monitoring frameworks.
77+
78+
If you are interested in contributing, or you simply want to find out more,
79+
here's some useful information about the SIG:
80+
81+
- GitHub repository:
82+
[opentelemetry-go-compile-instrumentation](https://github.com/open-telemetry/opentelemetry-go-compile-instrumentation)
83+
- CNCF Slack:
84+
[#otel-go-compt-instr-sig](https://cloud-native.slack.com/archives/C088D8GSSSF)
85+
- Meetings: Every other Thursday UTC: 08:00 – 09:00 (subscribe to
86+
[this Google Group](https://groups.google.com/a/opentelemetry.io/g/calendar-go)
87+
for calendar invites, or read more about
88+
[our community calendar](https://github.com/open-telemetry/community/?tab=readme-ov-file#calendar))
89+
90+
We look forward to seeing this new SIG in operation, and cannot wait for the
91+
fruits of this awesome collaboration!
92+
93+
[^1]:
94+
Unless you want to "build your own scales", or the OTel equivalent, which is
95+
manually instrumenting third-party libraries.

content/en/blog/2025/go-goals.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: >-
66
[Tyler Yahn](https://github.com/MrAlias) (Splunk)
77
sig: SIG Go
88
# prettier-ignore
9-
cSpell:ignore: Yahn dashpole pellared otelhttp dmathieu otelhttp codeboten otellogr otellogrus otelslog otelzap otelzerolog
9+
cSpell:ignore: codeboten dashpole dmathieu otelhttp otellogr otellogrus otelslog otelzap otelzerolog pellared Yahn
1010
---
1111

1212
As we kick off 2025, the

0 commit comments

Comments
 (0)