Skip to content

Commit

Permalink
Merge branch 'main' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
XiaotianZha authored Jan 23, 2024
2 parents ec58a76 + afce88b commit 87b0251
Show file tree
Hide file tree
Showing 88 changed files with 796 additions and 101 deletions.
1 change: 1 addition & 0 deletions .cspell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ languageSettings:
- CodeBlock
words:
- accountingservice
- actix
- adservice
- alibaba
- Alloc
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/auto-update-registry.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Auto-update registry versions

on:
workflow_dispatch:
schedule:
# At 04:31, every day
- cron: 31 4 * * *

jobs:
auto-update-versions:
name: Auto-update registry versions
runs-on: ubuntu-20.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: Use CLA approved github bot
run: |
git config user.name opentelemetrybot
git config user.email [email protected]
- name: Auto-update
run: |
.github/workflows/scripts/update-registry-versions.sh
env:
# change this to secrets.GITHUB_TOKEN when testing against a fork
# GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
121 changes: 121 additions & 0 deletions .github/workflows/scripts/update-registry-versions.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
#!/bin/bash -e

UPDATE_YAML="yq eval -i"
GIT=git
GH=gh
FILES="${FILES:-./data/registry/*.yml}"


if [[ -n "$GITHUB_ACTIONS" ]]; then
# Ensure that we're starting from a clean state
git reset --hard origin/main
elif [[ "$1" != "-f" ]]; then
# Do a dry-run when script it executed locally, unless the
# force flag is specified (-f).
echo "Doing a dry-run when run locally. Use -f as the first argument to force execution."
UPDATE_YAML="yq eval"
GIT="echo > DRY RUN: git "
GH="echo > DRY RUN: gh "
else
# Local execution with -f flag (force real vs. dry run)
shift
fi

body=""

for yaml_file in ${FILES}; do
echo $yaml_file
# Check if yq is installed
if ! command -v yq &> /dev/null; then
echo "yq could not be found, please install yq."
exit 1
fi

# Function to get latest version based on registry
get_latest_version() {
package_name=$1
registry=$2

case $registry in
npm)
curl -s "https://registry.npmjs.org/${package_name}/latest" | jq -r '.version'
;;
packagist)
curl -s "https://repo.packagist.org/p2/${package_name}.json" | jq -r ".packages.\"${package_name}\"[0].version"
;;
gems)
curl -s "https://rubygems.org/api/v1/versions/${package_name}/latest.json" | jq -r '.version'
;;
go)
go list -m --versions "$package_name" | awk '{ if (NF > 1) print $NF ; else print "" }'
;;
go-collector)
go list -m --versions "$package_name" | awk '{ if (NF > 1) print $NF ; else print "" }'
;;
nuget)
lower_case_package_name=$(echo "$package_name" | tr '[:upper:]' '[:lower:]')
curl -s "https://api.nuget.org/v3/registration5-gz-semver2/${lower_case_package_name}/index.json" | gunzip | jq -r '.items[0].upper'
;;
hex)
curl -s "https://hex.pm/api/packages/$package_name" | jq -r '.releases | max_by(.inserted_at) | .version'
;;
*)
echo "Registry not supported."
;;
esac
}

# Read package details
name=$(yq eval '.package.name' "$yaml_file")
registry=$(yq eval '.package.registry' "$yaml_file")
current_version=$(yq eval '.package.version' "$yaml_file")

if [ -z "$name" ] || [ -z "$registry" ]; then
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")

