Skip to content

Commit 5409a88

Browse files
vitorvascvitorvasc
authored
Merge branch 'main' into pt_update_concepts_signals
2 parents 2bb524b + 01d3e2e commit 5409a88

File tree

77 files changed

+2230
-3432
lines changed

Some content is hidden

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

77 files changed

+2230
-3432
lines changed

‎.cspell.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ import:
1010
caseSensitive: true
1111
ignorePaths:
1212
- '*.svg'
13-
- data/community/members.yaml
14-
- vendors.yaml
1513
- content/ja
1614
- content/zh
15+
- data/community/members.yaml
16+
- static/refcache.json
17+
- vendors.yaml
1718
patterns:
1819
- name: CodeBlock
1920
pattern: |

‎.github/workflows/check-links.yml

+34-32
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
env:
99
CHANGED_FILES:
10-
PR_NUM: ${{ github.event.issue.number }}
10+
PR_NUM: ${{ github.event.pull_request.number }}
1111
USER_EMAIL: [email protected]
1212
USER_NAME: opentelemetrybot
1313

@@ -55,36 +55,6 @@ jobs:
5555
echo "CHANGED_FILES=$CHANGED_FILES" >> "$GITHUB_ENV"
5656
continue-on-error: true
5757
58-
- name: Push changes if any, and fail check
59-
if: ${{ env.CHANGED_FILES }}
60-
run: |
61-
echo "Changes detected in the refcache etc:"
62-
git status --short
63-
64-
gh pr checkout $PR_NUM -b "pr-check-links-${RANDOM}"
65-
git branch -v
66-
67-
git config --local user.email "$USER_EMAIL"
68-
git config --local user.name "$USER_NAME"
69-
git add -A
70-
git commit -m "Updates from build-and-check-links workflow"
71-
72-
echo "\nPushing changes to PR."
73-
current_branch=$(git rev-parse --abbrev-ref HEAD)
74-
echo current_branch=$current_branch
75-
# gh pr checkout sets some git configs that we can use to make sure
76-
# we push to the right repo & to the right branch
77-
remote_repo=$(git config --get branch.${current_branch}.remote)
78-
echo remote_repo=$remote_repo
79-
remote_branch=$(git config --get branch.${current_branch}.merge)
80-
echo remote_branch=$remote_branch
81-
git push ${remote_repo} HEAD:${remote_branch}
82-
83-
echo "Failing workflow so that changes can be reviewed, and checks rerun."
84-
exit 1
85-
env:
86-
GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
87-
8858
- uses: actions/upload-artifact@v4
8959
with:
9060
name: build-log-etc
@@ -93,6 +63,36 @@ jobs:
9363
tmp/package*.json
9464
static/refcache.json
9565
66+
- name: Push changes if any, and fail check
67+
if: ${{ env.CHANGED_FILES }}
68+
run: |
69+
echo "Changes detected in the refcache etc:"
70+
git status --short
71+
72+
echo 'cmd: gh pr checkout $PR_NUM -b "pr-check-links-${RANDOM}"'
73+
# git branch -v
74+
75+
# git config --local user.email "$USER_EMAIL"
76+
# git config --local user.name "$USER_NAME"
77+
# git add -A
78+
# git commit -m "Updates from build-and-check-links workflow"
79+
80+
# echo "\nPushing changes to PR."
81+
# current_branch=$(git rev-parse --abbrev-ref HEAD)
82+
# echo current_branch=$current_branch
83+
# # gh pr checkout sets some git configs that we can use to make sure
84+
# # we push to the right repo & to the right branch
85+
# remote_repo=$(git config --get branch.${current_branch}.remote)
86+
# echo remote_repo=$remote_repo
87+
# remote_branch=$(git config --get branch.${current_branch}.merge)
88+
# echo remote_branch=$remote_branch
89+
# git push ${remote_repo} HEAD:${remote_branch}
90+
91+
# echo "Failing workflow so that changes can be reviewed, and checks rerun."
92+
# exit 1
93+
# env:
94+
# GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
95+
9696
check-refcache:
9797
name: REFCACHE updates?
9898
needs: build-and-check-links
@@ -104,7 +104,9 @@ jobs:
104104
- name: Fail when refcache contains entries with HTTP status 4XX
105105
run: |
106106
if grep -B 1 -e '"StatusCode": 4' static/refcache.json; then
107-
echo "Run 'npx gulp prune' to remove 4xx entries from the refcache"
107+
echo "Run 'npm run _refcache:prune' to remove 404 entries from refcache.json,"
108+
echo "or run './scripts/double-check-refcache-400s.mjs' locally to address"
109+
echo "other 400-status entries."
108110
exit 1
109111
fi
110112
- name: Does the refcache need updating?

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
env:
88
PR_NUM: ${{ github.event.pull_request.number }}
9-
SURVEY_URL: https://forms.gle/WV58koUBGSG9HBY66
9+
SURVEY_URL: https://docs.google.com/forms/d/e/1FAIpQLSf2FfCsW-DimeWzdQgfl0KDzT2UEAqu69_f7F2BVPSxVae1cQ/viewform?entry.1540511742=open-telemetry/opentelemetry.io
1010

