Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
theletterf authored Nov 19, 2024
2 parents 42d48fe + 047bdad commit e3526d1
Show file tree
Hide file tree
Showing 377 changed files with 2,859 additions and 2,108 deletions.
15 changes: 12 additions & 3 deletions .github/workflows/check-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,22 @@ jobs:
cache: npm
cache-dependency-path: tmp/package-ci.json

- run: npm install --omit=optional
- run: |
npm install --omit=optional
git restore package.json
- name: Git submodules properly pinned?
run: |
npm run seq pin:submodule
echo "If the diff check below fails, then update .gitmodules by pinning the named git"
echo "submodule(s); or undo the submodule update(s) if it happened by mistake."
npm run _diff:fail
- run: npm run log:check:links
continue-on-error: true
- name: Any files need updating?
run: |
git restore package.json
echo "If the following fails, then either run 'npm run fix:htmltest-config' locally or '/fix:htmltest-config' in GitHub"
echo "If the diff fails due to .htmltest, then either run 'npm run fix:htmltest-config' locally or '/fix:htmltest-config' in GitHub"
npm run _diff:fail
- uses: actions/upload-artifact@v4
with:
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/scripts/update-registry-versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
UPDATE_YAML="yq eval -i"
GIT=git
GH=gh
NPM=npm
FILES="${FILES:-./data/registry/*.yml}"


Expand All @@ -16,6 +17,7 @@ elif [[ "$1" != "-f" ]]; then
UPDATE_YAML="yq eval"
GIT="echo > DRY RUN: git "
GH="echo > DRY RUN: gh "
NPM="echo > DRY RUN: npm "
else
# Local execution with -f flag (force real vs. dry run)
shift
Expand Down Expand Up @@ -59,6 +61,12 @@ for yaml_file in ${FILES}; do
hex)
curl -s "https://hex.pm/api/packages/$package_name" | jq -r '.releases | max_by(.inserted_at) | .version'
;;
maven)
groupid=$(echo "${package_name}" | cut -d/ -f1)
artifactid=$(echo "${package_name}" | cut -d/ -f2)
#curl -s "https://search.maven.org/solrsearch/select?q=g:com.google.inject+AND+a:guice&core=gav&rows=20&wt=json" | jq -r '.response.docs[0].v'
curl -s "https://search.maven.org/solrsearch/select?q=g:${groupid}+AND+a:${artifactid}&core=gav&rows=20&wt=json" | jq -r '.response.docs[0].v'
;;
*)
echo "Registry not supported."
;;
Expand Down Expand Up @@ -110,6 +118,8 @@ if [ "$existing_pr_count" -gt 0 ]; then
exit 0
fi

$NPM run fix:format

$GIT checkout -b "$branch"
$GIT commit -a -m "$message"
$GIT push --set-upstream origin "$branch"
Expand Down
2 changes: 0 additions & 2 deletions .htmltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ IgnoreDirs:
# DO NOT EDIT! IgnoreDirs list is auto-generated from markdown file front matter.
# Ignore blog index pages for all locales and in all blog sections (top-level and years)
- ^(../)?blog/(\d+/)?page/\d+
# TODO drop next line after https://github.com/open-telemetry/opentelemetry.io/issues/5423 is fixed for ja pages:
- ^ja/docs/concepts/instrumentation/libraries/
# TODO drop next lines after https://github.com/open-telemetry/opentelemetry.io/issues/5555 is fixed for these pages:
- ^zh/docs/concepts/signals/baggage/
- ^zh/docs/zero-code/php/
Expand Down
1 change: 1 addition & 0 deletions .warnings-skip-list.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
_filename-error
The following package was not found and will be installed
34 changes: 34 additions & 0 deletions content/en/blog/2024/community-awards-winners.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
title: Announcing 2024 OpenTelemetry Community Awards Winners
linkTitle: OpenTelemetry Community Awards Winners
date: 2024-11-15
author: OpenTelemetry Governance Committee
# prettier-ignore
cSpell:ignore: anunarapureddy Anusha avillela codeboten emdneto Narapureddy ozal serkan Serkan Özal
---

