Merge branch 'main' into add-embrace-vendor-list

.cspell.yml

@@ -5,6 +5,7 @@ version: '0.2'
 caseSensitive: true
 ignorePaths:
   - '*.svg'
+  - 'vendors.yaml'
 # words here are only listed for their spelling, if there is a certain way
 # to write a word (e.g. OpenTelemetry vs Opentelemetry or cloud native vs
 # cloud-native), edit the text-lint rules in .textlintrc.yml

.github/workflows/check-text.yml

@@ -9,13 +9,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      # Make sure that we only install the dependencies for textlint to speed up install
-      - run: |
+      - name: Create and use reduced-dependencies package.json
+        run: |
           mkdir -p tmp
           jq '.devDependencies |= with_entries( select(.key | startswith("textlint")))
               | del(.dependencies, .optionalDependencies)' \
-              package.json > tmp/package-min.json
-          cp tmp/package-min.json package.json
+              package.json > tmp/package-ci.json
+          cp tmp/package-ci.json package.json
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
+          cache: npm
+          cache-dependency-path: tmp/package-ci.json
       - run: npm install --ignore-scripts --omit=optional
       - run: .github/workflows/scripts/textlint.sh
 
@@ -24,15 +29,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-
       - name: Create and use reduced-dependencies package.json
         run: |
           mkdir -p tmp
           jq '.devDependencies |= with_entries(
                   select(.key | test("gulp|markdown|through|require|yargs"))
                 )
                 | del(.dependencies, .optionalDependencies)' \
-            package.json > tmp/package-min.json
-          cp tmp/package-min.json package.json
+            package.json > tmp/package-ci.json
+          cp tmp/package-ci.json package.json
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
+          cache: npm
+          cache-dependency-path: tmp/package-ci.json
       - run: npm install --ignore-scripts --omit=optional
       - run: npm run check:markdown

.github/workflows/pr-actions.yml

@@ -23,7 +23,7 @@ jobs:
       pull-requests: write
 
     env:
-      DEPTH: --depth 100 # submodule clone depth
+      DEPTH: --depth 1000 # submodule clone depth
 
     steps:
       - name: Extract action name

.gitmodules

@@ -1,8 +1,9 @@
 [submodule "themes/docsy"]
 	path = themes/docsy
-	url = https://github.com/cncf/docsy.git
+	url = https://github.com/google/docsy.git
 	docsy-pin = v0.9.1-17-gb077a74
-	docsy-reminder = "Ensure that all tags from google/docsy are also present in cncf/docsy, otherwise add (push) them."
+	docsy-note = "2024-04-01 Switching to google/docsy.git from cncf/docsy.git since we don't have any CNCF customizations."
+	docsy-reminder = "Ensure that any tag referenced by `docsy-pin` is present in the remote repo (url), otherwise add (push) the tags to the repo."
 [submodule "content-modules/opentelemetry-specification"]
 	path = content-modules/opentelemetry-specification
 	url = https://github.com/open-telemetry/opentelemetry-specification.git
@@ -14,11 +15,11 @@
 [submodule "content-modules/opentelemetry-proto"]
 	path = content-modules/opentelemetry-proto
 	url = https://github.com/open-telemetry/opentelemetry-proto
-	otlp-pin = v1.1.0
+	otlp-pin = v1.2.0
 [submodule "content-modules/semantic-conventions"]
 	path = content-modules/semantic-conventions
 	url = https://github.com/open-telemetry/semantic-conventions
-	semconv-pin = v1.24.0
+	semconv-pin = v1.25.0
 [submodule "content-modules/opamp-spec"]
 	path = content-modules/opamp-spec
 	url = https://github.com/open-telemetry/opamp-spec

CONTRIBUTING.md

@@ -69,8 +69,8 @@ PR shortly or let maintainers now if you run into any blockers.
 ## Contributor's guide
 
 To learn how to contribute fixes and new content to this project, read the
