Skip to content

Commit

Permalink
Merge branch 'open-telemetry:main' into librariesPage
Browse files Browse the repository at this point in the history
  • Loading branch information
DIANAAJAMBO authored Dec 13, 2024
2 parents c9a0d78 + 81c8e86 commit 88e6fb6
Show file tree
Hide file tree
Showing 601 changed files with 8,886 additions and 4,568 deletions.
21 changes: 21 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!--
Please provide a meaningful description of what your changes will do. Bonus points for including links to related issues, other PRs, or technical references.
A detailed description helps reviewers understand the context of your change and reduces
the time needed to review.
Please make sure to follow the [contribution guidelines](https://opentelemetry.io/docs/contributing/).
We run checks on all PRs, to ensure that your contribution follows our [style guide](https://opentelemetry.io/docs/contributing/style-guide/).
Many requirements of that guide can be enforced by running `npm run fix:all` locally and committing the changes.
Note, that although those checks need to be green before we can merge your PR, do not
worry about their status after submitting your PR. We will provide you with guidance, when and how to
address them.
Similarly, do not worry about your PR being out-of-date with the base branch and do not continuously
update or rebase your branch. We will let you know when it is necessary.
If you have any questions, feel free to ask.
-->
6 changes: 0 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE/DOCS_UPDATE.md

This file was deleted.

45 changes: 45 additions & 0 deletions .github/workflows/auto-update-community-members.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Auto-update community members page

on:
workflow_dispatch:
schedule:
# At 03:41, every day
- cron: 41 3 * * *

jobs:
auto-update-versions:
name: Auto-update community members page
runs-on: ubuntu-24.04
# Remove the if statement below when testing againt a fork
if: github.repository == 'open-telemetry/opentelemetry.io'
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: '22'

- name: Install dependencies
working-directory: ./scripts/generate-community-data
run: npm install

- name: Run script
working-directory: ./scripts/generate-community-data
run: node generate.js ../../data/community/members.yaml
env:
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}

- name: Create pull request
uses: peter-evans/create-pull-request@v7
with:
add-paths: 'data/community/members.yaml'
committer:
opentelemetrybot
<[email protected]>
token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
branch: update-community-members
title: Update community members
body: |
This pull request contains automated updates to files by the GitHub Action.
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
4 changes: 2 additions & 2 deletions .github/workflows/pr-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ jobs:

- run: |
case $PR_ACTION in
all|refcache)
all|refcache|text)
npm install --omit=optional
;&
dict|filenames|format|htmltest-config|markdown|submodule*)
*)
npm run fix:$PR_ACTION
;;
esac
Expand Down
38 changes: 29 additions & 9 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 All @@ -74,9 +82,11 @@ for yaml_file in ${FILES}; do
echo "${yaml_file}: Package name and/or registry are missing in the YAML file."
else
# Get latest version
latest_version=$(get_latest_version "$name" "$registry")
latest_version=$(get_latest_version "$name" "$registry" || echo "Could not fetch version.")

if [ "$latest_version" == "Registry not supported." ]; then
if [ "$latest_version" == "Could not fetch version." ]; then
echo "${yaml_file} ($registry): Registry not supported.";
elif [ "$latest_version" == "Registry not supported." ]; then
echo "${yaml_file} ($registry): Registry not supported.";
elif [ -z "$latest_version" ]; then
echo "${yaml_file} ($registry): Could not get latest version from registry."
Expand Down Expand Up @@ -110,12 +120,22 @@ if [ "$existing_pr_count" -gt 0 ]; then
exit 0
fi

$GIT checkout -b "$branch"
$GIT commit -a -m "$message"
$GIT push --set-upstream origin "$branch"
if [[ -n $(git status --porcelain) ]]; then
echo "Versions have been updated, formatting and pushing changes."

$NPM run fix:format

$GIT checkout -b "$branch"
$GIT commit -a -m "$message"
$GIT push --set-upstream origin "$branch"

body_file=$(mktemp)
echo -en "${body}" >> "${body_file}"
body_file=$(mktemp)
echo -en "${body}" >> "${body_file}"

echo "Submitting auto-update PR '$message'."
$GH pr create --title "$message" --body-file "${body_file}"
echo "Submitting auto-update PR '$message'."
$GH pr create --title "$message" --body-file "${body_file}"

