Skip to content

Commit 69ae623

Browse files
lmolkovalmolkova
authored
Merge branch 'main' into opentelemetrybot/semconv-integration-v1.31.0-dev
2 parents 5dcbe18 + f2a520b commit 69ae623

File tree

475 files changed

+5276
-1233
lines changed

Some content is hidden

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

475 files changed

+5276
-1233
lines changed

‎.github/workflows/check-i18n.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ jobs:
1313
with:
1414
fetch-depth: 0 # all
1515
- name: Any files missing hash key?
16-
run: scripts/check-i18n.sh -n -x -v
16+
run: |
17+
scripts/check-i18n.sh -n -x -v
18+
.github/workflows/scripts/check-i18n-helper.sh
1719
- name: Any files with invalid hash keys?
1820
run: scripts/check-i18n.sh -v
19-
- run: .github/workflows/scripts/check-i18n-helper.sh
21+
- name: Drifted status needs updating?
22+
run: |
23+
scripts/check-i18n.sh -D
24+
# npm run _diff:fail

‎.github/workflows/fossa.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: FOSSA scanning
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
fossa:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16+
17+
- uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
18+
with:
19+
api-key: ${{secrets.FOSSA_API_KEY}}
20+
team: OpenTelemetry

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[submodule "content-modules/opentelemetry-specification"]
99
path = content-modules/opentelemetry-specification
1010
url = https://github.com/open-telemetry/opentelemetry-specification.git
11-
spec-pin = v1.41.0
11+
spec-pin = v1.42.0
1212
[submodule "content-modules/community"]
1313
path = content-modules/community
1414
url = https://github.com/open-telemetry/community

‎.markdownlint.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"emphasis-style": false,
3+
"first-line-h1": false,
34
"line-length": false,
45
"link-fragments": false,
56
"list-marker-space": false,

