Skip to content

Commit f5a6c58

Browse files
authored
Merge branch 'main' into chore/localize-exporter-of-concepts
2 parents 13ae7f0 + 5ee3c7e commit f5a6c58

File tree

286 files changed

+1123
-577
lines changed

Some content is hidden

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

286 files changed

+1123
-577
lines changed

.cspell/en-words.txt

-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ quoteservice
111111
react-native-app
112112
recommendationservice
113113
redis
114-
relref
115114
Rexed
116115
runbook
117116
runbooks

.github/workflows/auto-update-community-members.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
auto-update-versions:
1111
name: Auto-update community members page
1212
runs-on: ubuntu-24.04
13-
# Remove the if statement below when testing againt a fork
13+
# Remove the if statement below when testing against a fork
1414
if: github.repository == 'open-telemetry/opentelemetry.io'
1515
steps:
1616
- name: Checkout

.github/workflows/auto-update-registry.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
auto-update-versions:
1111
name: Auto-update registry versions
1212
runs-on: ubuntu-20.04
13-
# Remove the if statement below when testing againt a fork
13+
# Remove the if statement below when testing against a fork
1414
if: github.repository == 'open-telemetry/opentelemetry.io'
1515
steps:
1616
- name: Checkout

.github/workflows/build-dev.yml

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ on:
77
description: Regex of submodule paths to update to HEAD before building.
88
default: content-modules
99
type: string
10+
workflow_call:
11+
inputs:
12+
submodule_path_regex:
13+
type: string
14+
required: true
1015

1116
jobs:
1217
build-and-test:
+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Build Semantic Conventions (daily)
2+
3+
on:
4+
schedule:
5+
# daily at 10:24 UTC
6+
- cron: '24 10 * * *'
7+
workflow_dispatch:
8+
9+
jobs:
10+
build-dev:
11+
uses: ./.github/workflows/build-dev.yml
12+
with:
13+
submodule_path_regex: semantic-conventions
14+
15+
workflow-notification:
16+
needs:
17+
- build-dev
18+
if: always()
19+
uses: ./.github/workflows/reusable-workflow-notification.yml
20+
with:
21+
success: ${{ needs.build-dev.result == 'success' }}
22+
repo: open-telemetry/semantic-conventions
23+
secrets:
24+
opentelemetrybot_github_token:
25+
${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}

.github/workflows/component-owners.yml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ jobs:
1010
contents: read
1111
issues: write
1212
pull-requests: write
13+
if: github.repository_owner == 'open-telemetry'
1314
steps:
1415
- uses: dyladan/[email protected]
1516
with:
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# this is useful because notifications for scheduled workflows are only sent to the user who
2+
# initially created the given workflow
3+
name: Reusable - Workflow notification
4+
5+
on:
6+
workflow_call:
7+
inputs:
8+
success:
9+
type: boolean
10+
required: true
11+
repo:
12+
type: string
13+
required: false
14+
secrets:
15+
opentelemetrybot_github_token:
16+
type: string
17+
required: false
18+
19+
jobs:
20+
workflow-notification:
21+
runs-on: ubuntu-latest
22+
steps:
23+
- uses: actions/checkout@v4
24+
25+
- name: Open issue or add comment if issue already open
26+
env:
27+
# need to use opentelemetrybot token when opening issues in other repos
28+
GH_TOKEN:
29+
${{ secrets.opentelemetrybot_github_token || secrets.GITHUB_TOKEN }}
30+
run: |
31+
if [ -z "${{ inputs.repo }}" ]; then
32+
repo="$GITHUB_REPOSITORY"
33+
title="Workflow failed: $GITHUB_WORKFLOW"
34+
body="See [$GITHUB_WORKFLOW #$GITHUB_RUN_NUMBER](https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID)."
35+
else
36+
repo="${{ inputs.repo }}"
37+
title="Workflow failed: $GITHUB_REPOSITORY $GITHUB_WORKFLOW"
38+
body="See [$GITHUB_REPOSITORY $GITHUB_WORKFLOW #$GITHUB_RUN_NUMBER](https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID)."
39+
fi
40+
41+
# TODO (trask) search doesn't support exact phrases, so it's possible that this could grab the wrong issue
42+
number=$(gh issue list --repo $repo --search "in:title $title" --limit 1 --json number -q .[].number)
43+
44+
echo $number
45+
echo ${{ inputs.success }}
46+
47+
if [[ $number ]]; then
48+
if [[ "${{ inputs.success }}" == "true" ]]; then
49+
gh issue close $number \
50+
--repo $repo
51+
else
52+
gh issue comment $number \
53+
--repo $repo \
54+
--body "$body"
55+
fi
56+
elif [[ "${{ inputs.success }}" == "false" ]]; then
57+
gh issue create --repo $repo \
58+
--title "$title (#$GITHUB_RUN_NUMBER)" \
59+
--body "$body"
60+
fi

