From e6f114fd5f95fb263f7914c32e997a37c3c9ed6e Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Sun, 5 Nov 2023 09:00:57 -0500 Subject: [PATCH 1/4] [CI] Textlint: properly check for Java capitalization & more --- .textlintrc.json | 7 +++---- content/en/blog/2022/debug-otel-with-otel/index.md | 2 +- content/en/docs/instrumentation/java/manual.md | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.textlintrc.json b/.textlintrc.json index 4999d1335a4f..80b536967519 100644 --- a/.textlintrc.json +++ b/.textlintrc.json @@ -1,6 +1,6 @@ { "plugins": { - "@textlint/text": { + "@textlint/markdown": { "extensions": [".yml"] } }, @@ -20,8 +20,7 @@ "Open Agent Management Protocol", "SignalFx Smart Agent", "/^(?:language|repo): .*$/m", - "/tags:([\\n\\r\\s]*-[\\s\\S]*?[\\n\\r]+)*/m", - "/\\.java\\b/" + "/tags:([\\n\\r\\s]*-[\\s\\S]*?[\\n\\r]+)*/m" ] } }, @@ -54,7 +53,6 @@ "HTTP", "HTTPS", "Jaeger", - "Java", "JavaScript", "JBoss", "Jetty", @@ -115,6 +113,7 @@ ["he/she", "they"], ["\\(s\\)he", "they"], ["id['’]?s", "IDs"], + ["(? Date: Sun, 5 Nov 2023 09:17:51 -0500 Subject: [PATCH 2/4] Improve on registry tags allow pattern --- .textlintrc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.textlintrc.json b/.textlintrc.json index 80b536967519..93361ca50e50 100644 --- a/.textlintrc.json +++ b/.textlintrc.json @@ -20,7 +20,7 @@ "Open Agent Management Protocol", "SignalFx Smart Agent", "/^(?:language|repo): .*$/m", - "/tags:([\\n\\r\\s]*-[\\s\\S]*?[\\n\\r]+)*/m" + "/^tags:(\\s*-.+$)*/m" ] } }, From 6e1a98c4c5a78d8f4e380784967520dc74e33af8 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Sun, 5 Nov 2023 10:00:18 -0500 Subject: [PATCH 3/4] Fix markdown link-def placement --- content/en/docs/instrumentation/java/manual.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/content/en/docs/instrumentation/java/manual.md b/content/en/docs/instrumentation/java/manual.md index b638036bc335..05ed6b662048 100644 --- a/content/en/docs/instrumentation/java/manual.md +++ b/content/en/docs/instrumentation/java/manual.md @@ -200,9 +200,13 @@ dependencies { ``` Throughout this documentation you will add additional dependencies. For a full -list of artifact coordinates see [releases] and for semantic convention releases +list of artifact coordinates, see [releases]. For semantic convention releases, see [semantic-conventions-java]. +[releases]: https://github.com/open-telemetry/opentelemetry-java#releases +[semantic-conventions-java]: + https://github.com/open-telemetry/semantic-conventions-java/releases + {{% /tab %}} {{% tab Maven %}} ```xml @@ -1652,8 +1656,5 @@ io.opentelemetry.sdk.trace.export.BatchSpanProcessor = io.opentelemetry.extensio [opentelemetry registry]: /ecosystem/registry/?component=exporter&language=java [parentbased]: https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/samplers/ParentBasedSampler.java -[releases]: https://github.com/open-telemetry/opentelemetry-java#releases -[semantic-conventions-java]: - https://github.com/open-telemetry/semantic-conventions-java/releases [traceidratiobased]: https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/samplers/TraceIdRatioBasedSampler.java From b288a42a1e98fb7c7127dba07144f8962c6badfc Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Sun, 5 Nov 2023 10:08:56 -0500 Subject: [PATCH 4/4] Drop redundant word --- content/en/docs/instrumentation/java/manual.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/en/docs/instrumentation/java/manual.md b/content/en/docs/instrumentation/java/manual.md index 05ed6b662048..4cc415eb7c42 100644 --- a/content/en/docs/instrumentation/java/manual.md +++ b/content/en/docs/instrumentation/java/manual.md @@ -199,9 +199,9 @@ dependencies { } ``` -Throughout this documentation you will add additional dependencies. For a full -list of artifact coordinates, see [releases]. For semantic convention releases, -see [semantic-conventions-java]. +Throughout this documentation you will add dependencies. For a full list of +artifact coordinates, see [releases]. For semantic convention releases, see +[semantic-conventions-java]. [releases]: https://github.com/open-telemetry/opentelemetry-java#releases [semantic-conventions-java]: