Skip to content

Commit 8232f76

Browse files
MrAliasMrAlias
authored
Merge branch 'main' into go-2025-goals
2 parents ae4b8a7 + be107d8 commit 8232f76

File tree

113 files changed

+4403
-1059
lines changed

Some content is hidden

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

113 files changed

+4403
-1059
lines changed

‎.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:

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

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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

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

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
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+
15+
jobs:
16+
workflow-notification:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v4
20+
21+
- name: Open issue or add comment if issue already open
22+
env:
23+
# need to use opentelemetrybot for opening issues in other repos
24+
GH_TOKEN:
25+
${{ inputs.repo && secrets.OPENTELEMETRYBOT_GITHUB_TOKEN ||
26+
secrets.GITHUB_TOKEN }}
27+
run: |
28+
if [ -z "${{ inputs.repo }}" ]; then
29+
repo="$GITHUB_REPOSITORY"
30+
title="Workflow failed: $GITHUB_WORKFLOW"
31+
body="See [$GITHUB_WORKFLOW #$GITHUB_RUN_NUMBER](https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID)."
32+
else
33+
repo="${{ inputs.repo }}"
34+
title="Workflow failed: $GITHUB_REPOSITORY $GITHUB_WORKFLOW"
35+
body="See [$GITHUB_REPOSITORY $GITHUB_WORKFLOW #$GITHUB_RUN_NUMBER](https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID)."
36+
fi
37+
38+
# TODO (trask) search doesn't support exact phrases, so it's possible that this could grab the wrong issue
39+
number=$(gh issue list --repo $repo --search "in:title $title" --limit 1 --json number -q .[].number)
40+
41+
echo $number
42+
echo ${{ inputs.success }}
43+
44+
if [[ $number ]]; then
45+
if [[ "${{ inputs.success }}" == "true" ]]; then
46+
gh issue close $number \
47+
--repo $repo
48+
else
49+
gh issue comment $number \
50+
--repo $repo \
51+
--body "$body"
52+
fi
53+
elif [[ "${{ inputs.success }}" == "false" ]]; then
54+
gh issue create --repo $repo \
55+
--title "$title (#$GITHUB_RUN_NUMBER)" \
56+
--body "$body"
57+
fi

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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"]

‎.htmltest.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,16 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
6464
# Ignore Docsy-generated GitHub links for now, until
6565
# https://github.com/google/docsy/issues/1432 is fixed
6666
- ^https?://github\.com/.*?/.*?/(new|edit|issues/new\?title)/ # view-page, edit-source etc
67+
# Here's an approximate regex to avoid the "View page source" links. TODO: fix this in Docsy
6768
- ^https?://github\.com/open-telemetry/opentelemetry.io/tree/
69+
# FIXME: A patch until we can get Docsy to mark "View page source" links as excluded from link checking,
70+
# Actually, it would be better to pin the version of the OTel spec.
71+
- ^https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/logs/event-(api|sdk)\.md
72+
# FIXME: same issue as for the OTel spec mentioned above:
73+
- ^https://github.com/open-telemetry/semantic-conventions/tree/main
6874

6975
# Ignore some links to GH repo content for now, most 4XX
70-
- ^https?://github\.com/open-telemetry/(opentelemetry-collector-contrib|opentelemetry-collector|opentelemetry-dotnet-instrumentation|opentelemetry-helm-charts|opentelemetry-java-instrumentation|opentelemetry-java|opentelemetry-operator|opentelemetry-proto|opentelemetry-python-contrib|opentelemetry-specification|oteps|semantic-conventions|sig-end-user)/
7176
- ^https?://github\.com/open-telemetry/opentelemetry-demo/blob/main/src/(imageprovider|loadgenerator|otelcollector|.*service)
72-
# TODO drop the following after https://github.com/open-telemetry/semantic-conventions/pull/1753 is merged and the submodule updated:
73-
- ^https?://github\.com/in-toto/
7477

7578
# Too many redirects as the server tries to figure out the country and language,
7679
# e.g.: https://www.microsoft.com/en-ca/sql-server.

‎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/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/otel-collector-anti-patterns/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ before things start to escalate. This is where monitoring your Collectors can be
7575
very useful.
7676

