Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
grammar fix
Browse files Browse the repository at this point in the history
Akhaled19 committed Nov 22, 2023
2 parents fbad7e1 + 12e580c commit 3b00e96
Showing 201 changed files with 5,124 additions and 1,341 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/auto-update-versions.yml
Original file line number Diff line number Diff line change
@@ -25,13 +25,13 @@ jobs:
- name: Auto-update
run: |
.github/workflows/scripts/auto-update-version.sh opentelemetry-collector-releases collectorVersion content/en/docs/collector/_index.md
.github/workflows/scripts/auto-update-version.sh opentelemetry-java javaVersion content/en/docs/instrumentation/java/_index.md
.github/workflows/scripts/auto-update-version.sh opentelemetry-java-instrumentation javaInstrumentationVersion content/en/docs/instrumentation/java/automatic/annotations.md
.github/workflows/scripts/auto-update-version.sh opentelemetry-collector-releases vers content/en/docs/collector/_index.md
.github/workflows/scripts/auto-update-version.sh opentelemetry-java otel content/en/docs/instrumentation/java/_index.md
.github/workflows/scripts/auto-update-version.sh opentelemetry-java-instrumentation instrumentation content/en/docs/instrumentation/java/_index.md
.github/workflows/scripts/auto-update-version.sh opentelemetry-specification spec scripts/content-modules/adjust-pages.pl
.github/workflows/scripts/auto-update-version.sh opentelemetry-proto otlp scripts/content-modules/adjust-pages.pl
.github/workflows/scripts/auto-update-version.sh semantic-conventions semconv scripts/content-modules/adjust-pages.pl
.github/workflows/scripts/auto-update-version.sh semantic-conventions-java semconvJavaVersion content/en/docs/instrumentation/java/_index.md
.github/workflows/scripts/auto-update-version.sh semantic-conventions-java semconv content/en/docs/instrumentation/java/_index.md
env:
# change this to secrets.GITHUB_TOKEN when testing against a fork
GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
7 changes: 4 additions & 3 deletions .github/workflows/scripts/auto-update-version.sh
Original file line number Diff line number Diff line change
@@ -63,14 +63,15 @@ See https://github.com/open-telemetry/$repo/releases/tag/v$latest_version."

existing_pr_count=$(gh pr list --state all --search "in:title $message" | wc -l)
if [ "$existing_pr_count" -gt 0 ]; then
echo "PR(s) for version $latest_version of $repo already exist:"
gh pr list --state all --search "in:title $message"
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

if [[ "$repo" == "opentelemetry-specification"
|| "$repo" == "opentelemetry-proto" ]]; then
|| "$repo" == "opentelemetry-proto"
|| "$repo" == "semantic-conventions" ]]; then
echo "Switching to $repo at tag v$latest_version"
( set -x;
npm run get:submodule -- content-modules/$repo &&
2 changes: 1 addition & 1 deletion .htmltest.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CacheExpires: 4400h # ~ 6 months
CacheExpires: 6000h # ~ 8.2 months
DirectoryPath: public
IgnoreDirectoryMissingTrailingSlash: true
IgnoreAltMissing: true
10 changes: 10 additions & 0 deletions .markdown-link-check.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"ignorePatterns": [
{
"pattern": "^http://localhost"
}
],
"timeout": "3s",
"retryOn429": true,
"aliveStatusCodes": [200, 206]
}
133 changes: 0 additions & 133 deletions .textlintrc.json

This file was deleted.