We are excited to announce the winners of the first-ever **OpenTelemetry
Community Awards**! These awards recognize individuals who have made a notable
impact to OpenTelemetry project over the past year, whether it's through code,
documentation, project management, outreach, adoption, or simply helping others
answer technical questions on our [CNCF Slack](https://slack.cncf.io/). We
received many nominations from the community, and we are delighted to share the
winners with you.

Let's congratulate our 2024 OpenTelemetry Community Awards winners:

- [@serkan-ozal](https://github.com/serkan-ozal) (Serkan Özal)
- [@anunarapureddy](https://github.com/anunarapureddy) (Anusha Narapureddy)
- [@avillela](https://github.com/avillela) (Adriana Villela)
- [@codeboten](https://github.com/codeboten) (Alex Boten)
- [@emdneto](https://github.com/emdneto) (Emídio Neto)

We have collected any attached comments (some of them summarized) from all
received nominations. These demonstrate the great appreciation from the
community towards all nominated individuals. You can find those comments in the
following
[presentation slides](https://docs.google.com/presentation/d/1YaJvAWnNcUJd1RNsqvEYCcqvJUoj0TDd).

We would like to thank everyone who participated in the nomination process, and
we congratulate the winners for their outstanding contributions to the
OpenTelemetry project.
2 changes: 1 addition & 1 deletion content/en/docs/collector/deployment/agent.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ Cons:
[instrumentation]: /docs/languages/
[otlp]: /docs/specs/otel/protocol/
[collector]: /docs/collector/
[instrument-java-metrics]: /docs/languages/java/api-components/#meterprovider
[instrument-java-metrics]: /docs/languages/java/api/#meterprovider
[otlp-exporter]: /docs/specs/otel/protocol/exporter/
[java-otlp-example]:
https://github.com/open-telemetry/opentelemetry-java-docs/tree/main/otlp
Expand Down
6 changes: 3 additions & 3 deletions content/en/docs/collector/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ To get started on Debian systems run the following commands:

```sh
sudo apt-get update
sudo apt-get -y install wget systemctl
sudo apt-get -y install wget
wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{% param vers %}}/otelcol_{{% param vers %}}_linux_amd64.deb
sudo dpkg -i otelcol_{{% param vers %}}_linux_amd64.deb
```
Expand All @@ -122,7 +122,7 @@ sudo dpkg -i otelcol_{{% param vers %}}_linux_amd64.deb

```sh
sudo apt-get update
sudo apt-get -y install wget systemctl
sudo apt-get -y install wget
wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{% param vers %}}/otelcol_{{% param vers %}}_linux_arm64.deb
sudo dpkg -i otelcol_{{% param vers %}}_linux_arm64.deb
```
Expand All @@ -131,7 +131,7 @@ sudo dpkg -i otelcol_{{% param vers %}}_linux_arm64.deb

```sh
sudo apt-get update
sudo apt-get -y install wget systemctl
sudo apt-get -y install wget
wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v{{% param vers %}}/otelcol_{{% param vers %}}_linux_386.deb
sudo dpkg -i otelcol_{{% param vers %}}_linux_386.deb
```
Expand Down
4 changes: 2 additions & 2 deletions content/en/docs/concepts/instrumentation/libraries.md
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,8 @@ After you create a span, pass new trace context to the application code
(callback or handler), by making the span active; if possible, do this
explicitly. The following Java example shows how to add trace context and
activate a span. See the
[Context extraction in Java](/docs/languages/java/api-components/#contextpropagators),
for more examples.
[Context extraction in Java](/docs/languages/java/api/#contextpropagators), for
more examples.

```java
// extract the context
Expand Down
Loading

0 comments on commit e3526d1

Please sign in to comment.