Merge branch 'main' into main

content/en/docs/kubernetes/operator/automatic.md

@@ -205,7 +205,7 @@ EOF
 ```
 
 By default, the Instrumentation resource that auto-instruments Java services
-uses `otlp` with the `http+protobuf` protocol. This means that the configured
+uses `otlp` with the `http/protobuf` protocol. This means that the configured
 endpoint must be able to receive OTLP over `http` via `protobuf` payloads.
 Therefore, the example uses `http://demo-collector:4318`, which connects to the
 `http` port of the otlpreceiver of the Collector created in the previous step.

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

@@ -973,6 +973,25 @@ OpenTelemetry provides a text-based approach to propagate context to remote
 services using the [W3C Trace Context](https://www.w3.org/TR/trace-context/)
 HTTP headers.
 
+### Context propagation between threads
+
+THe following example demonstrates how to propagate the context between threads:
+
+```java
+io.opentelemetry.context.Context context = io.opentelemetry.context.Context.current();
+Thread thread = new Thread(new Runnable() {
+  @Override
+  public void run() {
+    try (Scope scope = context.makeCurrent()) {
+      // Code for which you want to propagate the context
+    }
+  }
+});
+thread.start();
+```
+
+### Context propagation between HTTP requests
+
 The following presents an example of an outgoing HTTP request using
 `HttpURLConnection`.