Merge branch 'main' into update-java-sampling

.cspell.yml

@@ -104,6 +104,7 @@ words:
   - opentelemetry
   - opentracing
   - openzipkin
+  - OSTIF
   - otel
   - otel-comms
   - otel-endusers

.github/CODEOWNERS

@@ -14,40 +14,3 @@
 
 # Global owners, will be the owners for everything in the repo.
 * @open-telemetry/docs-approvers
-
-# content owners
-content-modules/                         @open-telemetry/docs-maintainers
-content-modules/opamp-spec               @open-telemetry/docs-maintainers @open-telemetry/opamp-spec-approvers
-content-modules/opentelemetry-proto      @open-telemetry/docs-maintainers @open-telemetry/specs-approvers
-content-modules/opentelemetry-specification  @open-telemetry/docs-maintainers @open-telemetry/specs-approvers
-content-modules/semantic-conventions     @open-telemetry/docs-maintainers @open-telemetry/specs-semconv-approvers
-content/en/blog/                         @open-telemetry/docs-maintainers
-content/en/community/end-user/           @open-telemetry/docs-approvers @open-telemetry/sig-end-user-approvers
-content/en/docs/collector                @open-telemetry/docs-approvers @open-telemetry/collector-approvers
-content/en/docs/contributing/            @open-telemetry/docs-approvers @open-telemetry/docs-maintainers
-content/en/docs/demo                     @open-telemetry/docs-approvers @open-telemetry/demo-approvers
-content/en/docs/kubernetes/helm/         @open-telemetry/docs-approvers @open-telemetry/helm-approvers
-content/en/docs/kubernetes/operator/     @open-telemetry/docs-approvers @open-telemetry/operator-approvers
-content/en/docs/languages/cpp/           @open-telemetry/docs-approvers @open-telemetry/cpp-approvers
-content/en/docs/languages/erlang/        @open-telemetry/docs-approvers @open-telemetry/erlang-approvers
-content/en/docs/languages/go/            @open-telemetry/docs-approvers @open-telemetry/go-approvers @open-telemetry/go-instrumentation-approvers
-content/en/docs/languages/java/          @open-telemetry/docs-approvers @open-telemetry/java-approvers @open-telemetry/java-instrumentation-approvers
-content/en/docs/languages/js/            @open-telemetry/docs-approvers @open-telemetry/javascript-approvers
-content/en/docs/languages/net/           @open-telemetry/docs-approvers @open-telemetry/dotnet-approvers @open-telemetry/dotnet-instrumentation-approvers
-content/en/docs/languages/php/           @open-telemetry/docs-approvers @open-telemetry/php-approvers
-content/en/docs/languages/python/        @open-telemetry/docs-approvers @open-telemetry/python-approvers
-content/en/docs/languages/ruby/          @open-telemetry/docs-approvers @open-telemetry/ruby-approvers @open-telemetry/ruby-contrib-approvers
-content/en/docs/languages/rust/          @open-telemetry/docs-approvers @open-telemetry/rust-approvers
-content/en/docs/languages/swift/         @open-telemetry/docs-approvers @open-telemetry/swift-approvers
-content/en/docs/security/                @open-telemetry/docs-approvers @open-telemetry/sig-security-maintainers
-content/en/docs/specs/                   @open-telemetry/docs-approvers @open-telemetry/specs-approvers
-content/en/docs/zero-code/go             @open-telemetry/docs-approvers @open-telemetry/go-approvers @open-telemetry/go-instrumentation-approvers
-content/en/docs/zero-code/java/          @open-telemetry/docs-approvers @open-telemetry/java-approvers @open-telemetry/java-instrumentation-approvers
-content/en/docs/zero-code/js/            @open-telemetry/docs-approvers @open-telemetry/javascript-approvers
-content/en/docs/zero-code/net/           @open-telemetry/docs-approvers @open-telemetry/dotnet-approvers @open-telemetry/dotnet-instrumentation-approvers
-content/en/docs/zero-code/python/        @open-telemetry/docs-approvers @open-telemetry/python-approvers
-content/en/docs/zero-code/php/           @open-telemetry/docs-approvers @open-telemetry/php-approvers
-content/en/ecosystem/demo/               @open-telemetry/demo-approvers @open-telemetry/demo-approvers
-content/zh/                              @open-telemetry/docs-maintainers @open-telemetry/docs-zh-approvers
-content/ja/                              @open-telemetry/docs-maintainers @open-telemetry/docs-ja-approvers
-