151 changes: 151 additions & 0 deletions .textlintrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
# cspell:ignore ebpf postgres
plugins:
'@textlint/markdown':
extensions: [.yml]
filters:
comments:
disablingComment: prettier-ignore-start
enablingComment: prettier-ignore-end
allowlist:
allow:
# Don't check registry .yml file fields for language, repo and tags:
- '/^(?:language|repo): .*$/m'
- /^tags:(\s*-.+$)*/m
# Hugo template syntax:
- /{{.*?}}/
- /{{%.*?%}}/
# Other
- /<https?://.*?>/ # Raw URLs
rules:
terminology:
defaultTerms: false
skip: []
terms:
- Ajax
- Apache
- API
- AWS
- Azure
- Caml
- Cassandra
- Clojure
- CNCF
- eBPF
- ECMAScript
- Elixir
- Erlang
- GCP
- GitHub
- Gitpod
- GraphQL
- gRPC
- Haskell
- HTTP
- HTTPS
- ID
- iOS
- Jaeger
- JavaScript
- JBoss
- Jetty
- JMX
- JSON
- Julia
- K8s
- Kafka
- KubeCon
- Kubernetes
- Laravel
- MacBook
- macOS
- MongoDB
- MySQL
- NDJSON
- Netlify
- NGINX
- OCaml
- OK
- OpAMP
- OpenSearch
- OpenTelemetry Collector
- OTel
- OTEP
- PDF
- Phoenix
- PHP
- PostgreSQL
- protobuf
- Python
- Quarkus
- Rails
- Redis
- Ruby
- Rust
- SDK
- SemVer
- SQL
- SQLite
- Swift
- Symfony
- Thanos
- Traefik
- TypeScript
- URL
- WordPress
- WSGI
- YouTube
- Zend
- Zipkin
#
# ADVANCED RULES given as `[pattern, replacement]`, take as arguments to a
# search-and-replace of the form /pattern/replacement/.
#
# If the regex pattern starts with `(?<` or `(?=` or `(?!`, the
# terminology linter rule will use the regex AS IS to match strings in
# checked files. Otherwise, the pattern is wrapped into a regex with other
# constraints, such as requiring that is be at word boundaries. For
# details, see
# https://github.com/sapegin/textlint-rule-terminology/blob/ca36a645c56d21f27cb9d902b5fb9584030c59e3/index.js#L137-L142.
#
- ['3rd[- ]party', third-party]
- [cpp, C++]
- # dotnet|.net -> .NET, but NOT for strings like:
# - File extension: file.net
# - Repo names: opentelemetry-dotnet
# - Compound names: System.Net.Http.HttpClient
- '(?<=(^|\s))(?:\bdot|\.)net\b'
- .NET
- [ebpf, eBPF]
- ['http[ /]?2(?:\.0)?', HTTP/2]
- [he(/| or )she, they]
- [\(s\)he, they]
- ["id['’]?s", IDs]
- # Capitalize Java, but NOT for strings like:
# - File names: file.java
# - Repo names: opentelemetry-java
# - Compound names: java.util.List
- '(?<![.-])java\b(?![.])'
- Java
- ['java[- ]?agent', Java agent]
- [mac ?os, macOS]
- ['meta[- ]data', metadata]
- [nd-?json, NDJSON]
- [node\.?js, Node.js]
- [open-source, open source]
- # OpenTelemetry, exclude occurrences like:
# - Compound names: go.opentelemetry.io
# - Paths: medium.com/opentelemetry
# - Repo names: opentelemetry-cpp or ocaml-opentelemetry
# - Slack or social media anchors: #opentelemetry or @opentelemetry
- '(?<![-#@./])\bopen[- ]?telemetry\b(?![.-])'
- OpenTelemetry
- [os x, macOS]
- [postgres, PostgreSQL]
- ['psr[ -]?([0-9]+)', PSR-$1]
- ['react[ .]js', React]
- [regexp?(s)?, regular expression$1]
- [repo\b, repository]
- [repos, repositories]
- ['screen[- ]shot(s)?', screenshot$1]
- ['time[- ]stamp(s)?', timestamp$1]
- ["uid['’]?(s)?", UID$1]
8 changes: 6 additions & 2 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
@@ -23,9 +23,9 @@
"autoloading",
"backoff",
"bytecode",
"cassandra",
"caml",
"cartservice",
"cassandra",
"checkoutservice",
"cncf",
"currencyservice",
@@ -44,6 +44,7 @@
"frauddetectionservice",
"frontendproxy",
"github",
"gitpod",
"grafana",
"gzipped",
"Hausenblas",
@@ -74,6 +75,7 @@
"mongodb",
"mysql",
"ndjson",
"netlify",
"Neumann",
"nginx",
"ocaml",
@@ -108,8 +110,8 @@
"quarkus",
"quoteservice",
"recommendationservice",
"relref",
"redis",
"relref",
"Rexed",
"roadmap",
"runtimes",
@@ -125,6 +127,7 @@
"sqlite",
"Stalnaker",
"stdoutmetric",
"Strimzi",
"subdir",
"symfony",
"tabpane",
@@ -138,6 +141,7 @@
"traefik",
"Trask",
"uids",
"unshallow",
"upstreamed",
"Villela",
"wordpress",
Loading

0 comments on commit 3b00e96

Please sign in to comment.