From a0935d81c5d7025eaa5a0330c4e7039623b607c0 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Sat, 23 Nov 2024 09:06:24 -0500 Subject: [PATCH 1/4] [CI] Patch search results page so search results will display (#5675) --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 4b18d20f3a6a..c2f74763de4c 100644 --- a/package.json +++ b/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": { From e5402a44a6291107bb26337da6f89962a6c64a8a Mon Sep 17 00:00:00 2001 From: Juliano Costa Date: Mon, 25 Nov 2024 11:41:11 +0100 Subject: [PATCH 2/4] [Demo] Update diagram (#5678) Co-authored-by: Mikko Viitanen <74129181+mviitane@users.noreply.github.com> --- content/en/docs/demo/architecture.md | 61 ++++++++++++++++------------ 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/content/en/docs/demo/architecture.md b/content/en/docs/demo/architecture.md index ab2f2040807b..245ff539c225 100644 --- a/content/en/docs/demo/architecture.md +++ b/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
(redis))] +cache[(Cache
(Valkey))] 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
(Envoy)):::cpp @@ -30,40 +31,52 @@ productcatalogservice(Product Catalog Service):::golang quoteservice(Quote Service):::php recommendationservice(Recommendation Service):::python shippingservice(Shipping Service):::rust -queue[(queue
(Kafka))] +queue[(queue
(Kafka))]:::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; From 861c566e2c5b95e43a14c3e3525611f58614fdd0 Mon Sep 17 00:00:00 2001 From: jack-berg <34418638+jack-berg@users.noreply.github.com> Date: Mon, 25 Nov 2024 04:51:26 -0600 Subject: [PATCH 3/4] Add missing contrib processors, add auto version update for opentelemetry-java-contrib (#5664) --- content/en/docs/languages/java/_index.md | 2 +- content/en/docs/languages/java/sdk.md | 10 ++++++---- scripts/auto-update/all-versions.sh | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/content/en/docs/languages/java/_index.md b/content/en/docs/languages/java/_index.md index 50d2da30240b..a6c31bdd4aa9 100644 --- a/content/en/docs/languages/java/_index.md +++ b/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 --- diff --git a/content/en/docs/languages/java/sdk.md b/content/en/docs/languages/java/sdk.md index ef4b13c07a8c..cf7b49074622 100644 --- a/content/en/docs/languages/java/sdk.md +++ b/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: diff --git a/scripts/auto-update/all-versions.sh b/scripts/auto-update/all-versions.sh index d7e990819455..1020bb6a54d4 100755 --- a/scripts/auto-update/all-versions.sh +++ b/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" From f7c0ac79b4419e0742e2778ab0e4e6fcca6dffd1 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Mon, 25 Nov 2024 05:52:03 -0500 Subject: [PATCH 4/4] Make some Collector images dark-mode compatible (#5674) --- .../otel-collector-after-connector.svg | 587 +++++++++++------- .../otel-collector-before-connector.svg | 2 +- .../docs/collector/img/otel-gateway-sdk.svg | 2 +- 3 files changed, 355 insertions(+), 236 deletions(-) diff --git a/content/en/docs/collector/building/connector/otel-collector-after-connector.svg b/content/en/docs/collector/building/connector/otel-collector-after-connector.svg index a6bd7802b339..561951e55d7a 100644 --- a/content/en/docs/collector/building/connector/otel-collector-after-connector.svg +++ b/content/en/docs/collector/building/connector/otel-collector-after-connector.svg @@ -1,235 +1,354 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/content/en/docs/collector/building/connector/otel-collector-before-connector.svg b/content/en/docs/collector/building/connector/otel-collector-before-connector.svg index 662198cd7766..102202599f99 100644 --- a/content/en/docs/collector/building/connector/otel-collector-before-connector.svg +++ b/content/en/docs/collector/building/connector/otel-collector-before-connector.svg @@ -1,6 +1,6 @@ - + diff --git a/content/en/docs/collector/img/otel-gateway-sdk.svg b/content/en/docs/collector/img/otel-gateway-sdk.svg index 006a96a54949..5279ce7a6be3 100644 --- a/content/en/docs/collector/img/otel-gateway-sdk.svg +++ b/content/en/docs/collector/img/otel-gateway-sdk.svg @@ -1,5 +1,5 @@ - +