Rework java manual instrumentation

content/en/docs/instrumentation/java/exporters.md

@@ -128,7 +128,7 @@ public class DiceApplication {
 }
 ```
 
-To try out the exporters quickly, you can run Jaeger with OTLP enabled in a
+To see the traces exported quickly, you can run Jaeger with OTLP enabled in a
 docker container:
 
 ```shell

content/en/docs/instrumentation/java/manual.md

@@ -199,6 +199,10 @@ dependencies {
 }
 ```
 
+Throughout this documentation you will add additional dependencies. For a full
+list of artifact coordinates see [releases][releases] and for semantic
+convention releases see [semantic-conventions-java][semantic-conventions-java].
+
 {{% /tab %}} {{% tab Maven %}}
 
 ```xml
@@ -311,7 +315,7 @@ dependencies {
     implementation("io.opentelemetry:opentelemetry-sdk:{{% param javaVersion %}}");
     implementation("io.opentelemetry:opentelemetry-sdk-metrics:{{% param javaVersion %}}");
     implementation("io.opentelemetry:opentelemetry-exporter-logging:{{% param javaVersion %}}");
-    implementation("io.opentelemetry:opentelemetry-semconv:{{% param javaVersion %}}-alpha");
+    implementation 'io.opentelemetry.semconv:opentelemetry-semconv:{{% param semconvJavaVersion %}}-alpha'
     implementation("opentelemetry-sdk-extension-autoconfigure:{{% param javaVersion %}}");
     implementation("opentelemetry-sdk-extension-autoconfigure-spi:{{% param javaVersion %}}");
 }
@@ -448,7 +452,7 @@ import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
 import io.opentelemetry.sdk.logs.SdkLoggerProvider;
 import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor;
 import io.opentelemetry.sdk.logs.export.LogRecordExporter;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
 
 @SpringBootApplication
 public class DiceApplication {
@@ -841,7 +845,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")
 }
 ```
 
@@ -1648,5 +1652,8 @@ 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

content/en/docs/instrumentation/java/resources.md

@@ -26,7 +26,8 @@ resource detection below.
 ## Detecting resources from common environments
 
 You can use `ResourceProvider`s for filling in attributes related to common
-environments, like [Container](/docs/specs/otel/resource/semantic_conventions/container/),
+environments, like
+[Container](/docs/specs/otel/resource/semantic_conventions/container/),
 [Host](/docs/specs/otel/resource/semantic_conventions/host/) or
 [Operating System](/docs/specs/otel/resource/semantic_conventions/os/). These
 can be used with or without
@@ -85,27 +86,27 @@ import io.opentelemetry.instrumentation.resources.ProcessRuntimeResource;
 Custom resources can be configured in your code like the following:
 
 ```java
-    Resource resource = Resource.getDefault()
-        .merge(Resource.create(Attributes.builder()
-            .put(ResourceAttributes.SERVICE_NAME, "dice-service")
-            .put(ResourceAttributes.SERVICE_VERSION, "0.1.0")
-            .put(ResourceAttributes.SERVICE_INSTANCE_ID, "dice-service-1")
-            .put(ResourceAttributes.HOST_NAME, System.getenv("HOSTNAME"))
-            .put(ResourceAttributes.PROCESS_PID, ProcessHandle.current().pid())
-            .build()));
-
-    SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
-        .setResource(resource)
-        ...
-        .build();
+Resource resource = Resource.getDefault()
+    .merge(Resource.create(Attributes.builder()
+        .put(ResourceAttributes.SERVICE_NAME, "dice-service")
+        .put(ResourceAttributes.SERVICE_VERSION, "0.1.0")
+        .put(ResourceAttributes.SERVICE_INSTANCE_ID, "dice-service-1")
+        .put(ResourceAttributes.HOST_NAME, System.getenv("HOSTNAME"))
+        .put(ResourceAttributes.PROCESS_PID, ProcessHandle.current().pid())
+        .build()));
 
-    SdkMeterProvider sdkMeterProvider = SdkMeterProvider.builder()
-        .setResource(resource)
-        ...
-        .build();
+SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
+    .setResource(resource)
+    ...
+    .build();
 
-    SdkLoggerProvider sdkLoggerProvider = SdkLoggerProvider.builder()
-        .setResource(resource)
-        ...
-        .build();
+SdkMeterProvider sdkMeterProvider = SdkMeterProvider.builder()
+    .setResource(resource)
+    ...
+    .build();
+
+SdkLoggerProvider sdkLoggerProvider = SdkLoggerProvider.builder()
+    .setResource(resource)
+    ...
+    .build();
 ```