else
echo "No changes detected."
exit 0
fi
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
[submodule "content-modules/opentelemetry-proto"]
path = content-modules/opentelemetry-proto
url = https://github.com/open-telemetry/opentelemetry-proto
otlp-pin = v1.3.2
otlp-pin = v1.4.0
[submodule "content-modules/semantic-conventions"]
path = content-modules/semantic-conventions
url = https://github.com/open-telemetry/semantic-conventions
semconv-pin = v1.28.0
semconv-pin = v1.29.0
[submodule "content-modules/opamp-spec"]
path = content-modules/opamp-spec
url = https://github.com/open-telemetry/opamp-spec
Expand All @@ -31,4 +31,4 @@
[submodule "content-modules/opentelemetry-java-examples"]
path = content-modules/opentelemetry-java-examples
url = https://github.com/open-telemetry/opentelemetry-java-examples.git
javaexamples-pin = 0f736ec
javaexamples-pin = 63cc9b4
25 changes: 0 additions & 25 deletions .htmltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,6 @@ IgnoreDirs:
# Ignore blog index pages for all locales and in all blog sections (top-level and years)
- ^(../)?blog/(\d+/)?page/\d+
# TODO drop next lines after https://github.com/open-telemetry/opentelemetry.io/issues/5555 is fixed for these pages:
- ^es/docs/concepts/glossary/
- ^es/docs/concepts/instrumentation/zero-code/
- ^es/docs/concepts/signals/baggage/
- ^es/docs/zero-code/php/
# 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:
- ^pt/docs/concepts/components/
- ^pt/docs/concepts/glossary/
- ^pt/docs/concepts/signals/baggage/
- ^pt/docs/languages/erlang/instrumentation/
- ^pt/docs/languages/erlang/sampling/
- ^pt/docs/languages/js/instrumentation/
- ^pt/docs/languages/js/sampling/
- ^pt/docs/languages/net/instrumentation/
- ^pt/docs/languages/net/libraries/
- ^pt/docs/languages/net/shim/
- ^pt/docs/languages/php/instrumentation/
- ^pt/docs/languages/python/instrumentation/
- ^pt/docs/languages/ruby/instrumentation/
- ^pt/docs/languages/ruby/sampling/
- ^pt/docs/zero-code/php/
# TODO drop next line after https://github.com/open-telemetry/opentelemetry.io/issues/5423 is fixed for pt pages:
- ^pt/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/
# DO NOT EDIT! IgnoreDirs list is auto-generated from markdown file front matter.
Expand Down
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
!/layouts/shortcodes
/layouts/shortcodes/*
!/layouts/shortcodes/docs
/layouts/shortcodes/pt
!/layouts/shortcodes/es
!/layouts/shortcodes/pt

/content/ja
/content/zh
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
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ We, the OTel Communications SIG, meet every two weeks on Monday at 10:00 PT.
Check out the [OpenTelemetry community calendar][] for the Zoom link and any
updates to this schedule.

Meeting notes are available as a public [Google doc][]. If you have trouble accessing
the doc, get in touch in the `#otel-comms` channel on [Slack][].
Meeting notes are available as a public [Google doc][]. If you have trouble
accessing the doc, get in touch in the `#otel-comms` channel on [Slack][].

## Roles

Expand Down Expand Up @@ -74,8 +74,8 @@ Here is a list of community roles with current and previous members:
- [Morgan McLean](https://github.com/mtwo)
- [jparsana](https://github.com/jparsana)

Learn more about roles in the [community repository][]. Thanks to [all who have already
contributed][contributors]!
Learn more about roles in the [community repository][]. Thanks to [all who have
already contributed][contributors]!

## Licenses

Expand Down
23 changes: 23 additions & 0 deletions assets/scss/_registry.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,26 @@
.registry-entry {
@extend .shadow;
}

#searchForm .btn.btn-outline-success,
.btn-outline-danger,
.btn-outline-secondary {
&:hover {
color: var(--bs-white);
}
}

@include color-mode(dark) {
@media (prefers-color-scheme: dark) {
.border-default {
border-color: #a3a3a3;
}
.card.registry-entry {
box-shadow: 0 20px 50px rgba(0, 0, 0, 0.8) !important;
}
.card.registry-entry,
.list-group > .list-group-item {
background-color: #262d2c;
}
}
}
2 changes: 1 addition & 1 deletion content-modules/opentelemetry-java-examples
Submodule opentelemetry-java-examples updated 32 files
+0 −6 .github/renovate.json5
+1 −2 .github/workflows/build.yml
+1 −1 build.gradle.kts
+22 −0 declarative-configuration/README.md
+1 −1 declarative-configuration/build.gradle.kts
+4 −2 declarative-configuration/otel-sdk-config.yaml
+2 −1 declarative-configuration/src/main/java/io/opentelemetry/examples/fileconfig/Application.java
+1 −1 doc-snippets/api/src/main/java/otel/ContextUsage.java
+7 −0 doc-snippets/configuration/src/main/java/otel/SdkMeterProviderConfig.java
+7 −0 doc-snippets/configuration/src/main/java/otel/ViewConfig.java
+2 −2 doc-snippets/exporters/build.gradle.kts
+2 −2 doc-snippets/getting-started/build.gradle.kts
+2 −2 doc-snippets/spring-starter/build.gradle.kts
+0 −20 file-configuration/README.md
+2 −2 gradle/wrapper/gradle-wrapper.properties
+2 −2 grpc/build.gradle.kts
+6 −9 http/src/main/java/io/opentelemetry/example/http/HttpServer.java
+3 −2 javaagent/Dockerfile
+10 −5 javaagent/README.md
+14 −3 javaagent/build.gradle.kts
+6 −4 javaagent/docker-compose.yml
+230 −22 javaagent/sdk-config.yaml
+3 −3 javaagent/src/main/java/io/opentelemetry/example/javagent/Controller.java
+1 −1 kotlin-extension/build.gradle.kts
+3 −3 log-appender/build.gradle.kts
+1 −1 log-appender/docker-compose.yml
+1 −7 micrometer-shim/build.gradle.kts
+8 −28 settings.gradle.kts
+3 −3 spring-native/build.gradle.kts
+1 −1 spring-native/docker-compose.yml
+6 −12 telemetry-testing/build.gradle.kts
+1 −1 telemetry-testing/src/test/java/io/opentelemetry/example/telemetry/ApplicationTest.java
2 changes: 1 addition & 1 deletion content-modules/semantic-conventions
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ your questions!
Thanks [Sarah Novotny](https://twitter.com/sarahnovotny) for review and
feedback!

_A version of this article was [originally posted][] on [medium.com/opentelemetry](https://medium.com/opentelemetry)._
_A version of this article was [originally posted][] on
[medium.com/opentelemetry](https://medium.com/opentelemetry)._

[originally posted]: {{% param canonical_url %}}
3 changes: 2 additions & 1 deletion content/en/blog/2021/gc-election.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ canonical_url: https://medium.com/opentelemetry/announcing-the-2021-opentelemetr
---

The OpenTelemetry project is excited to announce the 2021 OpenTelemetry
Governance Committee (GC) election. For all the details, see the [original post][].
Governance Committee (GC) election. For all the details, see the [original
post][].

[original post]: {{% param canonical_url %}}
3 changes: 2 additions & 1 deletion content/en/blog/2021/womens-day.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ canonical_url: https://medium.com/opentelemetry/opentelemetry-observes-internati
---

Happy International Women’s Day! The OpenTelemetry project would like to extend
our thanks to all our women contributors. For all the details, see the [original post][].
our thanks to all our women contributors. For all the details, see the [original
post][].

[original post]: {{% param canonical_url %}}
4 changes: 2 additions & 2 deletions content/en/blog/2022/debug-otel-with-otel/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@ in the NGINX module and we need to fix that.

### The fix

To fix our problem we [added some checks to the module for NGINX][], that make sure
that the trace headers are only set once.
To fix our problem we [added some checks to the module for NGINX][], that make
sure that the trace headers are only set once.

This fix is contained in the [v1.0.1 release of the otel-webserver-module][].
This means you can update the `Dockerfile` to install the NGINX module like the
Expand Down
Loading

0 comments on commit 88e6fb6

Please sign in to comment.