.github/component-owners.yml

@@ -0,0 +1,79 @@
+# This file is used to define the owners of the content modules in the OpenTelemetry repository.
+components:
+  content-modules:
+    - open-telemetry/docs-maintainers
+  content-modules/opamp-spec:
+    - open-telemetry/docs-maintainers
+    - open-telemetry/opamp-spec-approvers
+  content-modules/opentelemetry-proto:
+    - open-telemetry/docs-maintainers
+    - open-telemetry/specs-approvers
+  content-modules/opentelemetry-specification:
+    - open-telemetry/docs-maintainers
+    - open-telemetry/specs-approvers
+  content-modules/semantic-conventions:
+    - open-telemetry/docs-maintainers
+    - open-telemetry/specs-semconv-approvers
+  content/en/blog:
+    - open-telemetry/docs-maintainers
+  content/en/community/end-user:
+    - open-telemetry/sig-end-user-approvers
+  content/en/docs/collector:
+    - open-telemetry/collector-approvers
+  content/en/docs/contributing:
+    - open-telemetry/docs-maintainers
+  content/en/docs/demo:
+    - open-telemetry/demo-approvers
+  content/en/docs/kubernetes/helm:
+    - open-telemetry/helm-approvers
+  content/en/docs/kubernetes/operator:
+    - open-telemetry/operator-approvers
+  content/en/docs/languages/cpp:
+    - open-telemetry/cpp-approvers
+  content/en/docs/languages/erlang:
+    - open-telemetry/erlang-approvers
+  content/en/docs/languages/go:
+    - open-telemetry/go-approvers
+    - open-telemetry/go-instrumentation-approvers
+  content/en/docs/languages/java:
+    - open-telemetry/java-approvers
+    - open-telemetry/java-instrumentation-approvers
+  content/en/docs/languages/js:
+    - open-telemetry/javascript-approvers
+  content/en/docs/languages/net:
+    - open-telemetry/dotnet-approvers
+    - open-telemetry/dotnet-instrumentation-approvers
+  content/en/docs/languages/php:
+    - open-telemetry/php-approvers
+  content/en/docs/languages/python:
+    - open-telemetry/python-approvers
+  content/en/docs/languages/ruby:
+    - open-telemetry/ruby-approvers
+    - open-telemetry/ruby-contrib-approvers
+  content/en/docs/languages/rust:
+    - open-telemetry/rust-approvers
+  content/en/docs/languages/swift:
+    - open-telemetry/swift-approvers
+  content/en/docs/security:
+    - open-telemetry/sig-security-maintainers
+  content/en/docs/specs:
+    - open-telemetry/specs-approvers
+  content/en/docs/zero-code/java:
+    - open-telemetry/java-approvers
+    - open-telemetry/java-instrumentation-approvers
+  content/en/docs/zero-code/js:
+    - open-telemetry/javascript-approvers
+  content/en/docs/zero-code/net:
+    - open-telemetry/dotnet-approvers
+    - open-telemetry/dotnet-instrumentation-approvers
+  content/en/ecosystem/demo:
+    - open-telemetry/demo-approvers
+  content/zh:
+    - open-telemetry/docs-maintainers
+    - open-telemetry/docs-zh-approvers
+  content/ja:
+    - open-telemetry/docs-maintainers
+    - open-telemetry/docs-ja-approvers
+  content/pt:
+    - open-telemetry/docs-maintainers
+    - open-telemetry/docs-pt-approvers

.github/workflows/component-owners.yml

@@ -0,0 +1,15 @@
+name: Component owners
+on:
+  pull_request_target:
+
+jobs:
+  run_self:
+    runs-on: ubuntu-latest
+    name: Assign component owners
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - uses: dyladan/[email protected]
+        with:
+          config-file: .github/component-owners.yml

.gitmodules

@@ -27,4 +27,7 @@
 [submodule "content-modules/opentelemetry-go"]
 	path = content-modules/opentelemetry-go
 	url = https://github.com/open-telemetry/opentelemetry-go