‎.textlintrc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ filters:
1919
# src attribute in figure Hugo template:
2020
- /src=".*?"/
2121
# Other:
22-
- /<https?://.*?>/ # Raw URLs
22+
- /<https?:\/\/.*?>/ # Raw URLs
2323
rules:
2424
terminology:
2525
defaultTerms: false

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Here is a list of community roles with current and previous members:
6161
- [Fabrizio Ferri-Benedetti](https://github.com/theletterf)
6262
- [Patrice Chalin](https://github.com/chalin), CNCF
6363
- [Phillip Carter](https://github.com/cartermp), Honeycomb
64-
- [Severin Neumann](https://github.com/svrnm), Cisco
64+
- [Severin Neumann](https://github.com/svrnm)
6565
- [Tiffany Hrabusa](https://github.com/tiffany76), Grafana Labs
6666

6767
- Emeritus approvers:

‎assets/js/tracing.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { getWebAutoInstrumentations } from '@opentelemetry/auto-instrumentations
77
import { registerInstrumentations } from '@opentelemetry/instrumentation';
88
import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
99
import { Resource } from '@opentelemetry/resources';
10-
import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
10+
import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
1111
import { ZoneContextManager } from '@opentelemetry/context-zone-peer-dep';
1212

1313
const collectorOptions = {
@@ -16,21 +16,23 @@ const collectorOptions = {
1616
const exporter = new OTLPTraceExporter(collectorOptions);
1717

1818
const resources = new Resource({
19-
[SemanticResourceAttributes.SERVICE_NAME]: 'opentelemetry.io',
19+
[ATTR_SERVICE_NAME]: 'opentelemetry.io',
2020
'browser.language': navigator.language,
2121
});
2222

2323
const provider = new WebTracerProvider({
2424
resource: resources,
25+
spanProcessors: [
26+
new SimpleSpanProcessor(exporter),
27+
new SimpleSpanProcessor(new ConsoleSpanExporter()),
28+
],
2529
});
2630

2731
registerInstrumentations({
2832
instrumentations: [getWebAutoInstrumentations({})],
2933
tracerProvider: provider,
3034
});
3135

32-
provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
33-
provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
3436
provider.register({
3537
contextManger: new ZoneContextManager(),
3638
});

‎content-modules/opentelemetry-specification

Submodule opentelemetry-specification updated 39 files

‎content/en/_includes/page-not-translated-msg.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
---
3+
4+
<i class="fa-solid fa-circle-info" style="margin-left: -1.5rem"></i> You are
5+
viewing the **English version** of this page because it has not yet been fully
6+
translated. Interested in helping out? See [Contributing](/docs/contributing/).

‎content/en/announcements/contribex-survey.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
title: Contributor Experience Survey
3+
date: 2025-02-17
4+
expiryDate: 2025-03-17
5+
---
6+
7+
<i class="fas fa-bullhorn"></i> Help us [improve the contributor experience]
8+
(5-10 min). Survey closes March 17.
9+
10+
[improve the contributor experience]: /blog/2025/contribex-survey/

‎content/en/announcements/kubecon-eu.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@ title: KubeCon + CloudNativeCon Europe 2025
33
linkTitle: KubeCon EU 2025
44
date: 2025-02-03
55
expiryDate: 2025-04-04
6+
weight: -1
67
---
78

89
<i class="fas fa-bullhorn"></i> [**{{% param title %}}**][LF],
910
**<span class="text-nowrap">April 1 - 4,</span> London England**.
10-
<span class="d-none d-md-inline"><br></span> Come collaborate, learn, and
11-
share<span class="d-none d-sm-inline"> with the Cloud Native community</span>!
11+
<span class="d-none d-md-inline"><br></span> Come [collaborate, learn, and
12+
share][blog]<span class="d-none d-sm-inline"> with the Cloud Native
13+
community</span>!
1214

1315
[LF]:
1416
https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/register/?utm_source=opentelemetry&utm_medium=all&utm_campaign=KubeCon-EU-2025&utm_content=slim-banner
17+
[blog]: /blog/2025/kubecon-eu/

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ Here’s what the setup looks like:
183183
semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
184184
)
185185

186-
func JaegerTraceProvider()(*sdktrace.TracerProvider, error) {
186+
func JaegerTracerProvider()(*sdktrace.TracerProvider, error) {
187187
exp, err: = jaeger.New(jaeger.WithCollectorEndpoint(jaeger.WithEndpoint("http://localhost:14268/api/traces")))
188188
if err != nil {
189189
return nil, err
@@ -201,11 +201,11 @@ Here’s what the setup looks like:
201201
```
202202

203203
4. Go back to the main.go file and modify our code to use the
204-
JaegerTraceProvider function we just created
204+
JaegerTracerProvider function we just created
205205

206206
```go
207207
func main() {
208-
tp, tpErr: = tracing.JaegerTraceProvider()
208+
tp, tpErr: = tracing.JaegerTracerProvider()
209209
if tpErr != nil {
210210
log.Fatal(tpErr)
211211
}
@@ -322,7 +322,7 @@ Here’s what the setup looks like:
322322

323323
func main() {
324324
//Export traces to Jaeger
325-
tp, tpErr: = tracing.JaegerTraceProvider()
325+
tp, tpErr: = tracing.JaegerTracerProvider()
326326
if tpErr != nil {
327327
log.Fatal(tpErr)
328328
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ they use OpenTelemetry in real life. Sessions are held for users in the Americas
2020
discussions take place using a
2121
[Lean Coffee format](https://agilecoffee.com/leancoffee/), whereby folks are
2222
invited to post their topics to the
23-
[Agile Coffee board like this one](http://agile.coffee/#b3b37364-d40e-4029-847c-8ee059d60855),
23+
[Agile Coffee board like this one](http://agile.coffee/?disable_http_check#b3b37364-d40e-4029-847c-8ee059d60855),
2424
and everyone in attendance votes on what they want to talk about.
2525

2626
This is a great way to meet other users in the OpenTelemetry community, and to

‎content/en/blog/2023/end-user-discussions-02.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Americas (AMER), Europe Middle-East & Africa (EMEA), and Asia-Pacific (APAC).
1818
The discussions take place using a
1919
[Lean Coffee format](https://agilecoffee.com/leancoffee/), whereby folks are
2020
invited to post their topics to the
21-
[Agile Coffee board like this one](http://agile.coffee/#3716060f-183a-4966-8da4-60daab2842c4),
21+
[Agile Coffee board like this one](http://agile.coffee/?disable_http_check#3716060f-183a-4966-8da4-60daab2842c4),
2222
and everyone in attendance votes on what they want to talk about.
2323

2424
## What we talked about

‎content/en/blog/2023/end-user-discussions-03.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Americas (AMER), Europe Middle-East & Africa (EMEA), and Asia-Pacific (APAC).
1919
The discussions take place using a
2020
[Lean Coffee format](https://agilecoffee.com/leancoffee/), whereby folks are
2121
invited to post their topics to the
22-
[Agile Coffee board like this one](http://agile.coffee/#3716060f-183a-4966-8da4-60daab2842c4),
22+
[Agile Coffee board like this one](http://agile.coffee/?disable_http_check#3716060f-183a-4966-8da4-60daab2842c4),
2323
and everyone in attendance votes on what they want to talk about.
2424

2525
## What we talked about

‎content/en/blog/2023/end-user-discussions-04.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ regions again in May.
1313
The discussions take place using a
1414
[Lean Coffee format](https://agilecoffee.com/leancoffee/), whereby folks are
1515
invited to post their topics to the
16-
[Agile Coffee board like this one](http://agile.coffee/#2f83c1c1-918c-4c78-8671-194b2e9d8e54),
16+
[Agile Coffee board like this one](http://agile.coffee/?disable_http_check#2f83c1c1-918c-4c78-8671-194b2e9d8e54),
1717
and everyone in attendance votes on what they want to talk about.
1818

1919
## What we talked about

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ him in the
274274
channel!
275275

276276
Also, be sure to check out more of Doug's OTel adventures at this month's
277-
[OTel in Practice series, on March 27th, 09:00 PT/11:00 ET](http://surl.li/fqdox).
277+
[OTel in Practice series, on March 27th, 09:00 PT/11:00 ET](https://surl.li/fqdox).
278278

279279
## Final Thoughts
280280

‎content/en/blog/2023/otel-arrow/index.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ which is based on [Apache Arrow](https://arrow.apache.org/), a columnar-oriented
1515
memory format used for developing analytics applications. This integration
1616
facilitates a reduction in telemetry data traffic by a factor of 10 after
1717
compression, offering a 40% improvement over the best existing OpenTelemetry
18-
Protocol (OTLP) configurations with [Zstandard (zstd)](http://www.zstd.net/)
19-
compression enabled. As a result, this new protocol emerges as an optimal choice
20-
for transporting telemetry data over the internet. We are also excited to
21-
announce the release of a new pair of receiver/exporter in the
18+
Protocol (OTLP) configurations with
19+
[Zstandard (zstd)](https://facebook.github.io/zstd/) compression enabled. As a
20+
result, this new protocol emerges as an optimal choice for transporting
21+
telemetry data over the internet. We are also excited to announce the release of
22+
a new pair of receiver/exporter in the
2223
[opentelemetry-collector-contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/)
2324
repository that supports this protocol. This protocol, designed to complement
2425
the OTLP protocol in situations with substantial telemetry data volumes, has

‎content/en/blog/2023/otterize-otel/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ with each other. You can then use that information for operational or security
4747
needs, such as determining the blast radius of a downtime or security incident.
4848
You can use the service graph to figure out where to start rolling out
4949
OpenTelemetry tracing, as that deployment tends to be more involved and requires
50-
the integration of the OpenTelemetry SDK into your source code.
50+
the integration of the OpenTelemetry SDK into your source code.
5151

5252
While it was easy to use the OTel SDK for the network mapper, we can see why
5353
there's a bit of a chicken-and-egg problem here when you're looking into

‎content/en/blog/2024/cve-2024-36129.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,11 @@ If you are using a custom distribution and building it with the
100100
can add a
101101
[“replaces”](https://github.com/open-telemetry/opentelemetry-collector/tree/main/cmd/builder#configuration)
102102
entry pointing to the latest version of the
103-
[confighttp](http://go.opentelemetry.io/collector/config/confighttp) and
104-
[configgrpc](http://go.opentelemetry.io/collector/config/configgrpc) Go module.
105-
If your base Collector version is at v0.96.0 or higher, we do not expect any
106-
compatibility issues by just bumping to the latest version.
103+
[confighttp](https://pkg.go.dev/go.opentelemetry.io/collector/config/confighttp)
104+
and
105+
[configgrpc](https://pkg.go.dev/go.opentelemetry.io/collector/config/configgrpc)
106+
Go module. If your base Collector version is at v0.96.0 or higher, we do not
107+
expect any compatibility issues by just bumping to the latest version.
107108
108109
## Lessons learned
109110

‎content/en/blog/2025/ai-agent-observability/agent-agent-framework.png

31.5 KB
Loading

‎content/en/blog/2025/ai-agent-observability/ai-agent.png

469 KB
Loading

0 commit comments

Comments
 (0)