7777
But how does one monitor a Collector? The OTel Collector already emits
78-
[metrics for the purposes of its own monitoring](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/monitoring.md).
78+
[metrics for the purposes of its own monitoring](/docs/collector/internal-telemetry/#use-internal-telemetry-to-monitor-the-collector).
7979
These can then be sent to your Observability backend for monitoring.
8080

8181
### 3- Not using the right Collector Distribution (or not building your own distribution)

‎content/en/blog/2024/otel-collector-survey/index.md

+19-19
Original file line numberDiff line numberDiff line change
@@ -90,42 +90,42 @@ The top components according to our survey results are as follows:
9090
### Exporters
9191

9292
1. [otlpexporter](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlpexporter)
93-
2. [prometheusremotewriteexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/exporter/prometheusremotewriteexporter/README.md)
94-
3. [prometheusexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/exporter/prometheusexporter/README.md)
95-
4. [lokiexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/exporter/lokiexporter/README.md)
93+
2. [prometheusremotewriteexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/exporter/prometheusremotewriteexporter/README.md)
94+
3. [prometheusexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/exporter/prometheusexporter/README.md)
95+
4. [lokiexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/exporter/lokiexporter/README.md)
9696
5. [debugexporter](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/debugexporter)
9797

9898
### Receivers
9999

100100
1. [otlpreceiver](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver)
101-
2. [prometheusreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/receiver/prometheusreceiver/README.md)
101+
2. [prometheusreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/receiver/prometheusreceiver/README.md)
102102
3. [filelogreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/filelogreceiver)
103-
4. [hostmetricsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/receiver/hostmetricsreceiver/README.md)
104-
5. [k8sclusterreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/receiver/k8sclusterreceiver/README.md)
103+
4. [hostmetricsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/receiver/hostmetricsreceiver/README.md)
104+
5. [k8sclusterreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/receiver/k8sclusterreceiver/README.md)
105105

106106
### Processors
107107

108108
1. [batchprocessor](https://github.com/open-telemetry/opentelemetry-collector/tree/main/processor/batchprocessor)
109-
2. [attributesprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/processor/attributesprocessor/README.md)
110-
3. [filterprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/processor/filterprocessor/README.md)
109+
2. [attributesprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/processor/attributesprocessor/README.md)
110+
3. [filterprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/processor/filterprocessor/README.md)
111111
4. [memorylimiterprocessor](https://github.com/open-telemetry/opentelemetry-collector/tree/main/processor/memorylimiterprocessor)
112-
5. [k8sattributesprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/processor/k8sattributesprocessor/README.md)
112+
5. [k8sattributesprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/processor/k8sattributesprocessor/README.md)
113113

114114
### Connectors
115115

116-
1. [spanmetricsconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/extension/spanmetricsprocessor/README.md)
117-
2. [servicegraphconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/extension/servicegraphprocessor/README.md)
118-
3. [routingconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/processor/routingprocessor/README.md)
119-
4. [countconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/extension/countprocessor/README.md)
120-
5. [datadogconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/exporter/datadogexporter/README.md)
116+
1. [spanmetricsconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/connector/spanmetricsconnector/README.md)
117+
2. [servicegraphconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/connector/servicegraphconnector/README.md)
118+
3. [routingconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/processor/routingprocessor/README.md)
119+
4. [countconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/connector/countconnector/README.md)
120+
5. [datadogconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/exporter/datadogexporter/README.md)
121121

122122
### Extensions
123123

124-
1. [healthcheckextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/extension/healthcheckextension/README.md)
125-
2. [basicauthextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/extension/basicauthextension/README.md)
126-
3. [pprofextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/extension/pprofextension/README.md)
127-
4. [bearertokenauthextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/extension/bearertokenauthextension/README.md)
128-
5. [oauth2clientauthextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/extension/oauth2clientauthextension/README.md)
124+
1. [healthcheckextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/extension/healthcheckextension/README.md)
125+
2. [basicauthextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/extension/basicauthextension/README.md)
126+
3. [pprofextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/extension/pprofextension/README.md)
127+
4. [bearertokenauthextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/extension/bearertokenauthextension/README.md)
128+
5. [oauth2clientauthextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.117.0/extension/oauth2clientauthextension/README.md)
129129

130130
<br/>
131131

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ opentelemetry-instrument --traces_exporter console --metrics_exporter console py
164164
```
165165

166166
There is a complete example
167-
[available here](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation-genai/opentelemetry-instrumentation-openai-v2/example).
167+
[available here](https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation-genai/opentelemetry-instrumentation-openai-v2/examples/).
168168

169169
With this simple instrumentation, one can begin capture traces from their
170170
generative AI application. Here is an example from the

‎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/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!

‎content/en/blog/_index.md

+12-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
---
22
title: Blog
33
menu: { main: { weight: 50 } }
4-
redirects:
5-
# Every January, update the year number in the paths below
6-
- { from: '', to: '2024/ 302!' }
7-
# Workaround to https://github.com/open-telemetry/opentelemetry.io/issues/4440:
8-
- { from: 'index.xml', to: '2024/index.xml 302!' }
94
outputs: [HTML, RSS]
105
htmltest:
116
# 2024-11-07 DO NOT COPY the following IgnoreDirs to non-en pages because it handles all locales.
@@ -14,4 +9,16 @@ htmltest:
149
- ^(../)?blog/(\d+/)?page/\d+
1510
# Ignore old blog posts
1611
- ^(../)?blog/20(19|21|22|23)/
12+
description: OpenTelemetry blog
1713
---
14+
15+
<script>
16+
document.addEventListener("DOMContentLoaded", function () {
17+
if (window.location.pathname.includes('/page/')) return;
18+
19+
var checkbox = document.getElementById("m-blog2025-check");
20+
if (checkbox) checkbox.checked = true;
21+
checkbox = document.getElementById("m-blog2024-check");
22+
if (checkbox) checkbox.checked = true;
23+
});
24+
</script>

0 commit comments

Comments
 (0)