From 7dd770345a1599d5ff9bd867f2070e0d8120df7d Mon Sep 17 00:00:00 2001 From: Jack Berg Date: Fri, 8 Sep 2023 11:55:52 -0500 Subject: [PATCH 1/5] Update docs to point to new semconv artifact --- content/en/docs/instrumentation/java/manual.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/content/en/docs/instrumentation/java/manual.md b/content/en/docs/instrumentation/java/manual.md index da8d38ab8872..b61e09bcd18e 100644 --- a/content/en/docs/instrumentation/java/manual.md +++ b/content/en/docs/instrumentation/java/manual.md @@ -61,9 +61,10 @@ telemetry source-identifying info. opentelemetry-exporter-otlp - io.opentelemetry + + io.opentelemetry.semconv opentelemetry-semconv - {{% param javaVersion %}}-alpha + 1.21.0-alpha @@ -71,6 +72,8 @@ telemetry source-identifying info. See [releases][releases] for a full list of artifact coordinates. +See [semantic-conventions-java][semantic-conventions-java] for semantic conventions releases. + ### Gradle ```kotlin @@ -78,12 +81,14 @@ dependencies { implementation 'io.opentelemetry:opentelemetry-api:{{% param javaVersion %}}' implementation 'io.opentelemetry:opentelemetry-sdk:{{% param javaVersion %}}' implementation 'io.opentelemetry:opentelemetry-exporter-otlp:{{% param javaVersion %}}' - implementation 'io.opentelemetry:opentelemetry-semconv:{{% param javaVersion %}}-alpha' + implementation 'io.opentelemetry.semconv:opentelemetry-semconv:{{% param javaVersion %}}-alpha' } ``` See [releases][releases] for a full list of artifact coordinates. +See [semantic-conventions-java][semantic-conventions-java] for semantic conventions releases. + ### Imports ```java @@ -102,7 +107,7 @@ import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.export.BatchSpanProcessor; import io.opentelemetry.sdk.logs.SdkLoggerProvider; import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor; -import io.opentelemetry.semconv.resource.attributes.ResourceAttributes; +import io.opentelemetry.semconv.ResourceAttributes; ``` ### Example @@ -1103,5 +1108,6 @@ io.opentelemetry.sdk.trace.export.BatchSpanProcessor = io.opentelemetry.extensio [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 3e415ab2ffc898be46e9ee36dd0fac11684c84ed Mon Sep 17 00:00:00 2001 From: Jack Berg Date: Mon, 11 Sep 2023 10:44:20 -0500 Subject: [PATCH 2/5] Fix formatting --- content/en/docs/instrumentation/java/manual.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/content/en/docs/instrumentation/java/manual.md b/content/en/docs/instrumentation/java/manual.md index b61e09bcd18e..3574f0b1e60e 100644 --- a/content/en/docs/instrumentation/java/manual.md +++ b/content/en/docs/instrumentation/java/manual.md @@ -72,7 +72,8 @@ telemetry source-identifying info. See [releases][releases] for a full list of artifact coordinates. -See [semantic-conventions-java][semantic-conventions-java] for semantic conventions releases. +See [semantic-conventions-java][semantic-conventions-java] for semantic +conventions releases. ### Gradle @@ -87,7 +88,8 @@ dependencies { See [releases][releases] for a full list of artifact coordinates. -See [semantic-conventions-java][semantic-conventions-java] for semantic conventions releases. +See [semantic-conventions-java][semantic-conventions-java] for semantic +conventions releases. ### Imports @@ -1108,6 +1110,7 @@ io.opentelemetry.sdk.trace.export.BatchSpanProcessor = io.opentelemetry.extensio [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 +[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 76d1a775de129a3553e748b5968b84bca100acad Mon Sep 17 00:00:00 2001 From: Jack Berg Date: Mon, 11 Sep 2023 10:51:02 -0500 Subject: [PATCH 3/5] Auto update semconvJavaVersion --- .github/workflows/auto-update-versions.yml | 1 + content/en/docs/instrumentation/java/_index.md | 1 + content/en/docs/instrumentation/java/manual.md | 9 +++++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-update-versions.yml b/.github/workflows/auto-update-versions.yml index 8fd77910692b..492318935c68 100644 --- a/.github/workflows/auto-update-versions.yml +++ b/.github/workflows/auto-update-versions.yml @@ -27,6 +27,7 @@ jobs: .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 env: # change this to secrets.GITHUB_TOKEN when testing against a fork GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} diff --git a/content/en/docs/instrumentation/java/_index.md b/content/en/docs/instrumentation/java/_index.md index ed023db8b6d5..051e82aa7e34 100644 --- a/content/en/docs/instrumentation/java/_index.md +++ b/content/en/docs/instrumentation/java/_index.md @@ -7,6 +7,7 @@ aliases: [/java, /java/metrics, /java/tracing] weight: 18 cascade: javaVersion: 1.29.0 + semconvJavaVersion: 1.21.0 --- {{% docs/instrumentation/index-intro java /%}} diff --git a/content/en/docs/instrumentation/java/manual.md b/content/en/docs/instrumentation/java/manual.md index 3574f0b1e60e..5df3ce12d284 100644 --- a/content/en/docs/instrumentation/java/manual.md +++ b/content/en/docs/instrumentation/java/manual.md @@ -64,7 +64,7 @@ telemetry source-identifying info. io.opentelemetry.semconv opentelemetry-semconv - 1.21.0-alpha + {{% param semconvJavaVersion %}}-alpha @@ -82,7 +82,7 @@ dependencies { implementation 'io.opentelemetry:opentelemetry-api:{{% param javaVersion %}}' implementation 'io.opentelemetry:opentelemetry-sdk:{{% param javaVersion %}}' implementation 'io.opentelemetry:opentelemetry-exporter-otlp:{{% param javaVersion %}}' - implementation 'io.opentelemetry.semconv:opentelemetry-semconv:{{% param javaVersion %}}-alpha' + implementation 'io.opentelemetry.semconv:opentelemetry-semconv:{{% param semconvJavaVersion %}}"-alpha' } ``` @@ -305,8 +305,9 @@ First add the semantic conventions as a dependency to your application: ```xml - io.opentelemetry + io.opentelemetry.semconv opentelemetry-semconv + {{% param semconvJavaVersion %}}-alpha ``` @@ -314,7 +315,7 @@ First add the semantic conventions as a dependency to your application: ```kotlin dependencies { - implementation("io.opentelemetry:opentelemetry-semconv") + implementation("io.opentelemetry.semconv:opentelemetry-semconv:{{% param semconvJavaVersion %}}-alpha") } ``` From d9f211496e5a013e5355102ef390d20145ec387b Mon Sep 17 00:00:00 2001 From: Jack Berg Date: Mon, 11 Sep 2023 10:52:50 -0500 Subject: [PATCH 4/5] Fix typo --- content/en/docs/instrumentation/java/manual.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/instrumentation/java/manual.md b/content/en/docs/instrumentation/java/manual.md index 5df3ce12d284..5b299bcc41e7 100644 --- a/content/en/docs/instrumentation/java/manual.md +++ b/content/en/docs/instrumentation/java/manual.md @@ -82,7 +82,7 @@ dependencies { implementation 'io.opentelemetry:opentelemetry-api:{{% param javaVersion %}}' implementation 'io.opentelemetry:opentelemetry-sdk:{{% param javaVersion %}}' implementation 'io.opentelemetry:opentelemetry-exporter-otlp:{{% param javaVersion %}}' - implementation 'io.opentelemetry.semconv:opentelemetry-semconv:{{% param semconvJavaVersion %}}"-alpha' + implementation 'io.opentelemetry.semconv:opentelemetry-semconv:{{% param semconvJavaVersion %}}-alpha' } ``` From b5145c2914151924e518ca78bd5fac425bd83e63 Mon Sep 17 00:00:00 2001 From: svrnm Date: Wed, 13 Sep 2023 09:16:32 +0200 Subject: [PATCH 5/5] fix refcache Signed-off-by: svrnm --- static/refcache.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/static/refcache.json b/static/refcache.json index fd8e0eb90ffd..049b82b8fa2d 100644 --- a/static/refcache.json +++ b/static/refcache.json @@ -3167,6 +3167,10 @@ "StatusCode": 200, "LastSeen": "2023-06-30T11:43:23.38558-04:00" }, + "https://github.com/open-telemetry/semantic-conventions-java/releases": { + "StatusCode": 200, + "LastSeen": "2023-09-13T09:15:50.916636+02:00" + }, "https://github.com/open-telemetry/semantic-conventions/issues/new": { "StatusCode": 200, "LastSeen": "2023-07-06T18:29:34.673526-04:00"