.github/workflows/scripts/check-i18n-helper.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ echo "For localization docs, see https://opentelemetry.io/docs/contributing/loca
55
CHANGES=`git status --porcelain`
66

77
if [[ -z $CHANGES ]]; then
8-
echo "All localization pages have the requisit commit hash. <3"
8+
echo "All localization pages have the requisite commit hash. <3"
99
exit;
1010
fi
1111

.gitmodules

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
[submodule "themes/docsy"]
33
path = themes/docsy
44
url = https://github.com/google/docsy.git
5-
docsy-pin = v0.11.0-32-ge6d94771
5+
docsy-pin = v0.11.0-34-gef59ee75
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"]
99
path = content-modules/opentelemetry-specification
1010
url = https://github.com/open-telemetry/opentelemetry-specification.git
11-
spec-pin = v1.40.0
11+
spec-pin = v1.41.0
1212
[submodule "content-modules/community"]
1313
path = content-modules/community
1414
url = https://github.com/open-telemetry/community

content/en/_index.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ description: >-
55
observability
66
outputs:
77
- HTML
8-
- REDIRECTS # Include this `content/en` ONLY
8+
# Include the following for `content/en` ONLY
9+
- REDIRECTS
10+
- RSS
911
developer_note:
1012
The blocks/cover shortcode (used below) will use as a background image any
1113
image file containing "background" in its name.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ announce
1414
With this demo, you’ll be able to quickly run a complete end-to-end distributed
1515
system instrumented with 100% OpenTelemetry Traces and Metrics.
1616

17-
![The system architecture of the demo application represented as directed acyclic graph in Jaeger UI](sytem-architecture.png)
17+
![The system architecture of the demo application represented as directed acyclic graph in Jaeger UI](system-architecture.png)
1818

1919
One of our primary goals of this project has been to create a robust sample
2020
application for developers to use in learning OpenTelemetry, and we’re proud to

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: '[Carter Socha](https://github.com/cartersocha)'
77

88
## TL;DR
99

10-
The OpenTelemetry community has taken a good pre-existing demo (thanks,
10+
The OpenTelemetry community has taken a good preexisting demo (thanks,
1111
[Google](https://github.com/GoogleCloudPlatform/microservices-demo)!) and is in
1212
the process of making it even better. Every GA SDK (besides Swift) will be
1313
represented, demo support will be extended to Metrics and Logs, and canonical
@@ -66,8 +66,8 @@ backend choice, and they’re overly reliant on instrumentation libraries.
6666
As a starting point, we have selected a fork of the popular GCP microservices
6767
demo. Our first feature additions have been to simplify local deployment by
6868
consolidating the project onto a single docker compose file, updating the
69-
documentation, and replacing a pre-existing service with a Ruby example.
70-
Otherwise the pre-existing feature set from the GCP demo remains the same:
69+
documentation, and replacing a preexisting service with a Ruby example.
70+
Otherwise the preexisting feature set from the GCP demo remains the same:
7171

7272
- 10 application microservice with support for 6 languages (C#, Go, Java,
7373
Node.js, Python, and Ruby)

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

+7-6
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,13 @@ OpenTelemetry’s Exponential Histograms in Prometheus][]
190190
191191
_A version of this article was [originally posted][] to the author's blog._
192192
193-
<!-- prettier-ignore-start -->
194193
[Using OpenTelemetry’s Exponential Histograms in Prometheus]:
195194
https://www.youtube.com/watch?v=W2_TpDcess8
196-
[OTEP 149]: https://github.com/open-telemetry/oteps/blob/976c9395e4cbb3ea933d3b51589eba94b87a17bd/text/0149-exponential-histogram.md
197-
[specification for exponential histogram aggregations]: /docs/specs/otel/metrics/sdk/#base2-exponential-bucket-histogram-aggregation
198-
[Why Histograms?]: {{% relref "why-histograms" %}}
199-
[Histograms vs Summaries]: {{% relref "histograms-vs-summaries" %}}
195+
[OTEP 149]:
196+
https://github.com/open-telemetry/oteps/blob/976c9395e4cbb3ea933d3b51589eba94b87a17bd/text/0149-exponential-histogram.md
197+
[specification for exponential histogram aggregations]:
198+
/docs/specs/otel/metrics/sdk/#base2-exponential-bucket-histogram-aggregation
199+
[Why Histograms?]: ../why-histograms/
200+
[Histograms vs Summaries]: ../histograms-vs-summaries/
201+
200202
[originally posted]: {{% param canonical_url %}}
201-
<!-- prettier-ignore-end -->

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Histograms vs Summaries
33
date: 2023-05-15
44
author: '[Daniel Dyla](https://github.com/dyladan)'
55
canonical_url: https://dyladan.me/histograms/2023/05/03/histograms-vs-summaries/
6-
cSpell:ignore: aggregatable Björn Ganesh Kovalov Rabenstein Ruslan Vernekar
6+
cSpell:ignore: aggregable Björn Ganesh Kovalov Rabenstein Ruslan Vernekar
77
---
88

99
In many ways, histograms and summaries appear quite similar. They both roll up
@@ -34,9 +34,9 @@ could be off by as much as 60ms (`360 - 300`), a relative error of 17%
3434
(`60 / 360`). This error can be mitigated by configuring more and smaller
3535
buckets around your SLO values, but never eliminated.
3636

37-
One important property of histograms is that they are _aggregatable_, meaning
38-
that as long as the bucket boundaries line up, an arbitrary number of histograms
39-
can be combined into a single histogram with no loss of data or precision. This
37+
One important property of histograms is that they are _aggregable_, meaning that
38+
as long as the bucket boundaries line up, an arbitrary number of histograms can
39+
be combined into a single histogram with no loss of data or precision. This
4040
means that an arbitrary number of hosts can report histogram data structures to
4141
a server, which can aggregate and compute quantiles from all of them as if they
4242
were reported by a single host. By collecting histograms from 1 or more hosts

content/en/blog/2023/humans-of-otel.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ linkTitle: Humans of OTel
44
date: 2023-12-22
55
author: '[Adriana Villela](https://github.com/avillela) (Lightstep)'
66
# prettier-ignore
7-
cSpell:ignore: adiana alex aronoff bogdan boten caramanolis constance dapr drutu jacob juraci kanal kröhling paixāo purvi tyler utopic villela yahn youtube
7+
cSpell:ignore: alex aronoff bogdan boten caramanolis constance dapr drutu jacob juraci kanal kröhling paixāo purvi tyler utopic villela yahn youtube
88
---
99

1010
What a year it has been for OpenTelemetry!

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ had a
2121
and they've been available on AWS for years.
2222

2323
You're totally correct. Rest assured, we're not reinventing the wheel. However,
24-
there are some pre-existing problems that may impact users:
24+
there are some preexisting problems that may impact users:
2525

2626
- The OTel Lambda layers were only released as part of the
2727
[AWS Distribution for OTel (ADOT)](https://aws-otel.github.io/), and the

content/en/blog/2023/otel-in-focus-09.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ linkTitle: OTel in Focus 2023/09
44
date: 2023-10-01
55
author: '[Austin Parker](https://github.com/austinlparker)'
66
# prettier-ignore
7-
cSpell:ignore: attributesprocessor Autoscaler checkapi Contribfest coreinternal gopkg jaegerthrifthttp obsreport ottl resourcedetection resourceprocessor structs tailsampling ucum unmanaged
7+
cSpell:ignore: attributesprocessor Autoscaler checkapi Contribfest coreinternal jaegerthrifthttp obsreport ottl resourcedetection resourceprocessor structs tailsampling ucum unmanaged
88
---
99

1010
Welcome back to **OpenTelemetry in Focus** for September, 2023! The autumn winds

content/en/blog/2023/otel-in-focus-10.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ linkTitle: OTel in Focus 2023/10
44
date: 2023-11-01
55
author: '[Austin Parker](https://github.com/austinlparker)'
66
# prettier-ignore
7-
cSpell:ignore: Contribfest distro dockerstats dockerstatsreceiver k8sclusterreceiver parquetexporter pdata Pekko receiver resourcetype signalfxexporter splunkhecexporter structs
7+
cSpell:ignore: Contribfest distro dockerstatsreceiver k8sclusterreceiver parquetexporter pdata Pekko resourcetype signalfxexporter splunkhecexporter structs
88
---
99

1010
Welcome back to **OpenTelemetry in Focus** for October, 2023! It's been another

content/en/blog/2024/_index.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
22
title: 2024
33
weight: -2024
4-
outputs: [HTML, RSS]
54
---

content/en/blog/2024/llm-observability.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ title:
55
linkTitle: LLM Observability
66
date: 2024-06-04
77
author: '[Ishan Jain](https://github.com/ishanjainn) (Grafana)'
8-
cSpell:ignore: associated chatbots Ishan ishan_jainn ishanjainn Jain llm
8+
cSpell:ignore: chatbots Ishan ishan_jainn ishanjainn Jain llm
99
---
1010

1111
Large Language Models (LLMs) are really popular right now, especially

content/en/blog/2024/otel-collector-container-log-parser/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ combine them into one at first place:
8181

8282
```text
8383
2024-04-06T00:17:10.113242941Z stdout P This is a very very long line th
84-
2024-04-06T00:17:10.113242941Z stdout P at is really really long and spa
84+
2024-04-06T00:17:10.113242941Z stdout P at is really, really, long and spa
8585
2024-04-06T00:17:10.113242941Z stdout F ns across multiple log entries
8686
```
8787

content/en/blog/2024/otel-generative-ai/index.md

+10-4
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ The [Semantic Conventions for Generative AI](/docs/specs/semconv/gen-ai/) focus
4848
on capturing insights into AI model behavior through three primary signals:
4949
[Traces](/docs/concepts/signals/traces/),
5050
[Metrics](/docs/concepts/signals/metrics/), and
51-
[Events](/docs/specs/otel/logs/event-api/).
51+
[Events](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.40.0/specification/logs/event-api.md).
5252

5353
Together, these signals provide a comprehensive monitoring framework, enabling
5454
better cost management, performance tuning, and request tracing.
@@ -74,13 +74,19 @@ model responses, providing a granular view of model interactions. These insights
7474
are invaluable for debugging and optimizing AI applications where unexpected
7575
behaviors may arise.
7676

77-
{{% alert title="Note" color="info" %}} Note that we decided to use
78-
[events emitted](/docs/specs/otel/logs/api/#emit-an-event) with the
77+
{{% alert title="Note" color="info" %}}
78+
79+
Note that we decided to use [events emitted] with the
7980
[Logs API](/docs/specs/otel/logs/api/) specification in the Semantic Conventions
8081
for Generative AI. Events allows for us to define specific
8182
[semantic conventions](/docs/specs/semconv/general/events/) for the user prompts
8283
and model responses that we capture. This addition to the API is in development
83-
and considered unstable.{{% /alert %}}
84+
and considered unstable.
85+
86+
[events emitted]:
87+
https://github.com/open-telemetry/opentelemetry-specification/blob/v1.40.0/specification/logs/api.md#emit-an-event
88+
89+
{{% /alert %}}
8490

8591
### Extending Observability with Vendor-Specific Attributes
8692

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

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

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,10 @@ existing conventions.
175175

176176
For the most part, this feedback aligns with the future plans in the
177177
OpenTelemetry and Prometheus communities. The OpenTelemetry semantic conventions
178-
SIG is working on stabilizing conventions for a a wide variety of
179-
instrumentation. The OpenTelemetry Prometheus interoperability SIG is working on
180-
incorporating the results of this survey into the compatibility specification.
181-
The Prometheus community has
178+
SIG is working on stabilizing conventions for a wide variety of instrumentation.
179+
The OpenTelemetry Prometheus interoperability SIG is working on incorporating
180+
the results of this survey into the compatibility specification. The Prometheus
181+
community has
182182
[ambitious plans](https://prometheus.io/blog/2024/03/14/commitment-to-opentelemetry/)
183183
to add support for OpenTelemetry concepts.
184184

content/en/blog/2025/_index.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
title: 2025
33
weight: -2025
4-
outputs: [HTML, RSS]
54
---
65

76
## Happy New Year!

0 commit comments

Comments
 (0)