-[Contributor's guide](/content/en/docs/contributing), which includes a style
-guide and useful information on the review process.
+[Contributor's guide](https://opentelemetry.io/docs/contributing/), which
+includes a style guide and useful information on the review process.
 
 ## Development
 

content/en/docs/collector/building/connector.md

@@ -44,7 +44,8 @@ pipeline and send it to the metrics pipeline. Historically, some processors
 transmitted data by making use of a work-around that follows a bad practice
 where a processor directly exports data after processing. The connector
 component solves the need for this work-around and the processors that used the
-work around have been deprecated.
+work around have been deprecated. On the same line, above mentioned processors
+are also now deprecated in recent releases and are replaced by the connectors.
 
 Additional details about the connector's full capabilities can be found at the
 following links:

content/en/docs/collector/deployment/gateway.md

@@ -35,9 +35,6 @@ Let's have a look at such a case where we are using the load-balancing exporter:
    signals to a group of collectors.
 3. The collectors are configured to send telemetry data to one or more backends.
 
-{{% alert title="Note" color="info" %}} Currently, the load-balancing exporter
-only supports pipelines of the `traces` type. {{% /alert %}}
-
 ## Examples
 
 ### NGINX as an "out-of-the-box" load balancer

content/en/docs/demo/scenarios/recommendation-cache/index.md

@@ -12,8 +12,9 @@ traces to determine the cause of a memory leak.
 ## Setup
 
 To run this scenario, you will need to deploy the demo application and enable
-the `recommendationCache` feature flag. Let the application run for about 10
-minutes or so after enabling the feature flag to allow for data to populate.
+the `recommendationServiceCacheFailure` feature flag. Let the application run
+for about 10 minutes or so after enabling the feature flag to allow for data to
+populate.
 
 ## Diagnosis
 

content/en/docs/languages/go/exporters.md

@@ -110,7 +110,7 @@ docker run -d --name jaeger \
   jaegertracing/all-in-one:latest
 ```
 
-### OTLP metrics over HTTP (Experimental)
+### OTLP metrics over HTTP
 
 [`go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp`](https://pkg.go.dev/go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp)
 contains an implementation of OTLP metrics exporter using HTTP with binary
@@ -129,7 +129,7 @@ func newExporter(ctx context.Context) (metric.Exporter, error) {
 }
 ```
 
-### OTLP metrics over gRPC (Experimental)
+### OTLP metrics over gRPC
 
 [`go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc`](https://pkg.go.dev/go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc)
 contains an implementation of OTLP metrics exporter using gRPC.

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

@@ -7,7 +7,7 @@ aliases: [/java, /java/metrics, /java/tracing]
 cascade:
   vers:
     instrumentation: 2.2.0
-    otel: 1.36.0
+    otel: 1.37.0
     semconv: 1.24.0
 weight: 18
 ---

content/en/docs/languages/net/automatic/nuget-packages.md

@@ -37,7 +37,7 @@ To automatically instrument your application with OpenTelemetry .NET add the
 `OpenTelemetry.AutoInstrumentation` package to your project:
 
 ```terminal
-dotnet add [<PROJECT>] package OpenTelemetry.AutoInstrumentation --prerelease
+dotnet add [<PROJECT>] package OpenTelemetry.AutoInstrumentation
 ```
 
 If the application references packages that can be instrumented, but, require
@@ -46,7 +46,7 @@ you to either add the missing instrumentation package or to skip the
 instrumentation of the corresponding package:
 
 ```terminal
-~packages/opentelemetry.autoinstrumentation.buildtasks/1.0.0-rc.1/build/OpenTelemetry.AutoInstrumentation.BuildTasks.targets(29,5): error : OpenTelemetry.AutoInstrumentation: add a reference to the instrumentation package 'MongoDB.Driver.Core.Extensions.DiagnosticSources' version 1.3.0 or add 'MongoDB.Driver.Core' to the property 'SkippedInstrumentations' to suppress this error.
+~packages/opentelemetry.autoinstrumentation.buildtasks/1.4.0/build/OpenTelemetry.AutoInstrumentation.BuildTasks.targets(29,5): error : OpenTelemetry.AutoInstrumentation: add a reference to the instrumentation package 'MongoDB.Driver.Core.Extensions.DiagnosticSources' version 1.3.0 or add 'MongoDB.Driver.Core' to the property 'SkippedInstrumentations' to suppress this error.
 ```
 
 To resolve the error either add the recommended instrumentation package or skip

content/en/docs/languages/python/automatic/example.md

@@ -284,7 +284,7 @@ instrumentor.instrument_app(app, excluded_urls="/server_request")
 ```
 
 After running the example again, no instrumentation should appear on the server
-side. This is because or the `excluded_urls` option passed to `instrument_app`
+side. This is because of the `excluded_urls` option passed to `instrument_app`
 that effectively stops the `server_request` function from being instrumented as
 its URL matches the regular expression passed to `excluded_urls`.
 

data/ecosystem/integrations.yaml

@@ -196,3 +196,8 @@
   docsUrl: https://clickhouse.com/docs/en/operations/opentelemetry
   components: [C++]
   oss: true
+- name: FluentCI Engine
+  url: https://github.com/fluentci-io/fluentci-engine
+  docsUrl: https://github.com/fluentci-io/fluentci-engine#-opentelemetry-tracing
+  components: [Rust]
+  oss: true