Merge branch 'main' of github.com:open-telemetry/opentelemetry.io int…

…o jmacd/otelarrowprod

.cspell/en-words.txt

@@ -52,6 +52,7 @@ jaeger
 jaegertracing
 javaagent
 javadoc
+javadocs
 jboss
 jdbc
 julia

.gitmodules

@@ -7,7 +7,7 @@
 [submodule "content-modules/opentelemetry-specification"]
 	path = content-modules/opentelemetry-specification
 	url = https://github.com/open-telemetry/opentelemetry-specification.git
-	spec-pin = v1.36.0
+	spec-pin = v1.37.0
 [submodule "content-modules/community"]
 	path = content-modules/community
 	url = https://github.com/open-telemetry/community

.htmltest.yml

@@ -10,7 +10,7 @@ IgnoreDirs:
   - ^blog/(\d+/)?page/\d+
 IgnoreInternalURLs: # list of paths
 IgnoreURLs: # list of regexs of paths or URLs to be ignored
-  - ^(/..)?/docs/languages/\w+/(api|examples|registry)/$
+  - ^((/..)?/docs/languages/\w+|\.\.)/(api|examples|registry)/$
   - ^(/..)?/docs/collector/registry/$
   - ^(/..)?/docs/languages/net/(metrics-api|traces-api)/
   - ^((/..)?/docs/migration/)?opencensus/$

.textlintrc.yml

@@ -136,6 +136,7 @@ rules:
         - '(?<![.-])java\b(?![.])'
         - Java
       - ['java[- ]?agent', Java agent]
+      - ['java ?doc(s)?', 'Javadoc$1']
       - [mac ?os, macOS]
       - ['meta[- ]data', metadata]
       - [nd-?json, NDJSON]

content/en/api-docs.md

@@ -0,0 +1,16 @@
+---
+title: API Documentation
+linkTitle: Docs
+cSpell:ignore: apidocs
+---
+
+{{% blocks/section color="white" %}}
+
+## {{% param title %}}
+
+Below you will find links to all the API references available for the different
+implementations of the OpenTelemetry API & SDK
+
+{{% apidocs %}}
+
+{{% /blocks/section %}}

content/en/docs/collector/internal-telemetry.md

@@ -23,18 +23,24 @@ By default, the Collector exposes its own telemetry in two ways:
 
 You can configure how internal metrics are generated and exposed by the
 Collector. By default, the Collector generates basic metrics about itself and
-exposes them for scraping at `http://127.0.0.1:8888/metrics`. You can expose the
-endpoint to one specific or all network interfaces when needed. For
-containerized environments, you might want to expose this port on a public
-interface.
+exposes them using the OpenTelemetry Go
+[Prometheus exporter](https://github.com/open-telemetry/opentelemetry-go/tree/main/exporters/prometheus)
+for scraping at `http://127.0.0.1:8888/metrics`. You can expose the endpoint to
+one specific or all network interfaces when needed. For containerized
+environments, you might want to expose this port on a public interface.
 
-Set the address in the config `service::telemetry::metrics`:
+Set the Prometheus config under `service::telemetry::metrics`:
 
 ```yaml
 service:
   telemetry:
     metrics:
-      address: 0.0.0.0:8888
+      readers:
+        pull:
+          exporter:
+            prometheus:
+              host: '0.0.0.0'
+              port: 8888
 ```
 
 You can adjust the verbosity of the Collector metrics output by setting the
@@ -59,30 +65,34 @@ service:
       level: detailed
 ```
 
-The Collector can also be configured to scrape its own metrics using a
-[Prometheus receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/prometheusreceiver)
-and send them through configured pipelines. For example:
+The Collector can also be configured to push its own metrics to an
+[OTLP receiver](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver)
+and send them through configured pipelines. In the following example, the
+Collector is configured to push metrics every 10s using OTLP gRPC to
+`localhost:14317`:
 
 ```yaml
 receivers:
-  prometheus:
-    config:
-      scrape_configs:
-        - job_name: 'otelcol'
-          scrape_interval: 10s
-          static_configs:
-            - targets: ['0.0.0.0:8888']
-          metric_relabel_configs:
-            - source_labels: [__name__]
-              regex: '.*grpc_io.*'
-              action: drop
+  otlp/internal_metrics:
+    protocols:
+      grpc:
+        endpoint: localhost:14317
 exporters:
   debug:
 service:
   pipelines:
     metrics:
-      receivers: [prometheus]
+      receivers: [otlp/internal_metrics]
       exporters: [debug]
+  telemetry:
+    metrics:
+      readers:
+        - periodic:
+            interval: 10000
+            exporter:
+              otlp:
+                protocol: grpc/protobuf
+                endpoint: localhost:14317
 ```
 
 {{% alert title="Caution" color="warning" %}}

content/en/docs/collector/quick-start.md

@@ -40,10 +40,10 @@ preferred shell.
 
 ## Set up the environment
 
-1. Pull in the OpenTelemetry Collector Docker image:
+1. Pull in the OpenTelemetry Collector Contrib Docker image:
 
    ```sh
-   docker pull otel/opentelemetry-collector:{{% param vers %}}
+   docker pull otel/opentelemetry-collector-contrib:{{% param vers %}}
    ```
 
 2. Install the [telemetrygen] utility:
@@ -63,7 +63,7 @@ preferred shell.
    docker run \
      -p 127.0.0.1:4317:4317 \
      -p 127.0.0.1:55679:55679 \
-     otel/opentelemetry-collector:{{% param vers %}} \
+     otel/opentelemetry-collector-contrib:{{% param vers %}} \
      2>&1 | tee collector-output.txt # Optionally tee output for easier search later
    ```
 

content/en/docs/concepts/sampling/index.md

@@ -103,7 +103,7 @@ as possible. A decision to sample or drop a span or trace is not made by
 inspecting the trace as a whole.
 
 For example, the most common form of head sampling is
-[Consistent Probability Sampling](/docs/specs/otel/trace/tracestate-probability-sampling/#consistent-probability-sampling).
+[Consistent Probability Sampling](/docs/specs/otel/trace/tracestate-probability-sampling-experimental/#consistent-probability-sampling).
 This is also be referred to as Deterministic Sampling. In this case, a sampling
 decision is made based on the trace ID and the desired percentage of traces to
 sample. This ensures that whole traces are sampled - no missing spans - at a

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

@@ -6,8 +6,9 @@ description: >-
 aliases: [/java, /java/metrics, /java/tracing]
 cascade:
   vers:
-    instrumentation: 2.7.0
+    instrumentation: 2.8.0
     otel: 1.42.1
+    contrib: 1.38.0
     semconv: 1.27.0
 weight: 18
 ---