1111
jobs:
1212
comment-on-pr:
@@ -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} --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}"
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 }}

‎.htmltest.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,14 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
5555
# Ignore Docsy-generated GitHub links for now, until
5656
# https://github.com/google/docsy/issues/1432 is fixed
5757
- ^https?://github\.com/.*?/.*?/(new|edit|issues/new\?title)/ # view-page, edit-source etc
58-
# Here's an approximate regex to avoid the "View page source" links. TODO: fix this in Docsy
59-
- ^https?://github\.com/open-telemetry/opentelemetry.io/tree/
60-
# FIXME: A patch until we can get Docsy to mark "View page source" links as excluded from link checking,
61-
# Actually, it would be better to pin the version of the OTel spec.
62-
- ^https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/logs/event-(api|sdk)\.md
58+
# Ignore "View page source" links, except for spec pages, i.e., links starting with
59+
# https://github.com/open-telemetry/opentelemetry.io/tree/main/content/en/docs/specs
60+
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/[^e]
61+
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/es
62+
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/en/.*?/_index.md$
63+
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/en/[^d]
64+
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/en/docs/[^s]
65+
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/en/docs/security
6366
# FIXME: same issue as for the OTel spec mentioned above:
6467
- ^https://github.com/open-telemetry/semantic-conventions/tree/main
6568

‎content/en/blog/2022/k8s-otel-expose/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ linkTitle: Exposing a Collector
44
date: 2022-09-08
55
author: '[Benedikt Bongartz](https://github.com/frzifus)'
66
# prettier-ignore
7-
cSpell:ignore: basicauth Benedikt Bongartz dXNlci0xOjEyMzQK frzifus htpasswd k8sattributes K8sattributes k8sattributesprocessor K8sprocessor k8sprocessor Keycloak letsencrypt llczt oidc rolebinding
7+
cSpell:ignore: basicauth Benedikt Bongartz dXNlci0xOjEyMzQK frzifus htpasswd k8sattributes k8sattributesprocessor Keycloak letsencrypt llczt oidc rolebinding
88
---
99

1010
Exposing an [OpenTelemetry Collector](/docs/collector/) currently requires a

‎content/en/blog/2022/why-and-how-ebay-pivoted-to-opentelemetry/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ date: 2022-12-19
55
author: '[Vijay Samuel](https://github.com/vjsamuel) (eBay)'
66
canonical_url: https://tech.ebayinc.com/engineering/why-and-how-ebay-pivoted-to-opentelemetry/
77
# prettier-ignore
8-
cSpell:ignore: Aishwarya Aradros Ashpole Auditbeat autodiscover Bhattacharya Bogdan Charif Christos clusterlocal Dropwizard Drutu Feldmeier Filebeat filereloadreceiver Golubenco Kroh kube Markou Metricbeat metricbeat Mirabella Nigaryan Premendra Pérez Rami Ruflin Santanu Sarbu sharded Siering Soriano statefulset Steffen Teoh Tigran Vijay Yandapalli
8+
cSpell:ignore: Aishwarya Aradros Ashpole Auditbeat autodiscover Bhattacharya Bogdan Charif Christos clusterlocal Dropwizard Drutu Feldmeier Filebeat filereloadreceiver Golubenco Kroh kube Markou metricbeat Mirabella Nigaryan Premendra Pérez Rami Ruflin Santanu Sarbu sharded Siering Soriano statefulset Steffen Teoh Tigran Vijay Yandapalli
99
---
1010

