Merge branch 'main' into patch-2

content/en/docs/demo/architecture.md

@@ -14,12 +14,13 @@ graph TD
 subgraph Service Diagram
 accountingservice(Accounting Service):::dotnet
 adservice(Ad Service):::java
-cache[(Cache<br/>&#40redis&#41)]
+cache[(Cache<br/>&#40Valkey&#41)]
 cartservice(Cart Service):::dotnet
 checkoutservice(Checkout Service):::golang
 currencyservice(Currency Service):::cpp
 emailservice(Email Service):::ruby
-flagd(Flagd-ui):::typescript
+flagd(Flagd):::golang
+flagdui(Flagd-ui):::typescript
 frauddetectionservice(Fraud Detection Service):::kotlin
 frontend(Frontend):::typescript
 frontendproxy(Frontend Proxy <br/>&#40Envoy&#41):::cpp
@@ -30,40 +31,52 @@ productcatalogservice(Product Catalog Service):::golang
 quoteservice(Quote Service):::php
 recommendationservice(Recommendation Service):::python
 shippingservice(Shipping Service):::rust
-queue[(queue<br/>&#40Kafka&#41)]
+queue[(queue<br/>&#40Kafka&#41)]:::java
 
-Internet -->|HTTP| frontendproxy
-frontendproxy -->|HTTP| frontend
-frontendproxy -->|HTTP| flagd
-loadgenerator -->|HTTP| frontendproxy
-frontendproxy -->|HTTP| imageprovider
+adservice ---->|gRPC| flagd
 
-queue -->|TCP| accountingservice
-queue -->|TCP| frauddetectionservice
-
-frontend -->|gRPC| cartservice
-frontend -->|gRPC| currencyservice
+checkoutservice -->|gRPC| cartservice
+checkoutservice --->|TCP| queue
+cartservice --> cache
+cartservice -->|gRPC| flagd
 
-checkoutservice -->|gRPC| cartservice --> cache
-checkoutservice -->|gRPC| productcatalogservice
-checkoutservice -->|gRPC| currencyservice
-checkoutservice -->|HTTP| emailservice
-checkoutservice -->|gRPC| paymentservice
 checkoutservice -->|gRPC| shippingservice
-checkoutservice -->|TCP| queue
+checkoutservice -->|gRPC| paymentservice
+checkoutservice --->|HTTP| emailservice
+checkoutservice -->|gRPC| currencyservice
+checkoutservice -->|gRPC| productcatalogservice
+
+frauddetectionservice -->|gRPC| flagd
 
 frontend -->|gRPC| adservice
+frontend -->|gRPC| cartservice
+frontend -->|gRPC| checkoutservice
+frontend ---->|gRPC| currencyservice
+frontend ---->|gRPC| recommendationservice
 frontend -->|gRPC| productcatalogservice
-frontend --->|gRPC| checkoutservice
-frontend ---->|gRPC| recommendationservice -->|gRPC| productcatalogservice
 
-shippingservice -->|HTTP| quoteservice
+frontendproxy -->|gRPC| flagd
+frontendproxy -->|HTTP| frontend
+frontendproxy -->|HTTP| flagdui
+frontendproxy -->|HTTP| imageprovider
+
+Internet -->|HTTP| frontendproxy
+
+loadgenerator -->|HTTP| frontendproxy
+
+paymentservice -->|gRPC| flagd
 
+queue -->|TCP| accountingservice
+queue -->|TCP| frauddetectionservice
+
+recommendationservice -->|gRPC| productcatalogservice
+recommendationservice -->|gRPC| flagd
+
+shippingservice -->|HTTP| quoteservice
 end
 
 classDef dotnet fill:#178600,color:white;
 classDef cpp fill:#f34b7d,color:white;
-classDef erlang fill:#b83998,color:white;
 classDef golang fill:#00add8,color:black;
 classDef java fill:#b07219,color:white;
 classDef javascript fill:#f1e05a,color:black;
@@ -80,7 +93,6 @@ graph TD
 subgraph Service Legend
   dotnetsvc(.NET):::dotnet
   cppsvc(C++):::cpp
-  erlangsvc(Erlang/Elixir):::erlang
   golangsvc(Go):::golang
   javasvc(Java):::java
   javascriptsvc(JavaScript):::javascript
@@ -94,7 +106,6 @@ end
 
 classDef dotnet fill:#178600,color:white;
 classDef cpp fill:#f34b7d,color:white;
-classDef erlang fill:#b83998,color:white;
 classDef golang fill:#00add8,color:black;
 classDef java fill:#b07219,color:white;
 classDef javascript fill:#f1e05a,color:black;

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

@@ -8,7 +8,7 @@ cascade:
   vers:
     instrumentation: 2.10.0
     otel: 1.44.1
-    contrib: 1.38.0
+    contrib: 1.41.0
     semconv: 1.28.0
 weight: 18
 ---

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

@@ -325,6 +325,7 @@ Span processors built-in to the SDK and maintained by the community in
 | `BaggageSpanProcessor`    | `io.opentelemetry.contrib:opentelemetry-baggage-processor:{{% param vers.contrib %}}-alpha` | Enriches spans with baggage.                                              |
 | `JfrSpanProcessor`        | `io.opentelemetry.contrib:opentelemetry-jfr-events:{{% param vers.contrib %}}-alpha`        | Creates JFR events from spans.                                            |
 | `StackTraceSpanProcessor` | `io.opentelemetry.contrib:opentelemetry-span-stacktrace:{{% param vers.contrib %}}-alpha`   | Enriches select spans with stack trace data.                              |
+| `InferredSpansProcessor`  | `io.opentelemetry.contrib:opentelemetry-inferred-spans:{{% param vers.contrib %}}-alpha`    | Generates spans from async profiler instead of instrumentation.           |
 
 The following code snippet demonstrates `SpanProcessor` programmatic
 configuration:
@@ -998,10 +999,11 @@ other applications such as data enrichment.
 Log record processors built-in to the SDK and maintained by the community in
 `opentelemetry-java-contrib`:
 
-| Class                      | Artifact                                                     | Description                                                                  |
-| -------------------------- | ------------------------------------------------------------ | ---------------------------------------------------------------------------- |
-| `BatchLogRecordProcessor`  | `io.opentelemetry:opentelemetry-sdk:{{% param vers.otel %}}` | Batches log records and exports them via a configurable `LogRecordExporter`. |
-| `SimpleLogRecordProcessor` | `io.opentelemetry:opentelemetry-sdk:{{% param vers.otel %}}` | Exports each log record a via a configurable `LogRecordExporter`.            |
+| Class                      | Artifact                                                                             | Description                                                                  |
+| -------------------------- | ------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------- |
+| `BatchLogRecordProcessor`  | `io.opentelemetry:opentelemetry-sdk:{{% param vers.otel %}}`                         | Batches log records and exports them via a configurable `LogRecordExporter`. |
+| `SimpleLogRecordProcessor` | `io.opentelemetry:opentelemetry-sdk:{{% param vers.otel %}}`                         | Exports each log record a via a configurable `LogRecordExporter`.            |
+| `EventToSpanEventBridge`   | `io.opentelemetry.contrib:opentelemetry-processors:{{% param vers.contrib %}}-alpha` | Records event log records as span events on the current span.                |
 
 The following code snippet demonstrates `LogRecordProcessor` programmatic
 configuration:

package.json

@@ -23,6 +23,7 @@
     "_filename-error": "echo 'ERROR: the following files violate naming conventions; fix using: `npm run fix:filenames`'; echo; npm run -s _ls-bad-filenames; exit 1",
     "_get:no": "echo SKIPPING get operation",
     "_get:submodule": "set -x && git submodule update --init ${DEPTH:- --depth 999}",
+    "_hugo-0_139_0_gcse-patch": "perl -i -pe 's/gcse :/gcse:/' public/search/index.html",
     "_hugo": "hugo --cleanDestinationDir",
     "_install:dict": "npm install -D $(npm run -s _list:dict)",
     "_install:netlify-cli": "npm list netlify-cli || npm install -O netlify-cli",
@@ -94,6 +95,8 @@
     "prepare": "npm run seq -- get:submodule _prepare:docsy",
     "preserve:hugo": "npm run _prebuild",
     "preserve:netlify": "npm run seq -- _prebuild _install:netlify-cli",
+    "postbuild:preview": "npm run _hugo-0_139_0_gcse-patch",
+    "postbuild:production": "npm run _hugo-0_139_0_gcse-patch",
     "schemas:update": "npm run update:submodule content-modules/opentelemetry-specification",
     "seq": "bash -c 'for cmd in \"$@\"; do npm run $cmd || exit 1; done' - ",
     "serve:hugo": "npm run _serve:hugo -- --renderToMemory",
@@ -139,7 +142,7 @@
     "@opentelemetry/resources": "^1.28.0",
     "@opentelemetry/sdk-trace-base": "^1.28.0",
     "@opentelemetry/sdk-trace-web": "^1.28.0",
-    "@opentelemetry/semantic-conventions": "^1.27.0",
+    "@opentelemetry/semantic-conventions": "^1.28.0",
     "path": "^0.12.7"
   },
   "optionalDependencies": {

scripts/auto-update/all-versions.sh

@@ -8,6 +8,7 @@ function auto_update_versions() {
       "opentelemetry-java otel content/en/docs/zero-code/java/_index.md"
       "opentelemetry-java-instrumentation instrumentation content/en/docs/languages/java/_index.md"
       "opentelemetry-java-instrumentation instrumentation content/en/docs/zero-code/java/_index.md"
+      "opentelemetry-java-contrib contrib content/en/docs/languages/java/_index.md"
       "opentelemetry-specification spec scripts/content-modules/adjust-pages.pl .gitmodules"
       "opentelemetry-proto otlp scripts/content-modules/adjust-pages.pl .gitmodules"
       "semantic-conventions semconv scripts/content-modules/adjust-pages.pl .gitmodules"