-  go-pin = v1.27.0
+    go-pin = v1.27.0
+[submodule "content-modules/opentelemetry-java-examples"]
+	path = content-modules/opentelemetry-java-examples
+	url = https://github.com/open-telemetry/opentelemetry-java-examples.git

content/en/blog/2024/cve-2024-36129.md

@@ -8,7 +8,7 @@ author:
   '[Juraci Paixão Kröhling](https://github.com/jpkrohling) (OpenTelemetry,
   Grafana Labs), [Pablo Baeyens](https://github.com/mx-psi) (OpenTelemetry,
   Datadog)'
-cSpell:ignore: Baeyens configgrpc confighttp Miroslav OSTIF Stampar zstd
+cSpell:ignore: Baeyens configgrpc confighttp Miroslav Stampar zstd
 ---
 
 On our path toward graduation, the OpenTelemetry project is currently undergoing

content/en/blog/2024/hardening-the-collector-one.md

@@ -4,7 +4,7 @@ linkTitle: A new default bind address for the Collector
 date: 2024-07-02
 author: '[Pablo Baeyens](https://github.com/mx-psi) (OpenTelemetry, Datadog)'
 # prettier-ignore
-cSpell:ignore: awsfirehose awsproxy awsxray Baeyens jaegerremotesampling loki OSTIF remotetap sapm signalfx skywalking splunk
+cSpell:ignore: awsfirehose awsproxy awsxray Baeyens jaegerremotesampling loki remotetap sapm signalfx skywalking splunk
 issue: 4760
 sig: Collector SIG
 ---

content/en/docs/collector/configuration.md

@@ -545,8 +545,6 @@ extensions:
   health_check:
   pprof:
   zpages:
-  memory_ballast:
-    size_mib: 512
 ```
 
 > For detailed extension configuration, see the

content/en/docs/collector/troubleshooting.md

@@ -207,9 +207,6 @@ extensions:
   - name: zpages
     stability:
       extension: Beta
-  - name: memory_ballast
-    stability:
-      extension: Deprecated
   - name: health_check
     stability:
       extension: Beta

content/en/docs/concepts/context-propagation.md

@@ -33,7 +33,7 @@ information to be propagated from one service to another.
 
 Propagation is usually handled by instrumentation libraries and is transparent
 to the user. In the event that you need to manually propagate context, you can
-use Propagation APIs.
+use the [Propagators API](/docs/specs/otel/context/api-propagators/).
 
 OpenTelemetry maintains several official propagators. The default propagator is
 using the headers specified by the

content/en/docs/kubernetes/helm/collector.md

@@ -42,8 +42,6 @@ exporters:
   debug: {}
 extensions:
   health_check: {}
-  memory_ballast:
-    size_in_percentage: 40
 processors:
   batch: {}
   memory_limiter:
@@ -78,7 +76,6 @@ receivers:
 service:
   extensions:
     - health_check
-    - memory_ballast
   pipelines:
     logs:
       exporters:

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

@@ -300,6 +300,32 @@ spec:
         value: http,nestjs-core # comma-separated list of the instrumentation package names without the `@opentelemetry/instrumentation-` prefix.
 ```
 
+To keep all default libraries and disable only specific instrumentation
+libraries you can use the `OTEL_NODE_DISABLED_INSTRUMENTATIONS` environment
+variable. For details, see
+[Excluding instrumentation libraries](/docs/zero-code/js/configuration/#excluding-instrumentation-libraries).
+
+```yaml
+apiVersion: opentelemetry.io/v1alpha1
+kind: Instrumentation
+# ... other fields skipped from this example
+spec:
+  # ... other fields skipped from this example
+  nodejs:
+    env:
+      - name: OTEL_NODE_DISABLED_INSTRUMENTATIONS
+        value: fs,grpc # comma-separated list of the instrumentation package names without the `@opentelemetry/instrumentation-` prefix.
+```
+
+{{% alert title="Note" color="info" %}}
+
+If both environment variables are set, `OTEL_NODE_ENABLED_INSTRUMENTATIONS` is
+applied first, and then `OTEL_NODE_DISABLED_INSTRUMENTATIONS` is applied to that
+list. Therefore, if the same instrumentation is included in both lists, that
+instrumentation will be disabled.
+
+{{% /alert %}}
+
 #### Learn more {#js-learn-more}
 
 For more details, see