1111
eBay makes a crucial pivot to OpenTelemetry to better align with industry

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ date: 2023-07-24
55
author: '[Reese Lee](https://github.com/reese-lee) (New Relic)'
66
body_class: otel-with-contributions-from
77
# prettier-ignore
8-
cSpell:ignore: Aronoff autoscaler Boten codepath fluentbit k8sattributesprocessor kubelet spanmetrics
8+
cSpell:ignore: Aronoff autoscaler codepath fluentbit k8sattributesprocessor kubelet spanmetrics
99
---
1010

1111
With contributions from [Adriana Villela](https://github.com/avillela)

‎content/en/blog/2023/testing-otel-demo/index.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ linkTitle: Testing the OTel Demo
44
date: 2023-07-27
55
author: '[Daniel Dias](https://github.com/danielbdias) (Tracetest)'
66
body_class: otel-with-contributions-from
7-
# prettier-ignore
8-
cSpell:ignore: Adnan apiserver apparmor choren containerd Hamric healthcheck kube kubelet kubetracing nanos oteldemo Rahić tracetest tracetesting
7+
cSpell:ignore: Adnan Hamric kube nanos oteldemo Rahić tracetest tracetesting
98
---
109

1110
With contributions from [Adnan Rahić](https://github.com/adnanrahic) and

‎content/en/blog/2023/why-histograms/index.md

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ title: Why Histograms?
33
date: 2023-05-08
44
author: '[Daniel Dyla](https://github.com/dyladan)'
55
canonical_url: https://dyladan.me/histograms/2023/05/02/why-histograms/
6-
cSpell:ignore: reimplementation
76
---
87

98
A histogram is a multi-value counter that summarizes the distribution of data

‎content/en/blog/2024/collecting-otel-compliant-java-logs-from-files/index.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author: >
88
issue: https://github.com/open-telemetry/opentelemetry.io/issues/5606
99
sig: Java, Specification
1010
# prettier-ignore
11-
cSpell:ignore: Clerc cust Cyrille Dotel Gregor Logback logback otlphttp otlpjson resourcedetection SLF4J stdout Zeitlinger
11+
cSpell:ignore: Clerc cust Cyrille Dotel Gregor logback otlphttp otlpjson resourcedetection SLF4J stdout Zeitlinger
1212
---
1313

1414
If you want to get logs from your Java application ingested into an
@@ -53,7 +53,7 @@ This blog post shows how to set up this solution step by step.
5353
{{% alert title="Note" color="info" %}}
5454

5555
Blog post instructions can easily get outdated. In case of issues, check this
56-
[sample application deployed on Kubernetes](https://github.com/grafana/docker-otel-lgtm/tree/main/examples/java/json-logging-otlp),
56+
[sample application deployed on Kubernetes](https://github.com/open-telemetry/opentelemetry-java-examples/blob/main/logging-k8s-stdout-otlp-json/README.md),
5757
which is continuously updated and tested against the latest versions.
5858

5959
{{% /alert %}}
@@ -371,7 +371,7 @@ balance by providing highly contextualized logs that can be correlated with
371371
traces and metrics.
372372
373373
If any of the steps are unclear or you encounter issues, check this
374-
[sample application deployed on Kubernetes](https://github.com/grafana/docker-otel-lgtm/tree/main/examples/java/json-logging-otlp),
374+
[sample application deployed on Kubernetes](https://github.com/open-telemetry/opentelemetry-java-examples/blob/main/logging-k8s-stdout-otlp-json/README.md),
375375
which is continuously updated and tested against the latest versions.
376376
377377
Any feedback or questions? Reach out on

‎content/en/blog/2024/community-awards-winners.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ linkTitle: OpenTelemetry Community Awards Winners
44
date: 2024-11-15
55
author: OpenTelemetry Governance Committee
66
# prettier-ignore
7-
cSpell:ignore: anunarapureddy Anusha avillela codeboten emdneto Narapureddy ozal serkan Serkan Özal
7+
cSpell:ignore: anunarapureddy Anusha avillela codeboten emdneto Narapureddy ozal serkan Özal
88
---
99

1010
We are excited to announce the winners of the first-ever **OpenTelemetry

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Introducing the new container log parser for OpenTelemetry Collector
33
linkTitle: Collector container log parser
44
date: 2024-05-22
55
author: '[Christos Markou](https://github.com/ChrsMark) (Elastic)'
6-
cSpell:ignore: Christos containerd Filelog filelog Jaglowski kube Markou
6+
cSpell:ignore: Christos containerd filelog Jaglowski kube Markou
77
---
88

99
[Filelog receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/filelogreceiver)

‎content/en/blog/2024/spring-starter-stable/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author: >
88
issue: https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/11581
99
sig: Java
1010
# prettier-ignore
11-
cSpell:ignore: Bisutti Customizer customizers Gregor Logback logback petclinic Zeitlinger
11+
cSpell:ignore: Bisutti Customizer customizers Gregor logback petclinic Zeitlinger
1212
---
1313

1414
We're proud to announce that the OpenTelemetry Spring Boot starter is now

‎content/en/docs/collector/architecture.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Architecture
33
weight: 28
4-
cSpell:ignore: fanoutconsumer probabilisticsampler spanmetrics zpages
4+
cSpell:ignore: fanoutconsumer probabilisticsampler zpages
55
---
66

77
The OpenTelemetry Collector is an executable file that can receive telemetry,

‎content/en/docs/collector/building/connector/index.md

-1
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,6 @@ your own OpenTelemetry Collector binary. You can add or remove components
497497
name: otelcol-dev-bin
498498
description: Basic OpenTelemetry collector distribution for Developers
499499
output_path: ./otelcol-dev
500-
otelcol_version: 0.86.0
501500
502501
503502
exporters:

‎content/en/docs/collector/configuration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Configuration
33
weight: 20
44
description: Learn how to configure the Collector to suit your needs
55
# prettier-ignore
6-
cSpell:ignore: cfssl cfssljson fluentforward gencert genkey hostmetrics initca OIDC oidc otlphttp pprof prodevent prometheusremotewrite spanevents upsert zpages
6+
cSpell:ignore: cfssl cfssljson fluentforward gencert genkey hostmetrics initca oidc otlphttp pprof prodevent prometheusremotewrite spanevents upsert zpages
77
---
88

99
<!-- markdownlint-disable link-fragments -->

‎content/en/docs/collector/custom-collector.md

+8-11
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,14 @@ configure the code generation and compile process. In fact, all the tags for
9898

9999
Here are the tags for the `dist` map:
100100

101-
| Tag | Description | Optional | Default Value |
102-
| ---------------- | -------------------------------------------------------------------------------------------------- | -------- | --------------------------------------------------------------------------------- |
103-
| module: | The module name for the new distribution, following Go mod conventions. Optional, but recommended. | Yes | `go.opentelemetry.io/collector/cmd/builder` |
104-
| name: | The binary name for your distribution | Yes | `otelcol-custom` |
105-
| description: | A long name for the application. | Yes | `Custom OpenTelemetry Collector distribution` |
106-
| otelcol_version: | The OpenTelemetry Collector version to use as base for the distribution. | Yes | `{{% version-from-registry collector-builder noPrefix %}}` |
107-
| output_path: | The path to write the output (sources and binary). | Yes | `/var/folders/86/s7l1czb16g124tng0d7wyrtw0000gn/T/otelcol-distribution3618633831` |
108-
| version: | The version for your custom OpenTelemetry Collector. | Yes | `1.0.0` |
109-
| go: | Which Go binary to use to compile the generated sources. | Yes | go from the PATH |
101+
| Tag | Description | Optional | Default Value |
102+
| ------------ | -------------------------------------------------------------------------------------------------- | -------- | --------------------------------------------------------------------------------- |
103+
| module: | The module name for the new distribution, following Go mod conventions. Optional, but recommended. | Yes | `go.opentelemetry.io/collector/cmd/builder` |
104+
| name: | The binary name for your distribution | Yes | `otelcol-custom` |
105+
| description: | A long name for the application. | Yes | `Custom OpenTelemetry Collector distribution` |
106+
| output_path: | The path to write the output (sources and binary). | Yes | `/var/folders/86/s7l1czb16g124tng0d7wyrtw0000gn/T/otelcol-distribution3618633831` |
107+
| version: | The version for your custom OpenTelemetry Collector. | Yes | `1.0.0` |
108+
| go: | Which Go binary to use to compile the generated sources. | Yes | go from the PATH |
110109

111110
As you can see on the table above, all the `dist` tags are optional, so you will
112111
be adding custom values for them depending if your intentions to make your
@@ -125,7 +124,6 @@ dist:
125124
name: otelcol-dev
126125
description: Basic OTel Collector distribution for Developers
127126
output_path: ./otelcol-dev
128-
otelcol_version: 0.114.0
129127
```
130128
131129
Now you need to add the modules representing the components you want to be
@@ -149,7 +147,6 @@ dist:
149147
name: otelcol-dev
150148
description: Basic OTel Collector distribution for Developers
151149
output_path: ./otelcol-dev
152-
otelcol_version: {{% version-from-registry collector-builder noPrefix %}}
153150
154151
exporters:
155152
- gomod:

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ Let's have a look at such a case where we are using the load-balancing exporter:
4040

4141
### NGINX as an "out-of-the-box" load balancer
4242

43-
Assuming you have two collectors (`collector1` and `collector2`) configured and
44-
you want to load balance traffic across them using NGINX, you can use the
45-
following configuration:
43+
Assuming you have three collectors (`collector1`, `collector2`, and
44+
`collector3`) configured and you want to load balance traffic across them using
45+
NGINX, you can use the following configuration:
4646

4747
```nginx
4848
server {
@@ -77,11 +77,13 @@ server {
7777
upstream collector4317 {
7878
server collector1:4317;
7979
server collector2:4317;
80+
server collector3:4317;
8081
}
8182
8283
upstream collector4318 {
8384
server collector1:4318;
8485
server collector2:4318;
86+
server collector3:4318;
8587
}
8688
```
8789

‎content/en/docs/collector/installation.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
---
22
title: Install the Collector
33
weight: 2
4-
# prettier-ignore
5-
cSpell:ignore: darwin dpkg GOARCH journalctl kubectl otelcorecol pprof tlsv zpages
4+
cSpell:ignore: darwin dpkg journalctl kubectl otelcorecol pprof tlsv zpages
65
---
76

87
You can deploy the OpenTelemetry Collector on a wide variety of operating

‎content/en/docs/collector/internal-telemetry.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
---
22
title: Internal telemetry
33
weight: 25
4-
# prettier-ignore
5-
cSpell:ignore: alloc batchprocessor journalctl kube otecol pprof tracez underperforming zpages
4+
cSpell:ignore: alloc batchprocessor journalctl
65
---
76

87
You can inspect the health of any OpenTelemetry Collector instance by checking

‎content/en/docs/collector/quick-start.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Quick start
33
description: Setup and collect telemetry in minutes!
44
aliases: [getting-started]
55
weight: 1
6-
cSpell:ignore: docker dokey dpkg gobin okey telemetrygen
6+
cSpell:ignore: docker dokey gobin okey telemetrygen
77
---
88

99
<!-- markdownlint-disable ol-prefix blanks-around-fences -->

‎content/en/docs/demo/development.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
title: Development
3-
# prettier-ignore
4-
cSpell:ignore: grpcio intellij libcurl libprotobuf nlohmann openssl protoc rebar
3+
cSpell:ignore: grpcio intellij libcurl libprotobuf nlohmann openssl protoc
54
---
65

76
[OpenTelemetry Demo GitHub repository](https://github.com/open-telemetry/opentelemetry-demo)

‎content/en/docs/demo/docker-deployment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Docker deployment
33
linkTitle: Docker
44
aliases: [docker_deployment]
5-
cSpell:ignore: otelcollector otlphttp spanmetrics tracetest tracetesting
5+
cSpell:ignore: otlphttp spanmetrics tracetest tracetesting
66
---
77

88
<!-- markdownlint-disable code-block-style ol-prefix -->

0 commit comments

Comments
 (0)