if [ "$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."
elif [ -z "$current_version" ]; then
${UPDATE_YAML} ".package.version = \"$latest_version\"" $yaml_file
row="${yaml_file} ($registry): Version field was missing. Populated with the latest version: $latest_version"
echo "${row}"
body="${body}\n- ${row}"
elif [ "$latest_version" != "$current_version" ]; then
${UPDATE_YAML} ".package.version = \"$latest_version\"" "$yaml_file"
row="($registry): Updated version from $current_version to $latest_version in $yaml_file"
echo "${yaml_file} ${row}"
body="${body}\n- ${row}"
else
echo "${yaml_file} ($registry): Version is already up to date."
fi
fi
done;

# We use the sha1 over all version updates to uniquely identify the PR.
tag=$(echo body | sha1sum | awk '{print $1;}')
message="Auto-update registry versions (${tag})"
branch="opentelemetrybot/auto-update-registry-${tag}"


existing_pr_count=$(gh pr list --state all --search "in:title $message" | wc -l)
if [ "$existing_pr_count" -gt 0 ]; then
echo "PR(s) already exist for '$message'"
gh pr list --state all --search "\"$message\" in:title"
echo "So we won't create another. Exiting."
exit 0
fi

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

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

echo "Submitting auto-update PR '$message'."
$GH pr create --title "$message" --body-file "${body_file}"
1 change: 1 addition & 0 deletions .textlintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ rules:
defaultTerms: false
skip: []
terms:
- Actix
- Ajax
- Apache
- API
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ We have curated some issues with the tags [help wanted][] and [good first
issue][]. This should allow you to quickly find a place to contribute. See
[CONTRIBUTING.md][] for more information.

We, the OTel Comms SIG, meet every two weeks on Monday at 9:00 PT. Check out the
[OpenTelemetry community calendar][] for the Zoom link and any updates to this
schedule.
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 on [Slack][].
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/go/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ go get "go.opentelemetry.io/otel" \
"go.opentelemetry.io/otel/sdk/metric" \
"go.opentelemetry.io/otel/sdk/resource" \
"go.opentelemetry.io/otel/sdk/trace" \
"go.opentelemetry.io/otel/semconv/v1.21.0" \
"go.opentelemetry.io/otel/semconv/v1.24.0" \
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
```

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/rust/getting-started.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Getting Started
cSpell:ignore: Actix eprintln println rolldice tokio
cSpell:ignore: eprintln println rolldice tokio
weight: 10
---

Expand Down
4 changes: 4 additions & 0 deletions data/registry/exporter-js-google-cloud-monitoring.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ authors:
urls:
repo: https://github.com/GoogleCloudPlatform/opentelemetry-operations-js/tree/main/packages/opentelemetry-cloud-monitoring-exporter
createdAt: 2020-04-01
package:
registry: npm
name: '@google-cloud/opentelemetry-cloud-monitoring-exporter'
version: 0.17.0
4 changes: 4 additions & 0 deletions data/registry/exporter-js-google-cloud-trace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ authors:
urls:
repo: https://github.com/GoogleCloudPlatform/opentelemetry-operations-js/tree/main/packages/opentelemetry-cloud-trace-exporter
createdAt: 2020-04-01
package:
registry: npm
name: '@google-cloud/opentelemetry-cloud-trace-exporter'
version: 2.1.0
4 changes: 4 additions & 0 deletions data/registry/exporter-js-instana.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@ authors:
urls:
repo: https://github.com/instana/nodejs/tree/main/packages/opentelemetry-exporter
createdAt: 2022-04-18
package:
registry: npm
name: '@instana/opentelemetry-exporter'
version: 3.1.1
4 changes: 4 additions & 0 deletions data/registry/exporter-js-prometheus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-prometheus
createdAt: 2020-02-06
package:
registry: npm
name: '@opentelemetry/exporter-prometheus'
version: 0.47.0
8 changes: 8 additions & 0 deletions data/registry/exporter-ruby-datadog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,11 @@ authors:
urls:
repo: https://github.com/DataDog/dd-opentelemetry-exporter-ruby
createdAt: 2020-09-02
deprecated:
reason:
This exporter has been deprecated. To export your OTLP traces from
OpenTelemetry SDK directly to Datadog Agent, please refer to OTLP Ingest in
Datadog Agent.
package:
registry: gems
name: opentelemetry-exporters-datadog
4 changes: 4 additions & 0 deletions data/registry/exporter-ruby-jaeger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/exporter/jaeger
createdAt: 2022-11-07
package:
registry: gems
name: opentelemetry-exporter-jaeger
version: 0.23.0
4 changes: 4 additions & 0 deletions data/registry/exporter-ruby-otlp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/exporter/otlp
createdAt: 2022-11-07
package:
registry: gems
name: opentelemetry-exporter-otlp
version: 0.26.1
4 changes: 4 additions & 0 deletions data/registry/exporter-ruby-zipkin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/exporter/zipkin
createdAt: 2022-11-07
package:
registry: gems
name: opentelemetry-exporter-zipkin
version: 0.23.0
4 changes: 4 additions & 0 deletions data/registry/exporter-rust-application-insights.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@ authors:
urls:
repo: https://github.com/frigus02/opentelemetry-application-insights
createdAt: 2020-08-28
package:
registry: crates
name: opentelemetry-application-insights
version: 0.29.0
4 changes: 4 additions & 0 deletions data/registry/exporter-rust-jaeger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-jaeger
createdAt: 2020-08-28
package:
registry: crates
name: opentelemetry-jaeger
version: 0.20.0
4 changes: 4 additions & 0 deletions data/registry/exporter-rust-otlp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-otlp
createdAt: 2020-08-28
package:
registry: crates
name: opentelemetry-otlp
version: 0.14.0
4 changes: 4 additions & 0 deletions data/registry/exporter-rust-prometheus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-prometheus
createdAt: 2020-08-28
package:
registry: crates
name: opentelemetry-prometheus
version: 0.14.1
6 changes: 5 additions & 1 deletion data/registry/exporter-rust-stackdriver.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# cSpell:ignore jacobkiesel
# cSpell:ignore jacobkiesel stackdriver
title: Google StackDrive Exporter
registryType: exporter
language: rust
Expand All @@ -12,3 +12,7 @@ authors:
urls:
repo: https://github.com/vivint-smarthome/opentelemetry-stackdriver
createdAt: 2020-08-28
package:
registry: crates
name: opentelemetry-stackdriver
version: 0.18.0
19 changes: 19 additions & 0 deletions data/registry/exporter-rust-stdout.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
title: OTLP Exporter
registryType: exporter
language: rust
tags:
- rust
- exporter
license: Apache 2.0
description:
This crate provides exporters that export to stdout or any implementation of
[`std::io::Write`](https://doc.rust-lang.org/std/io/trait.Write.html).
authors:
- name: OpenTelemetry Authors
urls:
repo: https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-stdout
createdAt: 2024-01-19
package:
registry: crates
name: opentelemetry-stdout
version: 0.2.0
4 changes: 4 additions & 0 deletions data/registry/exporter-rust-zipkin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-zipkin
createdAt: 2020-08-28
package:
registry: crates
name: opentelemetry-zipkin
version: 0.19.0
2 changes: 1 addition & 1 deletion data/registry/instrumentation-js-angular.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ createdAt: 2020-06-30
package:
name: '@jufab/opentelemetry-angular-interceptor'
registry: npm
version: 1.7.0
version: 1.7.0-1
4 changes: 4 additions & 0 deletions data/registry/instrumentation-js-fetch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-fetch
createdAt: 2020-11-09
package:
registry: npm
name: '@opentelemetry/instrumentation-fetch'
version: 0.47.0
4 changes: 4 additions & 0 deletions data/registry/instrumentation-js-grpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-grpc
createdAt: 2020-11-09
package:
registry: npm
name: '@opentelemetry/instrumentation-grpc'
version: 0.47.0
4 changes: 4 additions & 0 deletions data/registry/instrumentation-js-http.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-http
createdAt: 2020-11-09
package:
registry: npm
name: '@opentelemetry/instrumentation-http'
version: 0.47.0
5 changes: 5 additions & 0 deletions data/registry/instrumentation-js-prisma.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# cSpell:ignore prisma
title: Prisma Tracing Instrumentation
registryType: instrumentation
language: js
Expand All @@ -13,3 +14,7 @@ authors:
urls:
repo: https://github.com/prisma/prisma/tree/main/packages/instrumentation
createdAt: 2022-08-25
package:
registry: npm
name: '@prisma/instrumentation'
version: 5.8.1
4 changes: 4 additions & 0 deletions data/registry/instrumentation-js-react-load.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ authors:
urls:
repo: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-plugin-react-load
createdAt: 2020-11-09
package:
registry: npm
name: '@opentelemetry/plugin-react-load'
version: 0.30.0
Loading

0 comments on commit 87b0251

Please sign in to comment.