diff --git a/pom.xml b/pom.xml index 950aab58..3d2406de 100644 --- a/pom.xml +++ b/pom.xml @@ -31,12 +31,14 @@ 2022 - 1.32.0 - 1.25.0 + 1.39.0 + 1.26.0 + 2.5.0 3.0.1 3.1 4.2.1 - 1.25.0-alpha + + 1.25.0-alpha @@ -64,16 +66,21 @@ - io.opentelemetry.instrumentation - opentelemetry-instrumentation-bom-alpha - ${opentelemetry.java.version}-alpha + io.opentelemetry + opentelemetry-bom + ${opentelemetry.java.version} pom import + + io.opentelemetry.instrumentation + opentelemetry-instrumentation-annotations + ${opentelemetry.java.instrumentation.version} + io.opentelemetry.semconv opentelemetry-semconv - ${version.otel.semconv} + ${version.otel.semconv-java} @@ -93,6 +100,7 @@ ${opentelemetry.java.version} ${opentelemetry.semconv.version} + ${opentelemetry.java.instrumentation.version} diff --git a/spec/src/main/asciidoc/opentelemetry-apis.adoc b/spec/src/main/asciidoc/opentelemetry-apis.adoc index 835aca0b..4f0dbcf6 100644 --- a/spec/src/main/asciidoc/opentelemetry-apis.adoc +++ b/spec/src/main/asciidoc/opentelemetry-apis.adoc @@ -71,4 +71,4 @@ The above packages have dependencies on the following packages which MUST be sup === Tracing Annotations -* https://www.javadoc.io/doc/io.opentelemetry.instrumentation/opentelemetry-instrumentation-annotations/latest/io/opentelemetry/instrumentation/annotations/package-summary.html[io.opentelemetry.instrumentation.annotations] (`WithSpan` and `SpanAttribute` only) \ No newline at end of file +* https://www.javadoc.io/doc/io.opentelemetry.instrumentation/opentelemetry-instrumentation-annotations/{otel-instrumentation-version}/io/opentelemetry/instrumentation/annotations/package-summary.html[io.opentelemetry.instrumentation.annotations] (`WithSpan` and `SpanAttribute` only) \ No newline at end of file diff --git a/spec/src/main/asciidoc/tracing.adoc b/spec/src/main/asciidoc/tracing.adoc index 2d112dcd..27d134c2 100644 --- a/spec/src/main/asciidoc/tracing.adoc +++ b/spec/src/main/asciidoc/tracing.adoc @@ -173,8 +173,7 @@ Calling the OpenTelemetry API directly MUST work in the same way and yield the s The https://github.com/open-telemetry/semantic-conventions/blob/v{otel-semconv-version}/docs/http/http-spans.md[Semantic Conventions for HTTP Spans] MUST be followed by any compatible implementation. NOTE: This is a breaking change from MicroProfile Telemetry 1.1 due to stabilization of HTTP semantic conventions in OpenTelemetry. -Changes to attributes are described in https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/migration-guide.md[HTTP semantic convention stability migration guide]. -// Migration guide was not part of 1.24.0 release, so the link is to the main branch. +Changes to attributes are described in https://github.com/open-telemetry/semantic-conventions/blob/v{otel-semconv-version}/docs/http/migration-guide.md[HTTP semantic convention stability migration guide]. Semantic Conventions distinguish several https://github.com/open-telemetry/semantic-conventions/blob/v{otel-semconv-version}/docs/general/attribute-requirement-level.md[Requirement Levels] for attributes. All Span attributes marked as `Required` and `Conditionally Required` MUST be present in the context of the Span where they are defined.